Attachment 247429 Details for Bug 276012 – [patch] fix paths in .cfg files

[patch] [patch] fix paths in .cfg files

pr-fpc-fix-paths-in-cfg-files.diff (text/plain), 1.41 KB, created by John Hein on 2024-01-03 06:51:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2024-01-03 06:51:28 UTC

Size: 1.41 KB

patch

obsolete

>diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
>index b5f241509213..b21eea550317 100644
>--- a/lang/fpc/Makefile
>+++ b/lang/fpc/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	fpc
> PORTVERSION=	3.2.2
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	lang
> MASTER_SITES=	SF/freepascal/Source/${PORTVERSION}:source \
> 		https://downloads.freepascal.org/${PORTNAME}/dist/${PORTVERSION}/source/:source \
>@@ -169,7 +169,16 @@ do-install:
> 	# symlinking compiler
> 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ../lib/fpc/${PORTVERSION}/${PPNAME})
> 	# creating sample configuration file
>-	${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" \
>+	${SED} \
>+		-e 's| CompilerConfigDir=$$sysdir/fppkg"| CompilerConfigDir=$${sysdir##$${STAGEDIR}}/fppkg"|' \
>+		-e 's|"basepath=$$FPCPATH"|"basepath=$${FPCPATH##$${STAGEDIR}}"|' \
>+		-e 's|"sharepath=$$SHAREPATH"|"sharepath=$${SHAREPATH##$${STAGEDIR}}"|' \
>+		-e 's|"GlobalPrefix=$$FPCGLOBALPREFIX"|"GlobalPrefix=$${FPCGLOBALPREFIX##$${STAGEDIR}}"|' \
>+		-e 's|"GlobalPath=$$FPCGLOBALPATH/{CompilerVersion}/"|"GlobalPath=$${FPCGLOBALPATH##$${STAGEDIR}}/{CompilerVersion}/"|' \
>+		-e 's|"FpcBin=$$FPCBIN"|"FpcBin=$${FPCBIN##$${STAGEDIR}}"|' \
>+		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" > \
>+		"${WRKDIR}/samplecfg"
>+	STAGEDIR=${STAGEDIR} ${SH} "${WRKDIR}/samplecfg" \
> 		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
> 		"${STAGEDIR}${PREFIX}/etc"
> 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \

Flags:

jcfyecrayz: maintainer-approval? (acm)

Actions: View | Diff

Attachments on bug 276012: 247429