all: replace SUBST_SED with the simpler SUBST_VARS

pkglint -Wall -r --only "substitution command" -F

With manual review and indentation fixes since pkglint doesn't get that
part correct in every case.

37 files changed, 118 insertions, 118 deletions

diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index 1f36c5e61db..8c7c47e6f14 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/12/09 21:05:33 adam Exp $
+# $NetBSD: Makefile,v 1.25 2019/05/23 19:23:04 rillig Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -84,12 +84,12 @@ 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|"
-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"
+SUBST_VARS.amavisd=	AMAVIS_DIR
+SUBST_VARS.amavisd+=	AMAVIS_USER
+SUBST_VARS.amavisd+=	AMAVIS_GROUP
+SUBST_VARS.amavisd+=	AMAVIS_QUARANTINE
+SUBST_VARS.amavisd+=	LOCALBASE
+SUBST_VARS.amavisd+=	PREFIX
 
 INSTALLATION_DIRS+=	sbin ${DOCDIR} ${EGDIR}
 
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index f5b54c8fe82..e79cebbe9d2 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/08/22 09:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2019/05/23 19:23:04 rillig Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -57,12 +57,12 @@ CONF_FILES_PERMS+=	${EGDIR}/sharedindexupdate			\
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/sharedindexupdate.sh
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@MKDIR@,${MKDIR},g'
-SUBST_SED.paths+=	-e 's,@RM@,${RM},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_SED.paths+=	-e 's,@TEST@,${TEST},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	MKDIR
+SUBST_VARS.paths+=	RM
+SUBST_VARS.paths+=	SH
+SUBST_VARS.paths+=	TEST
 SUBST_STAGE.paths=	pre-configure
 
 post-extract:
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 8e378bbcdde..5465ad25c5e 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/08/22 09:45:24 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2019/05/23 19:23:04 rillig Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
@@ -81,7 +81,7 @@ SUBST_STAGE.perms=	pre-configure
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
-SUBST_SED.paths+=	-e "s,@PREFIX@,${PREFIX},g"
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	pre-configure
 
 REPLACE_PERL+=	courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index 75e62289faa..34270d58b23 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:04 rillig Exp $
 
 DISTNAME=	deliver-2.1.14
 PKGREVISION=	3
@@ -38,7 +38,7 @@ SUBST_STAGE.sources=		pre-configure
 SUBST_MESSAGE.sources=		Fixing source code.
 SUBST_FILES.sources=		config.h deliver.8 conf/os-netbsd.h
 SUBST_SED.sources=		-e 's,@DELIVER_CONF_PREFIX@,${PKG_SYSCONFDIR},g'
-SUBST_SED.sources+=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.sources=		PREFIX
 
 pre-configure:
 	set -e; cd ${WRKSRC};							\
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 9973183d11b..b2e3a78e2ae 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:05 rillig Exp $
 
 DISTNAME=	dkim-milter-2.8.3
 PKGREVISION=	5
@@ -40,8 +40,8 @@ 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_SED.libs+=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.libs+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
+SUBST_VARS.libs=	PREFIX
+SUBST_VARS.libs+=	PKGMANDIR
 SUBST_SED.libs+=	-e 's|/etc/mail|${PKG_SYSCONFDIR}|g'
 SUBST_SED.libs+=	-e 's|.I /etc/dkim-filter.conf|.I ${PKG_SYSCONFDIR}/dkim-filter.conf|g'
 SUBST_MESSAGE.libs=	Fixing Makefile references and man pages.
diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index fa09d25b58d..e5c93177e67 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/01 04:02:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:05 rillig Exp $
 #
 
 DISTNAME=		dot-forward-0.71
@@ -22,7 +22,7 @@ INSTALLATION_DIRS=	${PKGMANDIR}
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	hier.c
-SUBST_SED.paths=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+SUBST_VARS.paths=	PKGMANDIR
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 7aa3f3efc8d..66bd901cb8b 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.193 2019/04/03 00:32:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.194 2019/05/23 19:23:05 rillig Exp $
 
 DOVECOT_VERSION=	1.2
 DOVECOT_SUBVERSION=	.17
@@ -52,7 +52,7 @@ INSTALLATION_DIRS+=	libexec/dovecot sbin share/doc/dovecot		\
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	dovecot-example.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	pre-configure
 
 BUILD_DEFS+=		VARBASE
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 4fbbe5b95c9..83e87c2a062 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2019/04/03 00:32:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.98 2019/05/23 19:23:05 rillig Exp $
 
 DISTNAME=	dspam-3.10.2
 PKGREVISION=	25
@@ -117,9 +117,9 @@ SUBST_STAGE.conf=	pre-install
 SUBST_FILES.conf=	src/dspam.conf.in
 SUBST_SED.conf=		-e "s|@dspam_home@|${DSPAM_HOME}|g"
 SUBST_SED.conf+=	-e "s|@delivery_agent@|${DSPAM_DELIVERY_AGENT_BIN}|g"
-SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.conf+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.conf+=	-e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g"
+SUBST_VARS.conf=	PREFIX
+SUBST_VARS.conf+=	VARBASE
+SUBST_VARS.conf+=	DSPAM_PIDDIR
 SUBST_MESSAGE.conf=	Fixing configuration file.
 
 post-extract:
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 315e6d6277b..51e5df96517 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/08/22 09:45:25 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/05/23 19:23:05 rillig Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	19
@@ -73,12 +73,12 @@ MAKE_ENV+=		LOOKUP_LIBS=${LOOKUP_LIBS:Q}
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	Local/Makefile.pkgsrc ${WRKDIR}/mailer.conf
 SUBST_FILES.paths+=	${WRKDIR}/exim_newaliases
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@GZIP_CMD@,${GZIP_CMD},g'
-SUBST_SED.paths+=	-e 's,@GZCAT@,${GZCAT},g'
-SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	GZIP_CMD
+SUBST_VARS.paths+=	GZCAT
+SUBST_VARS.paths+=	PERL5
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/exim
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index abbe39017a1..274863fe5fa 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/09/01 03:58:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:05 rillig Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -24,7 +24,7 @@ SUBST_FILES.djbware+=	cdb_seek.c
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	hier.c
-SUBST_SED.paths=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+SUBST_VARS.paths=	PKGMANDIR
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fml4/Makefile b/mail/fml4/Makefile
index 2b320bfeee9..1cafb5b818b 100644
--- a/mail/fml4/Makefile
+++ b/mail/fml4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/04/30 03:38:59 taca Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:05 rillig Exp $
 #
 
 DISTNAME=	fml-4.0-stable-20040215
@@ -35,8 +35,8 @@ REPLACE_PERL=	databases/examples/ldap-toymodel/dump.pl \
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	sbin/makefml
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_SED.paths+=	-e 's,@FML_DATADIR@,${FML_DATADIR:Q},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	FML_DATADIR
 SUBST_STAGE.paths=	pre-configure
 
 MAKE_ENV+=		_PATH_PERL=${PERL5} HOSTNAME="fml.example.net"
diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile
index c87bb3db81d..c1ccbbcb89d 100644
--- a/mail/freepops/Makefile
+++ b/mail/freepops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/12/13 19:52:07 adam Exp $
+# $NetBSD: Makefile,v 1.39 2019/05/23 19:23:05 rillig Exp $
 #
 
 DISTNAME=	freepops-0.2.9
@@ -42,9 +42,9 @@ SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	config.h doc/freepopsd.1 src/freepops.h
 SUBST_FILES.paths+=	src/lua/freepops.lua
-SUBST_SED.paths=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.paths+=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE}|g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	VARBASE
 SUBST_MESSAGE.paths=	Adjusting paths.
 
 BUILD_DEFS+=		VARBASE
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 16e98f2edaf..406175d9944 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2017/08/16 20:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2019/05/23 19:23:06 rillig Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -74,7 +74,7 @@ CONF_FILES_PERMS+=	${IMPDIR}/config/trailer.txt.dist \
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	imp.conf.dist
-SUBST_SED.files=	-e "s|@IMPDIR@|${IMPDIR}|g"
+SUBST_VARS.files=	IMPDIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 REPLACE_INTERPRETER+=	php
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index f0d566b66ea..074126d44b6 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/08/16 20:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:06 rillig Exp $
 
 DISTNAME=	ingo-h3-${INGOVER}
 PKGNAME=	ingo-${INGOVER}
@@ -37,7 +37,7 @@ USE_PKGINSTALL=		yes
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	ingo.conf.dist
-SUBST_SED.files=	-e "s|@INGODIR@|${INGODIR}|g"
+SUBST_VARS.files=	INGODIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 REPLACE_INTERPRETER+=	php
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 4f9c666455a..aeb7d4547d9 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2019/04/26 14:12:41 maya Exp $
+# $NetBSD: Makefile,v 1.87 2019/05/23 19:23:06 rillig Exp $
 
 DISTNAME=	mailman-2.1.29
 PKGNAME=	mailman-2.1.29
@@ -94,8 +94,8 @@ BUILD_DEFS+=		MAILMAN_CGIEXT
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailman.conf.dist
-SUBST_SED.paths+=	-e 's,@EXECDIR@,${EXECDIR},g'
-SUBST_SED.paths+=	-e 's,@MAILMAN_DATADIR@,${MAILMAN_DATADIR},g'
+SUBST_VARS.paths=	EXECDIR
+SUBST_VARS.paths+=	MAILMAN_DATADIR
 SUBST_STAGE.paths=	pre-configure
 
 DOCFILELIST=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README \
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 10f3ab39f1d..6387d50dea4 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2016/03/05 11:28:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2019/05/23 19:23:06 rillig Exp $
 #
 
 DISTNAME=	mailsync_5.2.1.orig
@@ -23,7 +23,7 @@ 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"
+SUBST_VARS.conf=	BUILDLINK_DIR
 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.
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index fedf95b53cb..86ff9c83f62 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/16 20:21:10 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/23 19:23:06 rillig Exp $
 
 DISTNAME=	mimp-h3-${MIMPVER}
 PKGNAME=	mimp-${MIMPVER}
@@ -53,7 +53,7 @@ CONF_FILES_PERMS+=	${MIMPDIR}/config/prefs.php.dist \
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	mimp.conf.dist
-SUBST_SED.files=	-e "s|@MIMPDIR@|${MIMPDIR}|g"
+SUBST_VARS.files=	MIMPDIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 REPLACE_INTERPRETER+=	php
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index 6ccf3825d14..3adbc2278aa 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2019/05/23 19:23:06 rillig Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -38,7 +38,7 @@ PLAT_MAKEFILE.*=		makefile.${LOWER_OPSYS}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	config.h-dist ${PLAT_MAKEFILE}
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_SED.paths+=	-e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g'
 SUBST_STAGE.paths=	pre-configure
 
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index b0af4b9e26f..f81dc399a47 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/04/25 07:33:04 maya Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:06 rillig Exp $
 #
 
 DISTNAME=		newspipe.1.1.9
@@ -24,9 +24,9 @@ REPLACE_PYTHON=	*.py
 SUBST_CLASSES+=		bin
 SUBST_STAGE.bin=	do-configure
 SUBST_FILES.bin=	newspipe.py newspipe
-SUBST_SED.bin=		-e 's|@LOCALBASE@|${LOCALBASE}|g'
-SUBST_SED.bin+=		-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.bin+=		-e 's|@PYTHONBIN@|${PYTHONBIN}|g'
+SUBST_VARS.bin=		LOCALBASE
+SUBST_VARS.bin+=	PREFIX
+SUBST_VARS.bin+=	PYTHONBIN
 
 INSTALLATION_DIRS=	bin share/newspipe share/doc/newspipe
 INSTALLATION_DIRS+=	share/examples/newspipe
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index ac9f2834d17..95d4cf07ea1 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2019/05/23 19:23:06 rillig Exp $
 
 VERSION=	5.7.3p2
 DISTNAME=	opensmtpd-${VERSION}
@@ -47,7 +47,7 @@ RCD_SCRIPTS=	opensmtpd
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=			exampledir
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 2bfbc085d64..a71004b0572 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/08/22 09:45:31 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=		Ezmlm-0.08.2
@@ -19,8 +19,8 @@ MAKE_ENV+=		BSD_BATCH_INSTALL=1	# skip interactive config stage
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	Ezmlm.pm
-SUBST_SED.paths=	-e 's|@LOCALBASE@|${LOCALBASE}|g'
-SUBST_SED.paths+=	-e 's|@QMAILDIR@|${QMAILDIR}|g'
+SUBST_VARS.paths=	LOCALBASE
+SUBST_VARS.paths+=	QMAILDIR
 SUBST_MESSAGE.paths=	Configuring paths.
 
 PERL5_PACKLIST=		auto/Mail/Ezmlm/.packlist
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 6bbcd2388e7..3b558a2a134 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=	pfqueue-0.5.6
@@ -34,7 +34,7 @@ SUBST_CLASSES+=		conf
 SUBST_MESSAGE.conf=	Fixing path to config file
 SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	pfqconfig.c pfqueue.conf.5
-SUBST_SED.conf=		-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_VARS.conf=	PKG_SYSCONFDIR
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pfqueue.conf ${DESTDIR}${PREFIX}/share/examples/pfqueue
diff --git a/mail/pfqueue/options.mk b/mail/pfqueue/options.mk
index a08a21048a5..670a4caacd4 100644
--- a/mail/pfqueue/options.mk
+++ b/mail/pfqueue/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2019/05/23 19:23:07 rillig Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfqueue
 
@@ -37,4 +37,4 @@ SUBST_CLASSES+=		backends
 SUBST_STAGE.backends=	pre-configure
 SUBST_MESSAGE.backends=	Enabling backends
 SUBST_FILES.backends=	backends/Makefile.in
-SUBST_SED.backends=	-e 's|@PFQ_BACKENDS@|${PFQ_BACKENDS:Q}|'
+SUBST_VARS.backends=	PFQ_BACKENDS
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 3b536467220..0c83b44a55f 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/08 12:19:27 asau Exp $
+# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -17,7 +17,7 @@ COMMENT=		Qualcomm's password change server mainly for Eudora
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	man/poppassd.8 password/poppassd.c
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 .include "../../mail/qpopper/Makefile.common"
 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 6960ff8793f..5b5d638f85f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.309 2019/04/30 03:41:51 taca Exp $
+# $NetBSD: Makefile,v 1.310 2019/05/23 19:23:07 rillig Exp $
 
 .include "../../mail/postfix/Makefile.common"
 
@@ -48,7 +48,7 @@ CONF_FILES_PERMS=	# empty
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
diff --git a/mail/qmqtool/Makefile b/mail/qmqtool/Makefile
index 5d26a3acf9a..f9b110b5332 100644
--- a/mail/qmqtool/Makefile
+++ b/mail/qmqtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/08/22 09:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=		qmqtool-1.15
@@ -25,15 +25,15 @@ BUILD_TARGET=		qmqtool
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	src/qmqtool
-SUBST_SED.paths+=	-e 's,@PS@,${PS},g'
-SUBST_SED.paths+=	-e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+=	-e 's,@RCD_SCRIPTS_DIR@,${RCD_SCRIPTS_DIR},g'
+SUBST_VARS.paths=	PS
+SUBST_VARS.paths+=	GREP
+SUBST_VARS.paths+=	RCD_SCRIPTS_DIR
 
 SUBST_CLASSES+=		users
 SUBST_STAGE.users=	pre-configure
 SUBST_FILES.users=	src/qmqtool
-SUBST_SED.users=	-e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g'
-SUBST_SED.users+=	-e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g'
+SUBST_VARS.users=	QMAIL_SEND_USER
+SUBST_VARS.users+=	QMAIL_QUEUE_USER
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 INSTALLATION_DIRS+=	share/doc/qmqtool share/examples/qmqtool
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 3bafa670c6d..cf75a42f73a 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2016/03/26 23:52:37 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -44,12 +44,12 @@ PKG_USERS=		${QPOPPER_USER}:${QPOPPER_GROUP}
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	man/popper.8
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 SUBST_CLASSES+=		sysconf
 SUBST_STAGE.sysconf=	pre-configure
 SUBST_FILES.sysconf=	man/popauth.8
-SUBST_SED.sysconf=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.sysconf=	PKG_SYSCONFDIR
 
 SUBST_CLASSES+=		varbase
 SUBST_STAGE.varbase=	pre-configure
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 4a3e7c59c79..606b8b3295c 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/04/04 07:46:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:07 rillig Exp $
 #
 
 DISTNAME=		queue-fix-1.4
@@ -17,14 +17,14 @@ DJB_RESTRICTED=		NO
 SUBST_CLASSES+=		groups
 SUBST_STAGE.groups=	do-configure
 SUBST_FILES.groups=	queue-fix.c
-SUBST_SED.groups=	-e 's,@QMAIL_QMAIL_GROUP@,${QMAIL_QMAIL_GROUP:Q},g'
+SUBST_VARS.groups=	QMAIL_QMAIL_GROUP
 
 SUBST_CLASSES+=		users
 SUBST_STAGE.users=	do-configure
 SUBST_FILES.users=	queue-fix.c
-SUBST_SED.users+=	-e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g'
-SUBST_SED.users+=	-e 's,@QMAIL_REMOTE_USER@,${QMAIL_REMOTE_USER:Q},g'
-SUBST_SED.users+=	-e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g'
+SUBST_VARS.users=	QMAIL_QUEUE_USER
+SUBST_VARS.users+=	QMAIL_REMOTE_USER
+SUBST_VARS.users+=	QMAIL_SEND_USER
 
 BUILD_DEFS+=		QMAIL_QUEUE_USER QMAIL_REMOTE_USER QMAIL_SEND_USER
 BUILD_DEFS+=		QMAIL_QMAIL_GROUP
diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index 140d146bfcf..7b20388c9bf 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/04/27 20:41:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:08 rillig Exp $
 #
 
 DISTNAME=		relay-ctrl-3.2
@@ -24,11 +24,11 @@ ADDON_SCRIPTS=		dovecot-settcpremoteip ifrelayclient
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${ADDON_SCRIPTS}
-SUBST_SED.paths=	-e 's,@ECHO@,${ECHO},g'
-SUBST_SED.paths+=	-e 's,@GREP@,${GREP},g'
-SUBST_SED.paths+=	-e 's,@SED@,${SED},g'
-SUBST_SED.paths+=	-e 's,@SETENV@,${SETENV},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	ECHO
+SUBST_VARS.paths+=	GREP
+SUBST_VARS.paths+=	SED
+SUBST_VARS.paths+=	SETENV
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	do-configure
 
 CFLAGS.SunOS+=		-DSOL_TCP=SOL_SOCKET
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index d57c4d32303..75ae2334e84 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2018/05/16 08:14:40 triaxx Exp $
+# $NetBSD: Makefile,v 1.90 2019/05/23 19:23:08 rillig Exp $
 
 DISTNAME=	roundcubemail-${RC_VERS}
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/}
@@ -72,11 +72,11 @@ SUBST_FILES.files+=	config/config.inc.php.sample
 SUBST_FILES.files+=	program/include/iniset.php
 SUBST_FILES.files+=	program/lib/Roundcube/rcube_mime.php
 SUBST_VARS.files=	RCDIR VARBASE PKG_EXAMPLES PKG_SYSCONFBASE PKG_SYSCONFDIR
-SUBST_SED.files=	-e "s|@RCDIR@|${RCDIR}|g"
-SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
+SUBST_VARS.files+=	RCDIR
+SUBST_VARS.files+=	VARBASE
 SUBST_SED.files+=	-e "s|@PKG_EXAMPLES@|${PREFIX}/share/examples/roundcube|g"
-SUBST_SED.files+=	-e "s|@PKG_SYSCONFBASE@|${PKG_SYSCONFBASE}|g"
-SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.files+=	PKG_SYSCONFBASE
+SUBST_VARS.files+=	PKG_SYSCONFDIR
 
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	/usr/bin/env php
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index aaaed927434..e72b36e0d6c 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/04/08 17:50:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:08 rillig Exp $
 #
 
 DISTNAME=		serialmail-0.75
@@ -23,7 +23,7 @@ SUBST_FILES.djbware+=	leapsecs_read.c
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	hier.c
-SUBST_SED.paths=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+SUBST_VARS.paths=	PKGMANDIR
 
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 99caa06010e..bc47496abfb 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2019/01/26 18:23:05 abs Exp $
+# $NetBSD: Makefile,v 1.134 2019/05/23 19:23:08 rillig Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.4.2
 PKGNAME=	spamassassin-3.4.2
@@ -132,8 +132,8 @@ SUBST_MESSAGE.sa2=	Setting correct paths for pkgsrc (part 1)
 SUBST_STAGE.sa2=	pre-configure
 SUBST_FILES.sa2=	README spamd/spamd.raw
 SUBST_SED.sa2=		-e s!@@PREFIX@@!${PREFIX}!g
-SUBST_SED.sa2+=		-e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
-SUBST_SED.sa2+=		-e s!@VARBASE@!${VARBASE}!g
+SUBST_VARS.sa2=		PKG_SYSCONFDIR
+SUBST_VARS.sa2+=	VARBASE
 
 SUBST_CLASSES+=		sa3
 SUBST_MESSAGE.sa3=	Setting correct paths for pkgsrc (part 2)
diff --git a/mail/spamdyke/Makefile b/mail/spamdyke/Makefile
index 0a62e809d9c..28801491b43 100644
--- a/mail/spamdyke/Makefile
+++ b/mail/spamdyke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/07/29 08:41:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.38 2019/05/23 19:23:08 rillig Exp $
 #
 
 DISTNAME=		spamdyke-5.0.1
@@ -21,8 +21,8 @@ MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	spamdyke.h
-SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_SED.paths+=	-e 's,@QMAILDIR@,${QMAILDIR:Q},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	QMAILDIR
 SUBST_STAGE.paths=	do-configure
 
 BUILD_DEFS+=		QMAILDIR
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index a3c484bad56..682f9b639f3 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2018/08/22 09:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2019/05/23 19:23:08 rillig Exp $
 
 DISTNAME=	squirrelmail-webmail-1.4.23pre14764
 PKGNAME=	${DISTNAME:S/-webmail//}
@@ -62,9 +62,9 @@ OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/squirrelmail.conf.dist
 SUBST_FILES.paths+=	config/config_default.php
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@ATTACHMENTS_DIR@,${ATTACHMENTS_DIR},g'
-SUBST_SED.paths+=	-e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	ATTACHMENTS_DIR
+SUBST_VARS.paths+=	USER_PREFS_DIR
 SUBST_SED.paths+=	-e 's,@SMDIR@,${PREFIX}/${SMDIR},g'
 SUBST_STAGE.paths=	pre-configure
 
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 0703c6ad243..43dc2bfc5f1 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/03/09 03:24:19 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2019/05/23 19:23:09 rillig Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
@@ -33,7 +33,7 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf ssmtp.c ssmtp.conf ssmtp.8
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_SED.paths+=	-e 's,/etc/ssl/certs,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,/etc/ssmtp,${PKG_SYSCONFDIR},g'
 SUBST_STAGE.paths=	pre-configure
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index fdd9fc495c5..b7ce26777f8 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/08/22 09:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2019/05/23 19:23:09 rillig Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -38,7 +38,7 @@ BUILD_DEFS=		APACHE_USER
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	turba.conf.dist
-SUBST_SED.files=	-e "s|@TURBADIR@|${TURBADIR}|g"
+SUBST_VARS.files=	TURBADIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 REPLACE_INTERPRETER+=	php
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 0df3c11c1a6..7495246784f 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:09 rillig Exp $
 
 DISTNAME=	up-imapproxy-1.2.5
 PKGREVISION=	7
@@ -15,7 +15,7 @@ RCD_SCRIPTS=	upimapproxy
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	include/imapproxy.h
-SUBST_SED.paths=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.paths=	PKG_SYSCONFDIR
 SUBST_MESSAGE.paths=	Fixing hard coded paths.
 
 CONF_FILES=	${PREFIX}/share/examples/up-imapproxy/imapproxy.conf \