pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

aolserver4, mupen64-base, orion: replace SUBST_SED with SUBST_VARS



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jun 8 11:18:07 2019 +0200
Changeset:	3ae9f58932d79691123ca43a6095a25073e55237

Modified Files:
	aolserver4/Makefile
	mupen64-base/Makefile
	orion/Makefile

Log Message:
aolserver4, mupen64-base, orion: replace SUBST_SED with SUBST_VARS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3ae9f58932d79691123ca43a6095a25073e55237

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 aolserver4/Makefile   | 3 +--
 mupen64-base/Makefile | 4 ++--
 orion/Makefile        | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diffs:
diff --git a/aolserver4/Makefile b/aolserver4/Makefile
index 9d3510a067..9332107966 100644
--- a/aolserver4/Makefile
+++ b/aolserver4/Makefile
@@ -39,8 +39,7 @@ OWN_DIRS_PERMS+=	${NSD_PIDDIR} ${NSD_USER} ${NSD_GROUP} 740
 SUBST_CLASSES+=		cl1
 SUBST_STAGE.cl1=	post-patch
 SUBST_FILES.cl1=	sample-config.tcl
-SUBST_SED.cl1=		-e s!@PREFIX@!${PREFIX}!g \
-			-e s!@VARBASE@!${VARBASE}!g
+SUBST_VARS.cl1=		PREFIX VARBASE
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mupen64-base/Makefile b/mupen64-base/Makefile
index c7123d7155..0c5f3de4a0 100644
--- a/mupen64-base/Makefile
+++ b/mupen64-base/Makefile
@@ -22,8 +22,8 @@ LDFLAGS+=	${EXPORT_SYMBOLS_LDFLAGS}
 SUBST_CLASSES+=		fixme
 SUBST_STAGE.fixme=	post-patch
 SUBST_FILES.fixme=	Makefile
-SUBST_SED.fixme=	-e "s|@BLNK@|${BUILDLINK_DIR}|g" \
-			-e "s|@LDFLAGS@|${LDFLAGS}|g"
+SUBST_SED.fixme=	-e "s|@BLNK@|${BUILDLINK_DIR}|g"
+SUBST_VARS.fixme=	LDFLAGS
 
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 SHAREDIR=	${PREFIX}/share/${PKGBASE}
diff --git a/orion/Makefile b/orion/Makefile
index f1b6cec08c..925e4bcf1a 100644
--- a/orion/Makefile
+++ b/orion/Makefile
@@ -32,9 +32,7 @@ SCSH_IMAGE=		${PREFIX}/lib/scsh/scsh.image
 SUBST_CLASSES+=		orion
 SUBST_STAGE.orion=	post-patch
 SUBST_FILES.orion=	install.scm
-SUBST_SED.orion=	-e "s,@HEAP_SIZE@,${HEAP_SIZE},g" \
-			-e "s,@SCSH_VM@,${SCSH_VM},g"     \
-			-e "s,@SCSH_IMAGE@,${SCSH_IMAGE},g"
+SUBST_VARS.orion=	HEAP_SIZE SCSH_VM SCSH_IMAGE
 
 do-install:
 	cd ${WRKSRC}; \


Home | Main Index | Thread Index | Old Index