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.

9 files changed, 36 insertions, 36 deletions

diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index b08d8394fb9..9698da46709 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/04/26 13:14:14 maya Exp $
+# $NetBSD: Makefile,v 1.24 2019/05/23 19:23:16 rillig Exp $
 
 DISTNAME=	ansible-1.9.4
 PKGREVISION=	2
@@ -37,9 +37,9 @@ SUBST_FILES.prefix+=    lib/ansible/modules/extras/packaging/os/pkgin.py
 SUBST_FILES.prefix+=    plugins/README.md plugins/inventory/cobbler.py
 SUBST_FILES.prefix+=    plugins/inventory/collins.py
 SUBST_MESSAGE.prefix=   Fixing PREFIX path.
-SUBST_SED.prefix=       -e "s,@PREFIX@,${PREFIX},"
-SUBST_SED.prefix+=      -e "s,@PKG_SYSCONFBASE@,${PKG_SYSCONFBASE},"
-SUBST_SED.prefix+=      -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
+SUBST_VARS.prefix=	PREFIX
+SUBST_VARS.prefix+=	PKG_SYSCONFBASE
+SUBST_VARS.prefix+=	PKG_SYSCONFDIR
 
 SUBST_CLASSES+=         pythonbin
 SUBST_STAGE.pythonbin=  pre-configure
diff --git a/sysutils/atitvout/Makefile b/sysutils/atitvout/Makefile
index 552806e0f10..4694ca2004c 100644
--- a/sysutils/atitvout/Makefile
+++ b/sysutils/atitvout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/07/10 10:45:40 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:16 rillig Exp $
 
 DISTNAME=	atitvout-0.4
 PKGREVISION=	1
@@ -33,7 +33,7 @@ REPLACE_FILES.bash=	test.sh
 SUBST_CLASSES+=	sh
 SUBST_STAGE.sh=	pre-configure
 SUBST_FILES.sh=	test.sh
-SUBST_SED.sh=	-e "s,@PREFIX@,${PREFIX},"
+SUBST_VARS.sh=	PREFIX
 
 INSTALLATION_DIRS=	sbin share/doc/atitvout
 
diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index 66b41398c17..8ed5f1b9b06 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/08/22 09:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:17 rillig Exp $
 
 DISTNAME=	BackupPC-3.3.1
 PKGNAME=	${DISTNAME:tl}
@@ -77,13 +77,13 @@ SUBST_FILES.fix-paths+=		${WRKSRC}/build/${PREFIX}/share/BackupPC/lib/BackupPC/L
 SUBST_FILES.fix-paths+=		${WRKSRC}/backuppc.conf
 SUBST_FILES.fix-paths+=		${WRKSRC}/cgiwrapper.c
 SUBST_SED.fix-paths=		-e 's,${PREFIX}/share/examples/BackupPC,${PKG_SYSCONFDIR},g'
-SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.fix-paths+=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.fix-paths+=		-e 's,@APACHE_USER@,${APACHE_USER},g'
-SUBST_SED.fix-paths+=		-e 's,@APACHE_GROUP@,${APACHE_GROUP},g'
-SUBST_SED.fix-paths+=		-e 's,@BACKUPPC_USER@,${BACKUPPC_USER},g'
-SUBST_SED.fix-paths+=		-e 's,@BACKUPPC_GROUP@,${BACKUPPC_GROUP},g'
-SUBST_SED.fix-paths+=		-e 's,@PERL5@,${PERL5},g'
+SUBST_VARS.fix-paths=		PREFIX
+SUBST_VARS.fix-paths+=		PKG_SYSCONFDIR
+SUBST_VARS.fix-paths+=		APACHE_USER
+SUBST_VARS.fix-paths+=		APACHE_GROUP
+SUBST_VARS.fix-paths+=		BACKUPPC_USER
+SUBST_VARS.fix-paths+=		BACKUPPC_GROUP
+SUBST_VARS.fix-paths+=		PERL5
 
 FILES_SUBST+=			BACKUPPC_USER=${BACKUPPC_USER:Q} BACKUPPC_GROUP=${BACKUPPC_GROUP:Q}
 
diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index 1a68de7a329..2307ae84aad 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/04/09 11:08:13 sevan Exp $
+# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:17 rillig Exp $
 
 DISTNAME=	estd-r11
 PKGNAME=	estd-0.11
@@ -30,7 +30,7 @@ SUBST_CLASSES+=		rcd
 SUBST_STAGE.rcd=	do-configure
 SUBST_MESSAGE.rcd=	Fixing startup script.
 SUBST_FILES.rcd=	estd.sh
-SUBST_SED.rcd=		-e 's|@PREFIX@|${PREFIX}|'
-SUBST_SED.rcd+=		-e 's|@ECHO@|${ECHO}|'
+SUBST_VARS.rcd=		PREFIX
+SUBST_VARS.rcd+=	ECHO
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 141bf8b9ecc..82985a8f053 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2019/05/23 19:23:17 rillig Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
@@ -23,7 +23,7 @@ LDFLAGS.DragonFly=	-lintl
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	audio_oss.c
-SUBST_SED.paths+=	-e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},g'
+SUBST_VARS.paths=	DEVOSSAUDIO
 SUBST_STAGE.paths=	pre-configure
 
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/sysutils/smbldap-tools/Makefile b/sysutils/smbldap-tools/Makefile
index 299db7b6438..0d3554bc8d7 100644
--- a/sysutils/smbldap-tools/Makefile
+++ b/sysutils/smbldap-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/08/22 09:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:17 rillig Exp $
 
 DISTNAME=	smbldap-tools-${VERS}
 PKGREVISION=	7
@@ -43,10 +43,10 @@ SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-install
 SUBST_FILES.path=	configure.pl doc/slapd.conf doc/smb.conf
 SUBST_FILES.path+=	smbldap_tools.pm smbldap.conf
-SUBST_SED.path=		-e "s,@PREFIX@,${PREFIX},g"
-SUBST_SED.path+=	-e "s,@OPENLDAP_VARDIR@,${OPENLDAP_VARDIR},g"
-SUBST_SED.path+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
-SUBST_SED.path+=	-e "s,@SAMBA_PIDDIR@,${SAMBA_PIDDIR},g"
+SUBST_VARS.path=	PREFIX
+SUBST_VARS.path+=	OPENLDAP_VARDIR
+SUBST_VARS.path+=	PKG_SYSCONFDIR
+SUBST_VARS.path+=	SAMBA_PIDDIR
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile
index 6faf4a7963b..7f3669ce40b 100644
--- a/sysutils/tob/Makefile
+++ b/sysutils/tob/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/09/06 10:40:33 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/05/23 19:23:17 rillig Exp $
 
 DISTNAME=	tob-0.25
 PKGREVISION=	2
@@ -24,8 +24,8 @@ SUBST_CLASSES+=		confdir
 SUBST_STAGE.confdir=	do-build
 SUBST_MESSAGE.confdir=	Adjusting configuration directory
 SUBST_FILES.confdir=	tob tob.rc
-SUBST_SED.confdir=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.confdir+=	-e 's|@VARBASE@|${VARBASE}|g'
+SUBST_VARS.confdir=	PKG_SYSCONFDIR
+SUBST_VARS.confdir+=	VARBASE
 
 BUILD_DEFS+=		VARBASE
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 91216f668d0..823bbff5f6f 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2018/11/14 22:22:28 kleink Exp $
+# $NetBSD: Makefile,v 1.82 2019/05/23 19:23:17 rillig Exp $
 
 DISTNAME=	xcdroast-1.18
 PKGREVISION=	3
@@ -34,7 +34,7 @@ SUBST_CLASSES+=			devossaudio
 SUBST_STAGE.devossaudio=	pre-build
 SUBST_MESSAGE.devossaudio=	Fixing path to audio device.
 SUBST_FILES.devossaudio=	io.c wavplay.c
-SUBST_SED.devossaudio=		-e "s,@DEVOSSAUDIO@,${DEVOSSAUDIO},g"
+SUBST_VARS.devossaudio=		DEVOSSAUDIO
 
 INSTALLATION_DIRS=	${DOCDIR}
 SPECIAL_PERMS+=		lib/xcdroast/bin/xcdrwrap {REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4711
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index 73d25a538ab..864ed2f9238 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/10/26 09:15:06 sborrill Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/23 19:23:17 rillig Exp $
 #
 
 # Values from XenServer 7.0 = 7, 0, 0, 125243
@@ -37,16 +37,16 @@ RCD_SCRIPTS=		xenguest
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-install
 SUBST_FILES.paths=	${SRCFILES}
-SUBST_SED.paths=	-e "s,@VARBASE@,${VARBASE},g"
-SUBST_SED.paths+=	-e "s,@PREFIX@,${PREFIX},g"
+SUBST_VARS.paths=	VARBASE
+SUBST_VARS.paths+=	PREFIX
 
 SUBST_CLASSES+=		version
 SUBST_STAGE.version=	pre-install
 SUBST_FILES.version=	xe-update-guest-attrs
-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"
+SUBST_VARS.version=	XENMAJOR
+SUBST_VARS.version+=	XENMINOR
+SUBST_VARS.version+=	XENTEENY
+SUBST_VARS.version+=	XENBUILD
 
 INSTALLATION_DIRS=	sbin