Date: Tue, 9 Jan 2024 17:58:00 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 1b2c56b449ca - 2024Q1 - lang/fpc-devel*: Fix stage-qa issues Message-ID: <202401091758.409Hw0dU080178@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b2c56b449ca7ce8638d80bce1b5a23ae826094d commit 1b2c56b449ca7ce8638d80bce1b5a23ae826094d Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2024-01-05 18:10:40 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2024-01-09 17:57:52 +0000 lang/fpc-devel*: Fix stage-qa issues - Bump PORTREVISION Reported by: danfe via email (cherry picked from commit 3dd1d157565a1104c47db84cfe14ee26beb7f467) --- 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 <bsd.port.pre.mk> @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401091758.409Hw0dU080178>