summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2002-02-05 21:34:55 +0000
committeragc <agc@pkgsrc.org>2002-02-05 21:34:55 +0000
commit5ce12b16beed0fa758a2c9ce9ca10c6dfc04e8b1 (patch)
tree645d03161c96e9421fae1bccf945ed18e2a44765
parent92ec416ee7dc6aaa22df771e7151e963a0a1749a (diff)
downloadpkgsrc-5ce12b16beed0fa758a2c9ce9ca10c6dfc04e8b1.tar.gz
Don't set FILES_SUBST_SED explicitly - instead, use the one in
bsd.pkg.install.mk. Provided in PR 15500 by Lubomir Sedlacik <salo@Xtrmntr.org>
-rw-r--r--graphics/aview-x11/Makefile8
-rw-r--r--graphics/aview/Makefile8
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/aview-x11/Makefile b/graphics/aview-x11/Makefile
index 5cf5cdf19bc..d18d70281db 100644
--- a/graphics/aview-x11/Makefile
+++ b/graphics/aview-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/30 11:41:55 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/02/05 21:34:56 agc Exp $
#
DISTNAME= aview-1.3.0rc1
@@ -20,11 +20,10 @@ USE_BUILDLINK_ONLY= yes
.include "../../mk/bsd.prefs.mk"
.if (${MACHINE_ARCH} == "i386")
-FILES_SUBST= BIN_PROGRAMS="aview aaflip"
+FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
.else
-FILES_SUBST= BIN_PROGRAMS="aview"
+FILES_SUBST+= BIN_PROGRAMS="aview"
.endif
-FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
pre-configure:
@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
@@ -47,4 +46,5 @@ post-install:
.include "../../graphics/aalib-x11/buildlink.mk"
.include "../../graphics/netpbm/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index b905d5539ac..c0e93ad1d5d 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/01/30 12:05:27 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/02/05 21:34:55 agc Exp $
#
DISTNAME= aview-1.3.0rc1
@@ -23,11 +23,10 @@ USE_BUILDLINK_ONLY= yes
.include "../../mk/bsd.prefs.mk"
.if (${MACHINE_ARCH} == "i386")
-FILES_SUBST= BIN_PROGRAMS="aview aaflip"
+FILES_SUBST+= BIN_PROGRAMS="aview aaflip"
.else
-FILES_SUBST= BIN_PROGRAMS="aview"
+FILES_SUBST+= BIN_PROGRAMS="aview"
.endif
-FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/-e s!@/}
pre-configure:
@${SED} ${FILES_SUBST_SED} ${WRKSRC}/Makefile.in > ${WRKDIR}/Makefile.in
@@ -49,4 +48,5 @@ post-install:
.include "../../graphics/aalib/buildlink.mk"
.include "../../graphics/netpbm/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"