"Each sed command should appear in an assignment of its own."

38 files changed, 183 insertions, 176 deletions

diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index 1160432f401..c6691e5827f 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/03 00:02:43 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/04/06 21:07:31 rodent Exp $
 #
 
 DISTNAME=	quirc-0.9.84
@@ -22,7 +22,9 @@ SUBST_CLASSES+=		T85
 SUBST_STAGE.T85=	post-patch
 SUBST_FILES.T85=	configure configure.in
 SUBST_MESSAGE.T85=	Changing tcl/tk 8.3 search into tcl/tk 8.5 search
-SUBST_SED.T85=		-e 's,8_3,8_5,g' -e 's,8.3,8.5,g' -e 's,83,85,g'
+SUBST_SED.T85=		-e 's,8_3,8_5,g'
+SUBST_SED.T85+=		-e 's,8.3,8.5,g'
+SUBST_SED.T85+=		-e 's,83,85,g'
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index ed73069fffc..489a1ddba3b 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:16:31 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	7
@@ -21,8 +21,8 @@ SUBST_CLASSES+=		mod
 SUBST_MESSAGE.mod=	Fixing deprecated module names.
 SUBST_STAGE.mod=	post-patch
 SUBST_FILES.mod=	Profile.py SourceEditor.py StcStyle.py
-SUBST_SED.mod=		-e 's,wxPython\.lib\.PyCrust,wxPython.py,g'	\
-			-e 's,wxPython\.py,wx.py,g'
+SUBST_SED.mod=		-e 's,wxPython\.lib\.PyCrust,wxPython.py,g'
+SUBST_SED.mod+=		-e 's,wxPython\.py,wx.py,g'
 
 SUBST_CLASSES+=		py
 SUBST_MESSAGE.py=	Fixing paths in a wrapper script.
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 0b0d2b7d2bc..4ca426eca70 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2013/01/30 10:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2013/04/06 21:07:32 rodent Exp $
 
 DISTNAME=	doxygen-1.8.3.1.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -34,8 +34,8 @@ PLIST_VARS+=		pangocairo nopangocairo
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	doc/Makefile.in
-SUBST_SED.path=		-e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g" \
-			-e "s|@PYTHONBIN@|${PYTHONBIN}|g"
+SUBST_SED.path=		-e "s|@EPSTOPDF@|${LOCALBASE}/bin/epstopdf|g"
+SUBST_SED.path+=	-e "s|@PYTHONBIN@|${PYTHONBIN}|g"
 
 SUBST_CLASSES+=		perlbin
 SUBST_STAGE.perlbin=	pre-configure
diff --git a/devel/sgb/Makefile b/devel/sgb/Makefile
index f77e7552112..be60e9d9dac 100644
--- a/devel/sgb/Makefile
+++ b/devel/sgb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/31 11:19:45 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 21:07:32 rodent Exp $
 
 DISTNAME=	sgb-2007-03.28
 PKGNAME=	sgb-20070328
@@ -23,8 +23,8 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	Makefile
-SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g' \
-			-e 's,@PREFIX@,$${DESTDIR}${PREFIX},g'
+SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.paths+=	-e 's,@PREFIX@,$${DESTDIR}${PREFIX},g'
 
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/sgb
diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
index 4dbf45eeff9..0cb96030818 100644
--- a/emulators/xtrs/Makefile
+++ b/emulators/xtrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/01/13 20:54:30 is Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
 #
 
 DISTNAME=	xtrs-4.9d
@@ -17,19 +17,19 @@ BUILD_TARGET=	default
 SUBST_CLASSES+=		mf
 SUBST_STAGE.mf=		post-patch
 SUBST_FILES.mf=		Makefile.local
-SUBST_SED.mf=		-e 's|/usr/local|${PREFIX}|g' \
-			-e 's|/usr/X11/|${X11PREFIX}/|g' \
-			-e 's|/usr/include/X11|${X11BASE}/include|g' \
-			-e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g' \
-			-e 's|^\#EXTRALIBS.*|EXTRALIBS=${BUILDLINK_LDADD.oss}|'\
-			-e 's|/share/man|/man|g'
+SUBST_SED.mf=		-e 's|/usr/local|${PREFIX}|g'
+SUBST_SED.mf+=		-e 's|/usr/X11/|${X11PREFIX}/|g'
+SUBST_SED.mf+=		-e 's|/usr/include/X11|${X11BASE}/include|g'
+SUBST_SED.mf+=		-e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1-Wl,-R${X11BASE}/lib -L${X11BASE}/lib|g'
+SUBST_SED.mf+=		-e 's|^\#EXTRALIBS.*|EXTRALIBS=${BUILDLINK_LDADD.oss}|'
+SUBST_SED.mf+=		-e 's|/share/man|/man|g'
 
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	post-patch
 SUBST_FILES.oss=	trs_cassette.c cassette
 .if ${OSS_TYPE} != none
-SUBST_SED.oss=		-e 's|/dev/dsp|${DEVOSSSOUND}|g' \
-			-e 's|if __linux|if 1|'
+SUBST_SED.oss=		-e 's|/dev/dsp|${DEVOSSSOUND}|g'
+SUBST_SED.oss+=		-e 's|if __linux|if 1|'
 .endif
 
 
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 72c6e1fd1f3..44d5156cef4 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/06 11:54:53 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/04/06 21:07:32 rodent Exp $
 #
 
 DISTNAME=		scid-3.6.1
@@ -26,9 +26,9 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths to tcl.h and tk.h.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	configure
-SUBST_SED.paths=	-e 's,@TCLPREFIX@,${BUILDLINK_PREFIX.tcl},g'	\
-			-e 's,@TKPREFIX@,${BUILDLINK_PREFIX.tk},g'	\
-			-e 's,@LIBDL@,${BUILDLINK_LDADD.dl},g'
+SUBST_SED.paths=	-e 's,@TCLPREFIX@,${BUILDLINK_PREFIX.tcl},g'
+SUBST_SED.paths+=	-e 's,@TKPREFIX@,${BUILDLINK_PREFIX.tk},g'
+SUBST_SED.paths+=	-e 's,@LIBDL@,${BUILDLINK_LDADD.dl},g'
 
 MAKE_ENV+=		X_LDFLAGS=${X11_LDFLAGS:Q}
 
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index 5dc3b811161..cfd15c26387 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 14:11:23 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
 
 DISTNAME=	tkpiechart-5.4
 PKGREVISION=	1
@@ -21,8 +21,8 @@ SUBST_CLASSES+=		patch
 SUBST_MESSAGE.patch=	Remove version numbers for required packages.
 SUBST_STAGE.patch=	post-patch
 SUBST_FILES.patch=	demo demo.tcl instapkg.tcl piechart.htm
-SUBST_SED.patch=	-e '/require/s/stooop 3.7/stooop/g' \
-			-e '/require/s/switched 1.4/switched/g'
+SUBST_SED.patch=	-e '/require/s/stooop 3.7/stooop/g'
+SUBST_SED.patch+=	-e '/require/s/switched 1.4/switched/g'
 
 post-patch:
 	${CHMOD} a+x ${WRKSRC}/instapkg.tcl
diff --git a/graphics/vnc2swf/Makefile b/graphics/vnc2swf/Makefile
index 51b64740698..b10d5389176 100644
--- a/graphics/vnc2swf/Makefile
+++ b/graphics/vnc2swf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/03/20 03:05:50 obache Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
 #
 
 DISTNAME=		vnc2swf-0.5.0
@@ -36,11 +36,12 @@ SUBST_SED.x11base=	-e "s|/usr/X11R6|${PREFIX}|"
 SUBST_CLASSES+=		toolpath
 SUBST_STAGE.toolpath=	pre-configure
 SUBST_FILES.toolpath=	recordwin.sh
-SUBST_SED.toolpath=	-e "s|VNC2SWF=vnc2swf|VNC2SWF=${PREFIX}/bin/vnc2swf|" \
-			-e "s|X11VNC=x11vnc|X11VNC=${PREFIX}/bin/x11vnc|" \
-			-e "s|XWININFO=xwininfo|XWININFO=${X11BASE}/bin/xwininfo|" \
-			-e "s|AWK=awk|AWK=${AWK}|" \
-			-e 's|-mouse|-localhost|'
+SUBST_SED.toolpath=	-e "s|VNC2SWF=vnc2swf|VNC2SWF=${PREFIX}/bin/vnc2swf|"
+SUBST_SED.toolpath+=	-e "s|X11VNC=x11vnc|X11VNC=${PREFIX}/bin/x11vnc|"
+SUBST_SED.toolpath+=	-e "s|XWININFO=xwininfo|XWININFO=${X11BASE}/bin/xwininfo|"
+SUBST_SED.toolpath+=	-e "s|AWK=awk|AWK=${AWK}|"
+SUBST_SED.toolpath+=	-e 's|-mouse|-localhost|'
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Vnc2Swf.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Vnc2Swf
 	cd ${WRKSRC}/docs && \
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 824c51ccd25..a361677f231 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2013/02/16 11:22:35 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=	xpaint-2.7.8.1
 PKGREVISION=	10
@@ -18,10 +18,10 @@ MAKE_JOBS_SAFE=		NO
 SUBST_CLASSES+=		foo
 SUBST_STAGE.foo=	pre-configure
 SUBST_FILES.foo=	Local.config configure
-SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
-			-e "s|@PREFIX@|${PREFIX}|g" \
-			-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g" \
-			-e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
+SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g"
+SUBST_SED.foo+=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.foo+=		-e "s|@XAWDIR@|${BUILDLINK_PREFIX.Xaw3d}|g"
+SUBST_SED.foo+=		-e "s|@XPMDIR@|${BUILDLINK_PREFIX.libXpm}|g"
 
 INSTALLATION_DIRS+=	bin lib/X11/app-defaults ${PKGMANDIR}/cat1
 INSTALLATION_DIRS+=	share/xpaint
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 5569225a31c..976609df3ca 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2013/04/06 20:27:23 rodent Exp $
+# $NetBSD: Makefile,v 1.48 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=		sather-1.2.3
 PKGREVISION=		2
@@ -37,17 +37,16 @@ SUBST_FILES.sather-configure=			\
 	Browser/Web/gen_mml_sa_files		\
 	Browser/Web/gen_mml_shortflat		\
 	Browser/Web/graph2dot
-SUBST_SED.sather-configure=					\
-	-e 's:@CC@:${CC}:g'					\
-	-e 's:@CFLAGS@:${CFLAGS}:g'				\
-	-e 's:@GMAKE@:${GMAKE}:g'				\
-	-e 's:@PREFIX@:${PREFIX}:g'				\
-	-e 's:@X11BASE@:${X11BASE}:g'				\
-	-e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g'	\
-	-e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'		\
-	-e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'		\
-	-e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g'	\
-	-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g'
+SUBST_SED.sather-configure= 	-e 's:@CC@:${CC}:g'
+SUBST_SED.sather-configure+=	-e 's:@CFLAGS@:${CFLAGS}:g'
+SUBST_SED.sather-configure+=	-e 's:@GMAKE@:${GMAKE}:g'
+SUBST_SED.sather-configure+=	-e 's:@PREFIX@:${PREFIX}:g'
+SUBST_SED.sather-configure+=	-e 's:@X11BASE@:${X11BASE}:g'
+SUBST_SED.sather-configure+=	-e 's:@GC_PREFIX@:${BUILDLINK_PREFIX.boehm-gc}:g'
+SUBST_SED.sather-configure+=	-e 's:@TCL_PREFIX@:${BUILDLINK_PREFIX.tcl}:g'
+SUBST_SED.sather-configure+=	-e 's:@TK_PREFIX@:${BUILDLINK_PREFIX.tk}:g'
+SUBST_SED.sather-configure+=	-e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g'
+SUBST_SED.sather-configure+=	-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g'
 
 INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 lib/sather \
 			share/doc/sather share/emacs/site-lisp
diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index 01c78fa82ca..02b213fdcdb 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/08 12:19:02 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -108,14 +108,13 @@ do-build:	replace-interpreter
 SUBST_CLASSES+=		amavisd
 SUBST_STAGE.amavisd=	pre-build
 SUBST_FILES.amavisd=	amavisd amavisd.conf
-SUBST_SED.amavisd=	\
-	-e "s|/etc/amavisd.conf|${PKG_SYSCONFDIR}/amavisd.conf|"	\
-	-e "s|@AMAVIS_DIR@|${AMAVIS_DIR}|g"				\
-	-e "s|@AMAVIS_USER@|${AMAVIS_USER}|g"				\
-	-e "s|@AMAVIS_GROUP@|${AMAVIS_GROUP}|g"				\
-	-e "s|@AMAVIS_QUARANTINE@|${AMAVIS_QUARANTINE}|g"		\
-	-e "s|@LOCALBASE@|${LOCALBASE}|g"				\
-	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.amavisd=	-e "s|/etc/amavisd.conf|${PKG_SYSCONFDIR}/amavisd.conf|"
+SUBST_SED.amavisd+=	-e "s|@AMAVIS_DIR@|${AMAVIS_DIR}|g"
+SUBST_SED.amavisd+=	-e "s|@AMAVIS_USER@|${AMAVIS_USER}|g"
+SUBST_SED.amavisd+=	-e "s|@AMAVIS_GROUP@|${AMAVIS_GROUP}|g"
+SUBST_SED.amavisd+=	-e "s|@AMAVIS_QUARANTINE@|${AMAVIS_QUARANTINE}|g"
+SUBST_SED.amavisd+=	-e "s|@LOCALBASE@|${LOCALBASE}|g"
+SUBST_SED.amavisd+=	-e "s|@PREFIX@|${PREFIX}|g"
 
 INSTALLATION_DIRS=	sbin ${DOCDIR} ${EGDIR}
 
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index e1171637e73..b2b7679593b 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2012/10/08 12:19:06 asau Exp $
+# $NetBSD: Makefile,v 1.76 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=	courier-imap-4.10.0
 PKGREVISION=	1
@@ -62,19 +62,19 @@ SUBST_FILES.courier+=	imap/courierpop3d.8.in imap/mkpop3dcert.8.in	\
 			imap/mkpop3dcert.html.in imap/mkpop3dcert.in	\
 			imap/pop3d-ssl.dist.in imap/pop3d.cnf.openssl.in \
 			imap/pop3d.dist.in pop3d-ssl.rc.in pop3d.rc.in
-SUBST_SED.courier=	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"		\
-			-e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"	\
-			-e "s|^POP3DSTART=.*|POP3DSTART=YES|g"		\
-			-e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"	\
-			-e "s|@mydatadir@|@sysconfdir@|g"		\
-			-e "s|@datadir@/imapd.pem|@sysconfdir@/imapd.pem|g" \
-			-e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g" \
-			-e "s|@datadir@/pop3d.pem|@sysconfdir@/pop3d.pem|g" \
-			-e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g" \
-			-e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g" \
-			-e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g" \
-			-e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g" \
-			-e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
+SUBST_SED.courier=	-e "s|^IMAPDSTART=.*|IMAPDSTART=YES|g"
+SUBST_SED.courier+=	-e "s|^IMAPDSSLSTART=.*|IMAPDSSLSTART=YES|g"
+SUBST_SED.courier+=	-e "s|^POP3DSTART=.*|POP3DSTART=YES|g"
+SUBST_SED.courier+=	-e "s|^POP3DSSLSTART=.*|POP3DSSLSTART=YES|g"
+SUBST_SED.courier+=	-e "s|@mydatadir@|@sysconfdir@|g"
+SUBST_SED.courier+=	-e "s|@datadir@/imapd.pem|@sysconfdir@/imapd.pem|g"
+SUBST_SED.courier+=	-e "s|@datadir@/imapd.rand|@sysconfdir@/imapd.rand|g"
+SUBST_SED.courier+=	-e "s|@datadir@/pop3d.pem|@sysconfdir@/pop3d.pem|g"
+SUBST_SED.courier+=	-e "s|@datadir@/pop3d.rand|@sysconfdir@/pop3d.rand|g"
+SUBST_SED.courier+=	-e "s|@libexecdir@/couriertcpd|@sbindir@/couriertcpd|g"
+SUBST_SED.courier+=	-e "s|@sbindir@/imaplogin|@libexecdir@/imaplogin|g"
+SUBST_SED.courier+=	-e "s|@sbindir@/pop3login|@libexecdir@/courierpop3login|g"
+SUBST_SED.courier+=	-e "s|@bindir@/pop3d|@libexecdir@/courierpop3d|g"
 SUBST_STAGE.courier=	pre-configure
 
 .include "../../security/courier-authlib/buildlink3.mk"
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 562a7152e5a..8baddf0d87e 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2013/02/06 23:22:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
@@ -66,12 +66,12 @@ SUBST_FILES.courier=	courier/doc/mkesmtpdcert.8.in			\
 			courier/module.esmtp/esmtpd.cnf.openssl.in	\
 			courier/module.esmtp/esmtpd.dist.in		\
 			courier/module.esmtp/mkesmtpdcert.in
-SUBST_SED.courier=	-e "s|^ESMTPDSTART=.*|ESMTPDSTART=YES|g"	\
-			-e "s|^ESMTPDSSLSTART=.*|ESMTPDSSLSTART=YES|g"	\
-			-e "s|@mydatadir@|@sysconfdir@|g"		\
-			-e "s|@datadir@/esmtpd.pem|@sysconfdir@/esmtpd.pem|g" \
-			-e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g" \
-			-e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
+SUBST_SED.courier=	-e "s|^ESMTPDSTART=.*|ESMTPDSTART=YES|g"
+SUBST_SED.courier+=	-e "s|^ESMTPDSSLSTART=.*|ESMTPDSSLSTART=YES|g"
+SUBST_SED.courier+=	-e "s|@mydatadir@|@sysconfdir@|g"
+SUBST_SED.courier+=	-e "s|@datadir@/esmtpd.pem|@sysconfdir@/esmtpd.pem|g"
+SUBST_SED.courier+=	-e "s|@datadir@/esmtpd.rand|@sysconfdir@/esmtpd.rand|g"
+SUBST_SED.courier+=	-e "s|@libexecdir@/filters|@libexecdir@/courier/filters|g"
 SUBST_STAGE.courier=	pre-configure
 
 SUBST_CLASSES+=		perms
diff --git a/mail/dcc/Makefile b/mail/dcc/Makefile
index d4f10a6928f..6b13a1b79c2 100644
--- a/mail/dcc/Makefile
+++ b/mail/dcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/08 12:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/04/06 21:07:33 rodent Exp $
 #
 #	Request by the author:
 #
@@ -37,9 +37,9 @@ FILES_SUBST+=		DCC_RUN=${DCC_RUN}
 SUBST_CLASSES+=		dae
 SUBST_STAGE.dae=	post-patch
 SUBST_FILES.dae=	homedir/dcc_conf.in
-SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\)off$$/\1on/' \
-			-e 's/^\(DCCM_ENABLE=\)off$$/\1on/' \
-			-e 's/^\(DCCIFD_ENABLE=\)off$$/\1on/'
+SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\)off$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCM_ENABLE=\)off$$/\1on/'
+SUBST_SED.dae+=		-e 's/^\(DCCIFD_ENABLE=\)off$$/\1on/'
 SUBST_MESSAGE.dae=	Enabling all daemons in dcc_conf
 
 HAS_CONFIGURE=		yes
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 38466cf43ab..4100d1fdadb 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/02/06 23:22:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/06 21:07:33 rodent Exp $
 
 DISTNAME=	dk-milter-0.3.0
 PKGREVISION=	6
@@ -20,10 +20,10 @@ REPLACE_CSH=		dk-filter/gentxt.csh
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
 SUBST_FILES.libs=	dk-filter/Makefile.m4 libdk/Makefile.m4
-SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
-			-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' \
-			-e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' \
-			-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
+SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
+SUBST_SED.libs+=	-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
+SUBST_SED.libs+=	-e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
+SUBST_SED.libs+=	-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
 SUBST_MESSAGE.libs=	Fixing makefile references.
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/dk-milter
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index cd5004874a2..6b294bfc7bc 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2013/02/06 23:21:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.139 2013/04/06 21:07:34 rodent Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -98,20 +98,20 @@ SUBST_CLASSES+=		mbox
 SUBST_STAGE.mbox=	do-configure
 SUBST_FILES.mbox=	src/osdep/unix/env_unix.c
 .if defined(IMAP_USE_MAILSPOOLHOME)
-SUBST_SED.mbox=		-e 's|@SPOOLDIR@|myhomedir ()|'			\
-			-e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|'
+SUBST_SED.mbox=		-e 's|@SPOOLDIR@|myhomedir ()|'
+SUBST_SED.mbox+=	-e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|'
 .else
-SUBST_SED.mbox=		-e 's|@SPOOLDIR@|MAILSPOOL|'			\
-			-e 's|@MAILBOX@|myusername ()|'
+SUBST_SED.mbox=		-e 's|@SPOOLDIR@|MAILSPOOL|'
+SUBST_SED.mbox+=	-e 's|@MAILBOX@|myusername ()|'
 .endif
 
 SUBST_CLASSES+=		man
 SUBST_STAGE.man=	post-build
 SUBST_FILES.man=	src/imapd/imapd.8 src/ipopd/ipopd.8
-SUBST_SED.man=		-e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g"	\
-			-e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g"	\
-			-e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \
-			-e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
+SUBST_SED.man=		-e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g"
+SUBST_SED.man+=		-e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g"
+SUBST_SED.man+=		-e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g"
+SUBST_SED.man+=		-e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
 
 INSTALLATION_DIRS+=	bin lib libexec sbin				\
 			${PKGMANDIR}/man1 ${PKGMANDIR}/man8
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 985e25118d8..439d6f638ce 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/02/06 23:22:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.34 2013/04/06 21:07:34 rodent Exp $
 #
 
 DISTNAME=	mailsync_5.2.1.orig
@@ -23,9 +23,9 @@ CONFIGURE_ARGS+=	--without-krb5
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	configure doc/examples/mailsync doc/mailsync.1
-SUBST_SED.conf=		-e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \
-			-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
-			-e "s|/usr/share|${PREFIX}/share|g"
+SUBST_SED.conf=		-e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g"
+SUBST_SED.conf+=	-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g"
+SUBST_SED.conf+=	-e "s|/usr/share|${PREFIX}/share|g"
 SUBST_MESSAGE.conf=	Fixing configure script.
 
 DOCS=	COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 4ce23f52531..c757b76df60 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2012/10/08 12:19:27 asau Exp $
+# $NetBSD: Makefile,v 1.52 2013/04/06 21:07:34 rodent Exp $
 #
 
 DISTNAME=	popa3d-1.0.2
@@ -28,8 +28,8 @@ FILES_SUBST+=	POPA3D_GROUP=${POPA3D_GROUP:Q}
 SUBST_CLASSES+=		params
 SUBST_STAGE.params=	pre-configure
 SUBST_FILES.params=	params.h
-SUBST_SED.params=	-e 's,/var/empty,${PREFIX}/share/empty,'	\
-			-e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
+SUBST_SED.params=	-e 's,/var/empty,${PREFIX}/share/empty,'
+SUBST_SED.params+=	-e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 2c22ac3b2cb..247bfef76ff 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2013/04/06 14:09:34 rodent Exp $
+# $NetBSD: Makefile,v 1.113 2013/04/06 21:07:34 rodent Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -70,7 +70,8 @@ SUBST_CLASSES+=			unwrapping
 SUBST_STAGE.unwrapping=		post-build
 SUBST_MESSAGE.unwrapping=	Unwrapping wrapper scripts.
 SUBST_FILES.unwrapping=		src/mkoctfile
-SUBST_SED.unwrapping=		-e 's:$(DESTDIR)::g' -e 's:$(BUILDLINK_DIR)/lib:$(PREFIX)/lib:g'
+SUBST_SED.unwrapping=		-e 's:$(DESTDIR)::g'
+SUBST_SED.unwrapping+=		-e 's:$(BUILDLINK_DIR)/lib:$(PREFIX)/lib:g'
 
 SUBST_CLASSES+=			fix-make
 SUBST_STAGE.fix-make=		post-patch
diff --git a/misc/cowsay/Makefile b/misc/cowsay/Makefile
index a6e92c4a721..2a5fd6961e4 100644
--- a/misc/cowsay/Makefile
+++ b/misc/cowsay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/08 09:57:18 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/06 21:07:34 rodent Exp $
 
 DISTNAME=		cowsay-3.03
 PKGREVISION=		2
@@ -15,7 +15,8 @@ SUBST_CLASSES+=		pap
 SUBST_STAGE.pap=	pre-install # after patch to avoid sneaking into patches
 SUBST_MESSAGE.pap=	Adjusting paths to perl and the cows
 SUBST_FILES.pap=	cowsay cowsay.1
-SUBST_SED.pap=		-e "s|%BANGPERL%|!${PERL5}|" -e "s|%PREFIX%|${PREFIX}|"
+SUBST_SED.pap=		-e "s|%BANGPERL%|!${PERL5}|"
+SUBST_SED.pap+=		-e "s|%PREFIX%|${PREFIX}|"
 
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
diff --git a/net/aget/Makefile b/net/aget/Makefile
index 34ecde8988b..7239dc4c131 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/23 17:18:08 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/06 21:07:34 rodent Exp $
 #
 
 DISTNAME=	aget-0.4
@@ -20,9 +20,9 @@ SUBST_CLASSES+=		options
 SUBST_MESSAGE.options=	Fixing build options.
 SUBST_STAGE.options=	post-patch
 SUBST_FILES.options=	Makefile Makefile.Solaris
-SUBST_SED.options=	-e 's,CFLAGS =,\#CFLAGS =,' \
-			-e 's,LDFLAGS =,\#LDFLAGS =,' \
-			-e 's,CC =,\#CC =,'
+SUBST_SED.options=	-e 's,CFLAGS =,\#CFLAGS =,'
+SUBST_SED.options+=	-e 's,LDFLAGS =,\#LDFLAGS =,'
+SUBST_SED.options+=	-e 's,CC =,\#CC =,'
 
 PTHREAD_OPTS+=		require
 LDFLAGS+=		${PTHREAD_LIBS}
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 15883788a94..4bcffb647bb 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/23 17:19:14 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 21:07:34 rodent Exp $
 #
 
 DISTNAME=	tsocks-1.8beta5
@@ -26,7 +26,8 @@ SUBST_CLASSES+=		tsocks
 SUBST_STAGE.tsocks=	post-configure
 SUBST_MESSAGE.tsocks=	Generating tsocks wrapper script.
 SUBST_FILES.tsocks=	tsocks
-SUBST_SED.tsocks=	-e "s|@SH@|${SH}|g" -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.tsocks=	-e "s|@SH@|${SH}|g"
+SUBST_SED.tsocks+=	-e "s|@PREFIX@|${PREFIX}|g"
 
 INSTALLATION_DIRS+=	${EGDIR}
 
diff --git a/print/dvipdfmx/Makefile b/print/dvipdfmx/Makefile
index 45b9dacc4e0..0e08108d1f2 100644
--- a/print/dvipdfmx/Makefile
+++ b/print/dvipdfmx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/02/16 11:24:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2013/04/06 21:07:34 rodent Exp $
 
 DISTNAME=	texlive-20100720-source
 PKGNAME=	dvipdfmx-20100328
@@ -44,9 +44,9 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	data/dvipdfmx.cfg src/dvipdft
-SUBST_SED.paths=	-e 's,@DVIPDFM@,${PREFIX}/bin/dvipdfm,g' \
-			-e 's,@GS@,${TOOLS_PATH.gs},g' \
-			-e 's,@PS2PDF@,${LOCALBASE}/bin/ps2pdf,g'
+SUBST_SED.paths=	-e 's,@DVIPDFM@,${PREFIX}/bin/dvipdfm,g'
+SUBST_SED.paths+=	-e 's,@GS@,${TOOLS_PATH.gs},g'
+SUBST_SED.paths+=	-e 's,@PS2PDF@,${LOCALBASE}/bin/ps2pdf,g'
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
diff --git a/print/teTeX3-bin/Makefile b/print/teTeX3-bin/Makefile
index ab993deef19..4bd98586d41 100644
--- a/print/teTeX3-bin/Makefile
+++ b/print/teTeX3-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2013/04/06 20:27:27 rodent Exp $
+# $NetBSD: Makefile,v 1.72 2013/04/06 21:07:35 rodent Exp $
 
 DISTNAME=	tetex-src-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/:C/src/bin/}
@@ -43,8 +43,8 @@ SUBST_CLASSES+=		web2c
 SUBST_MESSAGE.web2c=	Disabling web2c.
 SUBST_STAGE.web2c=	pre-configure
 SUBST_FILES.web2c=	Makefile.in texk/Makefile.in
-SUBST_SED.web2c=	-e 's,^programs = web2c,programs =,' \
-			-e 's,^@FMU@,,'
+SUBST_SED.web2c=	-e 's,^programs = web2c,programs =,'
+SUBST_SED.web2c+=	-e 's,^@FMU@,,'
 
 BUILD_DEFS+=		VARBASE
 LOWER_PAPERSIZE_cmd=	${ECHO} ${PAPERSIZE} | ${TR} '[A-Z]' '[a-z]'
diff --git a/print/tex-pkfix/Makefile b/print/tex-pkfix/Makefile
index e8bb8cad109..5b790cb837f 100644
--- a/print/tex-pkfix/Makefile
+++ b/print/tex-pkfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/03 21:57:21 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2013/04/06 21:07:35 rodent Exp $
 
 DISTNAME=	pkfix
 PKGNAME=	tex-${DISTNAME}-1.5
@@ -20,9 +20,9 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	bin/pkfix
-SUBST_SED.paths=	-e 's,@DVIPS@,${LOCALBASE}/bin/dvips,g' \
-			-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' \
-			-e 's,@TEX@,${LOCALBASE}/bin/tex,g'
+SUBST_SED.paths=	-e 's,@DVIPS@,${LOCALBASE}/bin/dvips,g'
+SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@TEX@,${LOCALBASE}/bin/tex,g'
 
 INSTALLATION_DIRS+=	bin
 
diff --git a/security/CSP/Makefile b/security/CSP/Makefile
index 9fdbc8ff582..0a5807b6777 100644
--- a/security/CSP/Makefile
+++ b/security/CSP/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2013/02/06 23:23:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2013/04/06 21:07:35 rodent Exp $
 #
 
 DISTNAME=	CSP-0.32
@@ -32,8 +32,8 @@ BUILD_DEFS+=	CSPHOME
 
 SUBST_CLASSES+=		csp
 SUBST_FILES.csp=	csp
-SUBST_SED.csp=		-e s,@@CSPHOME@@,${CSPHOME},	\
-			-e s,@@OPENSSL@@,${OPENSSLBIN},
+SUBST_SED.csp=		-e s,@@CSPHOME@@,${CSPHOME},
+SUBST_SED.csp+=		-e s,@@OPENSSL@@,${OPENSSLBIN},
 SUBST_STAGE.csp=	post-patch
 
 post-install:
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index c79c7054675..2342e06be52 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/23 18:16:22 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:35 rodent Exp $
 #
 
 DISTNAME=		chkrootkit-0.47
@@ -23,14 +23,14 @@ DOCDIR=		${PREFIX}/share/doc/chkrootkit
 SUBST_CLASSES+=		helper
 SUBST_STAGE.helper=	post-patch
 SUBST_FILES.helper=	chkrootkit
-SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"	\
-			-e "s|./chkproc|${PREFIX}/bin/chkproc|g" 	\
-			-e "s|./chkwtmp|${PREFIX}/bin/chkwtmp|g"	\
-			-e "s|./chkutmp|${PREFIX}/bin/chkutmp|g"	\
-			-e "s|./ifpromisc|${PREFIX}/bin/ifpromisc|g"	\
-			-e "s|./strings-static|${PREFIX}/bin/strings-static|g" \
-			-e "s|./chkdirs|${PREFIX}/bin/chkdirs|g" 	\
-			-e "s|/bin/sh|${SH}|g"
+SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"
+SUBST_SED.helper+=	-e "s|./chkproc|${PREFIX}/bin/chkproc|g"
+SUBST_SED.helper+=	-e "s|./chkwtmp|${PREFIX}/bin/chkwtmp|g"
+SUBST_SED.helper+=	-e "s|./chkutmp|${PREFIX}/bin/chkutmp|g"
+SUBST_SED.helper+=	-e "s|./ifpromisc|${PREFIX}/bin/ifpromisc|g"
+SUBST_SED.helper+=	-e "s|./strings-static|${PREFIX}/bin/strings-static|g"
+SUBST_SED.helper+=	-e "s|./chkdirs|${PREFIX}/bin/chkdirs|g"
+SUBST_SED.helper+=	-e "s|/bin/sh|${SH}|g"
 
 .include "../../mk/compiler.mk"
 
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 01562a24b9e..7a2597bb86c 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2013/01/03 15:37:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2013/04/06 21:07:35 rodent Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
@@ -24,10 +24,9 @@ SUBST_FILES.prefix-fixup= \
 	Functions/Misc/zed \
 	Functions/Example/cat \
 	Functions/Example/zless
-SUBST_SED.prefix-fixup= \
-	-e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g' \
-	-e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g' \
-	-e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g' \
-	-e 's|^\#\! /usr/local/bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
+SUBST_SED.prefix-fixup= 	-e 's|^\#\!/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
+SUBST_SED.prefix-fixup+=	-e 's|^\#\! /bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
+SUBST_SED.prefix-fixup+=	-e 's|^\#\!/usr/local/bin/zsh|\#\!${PREFIX}/bin/zsh|g'
+SUBST_SED.prefix-fixup+=	-e 's|^\#\! /usr/local/bin/zsh|\#\! ${PREFIX}/bin/zsh|g'
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index 7e96128aa91..07ff38a0948 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/23 19:51:25 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/06 21:07:35 rodent Exp $
 #
 
 DISTNAME=		su2-1.3
@@ -22,8 +22,8 @@ SUBST_CLASSES+=		preproc
 SUBST_MESSAGE.preproc=	Correcting C preprocessor directives.
 SUBST_STAGE.preproc=	post-patch
 SUBST_FILES.preproc=	su2.c
-SUBST_SED.preproc=	-e 's,^\(\# *else\).*,\1,' \
-			-e 's,^\(\# *endif\).*,\1,'
+SUBST_SED.preproc=	-e 's,^\(\# *else\).*,\1,'
+SUBST_SED.preproc=	-e 's,^\(\# *endif\).*,\1,'
 
 LDLIBS=			-lcrypt
 
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index d929a416d94..97186d0da65 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/10/23 19:51:35 asau Exp $
+# $NetBSD: Makefile,v 1.9 2013/04/06 21:07:35 rodent Exp $
 #
 
 # Values from XenServer 6.0.2 = 6, 0, 2, 52898
@@ -36,15 +36,16 @@ RCD_SCRIPTS=		xenguest
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	${SRCFILES}
-SUBST_SED.paths=	-e "s,@VARBASE@,${VARBASE},g" -e "s,@PREFIX@,${PREFIX},g"
+SUBST_SED.paths=	-e "s,@VARBASE@,${VARBASE},g"
+SUBST_SED.paths+=	-e "s,@PREFIX@,${PREFIX},g"
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	post-patch
 SUBST_FILES.version=	xe-update-guest-attrs
-SUBST_SED.version=	-e "s,@XENMAJOR@,${XENMAJOR},g" \
-			-e "s,@XENMINOR@,${XENMINOR},g" \
-			-e "s,@XENTEENY@,${XENTEENY},g" \
-			-e "s,@XENBUILD@,${XENBUILD},g"
+SUBST_SED.version=	-e "s,@XENMAJOR@,${XENMAJOR},g"
+SUBST_SED.version+=	-e "s,@XENMINOR@,${XENMINOR},g"
+SUBST_SED.version+=	-e "s,@XENTEENY@,${XENTEENY},g"
+SUBST_SED.version+=	-e "s,@XENBUILD@,${XENBUILD},g"
 
 INSTALLATION_DIRS=	sbin
 
diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile
index 0723fdb3d99..9cbd8832780 100644
--- a/textproc/py-libxml2/Makefile
+++ b/textproc/py-libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2012/10/25 06:56:50 asau Exp $
+# $NetBSD: Makefile,v 1.45 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	libxml2-2.9.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,9 +18,9 @@ SUBST_CLASSES+=		setup
 SUBST_MESSAGE.setup=	Fixing hardcoded paths.
 SUBST_STAGE.setup=	pre-build
 SUBST_FILES.setup=	setup.py
-SUBST_SED.setup=	-e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g" \
-			-e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g" \
-			-e "/^\"/s,/usr/local/include,${BUILDLINK_PREFIX.iconv}/include,g"
+SUBST_SED.setup=	-e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g"
+SUBST_SED.setup+=	-e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g"
+SUBST_SED.setup+=	-e "/^\"/s,/usr/local/include,${BUILDLINK_PREFIX.iconv}/include,g"
 
 EGG_NAME=	${DISTNAME:S/-/_python-/}
 
diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile
index ba95f532b23..f9ac5c5eb08 100644
--- a/textproc/py-libxslt/Makefile
+++ b/textproc/py-libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/10/25 06:56:51 asau Exp $
+# $NetBSD: Makefile,v 1.39 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	libxslt-1.1.26
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -24,9 +24,9 @@ SUBST_CLASSES+=		setup
 SUBST_MESSAGE.setup=	Fixing hardcoded paths.
 SUBST_STAGE.setup=	pre-build
 SUBST_FILES.setup=	setup.py
-SUBST_SED.setup=	-e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g" \
-			-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" \
-			-e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
+SUBST_SED.setup=	-e "s,@LIBICONVDIR@,${BUILDLINK_PREFIX.iconv},g"
+SUBST_SED.setup+=	-e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g"
+SUBST_SED.setup+=	-e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
 
 BUILDLINK_API_DEPENDS.libxslt+=	libxslt>=${PKGVERSION}
 .include "../../textproc/libxslt/buildlink3.mk"
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile
index 484511a19b0..62ad47a88b7 100644
--- a/www/ap2-auth-ldap/Makefile
+++ b/www/ap2-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/02/06 23:23:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	mod_auth_ldap3.05
 PKGNAME=	ap2-auth-ldap-3.05
@@ -29,8 +29,8 @@ CONFIGURE_ARGS+=	--with-apache-ver=2
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	configure
-SUBST_SED.paths=	-e "s|@@HASHLIB@@|${PREFIX}/include|g" \
-			-e "s|@@HASHINC@@|${PREFIX}/lib|g"
+SUBST_SED.paths=	-e "s|@@HASHLIB@@|${PREFIX}/include|g"
+SUBST_SED.paths+=	-e "s|@@HASHINC@@|${PREFIX}/lib|g"
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 
 INSTALLATION_DIRS+=	lib/httpd
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index a82f0401acc..446bf9027a7 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/02/17 19:18:10 dholland Exp $
+# $NetBSD: Makefile,v 1.31 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	emacs-w3m-1.4.4
 PKGREVISION=	3
@@ -27,8 +27,8 @@ PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
 SUBST_CLASSES+=	fix-icondir
 SUBST_STAGE.fix-icondir=	pre-configure
 SUBST_FILES.fix-icondir=	Makefile.in w3m.el w3mhack.el
-SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g' \
-				-e 's|images/w3m|w3m|g'
+SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g'
+SUBST_SED.fix-icondir+=		-e 's|images/w3m|w3m|g'
 
 EMACS_BUILDLINK=# defined
 EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox emacs20 \
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index 12f6e255ad1..dd2d9a326ee 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/02/06 23:24:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	mini_httpd-1.19
 PKGREVISION=	7
@@ -27,7 +27,8 @@ SUBST_CLASSES=		htpasswd
 SUBST_MESSAGE.htpasswd=	Fix name of (m)htpasswd in manual pages.
 SUBST_STAGE.htpasswd=	pre-build
 SUBST_FILES.htpasswd=	htpasswd.1 mini_httpd.8
-SUBST_SED.htpasswd=	-e 's/\([^.]\)htpasswd/\1mhtpasswd/g' -e 's/^htpasswd/m&/'
+SUBST_SED.htpasswd=	-e 's/\([^.]\)htpasswd/\1mhtpasswd/g'
+SUBST_SED.htpasswd+=	-e 's/^htpasswd/m&/'
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 07c354690cd..d51f38289e5 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/28 06:31:06 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/04/06 21:07:36 rodent Exp $
 
 DISTNAME=	swiggle-0.4
 PKGREVISION=	3
@@ -14,7 +14,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 SUBST_CLASSES+=		mf
 SUBST_STAGE.mf=		post-patch
 SUBST_FILES.mf=		Makefile
-SUBST_SED.mf=		-e "s/gcc/${CC}/" -e "s/-O3//"
+SUBST_SED.mf=		-e "s/gcc/${CC}/"
+SUBST_SED.mf+=		-e "s/-O3//"
 
 INSTALLATION_DIRS=	bin
 
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index 5810e3eae74..064ca8bea30 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/28 06:31:08 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/04/06 21:07:36 rodent Exp $
 #
 
 DISTNAME=	validate-1.2.2
@@ -29,8 +29,8 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	validate
-SUBST_SED.paths=	-e 's,/usr/local/share,${PREFIX}/share,g' \
-			-e 's,/usr/local/bin/lq-nsgmls,${LOCALBASE}/bin/lq-nsgmls,g'
+SUBST_SED.paths=	-e 's,/usr/local/share,${PREFIX}/share,g'
+SUBST_SED.paths+=	-e 's,/usr/local/bin/lq-nsgmls,${LOCALBASE}/bin/lq-nsgmls,g'
 
 INSTALLATION_DIRS+=	bin share/doc share/wdg/sgml-lib
 
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile
index 39cdbba9a3a..a0611e210f0 100644
--- a/x11/ocaml-graphics/Makefile
+++ b/x11/ocaml-graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/04/06 15:46:40 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/06 21:07:36 rodent Exp $
 
 .include "../../lang/ocaml/Makefile.common"
 DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo
@@ -58,7 +58,8 @@ SUBST_MESSAGE.mklib=	Fixing MKLIB in otherlibs/Makefile.shared.
 SUBST_CLASSES+=		comp
 SUBST_STAGE.comp=	post-patch
 SUBST_FILES.comp=	otherlibs/Makefile
-SUBST_SED.comp=		-e 's,^CAMLC=.*,CAMLC=ocamlc,g' -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g'
+SUBST_SED.comp=		-e 's,^CAMLC=.*,CAMLC=ocamlc,g'
+SUBST_SED.comp+=	-e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g'
 SUBST_MESSAGE.comp=	Fixing CAMLC OCAMLOPT in otherlibs/Makefile.
 
 INSTALLATION_DIRS+=	lib/ocaml/stublibs