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.

13 files changed, 58 insertions, 58 deletions

diff --git a/pkgtools/autoswc/Makefile b/pkgtools/autoswc/Makefile
index 57c8a2e325b..bbe61002846 100644
--- a/pkgtools/autoswc/Makefile
+++ b/pkgtools/autoswc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/11/25 12:52:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:12 rillig Exp $
 
 PKGNAME=		autoswc-1.6
 CATEGORIES=		pkgtools sysutils
@@ -29,13 +29,13 @@ SUBST_FILES.build+=	config.site
 SUBST_SED.build=	-e 's|@ACLOCAL@|${LOCALBASE}/bin/aclocal|g'
 SUBST_SED.build+=	-e 's|@AUTOCONF@|${LOCALBASE}/bin/autoconf|g'
 SUBST_SED.build+=	-e 's|@AUTOMAKE@|${LOCALBASE}/bin/automake|g'
-SUBST_SED.build+=	-e 's|@CACHEDIR@|${CACHEDIR}|g'
+SUBST_VARS.build=	CACHEDIR
 SUBST_SED.build+=	-e 's|@LIBTOOLIZE@|${LOCALBASE}/bin/libtoolize|g'
-SUBST_SED.build+=	-e 's|@MACHINE_GNU_PLATFORM@|${MACHINE_GNU_PLATFORM}|g'
-SUBST_SED.build+=	-e 's|@MAKE@|${MAKE}|g'
-SUBST_SED.build+=	-e 's|@MKCONF@|${MKCONF}|g'
-SUBST_SED.build+=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.build+=	-e 's|@SH@|${SH}|g'
+SUBST_VARS.build+=	MACHINE_GNU_PLATFORM
+SUBST_VARS.build+=	MAKE
+SUBST_VARS.build+=	MKCONF
+SUBST_VARS.build+=	PREFIX
+SUBST_VARS.build+=	SH
 SUBST_SED.build+=	-e 's|@SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/autoswc
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index da85ef31658..7cddc573dda 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/09/27 23:02:57 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:12 rillig Exp $
 #
 
 PKGNAME=	dfdisk-1.0
@@ -27,12 +27,12 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	dfdisk.sh dfdisk.1 dfdisk.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@PKGVERSION@,${PKGVERSION},g'
-SUBST_SED.paths+=	-e 's,@PKGBASE@,${PKGBASE},g'
-SUBST_SED.paths+=	-e 's,@FTP@,${FTP},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	PKGVERSION
+SUBST_VARS.paths+=	PKGBASE
+SUBST_VARS.paths+=	FTP
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	pre-install
 
 post-extract:
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index 556198b1f70..998f6e46b7f 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.40 2019/05/23 19:23:12 rillig Exp $
 
 PKGNAME=		libkver-${VERSION}
 CATEGORIES=		pkgtools
@@ -32,8 +32,8 @@ FILES_SUBST+=		HAS_SYSCTL=false
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kver/kver.sh kver/kver.8 lib/kver.3
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8
diff --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile
index a46dc65d41c..ecd61124a84 100644
--- a/pkgtools/pkg_alternatives/Makefile
+++ b/pkgtools/pkg_alternatives/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 14:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/05/23 19:23:12 rillig Exp $
 #
 
 PKGNAME=	pkg_alternatives-1.6
@@ -28,14 +28,14 @@ SUBST_STAGE.vars=	do-configure
 SUBST_MESSAGE.vars=	Configuring sources.
 SUBST_FILES.vars=	pkg_alternatives.8 pkg_alternatives.sh
 SUBST_SED.vars=		-e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.vars+=	-e 's|@DATADIR@|${DATADIR}|g'
-SUBST_SED.vars+=	-e 's|@DBDIR@|${DBDIR}|g'
-SUBST_SED.vars+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
-SUBST_SED.vars+=	-e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'
-SUBST_SED.vars+=	-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_VARS.vars=	DATADIR
+SUBST_VARS.vars+=	DBDIR
+SUBST_VARS.vars+=	PKGMANDIR
+SUBST_VARS.vars+=	PKG_DBDIR
+SUBST_VARS.vars+=	PREFIX
 SUBST_SED.vars+=	-e 's|@ROOT_USER@|${REAL_ROOT_USER}|g'
-SUBST_SED.vars+=	-e 's|@ID@|${ID}|g'
-SUBST_SED.vars+=	-e 's|@SH@|${SH}|g'
+SUBST_VARS.vars+=	ID
+SUBST_VARS.vars+=	SH
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
diff --git a/pkgtools/pkg_distinst/Makefile b/pkgtools/pkg_distinst/Makefile
index 88656567ed5..b8277785abf 100644
--- a/pkgtools/pkg_distinst/Makefile
+++ b/pkgtools/pkg_distinst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/08/22 09:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/23 19:23:12 rillig Exp $
 
 PKGNAME=	pkg_distinst-0.02
 PKGREVISION=	6
@@ -16,9 +16,9 @@ AUTO_MKDIRS=	yes
 SUBST_CLASSES+=		di
 SUBST_STAGE.di=		do-configure
 SUBST_FILES.di=		pkg_distinst.pl
-SUBST_SED.di=		-e 's,@PERL5@,${PERL5},g'
-SUBST_SED.di+=		-e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
-SUBST_SED.di+=		-e 's,@MAKE@,${MAKE},g'
+SUBST_VARS.di=		PERL5
+SUBST_VARS.di+=		PKGSRCDIR
+SUBST_VARS.di+=		MAKE
 SUBST_MESSAGE.di=	Fixing script for installation.
 
 do-extract:
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index bc95963c249..6d6031e0747 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2018/08/22 09:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2019/05/23 19:23:12 rillig Exp $
 #
 
 PKGNAME=	pkg_filecheck-0.4
@@ -27,10 +27,10 @@ INSTALLATION_DIRS= \
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	builddb.pl builddb.1 pkg_filecheck.conf
 SUBST_FILES.paths+=	pkg_filecheck.conf.5 pkg_filecheck.c pkg_filecheck.1
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
-SUBST_SED.paths+=	-e 's,@PKG_DBDIR@,${PKG_DBDIR},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PERL5
+SUBST_VARS.paths+=	PKG_DBDIR
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
 SUBST_STAGE.paths=	pre-configure
 
 post-extract:
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index 06dd59fe14e..fe13cb7d34a 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/09/27 23:00:48 tnn Exp $
+# $NetBSD: Makefile,v 1.29 2019/05/23 19:23:12 rillig Exp $
 
 PKGNAME=	pkg_notify-0.4.6
 PKGREVISION=	1
@@ -26,11 +26,11 @@ SUBST_CLASSES+=			pkg_notify
 SUBST_STAGE.pkg_notify=		pre-install
 SUBST_FILES.pkg_notify=		pkg_notify
 SUBST_FILES.pkg_notify+=	pkg_notify.1
-SUBST_SED.pkg_notify=		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|'
-SUBST_SED.pkg_notify+=		-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.pkg_notify+=		-e 's|@MAKE@|${MAKE:Q}|g'
+SUBST_VARS.pkg_notify=		PKGSRCDIR
+SUBST_VARS.pkg_notify+=		PREFIX
+SUBST_VARS.pkg_notify+=		MAKE
 SUBST_SED.pkg_notify+=		-e 's|@PERL@|${PERL5:Q}|g'
-SUBST_SED.pkg_notify+=		-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_VARS.pkg_notify+=		PKG_SYSCONFDIR
 
 INSTALLATION_DIRS=	bin ${EGDIR} ${PKGMANDIR}/man1
 
diff --git a/pkgtools/pkg_p5up2date/Makefile b/pkgtools/pkg_p5up2date/Makefile
index 9776d67c4b0..568cf0c59e3 100644
--- a/pkgtools/pkg_p5up2date/Makefile
+++ b/pkgtools/pkg_p5up2date/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/08/22 09:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:13 rillig Exp $
 
 PKGNAME=	pkg_p5up2date-0.06
 PKGREVISION=	4
@@ -28,7 +28,7 @@ SUBST_CLASSES+=			pkgsrcdir
 SUBST_STAGE.pkgsrcdir=		pre-configure
 SUBST_MESSAGE.pkgsrcdir=	Recording default path of pkgsrc base directory.
 SUBST_FILES.pkgsrcdir=		pkg_p5up2date.pl
-SUBST_SED.pkgsrcdir=		-e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
+SUBST_VARS.pkgsrcdir=		PKGSRCDIR
 
 # REPLACE_PERL+=		pkg_p5up2date.pl
 
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index 6f395abaf94..794df6d06ea 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/09/14 16:31:28 leot Exp $
+# $NetBSD: Makefile,v 1.22 2019/05/23 19:23:13 rillig Exp $
 
 PKGNAME=	pkgclean-20051116
 CATEGORIES=	pkgtools
@@ -21,8 +21,8 @@ do-install:
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	pkgclean.sh pkgclean.1
-SUBST_SED.path+=	-e 's,@SH@,${SH},g'
-SUBST_SED.path+=	-e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
+SUBST_VARS.path=	SH
+SUBST_VARS.path+=	PKGSRCDIR
 SUBST_MESSAGE.path=	Adjusting pkgsrc directory.
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkglint4/Makefile b/pkgtools/pkglint4/Makefile
index 933fd518248..94b253c8f57 100644
--- a/pkgtools/pkglint4/Makefile
+++ b/pkgtools/pkglint4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/08/22 09:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:13 rillig Exp $
 
 PKGNAME=	pkglint4-4.164
 PKGREVISION=	1
@@ -34,11 +34,11 @@ SUBST_FILES.pkglint+=	build.pl pkglint.pl pkglint.t plist-clash.pl
 .if defined(BATCH)
 SUBST_SED.pkglint+=	-e s\|@PKGSRCDIR@\|/usr/pkgsrc\|g
 .else
-SUBST_SED.pkglint+=	-e s\|@PKGSRCDIR@\|${PKGSRCDIR}\|g
+SUBST_VARS.pkglint=	PKGSRCDIR
 .endif
-SUBST_SED.pkglint+=	-e s\|@PREFIX@\|${PREFIX}\|g
+SUBST_VARS.pkglint=	PREFIX
 SUBST_SED.pkglint+=	-e s\|@DISTVER@\|${PKGNAME:S/pkglint-//}\|g
-SUBST_SED.pkglint+=	-e s\|@MAKE@\|${MAKE:Q}\|g
+SUBST_VARS.pkglint+=	MAKE
 SUBST_SED.pkglint+=	-e s\|@PERL@\|${PERL5:Q}\|g
 SUBST_SED.pkglint+=	-e s\|@DATADIR@\|${FILESDIR}\|g
 
diff --git a/pkgtools/pkgsrc-todo/Makefile b/pkgtools/pkgsrc-todo/Makefile
index 0cdaba57ccb..41f1ce30670 100644
--- a/pkgtools/pkgsrc-todo/Makefile
+++ b/pkgtools/pkgsrc-todo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/08/22 09:46:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:13 rillig Exp $
 
 PKGNAME=	pkgsrc-todo-1.3
 PKGREVISION=	3
@@ -27,10 +27,10 @@ SUBST_FILES.todo+=	list_todo.sh
 SUBST_FILES.todo+=	obsolete_todo.pl
 SUBST_FILES.todo+=	obsolete_todo.1
 SUBST_SED.todo+=	-e s\|pkgsrc/\|${PKGSRCDIR}/\|g
-SUBST_SED.todo+=	-e s\|@PKGSRCDIR@\|${PKGSRCDIR}\|g
+SUBST_VARS.todo=	PKGSRCDIR
 SUBST_SED.todo+=	-e s\|@PERL@\|${PERL5:Q}\|g
-SUBST_SED.todo+=	-e s\|@SED@\|${SED:Q}\|g
-SUBST_SED.todo+=	-e s\|@PKG_INFO@\|${PKG_INFO:Q}\|g
+SUBST_VARS.todo+=	SED
+SUBST_VARS.todo+=	PKG_INFO
 
 do-extract:
 	cd ${FILESDIR} && ${CP} add_todo.1 add_todo.pl list_todo.sh \
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 70bc73d373d..43c5f46eaf6 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2018/08/22 09:46:12 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2019/05/23 19:23:13 rillig Exp $
 
 PKGNAME=	url2pkg-2.29
 PKGREVISION=	1
@@ -25,13 +25,13 @@ SUBST_CLASSES+=		up
 SUBST_STAGE.up=		do-configure
 SUBST_MESSAGE.up=	Replacing variable placeholders
 SUBST_FILES.up=		url2pkg.pl MakeMaker.pm
-SUBST_SED.up=		-e 's,@MAKE@,'${MAKE:Q}',g'
+SUBST_VARS.up=		MAKE
 SUBST_SED.up+=		-e 's,@PERL@,${PERL5},g'
 SUBST_SED.up+=		-e 's,@PERLLIBDIR@,${PREFIX}/lib/url2pkg,g'
 .if defined(BATCH)
 SUBST_SED.up+=		-e 's,@PKGSRCDIR@,/usr/pkgsrc,g'
 .else
-SUBST_SED.up+=		-e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
+SUBST_VARS.up+=		PKGSRCDIR
 .endif
 
 do-install:
diff --git a/pkgtools/verifypc/Makefile b/pkgtools/verifypc/Makefile
index 371d610d97d..d4693e842f0 100644
--- a/pkgtools/verifypc/Makefile
+++ b/pkgtools/verifypc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/02/20 02:55:15 dholland Exp $
+# $NetBSD: Makefile,v 1.17 2019/05/23 19:23:13 rillig Exp $
 #
 
 PKGNAME=	verifypc-1.7
@@ -15,8 +15,8 @@ SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	do-configure
 SUBST_MESSAGE.vars=	Configuring sources.
 SUBST_FILES.vars=	*
-SUBST_SED.vars=		-e s\|@MAKE@\|${MAKE:Q}\|g
-SUBST_SED.vars+=	-e s\|@SH@\|${SH:Q}\|g
+SUBST_VARS.vars=	MAKE
+SUBST_VARS.vars+=	SH
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1 bin