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

8 files changed, 54 insertions, 55 deletions

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