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.

21 files changed, 60 insertions, 60 deletions

diff --git a/net/djbdnscurve6/Makefile b/net/djbdnscurve6/Makefile
index 72d331e5d59..72d0361d70f 100644
--- a/net/djbdnscurve6/Makefile
+++ b/net/djbdnscurve6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/03/18 20:19:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/23 19:23:09 rillig Exp $
 
 DISTNAME=		djbdnscurve6-34
 CATEGORIES=		net
@@ -27,7 +27,7 @@ SUBST_MESSAGE.etc=	Fixing prefix.
 SUBST_CLASSES+=		sysconfdir
 SUBST_STAGE.sysconfdir=	do-configure
 SUBST_FILES.sysconfdir=	src/dnscache-conf.c
-SUBST_SED.sysconfdir=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_VARS.sysconfdir=	PKG_SYSCONFDIR
 SUBST_MESSAGE.sysconfdir=Fixing sysconfdir.
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile
index 1713161cab2..5cecb6694cf 100644
--- a/net/hf6to4/Makefile
+++ b/net/hf6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/03/21 10:45:18 taca Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:09 rillig Exp $
 #
 
 DISTNAME=		hf6to4-1.3
@@ -29,8 +29,8 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/hf6to4 share/doc/hf6to4
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	hf6to4
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	SH
 SUBST_STAGE.paths=	pre-install
 
 post-extract:
diff --git a/net/hping3/Makefile b/net/hping3/Makefile
index 89a6455eed7..1a613121123 100644
--- a/net/hping3/Makefile
+++ b/net/hping3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/06/14 12:17:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2019/05/23 19:23:09 rillig Exp $
 #
 
 DISTNAME=		hping3-alpha-2
@@ -15,7 +15,7 @@ LICENSE=		gnu-gpl-v2 AND original-bsd
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=      pre-configure
 SUBST_FILES.paths=	Makefile.in configure
-SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 
 USE_TOOLS=		gmake
 USE_PKGLOCALEDIR=	yes
diff --git a/net/icinga-base/Makefile b/net/icinga-base/Makefile
index abd1b528246..73ead221eee 100644
--- a/net/icinga-base/Makefile
+++ b/net/icinga-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/08/22 09:45:53 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/05/23 19:23:10 rillig Exp $
 #
 
 DISTNAME=	icinga-1.9.4
@@ -76,7 +76,7 @@ OWN_DIRS_PERMS+=${ICINGADIR}/checkresults ${ICINGA_USER} ${ICINGACMD_GROUP} 0775
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	icinga.conf.dist
-SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.files=	PREFIX
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 pre-build:
diff --git a/net/knot/Makefile b/net/knot/Makefile
index 97726da76b4..526eb1f6fac 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/04/25 07:33:11 maya Exp $
+# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:10 rillig Exp $
 
 DISTNAME=	knot-2.8.1
 PKGREVISION=	1
@@ -51,7 +51,7 @@ PKG_SYSCONFSUBDIR=	knot
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/samples/Makefile.in
 SUBST_STAGE.paths=	pre-configure
-SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
+SUBST_VARS.paths=	EGDIR
 
 CONF_FILES=	${EGDIR}/knot.sample.conf \
 			${PKG_SYSCONFDIR}/knot.conf
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 0aab993a701..8e99c69d737 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2019/04/14 21:50:36 jnemeth Exp $
+# $NetBSD: Makefile,v 1.128 2019/05/23 19:23:10 rillig Exp $
 
 DISTNAME=	mrtg-2.17.7
 #PKGREVISION=	12
@@ -30,7 +30,7 @@ SUBST_CLASSES+=		files
 SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg	\
 			../sys2mrtg ../envstat2mrtg
-SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.files=	PREFIX
 SUBST_MESSAGE.files=	Fixing default configuration files.
 
 INSTALLATION_DIRS+=	${EGDIR} libexec
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 3ce7775bf24..1196496fd1f 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2018/08/22 09:45:54 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2019/05/23 19:23:10 rillig Exp $
 #
 
 DISTNAME=		nagios-4.3.2
@@ -82,7 +82,7 @@ SPECIAL_PERMS+=	share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 06
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	nagios.conf.dist
-SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.files=	PREFIX
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 pre-build:
diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile
index 2d97d5e40f0..a720a3c94de 100644
--- a/net/nagstamon/Makefile
+++ b/net/nagstamon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/04/26 14:12:43 maya Exp $
+# $NetBSD: Makefile,v 1.55 2019/05/23 19:23:10 rillig Exp $
 
 VERSION=	1.0.1
 DISTNAME=	Nagstamon-${VERSION}
@@ -29,7 +29,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # py-libxslt, py-ORBit via py-gnome2, py-gtk
 
 SUBST_CLASSES+=		mandir
 SUBST_STAGE.mandir=	pre-configure
-SUBST_SED.mandir=	-e s,@PKGMANDIR@,${PKGMANDIR},g
+SUBST_VARS.mandir=	PKGMANDIR
 SUBST_FILES.mandir=	setup.py
 
 # Upstream renamed script from nagstamon to nagstamon.py
diff --git a/net/netdisco/Makefile b/net/netdisco/Makefile
index b4939c97274..3d7aeb41bdc 100644
--- a/net/netdisco/Makefile
+++ b/net/netdisco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/08/22 09:45:55 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/05/23 19:23:10 rillig Exp $
 
 DISTNAME=		netdisco-${PKGVERSION}_with_mibs
 PKGNAME=		netdisco-${PKGVERSION}
@@ -87,7 +87,7 @@ SUBST_MESSAGE.path=		Fixing hardcoded path.
 
 SUBST_STAGE.varbase=		pre-configure
 SUBST_FILES.varbase=		netdisco.conf
-SUBST_SED.varbase=		-e "s|@VARBASE@|${VARBASE}|g"
+SUBST_VARS.varbase=		VARBASE
 SUBST_MESSAGE.varbase=		Fixing data directory.
 
 NETDISCOUSER?=			netdisco
diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile
index 96360d9e1f4..94e80671b40 100644
--- a/net/ocsinventory-agent/Makefile
+++ b/net/ocsinventory-agent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/08/22 09:45:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:10 rillig Exp $
 #
 VERS=			1.1.2.1
 PKGREVISION=		10
@@ -44,7 +44,7 @@ SUBST_CLASSES+=			sysconfdir path varbase apachevers
 SUBST_STAGE.sysconfdir=		pre-configure
 SUBST_FILES.sysconfdir=		lib/Ocsinventory/Agent/Config.pm
 SUBST_FILES.sysconfdir+=	postinst.pl
-SUBST_SED.sysconfdir=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.sysconfdir=		PKG_SYSCONFDIR
 SUBST_MESSAGE.sysconfdir=	Fixing hardcoded install directory path.
 
 SUBST_STAGE.path=	pre-configure
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index 85052def50a..c6b430c49bc 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/04/26 13:14:10 maya Exp $
+# $NetBSD: Makefile,v 1.14 2019/05/23 19:23:10 rillig Exp $
 
 DISTNAME=	pypcap-1.1
 PKGNAME=	${PYPKGPREFIX}-pcap-1.1
@@ -20,7 +20,7 @@ SUBST_STAGE.python=	pre-configure
 
 SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	Makefile
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 SUBST_STAGE.prefix=	pre-configure
 
 PYDISTUTILSPKG=			yes
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 3a167a17100..64546cace2d 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:10 rillig Exp $
 #
 
 DISTNAME=		rinetd
@@ -22,8 +22,8 @@ RCD_SCRIPTS=		rinetd
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	rinetd.8
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
 SUBST_STAGE.paths=	pre-configure
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
diff --git a/net/ruby-stompserver/Makefile b/net/ruby-stompserver/Makefile
index fe6461790ac..ff2e32fff2b 100644
--- a/net/ruby-stompserver/Makefile
+++ b/net/ruby-stompserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=	drizztbsd-stompserver-1c7a275
 PKGNAME=	${RUBY_PKGPREFIX}-stompserver-1.0.0
@@ -77,13 +77,13 @@ OWN_DIRS_PERMS+=	${ST_ROOT}/${STOMPSERVER_CFGDIR}	\
 SUBST_CLASSES+=		cfg
 SUBST_STAGE.cfg=	pre-configure
 SUBST_FILES.cfg=	config/stompserver.conf
-SUBST_SED.cfg=		-e 's,@STOMPSERVER_WRKDIR@,${STOMPSERVER_WRKDIR},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_LOGDIR@,${STOMPSERVER_LOGDIR},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_PIDFILE@,${STOMPSERVER_PIDFILE},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_CFGDIR@,${STOMPSERVER_CFGDIR},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_STORAGE@,${STOMPSERVER_STORAGE},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_USER@,${STOMPSERVER_USER},g'
-SUBST_SED.cfg+=		-e 's,@STOMPSERVER_GROUP@,${STOMPSERVER_GROUP},g'
+SUBST_VARS.cfg=		STOMPSERVER_WRKDIR
+SUBST_VARS.cfg+=	STOMPSERVER_LOGDIR
+SUBST_VARS.cfg+=	STOMPSERVER_PIDFILE
+SUBST_VARS.cfg+=	STOMPSERVER_CFGDIR
+SUBST_VARS.cfg+=	STOMPSERVER_STORAGE
+SUBST_VARS.cfg+=	STOMPSERVER_USER
+SUBST_VARS.cfg+=	STOMPSERVER_GROUP
 
 FILES_SUBST+=		STOMPSERVER_RCD_CFG=${ST_ROOT}/${STOMPSERVER_CFGDIR}
 FILES_SUBST+=		STOMPSERVER_RCD_PID=${ST_ROOT}/${STOMPSERVER_PIDFILE}
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index e50f45e3d1b..b495e17a2ed 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/26 13:14:10 maya Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=	scapy-2.3.2
 PKGREVISION=	1
@@ -29,7 +29,7 @@ CONF_FILES=	${PREFIX}/share/examples/scapy/ethertypes \
 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	scapy/data.py setup.py
-SUBST_SED.config=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.config=	PKG_SYSCONFDIR
 SUBST_SED.config+=	-e "s|share/man|${PKGMANDIR}|g"
 SUBST_MESSAGE.config=	Fixing paths.
 
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 749afd7691f..5c60065d3dc 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/08/22 09:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=	smokeping-2.6.7
 PKGREVISION=	7
@@ -52,11 +52,11 @@ SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	etc/config.dist.in bin/smokeping \
 			bin/smokeping_cgi bin/tSmoke \
 			htdocs/Makefile.in smokeping.conf
-SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_SED.files+=	-e "s|@INTERP@|${INTERP}|g"
-SUBST_SED.files+=	-e "s|@SPDIR@|${SPDIR}|g"
+SUBST_VARS.files=	PREFIX
+SUBST_VARS.files+=	VARBASE
+SUBST_VARS.files+=	PKG_SYSCONFDIR
+SUBST_VARS.files+=	INTERP
+SUBST_VARS.files+=	SPDIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 SUBST_CLASSES+=		libs
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 06288dd4dbf..a6127e7dd3e 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/01/19 18:52:21 agc Exp $
+# $NetBSD: Makefile,v 1.34 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=	tf-40s1
 PKGNAME=	tf-4.0s1
@@ -26,7 +26,7 @@ SUBST_CLASSES+=			fix-paths
 SUBST_MESSAGE.fix-paths=	late-addition DESTDIR
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_FILES.fix-paths=		unix/Config
-SUBST_SED.fix-paths=		-e 's,@DESTDIR@,'${DESTDIR}',g'
+SUBST_VARS.fix-paths=		DESTDIR
 
 LDFLAGS.SunOS+=	-lz
 
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index 4bcffb647bb..fa2fc1d4f6a 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/04/06 21:07:34 rodent Exp $
+# $NetBSD: Makefile,v 1.18 2019/05/23 19:23:11 rillig Exp $
 #
 
 DISTNAME=	tsocks-1.8beta5
@@ -26,8 +26,8 @@ SUBST_CLASSES+=		tsocks
 SUBST_STAGE.tsocks=	post-configure
 SUBST_MESSAGE.tsocks=	Generating tsocks wrapper script.
 SUBST_FILES.tsocks=	tsocks
-SUBST_SED.tsocks=	-e "s|@SH@|${SH}|g"
-SUBST_SED.tsocks+=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.tsocks=	SH
+SUBST_VARS.tsocks+=	PREFIX
 
 INSTALLATION_DIRS+=	${EGDIR}
 
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 0eac5b7203e..e2858cc78a6 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2018/08/22 09:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
@@ -50,7 +50,7 @@ patch-sockets:
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	vncserver
-SUBST_SED.paths+=	-e 's,@X11BASE@,${X11BASE},g'
+SUBST_VARS.paths=	X11BASE
 SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	bin share/doc/vnc
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index f9fb4f1773a..e806c03310a 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/08/22 09:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2019/05/23 19:23:11 rillig Exp $
 #
 
 DISTNAME=		vpnc-0.5.3
@@ -24,12 +24,12 @@ SUBST_MESSAGE.paths=	fixing pathnames
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	config.c vpnc-script.in makeman.pl pcf2vpnc
 SUBST_FILES.paths+=	vpnc.8.template vpnc-disconnect
-SUBST_SED.paths=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.paths+=	-e 's|@PREFIX@|${PREFIX}|g'
-SUBST_SED.paths+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
-SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE}|g'
-SUBST_SED.paths+=	-e 's|@PERL5@|${PERL5}|g'
-SUBST_SED.paths+=	-e 's|@SH@|${SH}|g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	PKGMANDIR
+SUBST_VARS.paths+=	VARBASE
+SUBST_VARS.paths+=	PERL5
+SUBST_VARS.paths+=	SH
 
 
 BUILD_DEFS+=		VARBASE
diff --git a/net/xnap/Makefile b/net/xnap/Makefile
index a982d3a9064..abca7d66e22 100644
--- a/net/xnap/Makefile
+++ b/net/xnap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:21 asau Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:11 rillig Exp $
 #
 
 DISTNAME=	xnap-2.0
@@ -22,7 +22,7 @@ SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	fixing java path
 SUBST_FILES.path=	xnap.sh
 SUBST_SED.path=		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME}/,g'
-SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.path=	PREFIX
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xnap.sh ${DESTDIR}${PREFIX}/bin/xnap
diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index 04b6aaddd39..4a1862c66cf 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/09/12 11:15:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2019/05/23 19:23:11 rillig Exp $
 
 DISTNAME=	yale-tftpd-3.0
 PKGREVISION=	6
@@ -26,7 +26,7 @@ SUBST_STAGE.ytftpdman=		post-configure
 SUBST_MESSAGE.ytftpdman=	Fixing pathnames references
 SUBST_FILES.ytftpdman=		tftpd.8
 SUBST_SED.ytftpdman=		-e 's|@ETCDIR@|${PKG_SYSCONFDIR}|g'
-SUBST_SED.ytftpdman+=		-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_VARS.ytftpdman=		PREFIX
 
 INSTALLATION_DIRS=	libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8