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.

18 files changed, 56 insertions, 56 deletions

diff --git a/security/Bastille/Makefile b/security/Bastille/Makefile
index 842ee60198a..33ed61b9d81 100644
--- a/security/Bastille/Makefile
+++ b/security/Bastille/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/08/22 09:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:14 rillig Exp $
 #
 
 DISTNAME=	Bastille-3.0.9
@@ -34,9 +34,9 @@ SUBST_SED.b+=		-e 's,\$$RPM_BUILD_ROOT/var/,${DESTDIR}${VARBASE}/,g'
 SUBST_CLASSES+=		b2
 SUBST_STAGE.b2=		pre-configure
 SUBST_FILES.b2=		bin/bastille Bastille/API.pm
-SUBST_SED.b2=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.b2+=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.b2+=		-e 's,@VARBASE@,${VARBASE},g'
+SUBST_VARS.b2=		PKG_SYSCONFDIR
+SUBST_VARS.b2+=		PREFIX
+SUBST_VARS.b2+=		VARBASE
 
 SUBST_CLASSES+=		b3
 SUBST_STAGE.b3=		pre-configure
diff --git a/security/amap/Makefile b/security/amap/Makefile
index b49a40a40c4..04b24668f49 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/08/16 20:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:14 rillig Exp $
 #
 
 DISTNAME=	amap-5.2
@@ -24,13 +24,13 @@ CONF_FILES+=	${EGDIR}/appdefs.trig ${PKG_SYSCONFDIR}/appdefs.trig
 SUBST_CLASSES+=		conf
 SUBST_FILES.conf=	configure
 SUBST_STAGE.conf=	pre-configure
-SUBST_SED.conf=		-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_VARS.conf=	PREFIX
 SUBST_SED.conf+=	-e 's|@MANDIR@|${PREFIX}/man|g'
-SUBST_SED.conf+=	-e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
+SUBST_VARS.conf+=	COMPILER_RPATH_FLAG
 SUBST_SED.conf+=	-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
-SUBST_SED.conf+=	-e "s|@UNAME@|${UNAME}|g"
-SUBST_SED.conf+=	-e "s|@GREP@|${GREP}|g"
-SUBST_SED.conf+=	-e "s|@SED@|${SED}|g"
+SUBST_VARS.conf+=	UNAME
+SUBST_VARS.conf+=	GREP
+SUBST_VARS.conf+=	SED
 SUBST_MESSAGE.conf=	Fixing configure script.
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
diff --git a/security/base/Makefile b/security/base/Makefile
index 55ce9e0cfdd..e3f289901fa 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/08/22 09:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/05/23 19:23:14 rillig Exp $
 
 DISTNAME=	base-1.4.3.1
 PKGREVISION=	13
@@ -60,9 +60,9 @@ BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	base.conf base_conf.php.dist
-SUBST_SED.conf=		-e "s|@BASE_DIR@|${BASE_DIR}|g"
-SUBST_SED.conf+=	-e "s|@DBTYPE@|${DBTYPE}|g"
-SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.conf=	BASE_DIR
+SUBST_VARS.conf+=	DBTYPE
+SUBST_VARS.conf+=	PREFIX
 SUBST_MESSAGE.conf=	Fixing configuration files.
 
 INSTALLATION_DIRS=	${BASE_DIR} ${EGDIR} share/doc/base
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index cf0bd7fa741..2a9d87d28b2 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/07/31 20:34:17 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:14 rillig Exp $
 #
 
 DISTNAME=		cvm-0.97
@@ -30,7 +30,7 @@ SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_CLASSES+=		shlibs
 SUBST_STAGE.shlibs=	do-configure
 SUBST_FILES.shlibs=	INSTHIER
-SUBST_SED.shlibs=	-e 's|@CVM_LIB_EXT@|${CVM_LIB_EXT}|g'
+SUBST_VARS.shlibs=	CVM_LIB_EXT
 SUBST_MESSAGE.shlibs=	Fixing shlibs.
 
 RCD_SCRIPTS=		cvm
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 7c99223de4e..31db4252803 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2019/04/03 14:28:57 adam Exp $
+# $NetBSD: Makefile,v 1.93 2019/05/23 19:23:14 rillig Exp $
 
 DISTNAME=	gpgme-1.13.0
 CATEGORIES=	security
@@ -20,7 +20,7 @@ INFO_FILES=		yes
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	src/gpgme-config.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
-SUBST_SED.pthread+=	-e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
+SUBST_VARS.pthread=	PTHREAD_CFLAGS
 SUBST_STAGE.pthread=	pre-configure
 
 CPPFLAGS.Darwin=	-D_POSIX_C_SOURCE=200809L
diff --git a/security/john/Makefile b/security/john/Makefile
index a142710d529..1688018779c 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/24 17:22:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/23 19:23:14 rillig Exp $
 #
 
 DISTNAME=	john-1.8.0
@@ -73,7 +73,7 @@ INSTALLATION_DIRS=	bin share/john
 SUBST_CLASSES+=		john
 SUBST_STAGE.john=	pre-build
 SUBST_FILES.john=	src/params.h
-SUBST_SED.john=		-e "s+@PREFIX@+${PREFIX}+g"
+SUBST_VARS.john=	PREFIX
 
 do-install:
 	# programs and scripts
diff --git a/security/libprelude/Makefile.common b/security/libprelude/Makefile.common
index 1a7588e21ab..e6b7882642d 100644
--- a/security/libprelude/Makefile.common
+++ b/security/libprelude/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2018/07/04 13:40:34 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.14 2019/05/23 19:23:15 rillig Exp $
 #
 # used by security/libprelude/Makefile
 # used by security/libprelude-lua/Makefile
@@ -52,7 +52,7 @@ MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/profile ${REAL_ROOT_USER} ${REAL_ROOT_GROUP}
 SUBST_CLASSES+=		make
 SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
-SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
+SUBST_VARS.make=	EGDIR
 
 INSTALLATION_DIRS=	share/examples/libprelude
 
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index d4651753db9..341a5eb13b7 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/16 20:21:14 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:15 rillig Exp $
 
 DISTNAME=	logcheck-1.1.1
 PKGREVISION=	1
@@ -24,8 +24,8 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing hard-coded paths.
 SUBST_FILES.prefix=	Makefile systems/freebsd/logcheck.sh
 SUBST_SED.prefix=	-e "s+/usr/local+${PREFIX}+g"
-SUBST_SED.prefix+=	-e "s+@PKG_SYSCONFDIR@+${PKG_SYSCONFDIR}+g"
-SUBST_SED.prefix+=	-e "s+@TEMPDIR@+${TEMPDIR}+g"
+SUBST_VARS.prefix=	PKG_SYSCONFDIR
+SUBST_VARS.prefix+=	TEMPDIR
 
 INSTALLATION_DIRS+=	bin ${EGDIR}
 
diff --git a/security/lynis/Makefile b/security/lynis/Makefile
index 7c1ce6a91e6..bd05746b019 100644
--- a/security/lynis/Makefile
+++ b/security/lynis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/02/26 17:42:54 sborrill Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/23 19:23:15 rillig Exp $
 #
 
 DISTNAME=	lynis-2.6.2
@@ -17,13 +17,13 @@ SUBST_CLASSES+=		libdir
 SUBST_STAGE.libdir=	pre-install
 SUBST_MESSAGE.libdir=	Fixing lib path
 SUBST_FILES.libdir=	lynis
-SUBST_SED.libdir=	-e "s,@PREFIX@,${PREFIX},"
+SUBST_VARS.libdir=	PREFIX
 
 SUBST_CLASSES+=		vardir
 SUBST_STAGE.vardir=	pre-install
 SUBST_MESSAGE.vardir=	Fixing var path
 SUBST_FILES.vardir=	lynis
-SUBST_SED.vardir=	-e "s,@VARBASE@,${VARBASE},"
+SUBST_VARS.vardir=	VARBASE
 
 SUBST_CLASSES+=		confdir
 SUBST_STAGE.confdir=	pre-install
diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index c369c53f8d1..b584c178f12 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/05/23 19:23:15 rillig Exp $
 #
 
 DISTNAME=	opendnssec-1.4.13
@@ -51,7 +51,7 @@ PKG_SYSCONFSUBDIR=	opendnssec
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/conf/Makefile.in
 SUBST_STAGE.paths=	pre-configure
-SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
+SUBST_VARS.paths=	EGDIR
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
diff --git a/security/pam-tacplus/Makefile b/security/pam-tacplus/Makefile
index 7f64aa9ee2b..9aa6e34b030 100644
--- a/security/pam-tacplus/Makefile
+++ b/security/pam-tacplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:15 rillig Exp $
 #
 
 DISTNAME=	pam_tacplus-1.3.6
@@ -19,7 +19,7 @@ GNU_CONFIGURE=yes
 SUBST_CLASSES+=		egdir
 SUBST_STAGE.egdir=	pre-configure
 SUBST_FILES.egdir=	Makefile.in
-SUBST_SED.egdir=	-e "s,@EGDIR@,${EGDIR},"
+SUBST_VARS.egdir=	EGDIR
 
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/prelude-correlator/Makefile b/security/prelude-correlator/Makefile
index b98096b596c..bb119a72d19 100644
--- a/security/prelude-correlator/Makefile
+++ b/security/prelude-correlator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/04/26 14:12:45 maya Exp $
+# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:15 rillig Exp $
 
 DISTNAME=	prelude-correlator-0.9.0-beta8
 PKGNAME=	prelude-correlator-${DISTNAME:S/-beta/beta/:C/.*-//}
@@ -38,9 +38,9 @@ SUBST_CLASSES+=		code
 SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-correlator.c
 SUBST_FILES.code+=	${WRKSRC}/*.py
-SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
-SUBST_SED.code+=	-e 's,@PRELUDE_HOME@,${PRELUDE_HOME},g'
+SUBST_VARS.code=	PREFIX
+SUBST_VARS.code+=	PRELUDE_USER
+SUBST_VARS.code+=	PRELUDE_HOME
 
 CONF_FILES+=		${EGDIR}/prelude-correlator.conf ${PKG_SYSCONFDIR}/prelude-correlator/prelude-correlator.conf
 CONF_FILES+=		${EGDIR}/dshield.dat ${PRELUDE_HOME}/dshield.dat
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 8f95dbcde92..f9298eacded 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.15
@@ -51,13 +51,13 @@ FILES_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 SUBST_CLASSES+=		code
 SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-lml.c
-SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+SUBST_VARS.code=	PREFIX
+SUBST_VARS.code+=	PRELUDE_USER
 
 SUBST_CLASSES+=		make
 SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
-SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
+SUBST_VARS.make=	EGDIR
 
 PKG_SYSCONFSUBDIR=	prelude-lml
 CONF_FILES_PERMS+=	${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 52bbed97b99..d5e9af61865 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2019/05/23 19:23:16 rillig Exp $
 #
 
 DISTNAME=		prelude-manager-0.9.15
@@ -50,8 +50,8 @@ FILES_SUBST+=		PRELUDE_GROUP=${PRELUDE_USER:Q}
 SUBST_CLASSES+=		code
 SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-manager.c
-SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+SUBST_VARS.code=	PREFIX
+SUBST_VARS.code+=	PRELUDE_USER
 
 EGDIR=			share/examples/prelude-manager/
 CONF_FILES+=		${EGDIR}/prelude-manager.conf ${PKG_SYSCONFDIR}/prelude-manager/prelude-manager.conf
diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile
index 936d22565b4..45afa1fc54d 100644
--- a/security/prelude-pflogger/Makefile
+++ b/security/prelude-pflogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:16 rillig Exp $
 #
 
 DISTNAME=	prelude-pflogger-0.9.0-rc2
@@ -45,13 +45,13 @@ MESSAGE_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 SUBST_CLASSES+=		code
 SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-pflogger.c
-SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+SUBST_VARS.code=	PREFIX
+SUBST_VARS.code+=	PRELUDE_USER
 
 SUBST_CLASSES+=         make
 SUBST_STAGE.make=       pre-configure
 SUBST_FILES.make=       Makefile.am
-SUBST_SED.make=         -e 's,@EGDIR@,${EGDIR},g'
+SUBST_VARS.make=	EGDIR
 
 RCD_SCRIPTS=		pflogger
 
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 80ce7125878..437b68793ba 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/04/26 13:14:13 maya Exp $
+# $NetBSD: Makefile,v 1.50 2019/05/23 19:23:16 rillig Exp $
 
 DISTNAME=		prewikka-${VERSION}
 PKGNAME=		${PYPKGPREFIX}-prewikka-${VERSION}
@@ -44,9 +44,9 @@ PKG_USERS_VARS+=	PREWIKKA_USER
 SUBST_CLASSES+=		code
 SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	runPrewikka.c
-SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.code+=	-e 's,@PREWIKKA_USER@,${PREWIKKA_USER},g'
-SUBST_SED.code+=	-e 's,@PYTHONBIN@,${PYTHONBIN},g'
+SUBST_VARS.code=	PREFIX
+SUBST_VARS.code+=	PREWIKKA_USER
+SUBST_VARS.code+=	PYTHONBIN
 
 FILES_SUBST+=	PREWIKKA_USER=${PREWIKKA_USER:Q}
 
diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile
index 9c209517256..61888924fce 100644
--- a/security/py-tlslite/Makefile
+++ b/security/py-tlslite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/07/23 22:30:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:16 rillig Exp $
 
 DISTNAME=		tlslite-0.4.9
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -24,8 +24,8 @@ REPLACE_PYTHON=		setup.py tests/httpsclient.py tests/tlstest.py
 SUBST_CLASSES+=		pyclash
 SUBST_STAGE.pyclash=	do-configure
 SUBST_FILES.pyclash=	setup.py tests/tlstest.py tests/httpsserver.sh
-SUBST_SED.pyclash=	-e 's|@PYTHONBIN@|${PYTHONBIN}|g'
-SUBST_SED.pyclash+=	-e 's|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g'
+SUBST_VARS.pyclash=	PYTHONBIN
+SUBST_VARS.pyclash+=	PYVERSSUFFIX
 
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index a8891692039..ca8edd2c0e5 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2019/04/03 00:33:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/23 19:23:16 rillig Exp $
 #
 
 DISTNAME=	softhsm-1.3.7
@@ -25,7 +25,7 @@ EGDIR=			${PREFIX}/share/examples/softhsm
 SUBST_CLASSES+=         paths
 SUBST_FILES.paths=      ${WRKSRC}/Makefile.in
 SUBST_STAGE.paths=      pre-configure
-SUBST_SED.paths=        -e 's,@EGDIR@,${EGDIR},'
+SUBST_VARS.paths=	EGDIR
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE