From nobody Fri Jan 05 18:11:47 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T6BNz26H8z55V1W; Fri, 5 Jan 2024 18:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T6BNz1gYrz40SS; Fri, 5 Jan 2024 18:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704478307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eiPhl2dPfrxzDyRmvXldJBC2jCNd96phjZGN+8AJh7M=; b=XLGhI5go+ndSiIVUKVTe4aMzFFxC82eerODfzCQpPYc8D5LcvAJnxcCylL2prxcT6lgyRa /f+48nROd6Es5SXByOmfGrnvW8uIDKK5FcJCzjrsPiEEInF0KeFgjEeLOpepHbjYdrNAsy Xgom3W5H/Kk58l34ptuPYycApoHZaXtYXJYhtm9AAM36JtAIiTDrgLRk0wHXWJz0Ajo558 bszVS+S/EUQQJxAT7XDy/RxpTm9kmuQ7bqdD450ir1jhJVyXf6fKUFKbAI0A6WfvTkl0CE 1PaqsrgWOvCR2ii2qIld3/vWZG8upi+7A0luhWxVyMq5zSpFdjdJeHGzuIhKMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704478307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eiPhl2dPfrxzDyRmvXldJBC2jCNd96phjZGN+8AJh7M=; b=O9Gi0kw+rUsIHkObAqojne8SNeIQWVhZJUZuNbOYT7ovs5ggPlU7jIqydQYTiphRw4nPLs Dnz2pkz5X3DbrmC/ZUWl97fJTOjH2XR+IWdmT/BLkbrB/wTr6JNY7Ii5d+0BYuHQlVaBzx lU/cPgNLrFS2mqeqEvzapH2NJxxn5rnaSNsti3GVLRBjRXSzn1l3oqWr2gNtKrBI7JTgeD rY2DclpvB7+Q42GHor8KDJb1sriqpHlW3JMyKO2D6V1uH7qmdDsxaLyTdKl0ZBz+OiHItK pGWKQRskRll+ITVw0uvKLQ0sOkhe9bYjvJiz5D30KIdNFwj36lj/zpisJTFqtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704478307; a=rsa-sha256; cv=none; b=Oa0UAsxdmKilK01a8D4Yfva2f7qFV43GxtWsVUeEVgPNGCNK3lsnq2Xu4cqKUJr0Y2DwJ5 Ur0zF8hCrIWkWD9ymXmwhnTE3aKZi6FfWsVL8eGEbWQpIyu5D89R9+3c9UBSVc+BeqRd3u co6bmJMr9DYAu+JygdiTTM8tTDJNFDZf9WWm/dYsrdPDy60PAMjtcKJHOUsqTvmy9k+zg5 jYv9asC/N2qXb9JklIR54rBMES0lxXwX0yNXWMLz6dXidyCsuSp27KQ7DezPLcpFW11J+c pp7h62CG7u9e52daaPPXv+lwCWP8S6oSIDq9Y6TrlZa0IZhiYEH5BmSYs+Ip0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T6BNz0k3lz1750; Fri, 5 Jan 2024 18:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 405IBlw6021796; Fri, 5 Jan 2024 18:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405IBlGj021793; Fri, 5 Jan 2024 18:11:47 GMT (envelope-from git) Date: Fri, 5 Jan 2024 18:11:47 GMT Message-Id: <202401051811.405IBlGj021793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 3dd1d157565a - main - lang/fpc-devel*: Fix stage-qa issues List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dd1d157565a1104c47db84cfe14ee26beb7f467 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dd1d157565a1104c47db84cfe14ee26beb7f467 commit 3dd1d157565a1104c47db84cfe14ee26beb7f467 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-01-05 18:10:40 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-01-05 18:11:34 +0000 lang/fpc-devel*: Fix stage-qa issues - Bump PORTREVISION Reported by: danfe via email --- lang/fpc-devel-source/Makefile | 21 +++++++++++++-------- lang/fpc-devel/Makefile | 2 +- lang/fpc-devel/pkg-plist | 4 ++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/lang/fpc-devel-source/Makefile b/lang/fpc-devel-source/Makefile index 7321eef6c6a8..584ef96f0470 100644 --- a/lang/fpc-devel-source/Makefile +++ b/lang/fpc-devel-source/Makefile @@ -1,5 +1,6 @@ PORTNAME= fpc-devel PORTVERSION= 3.3.1.20240103 +PORTREVISON= 1 CATEGORIES= lang PKGNAMESUFFIX= -source DIST_SUBDIR= freepascal @@ -17,14 +18,11 @@ GL_ACCOUNT= fpc GL_PROJECT= source GL_TAGNAME= f86a9bd5c026c7a10a165a8225bcf83e17c47b25 -PORTDATA= * - +PLIST= ${WRKDIR}/pkg-plist PATCHDIR= ${PORTSDIR}/lang/fpc-devel/files DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}-${FPCBASEVER} -WRKSRC= ${WRKDIR}/${FPCSRCDIR} FPCBASEVER= 3.3.1 -FPCSRCDIR= source-${GL_TAGNAME} .include @@ -36,6 +34,7 @@ FPC_ARCH= x86_64 post-extract: ${RM} -R ${WRKSRC}/.git* + ${RM} ${WRKSRC}/packages/fcl-web/examples/httpserver/simplehttpserver post-patch: .if ${OPSYS} == FreeBSD @@ -51,14 +50,14 @@ post-patch: .if empty(ICONV_LIB) @${REINPLACE_CMD} -i "" -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \ -e "s|%%FPC_LDPATH%%|${FPC_LDPATH}|g" \ - ${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas + ${WRKSRC}/compiler/systems/t_bsd.pas @${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \ - ${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp + ${WRKSRC}/rtl/unix/cwstring.pp .endif @${REINPLACE_CMD} -i "" -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \ - ${WRKDIR}/${FPCSRCDIR}/compiler/Makefile + ${WRKSRC}/compiler/Makefile @${REINPLACE_CMD} -i "" -e 's|/usr/local|${PREFIX}|g' \ - ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp + ${WRKSRC}/packages/fpmkunit/src/fpmkunit.pp # enable or disable units @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/a52/fpmake.pp @@ -103,6 +102,12 @@ post-patch: @${REINPLACE_CMD} -i "" -e 's|linux|freebsd,linux|g' \ ${WRKSRC}/packages/zorba/fpmake.pp +pre-install: + @${RM} -f ${PLIST} + @cd ${WRKSRC} && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ + ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} + do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR}) diff --git a/lang/fpc-devel/Makefile b/lang/fpc-devel/Makefile index 9ded0b0c9749..0c79505c1a19 100644 --- a/lang/fpc-devel/Makefile +++ b/lang/fpc-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= fpc PORTVERSION= 3.3.1.20240103 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= LOCAL/acm/freepascal/:bootstrap \ LOCAL/acm/freepascal/:man diff --git a/lang/fpc-devel/pkg-plist b/lang/fpc-devel/pkg-plist index 1cf564ae3302..e9eb806c1865 100644 --- a/lang/fpc-devel/pkg-plist +++ b/lang/fpc-devel/pkg-plist @@ -1857,6 +1857,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ptcgraph.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ptcgraph.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ptcmouse.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/ptcmouse.ppu +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.o +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/graph/sdlgraph.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gst/gst.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gst/gst.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gtk2/atk.o @@ -2692,6 +2694,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.ppu +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.o +%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o