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

5 files changed, 15 insertions, 13 deletions

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