summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/dipmap/Makefile7
-rw-r--r--graphics/radiance/Makefile45
-rw-r--r--mail/dk-milter/Makefile7
-rw-r--r--mail/metamail/Makefile19
-rw-r--r--parallel/pvm3/Makefile7
5 files changed, 35 insertions, 50 deletions
diff --git a/games/dipmap/Makefile b/games/dipmap/Makefile
index ef1e1c7924a..437c6e77068 100644
--- a/games/dipmap/Makefile
+++ b/games/dipmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 06:59:03 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2012/02/06 06:19:17 sbd Exp $
DISTNAME= mapit.v1-16
PKGNAME= dipmap-1.16
@@ -18,10 +18,7 @@ USE_TOOLS+= csh:run
WRKSRC= ${WRKDIR}/mapit
INSTALLATION_DIRS= bin libexec
-REPLACE_INTERPRETER+= csh
-REPLACE.csh.old= /bin/csh
-REPLACE.csh.new= ${CSH}
-REPLACE_FILES.csh= dipmap
+REPLACE_CSH= dipmap
post-patch:
${SED} "s,@PREFIX@,${PREFIX},g" ${WRKSRC}/dipmap > ${WRKSRC}/dipmap.new
diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index 39e1ac2f936..e635a3b2be1 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/07/21 05:53:23 dholland Exp $
+# $NetBSD: Makefile,v 1.28 2012/02/06 06:19:17 sbd Exp $
#
DISTNAME= rad3R6P1
@@ -32,29 +32,26 @@ PATCHEES= makeall ./src/rt/Rmakefile ./src/util/Rmakefile \
./src/px/tiff/contrib/addtiffo/Makefile \
./src/px/tiff/contrib/iptcutil/Makefile
-REPLACE_INTERPRETER+= csh
-REPLACE.csh.old= /bin/csh
-REPLACE.csh.new= ${CSH}
-REPLACE_FILES.csh= src/cal/cal/colorcal.csh src/cal/cal/illumcal.csh
-REPLACE_FILES.csh+= src/cal/cal/reinhard.csh src/gen/genwindow.csh
-REPLACE_FILES.csh+= src/gen/genbackg.csh src/gen/genpine.csh
-REPLACE_FILES.csh+= src/gen/glaze.csh src/gen/markpath.csh
-REPLACE_FILES.csh+= src/px/falsecolor.csh src/px/normpat.csh
-REPLACE_FILES.csh+= src/px/pacuity.csh src/px/pbilat.csh src/px/pdelta.csh
-REPLACE_FILES.csh+= src/px/pdfblur.csh src/px/pgblur.csh src/px/phisteq.csh
-REPLACE_FILES.csh+= src/px/phisto.csh src/px/pmblur.csh src/px/psquish.csh
-REPLACE_FILES.csh+= src/px/pveil.csh src/px/vlpic.csh src/px/xyzimage.csh
-REPLACE_FILES.csh+= src/util/compamb.csh src/util/dayfact.csh
-REPLACE_FILES.csh+= src/util/debugcal.csh src/util/genambpos.csh
-REPLACE_FILES.csh+= src/util/help2roff.csh src/util/glare.csh
-REPLACE_FILES.csh+= src/util/ivpict.csh src/util/ivprep.csh
-REPLACE_FILES.csh+= src/util/objline.csh src/util/objpict.csh
-REPLACE_FILES.csh+= src/util/objview.csh src/util/raddepend.csh
-REPLACE_FILES.csh+= src/util/rlux.csh src/util/tradinstall.csh
-REPLACE_FILES.csh+= src/util/vinfo.csh
-REPLACE_FILES.csh+= obj/cabin/anim1/script obj/cabin/anim1/script2
-REPLACE_FILES.csh+= obj/cabin/runscript.csh
-REPLACE_FILES.csh+= obj/office/anim.csh obj/office/anim2.csh
+REPLACE_CSH= src/cal/cal/colorcal.csh src/cal/cal/illumcal.csh
+REPLACE_CSH+= src/cal/cal/reinhard.csh src/gen/genwindow.csh
+REPLACE_CSH+= src/gen/genbackg.csh src/gen/genpine.csh
+REPLACE_CSH+= src/gen/glaze.csh src/gen/markpath.csh
+REPLACE_CSH+= src/px/falsecolor.csh src/px/normpat.csh
+REPLACE_CSH+= src/px/pacuity.csh src/px/pbilat.csh src/px/pdelta.csh
+REPLACE_CSH+= src/px/pdfblur.csh src/px/pgblur.csh src/px/phisteq.csh
+REPLACE_CSH+= src/px/phisto.csh src/px/pmblur.csh src/px/psquish.csh
+REPLACE_CSH+= src/px/pveil.csh src/px/vlpic.csh src/px/xyzimage.csh
+REPLACE_CSH+= src/util/compamb.csh src/util/dayfact.csh
+REPLACE_CSH+= src/util/debugcal.csh src/util/genambpos.csh
+REPLACE_CSH+= src/util/help2roff.csh src/util/glare.csh
+REPLACE_CSH+= src/util/ivpict.csh src/util/ivprep.csh
+REPLACE_CSH+= src/util/objline.csh src/util/objpict.csh
+REPLACE_CSH+= src/util/objview.csh src/util/raddepend.csh
+REPLACE_CSH+= src/util/rlux.csh src/util/tradinstall.csh
+REPLACE_CSH+= src/util/vinfo.csh
+REPLACE_CSH+= obj/cabin/anim1/script obj/cabin/anim1/script2
+REPLACE_CSH+= obj/cabin/runscript.csh
+REPLACE_CSH+= obj/office/anim.csh obj/office/anim2.csh
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index e3485c09814..22e7b196de9 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/12/19 07:45:19 dholland Exp $
+# $NetBSD: Makefile,v 1.21 2012/02/06 06:19:17 sbd Exp $
DISTNAME= dk-milter-0.3.0
PKGREVISION= 5
@@ -17,10 +17,7 @@ RCD_SCRIPTS= dk-milter
USE_BUILTIN.libmilter= no
USE_TOOLS+= gm4 csh:run
-REPLACE_INTERPRETER+= csh
-REPLACE.csh.old= /bin/csh
-REPLACE.csh.new= ${CSH}
-REPLACE_FILES.csh= dk-filter/gentxt.csh
+REPLACE_CSH= dk-filter/gentxt.csh
SUBST_CLASSES+= libs
SUBST_STAGE.libs= pre-configure
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 7c96b4a8f14..6e56a838356 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2010/04/15 09:07:37 tron Exp $
+# $NetBSD: Makefile,v 1.47 2012/02/06 06:19:18 sbd Exp $
DISTNAME= mm2.7
PKGNAME= metamail-2.7
@@ -26,16 +26,13 @@ EGDIR= ${PREFIX}/share/examples/metamail
CONF_FILES= ${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
USE_TOOLS+= bdftopcf csh:run
-REPLACE_INTERPRETER+= csh
-REPLACE.csh.old= /bin/csh
-REPLACE.csh.new= ${CSH}
-REPLACE_FILES.csh= bin/audiocompose bin/audiosend bin/extcompose
-REPLACE_FILES.csh+= bin/getfilename bin/mailserver bin/mailto-hebrew
-REPLACE_FILES.csh+= bin/metasend bin/patch-metamail bin/showaudio
-REPLACE_FILES.csh+= bin/showexternal bin/shownonascii bin/showpartial
-REPLACE_FILES.csh+= bin/showpicture bin/sun-audio-file bin/sun-message.csh
-REPLACE_FILES.csh+= bin/sun-to-mime
-REPLACE_FILES.csh+= fonts/Xmailto-hebrew fonts/Xshownonascii
+REPLACE_CSH= bin/audiocompose bin/audiosend bin/extcompose
+REPLACE_CSH+= bin/getfilename bin/mailserver bin/mailto-hebrew
+REPLACE_CSH+= bin/metasend bin/patch-metamail bin/showaudio
+REPLACE_CSH+= bin/showexternal bin/shownonascii bin/showpartial
+REPLACE_CSH+= bin/showpicture bin/sun-audio-file bin/sun-message.csh
+REPLACE_CSH+= bin/sun-to-mime
+REPLACE_CSH+= fonts/Xmailto-hebrew fonts/Xshownonascii
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 ${EGDIR}
diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 99c844a56a1..6d8ec9379cf 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2012/02/03 04:29:54 sbd Exp $
+# $NetBSD: Makefile,v 1.62 2012/02/06 06:19:18 sbd Exp $
DISTNAME= pvm3.4.6
PKGNAME= pvm-3.4.6
@@ -39,10 +39,7 @@ MAKE_ENV+= PVMLIB_VER=3:4
MAKE_ENV+= PVM_DIR=${PVM_DIR:Q}
BUILD_TARGET= all install
-REPLACE_INTERPRETER+= csh
-REPLACE.csh.old= .*csh
-REPLACE.csh.new= ${CSH}
-REPLACE_FILES.csh= ${WRKSRC}/lib/debugger ${WRKSRC}/lib/debugger2
+REPLACE_CSH= ${WRKSRC}/lib/debugger ${WRKSRC}/lib/debugger2
# Set PVM_ARCH to the correct value for this machine platform.
.include "arch.mk"