diff --git a/ansible/Makefile b/ansible/Makefile
index d62d7f1e60..de28dabc1c 100644
--- a/ansible/Makefile
+++ b/ansible/Makefile
@@ -53,9 +53,9 @@ SUBST_FILES.prefix+=	lib/ansible/modules/system/ping.py
 SUBST_FILES.prefix+=	lib/ansible/modules/system/setup.py
 SUBST_FILES.prefix+=	lib/ansible/utils/module_docs_fragments/openstack.py
 SUBST_MESSAGE.prefix=	Fixing PREFIX, PYSITELIB, and PKG_SYSCONFDIR path.
-SUBST_SED.prefix=	-e "s,@PREFIX@,${PREFIX},"
-SUBST_SED.prefix+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
-SUBST_SED.prefix+=	-e "s,@PYSITELIB@,${PYSITELIB},"
+SUBST_VARS.prefix=	PREFIX
+SUBST_VARS.prefix+=	PKG_SYSCONFDIR
+SUBST_VARS.prefix+=	PYSITELIB
 
 SUBST_CLASSES+=			subprocess
 SUBST_STAGE.subprocess=		pre-configure
diff --git a/arla-3.99.14/Makefile b/arla-3.99.14/Makefile
index 3bee554d76..ab91b15a59 100644
--- a/arla-3.99.14/Makefile
+++ b/arla-3.99.14/Makefile
@@ -46,7 +46,7 @@ FILES_SUBST+=		ARLA_CACHE=${ARLA_CACHE:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/lkm.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	post-patch
 
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
diff --git a/asterisk11-vicidial/options.mk b/asterisk11-vicidial/options.mk
index 4a6e952507..948936efe2 100644
--- a/asterisk11-vicidial/options.mk
+++ b/asterisk11-vicidial/options.mk
@@ -81,8 +81,8 @@ DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
 SUBST_STAGE.webvmail=	post-patch
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
-SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
-SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
+SUBST_VARS.webvmail=	ASTETCDIR
+SUBST_VARS.webvmail+=	ASTSPOOLDIR
 INSTALLATION_DIRS+=	${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs
 SPECIAL_PERMS+=		${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555
 INSTALL_TARGET+=	webvmail
diff --git a/audit-system/Makefile b/audit-system/Makefile
index 041f44b007..7c2a4d3533 100644
--- a/audit-system/Makefile
+++ b/audit-system/Makefile
@@ -40,23 +40,23 @@ FTP?=		/usr/bin/ftp
 SUBST_CLASSES+=		tools
 SUBST_STAGE.tools=	post-configure
 SUBST_FILES.tools+=	${AS_FILES}
-SUBST_SED.tools=	-e "s|@AWK@|${AWK}|g"
-SUBST_SED.tools+=	-e "s|@SH@|${SH}|g"
-SUBST_SED.tools+=	-e "s|@CP@|${CP}|g"
-SUBST_SED.tools+=	-e "s|@MV@|${MV}|g"
-SUBST_SED.tools+=	-e "s|@RM@|${RM}|g"
-SUBST_SED.tools+=	-e "s|@IDENT@|${IDENT}|g"
-SUBST_SED.tools+=	-e "s|@OBJDUMP@|${OBJDUMP}|g"
-SUBST_SED.tools+=	-e "s|@STAT@|${STAT}|g"
-SUBST_SED.tools+=	-e "s|@CHMOD@|${CHMOD}|g"
-SUBST_SED.tools+=	-e "s|@MKDIR@|${MKDIR}|g"
-SUBST_SED.tools+=	-e "s|@FIND@|${FIND}|g"
-SUBST_SED.tools+=	-e "s|@CKSUM@|${CKSUM}|g"
-SUBST_SED.tools+=	-e "s|@FETCH_TOOL@|${FETCH_TOOL}|g"
-SUBST_SED.tools+=	-e "s|@ECHO@|${ECHO}|g"
-SUBST_SED.tools+=	-e "s|@SYSVULNDIR@|${SYSVULNDIR}|g"
-SUBST_SED.tools+=	-e "s|@SCRIPT_DIR@|${SCRIPT_DIR}|g"
-SUBST_SED.tools+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.tools=	AWK
+SUBST_VARS.tools+=	SH
+SUBST_VARS.tools+=	CP
+SUBST_VARS.tools+=	MV
+SUBST_VARS.tools+=	RM
+SUBST_VARS.tools+=	IDENT
+SUBST_VARS.tools+=	OBJDUMP
+SUBST_VARS.tools+=	STAT
+SUBST_VARS.tools+=	CHMOD
+SUBST_VARS.tools+=	MKDIR
+SUBST_VARS.tools+=	FIND
+SUBST_VARS.tools+=	CKSUM
+SUBST_VARS.tools+=	FETCH_TOOL
+SUBST_VARS.tools+=	ECHO
+SUBST_VARS.tools+=	SYSVULNDIR
+SUBST_VARS.tools+=	SCRIPT_DIR
+SUBST_VARS.tools+=	PKG_SYSCONFDIR
 
 do-extract:
 .for f in ${AS_FILES}
diff --git a/azureus/Makefile b/azureus/Makefile
index ffb97180c5..cb0281b5ca 100644
--- a/azureus/Makefile
+++ b/azureus/Makefile
@@ -26,7 +26,7 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-install
 SUBST_MESSAGE.prefix=	Fixing prefixes.
 SUBST_FILES.prefix=	azureus
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 do-install:
 	${INSTALL_SCRIPT_DIR} ${DESTDIR}${PREFIX}/bin
diff --git a/bareos/Makefile b/bareos/Makefile
index 08ab963db0..bdc8d75a41 100644
--- a/bareos/Makefile
+++ b/bareos/Makefile
@@ -19,7 +19,7 @@ SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing paths.
 SUBST_FILES.fix-paths?=
 SUBST_FILES.fix-paths+=		core/src/cats/make_catalog_backup.pl.in
-SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths=		PREFIX
 
 .include "options.mk"
 .include "Makefile.common"
diff --git a/bugzilla/Makefile b/bugzilla/Makefile
index 8cf21f8521..817c02aae1 100644
--- a/bugzilla/Makefile
+++ b/bugzilla/Makefile
@@ -93,11 +93,11 @@ SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_MESSAGE.conf=	Fixing configuration files.
 SUBST_FILES.conf=	bugzilla.conf localconfig Bugzilla/BugMail.pm
-SUBST_SED.conf=		-e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"
-SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.conf+=	-e "s|@BZDIR@|${BZDIR}|g"
-SUBST_SED.conf+=	-e "s|@CVS@|${CVS}|g"
-SUBST_SED.conf+=	-e "s|@DBDRIVER@|${DBDRIVER}|g"
+SUBST_VARS.conf=	BZ_WEB_GROUP
+SUBST_VARS.conf+=	PREFIX
+SUBST_VARS.conf+=	BZDIR
+SUBST_VARS.conf+=	CVS
+SUBST_VARS.conf+=	DBDRIVER
 SUBST_SED.conf+=	-e "s|/usr/lib/sendmail|${SENDMAIL}|g"
 
 SUBST_CLASSES+=		diff
diff --git a/crm114/Makefile b/crm114/Makefile
index a9e60455b2..b995fab2e5 100644
--- a/crm114/Makefile
+++ b/crm114/Makefile
@@ -40,7 +40,7 @@ SUBST_CLASSES+=		crmdirs
 SUBST_STAGE.crmdirs=	pre-configure
 SUBST_MESSAGE.crmdirs=	Fixing script references
 SUBST_FILES.crmdirs=	${SCRIPTS}
-SUBST_SED.crmdirs=	-e 's,@SCRIPTSDIR@,${SCRIPTSDIR},g'
+SUBST_VARS.crmdirs=	SCRIPTSDIR
 
 # Several differences will be shown in `make test':
 #   * userdirtest.crm: output depends on locale collation ordering
diff --git a/davical-git/Makefile b/davical-git/Makefile
index 3a2faeae11..369fe19584 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -79,7 +79,7 @@ SUBST_CLASSES+=			conf-path
 SUBST_STAGE.conf-path=		pre-configure
 SUBST_FILES.conf-path=		inc/always.php.in dba/update-davical-database
 SUBST_FILES.conf-path+=		inc/davical_configuration_missing.php
-SUBST_SED.conf-path+=		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_VARS.conf-path=		PKG_SYSCONFDIR
 SUBST_MESSAGE.conf-path=	Fixing configuration path.
 
 # See ../../devel/php-libawl/Makefile.common for the LIBAWLDIR value
@@ -100,7 +100,7 @@ SUBST_MESSAGE.examples=	Fixing config examples path.
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	davical.conf
-SUBST_SED.files+=	-e "s|@DAVICALDIR@|${DAVICALDIR}|g"
+SUBST_VARS.files=	DAVICALDIR
 SUBST_MESSAGE.files=	Fixing DAViCal configuration file for Apache.
 
 post-extract:
diff --git a/debootstrap/Makefile b/debootstrap/Makefile
index e474a81e23..52187ae91b 100644
--- a/debootstrap/Makefile
+++ b/debootstrap/Makefile
@@ -40,7 +40,7 @@ SUBST_CLASSES+=			fix-paths2
 SUBST_STAGE.fix-paths2=		pre-configure
 SUBST_MESSAGE.fix-paths2=	Fixing absolute paths.
 SUBST_FILES.fix-paths2=		debootstrap
-SUBST_SED.fix-paths2=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths2=		PREFIX
 
 SUBST_CLASSES+=			fix-paths3
 SUBST_STAGE.fix-paths3=		pre-configure
diff --git a/dhcpd-snmp/Makefile b/dhcpd-snmp/Makefile
index 7ced9289d0..6758075903 100644
--- a/dhcpd-snmp/Makefile
+++ b/dhcpd-snmp/Makefile
@@ -29,7 +29,7 @@ BUILD_DEFS+=		VARBASE NET_SNMP_MIBDIR
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	dhcpd-snmp.conf.dist
-SUBST_SED.paths+=	-e 's|@VARBASE@|${VARBASE}|g'
+SUBST_VARS.paths=	VARBASE
 SUBST_STAGE.paths=	post-configure
 
 CONF_FILES=		${PREFIX}/${EGDIR}/dhcpd-snmp.conf \
diff --git a/dokuwiki/Makefile b/dokuwiki/Makefile
index 818e177f56..457f32bf48 100644
--- a/dokuwiki/Makefile
+++ b/dokuwiki/Makefile
@@ -93,7 +93,7 @@ SUBST_FILES.files+=	conf/dokuwiki.php
 SUBST_FILES.files+=	apache.conf.dist
 SUBST_FILES.files+=	dokuser
 SUBST_SED.files+=	-e "s|@DATADIR@|${VARBASE}/dokuwiki|g"
-SUBST_SED.files+=	-e "s|@DOKUDIR@|${DOKUDIR}|g"
+SUBST_VARS.files=	DOKUDIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 MESSAGE_SUBST+=		DOKUDIR=${DOKUDIR}
diff --git a/doorman/Makefile b/doorman/Makefile
index 16589ed653..01f639c781 100644
--- a/doorman/Makefile
+++ b/doorman/Makefile
@@ -31,7 +31,7 @@ SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		post-patch
 SUBST_MESSAGE.fix-paths=	Fixing absolute pathes.
 SUBST_FILES.fix-paths=		configure
-SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths=		PREFIX
 
 SUBST_CLASSES+=			fix-conf-paths
 SUBST_STAGE.fix-conf-paths=	post-configure
diff --git a/dotclear/Makefile b/dotclear/Makefile
index 0e12ed47be..c4c033d3b2 100644
--- a/dotclear/Makefile
+++ b/dotclear/Makefile
@@ -51,10 +51,10 @@ SUBST_MESSAGE.files=	Fixing configuration files.
 SUBST_FILES.files=	dotclear.conf inc/config.php.in
 SUBST_FILES.files+=	inc/prepend.php inc/core/class.dc.core.php
 SUBST_FILES.files+=	admin/install/index.php admin/install/wizard.php
-SUBST_SED.files+=	-e "s|@DCDIR@|${DCDIR}|g"
-SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
-SUBST_SED.files+=	-e "s|@WWW_SYSCONFDIR@|${WWW_SYSCONFDIR}|g"
+SUBST_VARS.files=	DCDIR
+SUBST_VARS.files+=	VARBASE
+SUBST_VARS.files+=	PKG_SYSCONFDIR
+SUBST_VARS.files+=	WWW_SYSCONFDIR
 SUBST_SED.files+=	-e "s|@DC_ROOT@|${PREFIX}/share|g"
 SUBST_SED.files+=	-e "s|@DC_CACHE@|${VARBASE}/cache/dotclear|g"
 SUBST_SED.files+=	-e "s|@DC_WWW@|${VARBASE}/www/dotclear|g"
diff --git a/dovecot-antispam/Makefile b/dovecot-antispam/Makefile
index ee670b98b9..9d3274e693 100644
--- a/dovecot-antispam/Makefile
+++ b/dovecot-antispam/Makefile
@@ -17,9 +17,9 @@ USE_TOOLS+=		gmake
 SUBST_CLASSES+=		pkgsrc
 SUBST_STAGE.pkgsrc=	post-patch
 SUBST_FILES.pkgsrc=	defconfig
-SUBST_SED.pkgsrc=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.pkgsrc+=	-e "s|@ROOT_USER@|${ROOT_USER}|g"
-SUBST_SED.pkgsrc+=	-e "s|@ROOT_GROUP@|${ROOT_GROUP}|g"
+SUBST_VARS.pkgsrc=	PREFIX
+SUBST_VARS.pkgsrc+=	ROOT_USER
+SUBST_VARS.pkgsrc+=	ROOT_GROUP
 
 pre-configure:
 	cp ${WRKSRC}/defconfig ${WRKSRC}/.config
diff --git a/emacs-w3m-cvs/Makefile b/emacs-w3m-cvs/Makefile
index 7a18420e6a..3cb398a35d 100644
--- a/emacs-w3m-cvs/Makefile
+++ b/emacs-w3m-cvs/Makefile
@@ -52,7 +52,7 @@ EVAL_PREFIX+=		W3MPREFIX=w3m
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	w3m.el
-SUBST_SED.paths+=	-e 's,@W3MPREFIX@,${W3MPREFIX},g'
+SUBST_VARS.paths=	W3MPREFIX
 SUBST_STAGE.paths=	pre-configure
 
 .include "../../wip/emacs-git/modules.mk"
diff --git a/endless-sky/Makefile b/endless-sky/Makefile
index 6a60db8fbe..56c68d7feb 100644
--- a/endless-sky/Makefile
+++ b/endless-sky/Makefile
@@ -33,7 +33,7 @@ SUBST_FILES.fix-paths=		SConstruct source/Files.cpp
 SUBST_SED.fix-paths=		-e 's@/share/games/@/share/@g'
 SUBST_SED.fix-paths+=		-e 's@/games@/bin@g'
 SUBST_SED.fix-paths+=		-e 's@/share/man/@/${PKGMANDIR}/@g'
-SUBST_SED.fix-paths+=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths=		PREFIX
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONS} ${SCONS_ARGS}
diff --git a/evolution-rss/Makefile b/evolution-rss/Makefile
index ed2d2604bd..1ecaa9c7d0 100644
--- a/evolution-rss/Makefile
+++ b/evolution-rss/Makefile
@@ -26,7 +26,7 @@ GSED=			${PREFIX}/bin/gsed
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
-SUBST_SED.paths+=	-e 's|@GSED@|${GSED}|g'
+SUBST_VARS.paths=	GSED
 SUBST_FILES.paths+=	src/Makefile.in
 SUBST_MESSAGE.paths=	Fixing gsed path.
 
diff --git a/f1spirit/Makefile b/f1spirit/Makefile
index 4fded3bb3f..1c1b0dd19e 100644
--- a/f1spirit/Makefile
+++ b/f1spirit/Makefile
@@ -25,7 +25,7 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-install
 SUBST_FILES.prefix=	f1spirit.sh
 SUBST_MESSAGE.prefix=	Fixing PREFIX.
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 pre-patch:
 	${CP} ${FILESDIR}/f1spirit ${WRKSRC}/f1spirit.sh
diff --git a/flnews-devel/Makefile b/flnews-devel/Makefile
index 8ae2806edd..8f70167a8d 100644
--- a/flnews-devel/Makefile
+++ b/flnews-devel/Makefile
@@ -33,7 +33,7 @@ SUBST_STAGE.edit-config=	pre-configure
 SUBST_MESSAGE.edit-config=	Preparing CONFIG file ...
 SUBST_FILES.edit-config=	CONFIG
 SUBST_SED.edit-config=		-e 's,@VERSION@,${FLNEWS_VERSION},g'
-SUBST_SED.edit-config+=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.edit-config=		PREFIX
 SUBST_SED.edit-config+=		-e 's,@MAINT@,${FLNEWS_MAINTAINER},g'
 SUBST_SED.edit-config+=		-e 's,@IP6@,${FLNEWS_OPT_DISABLE_IP6},g'
 SUBST_SED.edit-config+=		-e 's,@NLS@,${FLNEWS_OPT_DISABLE_NLS},g'
diff --git a/gfeedline/Makefile b/gfeedline/Makefile
index 3305e73293..07d8f1a10b 100644
--- a/gfeedline/Makefile
+++ b/gfeedline/Makefile
@@ -45,7 +45,7 @@ REPLACE_PYTHON=		lib/plugins/post.py lib/plugins/twitter/dd.py
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	lib/utils/iconimage.py lib/utils/iconimage.py lib/constants.py
-SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.prefix=	PREFIX
 SUBST_MESSAGE.prefix=	Replacing pkg path.
 
 .include "options.mk"
diff --git a/harmony/Makefile b/harmony/Makefile
index 3d01e51b2e..6d9aad2598 100644
--- a/harmony/Makefile
+++ b/harmony/Makefile
@@ -119,11 +119,11 @@ SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-install
 SUBST_MESSAGE.conf=	Fixing configuration files.
 SUBST_FILES.conf=	bugzilla.conf localconfig Bugzilla/BugMail.pm
-SUBST_SED.conf=		-e "s|@BZ_WEB_GROUP@|${BZ_WEB_GROUP}|g"
-SUBST_SED.conf+=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.conf+=	-e "s|@BZDIR@|${BZDIR}|g"
-SUBST_SED.conf+=	-e "s|@CVS@|${CVS}|g"
-SUBST_SED.conf+=	-e "s|@DBDRIVER@|${DBDRIVER}|g"
+SUBST_VARS.conf=	BZ_WEB_GROUP
+SUBST_VARS.conf+=	PREFIX
+SUBST_VARS.conf+=	BZDIR
+SUBST_VARS.conf+=	CVS
+SUBST_VARS.conf+=	DBDRIVER
 SUBST_SED.conf+=	-e "s|/usr/lib/sendmail|${SENDMAIL}|g"
 
 SUBST_CLASSES+=		diff
diff --git a/hs-pcre-light/Makefile b/hs-pcre-light/Makefile
index d67fd0c1bf..4b9237ec36 100644
--- a/hs-pcre-light/Makefile
+++ b/hs-pcre-light/Makefile
@@ -11,7 +11,7 @@ LICENSE=	modified-bsd
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix+=	pcre-light.cabal
-SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.prefix=	PREFIX
 
 .include "../../wip/mk/haskell.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/ilohamail/Makefile b/ilohamail/Makefile
index b104193cb0..b2e40210aa 100644
--- a/ilohamail/Makefile
+++ b/ilohamail/Makefile
@@ -48,7 +48,7 @@ CONF_FILES_PERMS+=	${EGDIR}/conf/${file} ${ILOHAMAIL_CONF_DIR}/${file} \
 SUBST_CLASSES+=		ilohamail
 SUBST_STAGE.ilohamail=	post-patch
 SUBST_FILES.ilohamail=	IlohaMail/conf/conf.php
-SUBST_SED.ilohamail=	-e "s|@ILOHAMAIL_DATA_DIR@|${ILOHAMAIL_DATA_DIR}|g"
+SUBST_VARS.ilohamail=	ILOHAMAIL_DATA_DIR
 
 pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print -type f | ${XARGS} ${RM} -f
diff --git a/jabref3/Makefile b/jabref3/Makefile
index 657f00f74c..4468140a5b 100644
--- a/jabref3/Makefile
+++ b/jabref3/Makefile
@@ -20,8 +20,8 @@ SUBST_CLASSES+=		script
 SUBST_STAGE.script=	pre-install
 SUBST_MESSAGE.script=	Generating script file.
 SUBST_FILES.script=	jabref
-SUBST_SED.script+=	-e "s|@SH@|${SH}|g"
-SUBST_SED.script+=	-e "s|@JAVA_BINPREFIX@|${JAVA_BINPREFIX}|g"
+SUBST_VARS.script=	SH
+SUBST_VARS.script+=	JAVA_BINPREFIX
 SUBST_SED.script+=	-e "s|@JABREF_PREFIX@|${PREFIX}/share/java/|g"
 SUBST_SED.script+=	-e "s|@JABREF_JAR@|${DISTNAME}.jar|g"
 
diff --git a/jedit/Makefile b/jedit/Makefile
index 320b0c2725..db2e62a267 100644
--- a/jedit/Makefile
+++ b/jedit/Makefile
@@ -31,7 +31,7 @@ CHECK_SHLIBS_SUPPORTED=	no
 SUBST_CLASSES+=		launcher
 SUBST_STAGE.launcher=	pre-configure
 SUBST_FILES.launcher=	jedit
-SUBST_SED.launcher+=	-e 's,@PKG_JAVA_HOME@,'${PKG_JAVA_HOME}',g'
+SUBST_VARS.launcher=	PKG_JAVA_HOME
 SUBST_SED.launcher+=	-e 's,@JEDIT_HOME@,'${SHAREDIR:Q}',g'
 
 post-extract:
diff --git a/joomla/Makefile b/joomla/Makefile
index e981bfb05f..6ea8640033 100644
--- a/joomla/Makefile
+++ b/joomla/Makefile
@@ -47,7 +47,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing pathnames in configuration file.
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	../joomla.conf
-SUBST_SED.paths=	-e "s,@JOOMLADIR@,${JOOMLADIR},g"
+SUBST_VARS.paths=	JOOMLADIR
 
 post-extract:
 	${CP} ${FILESDIR}/joomla.conf ${WRKDIR}/joomla.conf
diff --git a/libgda-bdb/Makefile b/libgda-bdb/Makefile
index 3a975de150..d96bd87f3d 100644
--- a/libgda-bdb/Makefile
+++ b/libgda-bdb/Makefile
@@ -12,7 +12,7 @@ BDB_ACCEPTED=	db4
 SUBST_CLASSES+=		bdb
 SUBST_STAGE.bdb=	post-patch
 SUBST_FILES.bdb=	providers/bdb/Makefile.in
-SUBST_SED.bdb=		-e "s|@BDB_LIBS@|${BDB_LIBS}|"
+SUBST_VARS.bdb=		BDB_LIBS
 SUBST_MESSAGE.bdb=	Fixing bdb.
 
 CONFIGURE_ARGS+=	--with-bdb=${PREFIX}
diff --git a/libgda4/options.mk b/libgda4/options.mk
index 8a5f2a6d39..98b5067264 100644
--- a/libgda4/options.mk
+++ b/libgda4/options.mk
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-bdb=${PREFIX}				# XXX BDBBASE
 SUBST_CLASSES+=		bdb
 SUBST_STAGE.bdb=	post-patch
 SUBST_FILES.bdb=	providers/bdb/Makefile.in
-SUBST_SED.bdb=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.bdb=		PREFIX
 SUBST_MESSAGE.bdb=	"Fixing BDB prefix."
 
 .include "../../mk/bdb.buildlink3.mk"
@@ -69,7 +69,7 @@ CFLAGS+=		-DMDB_WITH_WRITE_SUPPORT
 SUBST_CLASSES+=		mdb
 SUBST_STAGE.mdb=	post-patch
 SUBST_FILES.mdb=	providers/mdb/Makefile.in
-SUBST_SED.mdb=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.mdb=		PREFIX
 SUBST_MESSAGE.mdb=	"Fixing MDB provider Makefile.in."
 
 .  include "../../wip/mdbtools/buildlink3.mk"
diff --git a/lua-luafilesystem/Makefile b/lua-luafilesystem/Makefile
index 353c0e0ec8..37171f09d0 100644
--- a/lua-luafilesystem/Makefile
+++ b/lua-luafilesystem/Makefile
@@ -18,9 +18,9 @@ SUBST_CLASSES+=		cfg
 SUBST_MESSAGE.cfg=	Fixing paths
 SUBST_STAGE.cfg=	pre-build
 SUBST_FILES.cfg=	config
-SUBST_SED.cfg+=		-e "s,@PREFIX@,${PREFIX},"
-SUBST_SED.cfg+=		-e "s,@LUA_CDIR@,${LUA_CDIR},"
-SUBST_SED.cfg+=		-e "s,@LUA_INCDIR@,${LUA_INCDIR},"
+SUBST_VARS.cfg=		PREFIX
+SUBST_VARS.cfg+=	LUA_CDIR
+SUBST_VARS.cfg+=	LUA_INCDIR
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE} src/lfs.so
diff --git a/mime-support/Makefile b/mime-support/Makefile
index cbd6f17b33..61f3e06c70 100644
--- a/mime-support/Makefile
+++ b/mime-support/Makefile
@@ -19,7 +19,7 @@ SUBST_CLASSES+=			fix-paths
 SUBST_MESSAGE.fix-paths=	Fixing path references
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_FILES.fix-paths=		run-mailcap.man
-SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths=		PREFIX
 
 SUBST_CLASSES+=		fix-x11
 SUBST_MESSAGE.fix-x11=	Fixing X11 references
diff --git a/modplugplay/Makefile b/modplugplay/Makefile
index 17eef93725..83ec481361 100644
--- a/modplugplay/Makefile
+++ b/modplugplay/Makefile
@@ -19,7 +19,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	modplugplay.c
-SUBST_SED.paths=	-e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},'
+SUBST_VARS.paths=	DEVOSSAUDIO
 
 do-build:
 	${CXX} ${WRKSRC}/modplugplay.c ${CFLAGS} ${LDFLAGS} \
diff --git a/mono-git/Makefile b/mono-git/Makefile
index e95b553a2e..b29b71f6ff 100644
--- a/mono-git/Makefile
+++ b/mono-git/Makefile
@@ -134,7 +134,7 @@ SUBST_CLASSES+=			fix-libx11
 SUBST_STAGE.fix-libx11=		pre-configure
 SUBST_MESSAGE.fix-libx11=	Fixing libX11 search path configuration
 SUBST_FILES.fix-libx11=		configure
-SUBST_SED.fix-libx11=		-e 's,@X11BASE@,${X11BASE},g'
+SUBST_VARS.fix-libx11=		X11BASE
 
 PLIST_VARS=	monodoc
 
diff --git a/mono/Makefile b/mono/Makefile
index 629b91c5c8..284aaaf797 100644
--- a/mono/Makefile
+++ b/mono/Makefile
@@ -132,7 +132,7 @@ SUBST_CLASSES+=			fix-libx11
 SUBST_STAGE.fix-libx11=		pre-configure
 SUBST_MESSAGE.fix-libx11=	Fixing libX11 search path configuration
 SUBST_FILES.fix-libx11=		configure
-SUBST_SED.fix-libx11=		-e 's,@X11BASE@,${X11BASE},g'
+SUBST_VARS.fix-libx11=		X11BASE
 
 PLIST_VARS=	monodoc
 
diff --git a/mpibzip2/Makefile b/mpibzip2/Makefile
index d5737110ee..eb8f889000 100644
--- a/mpibzip2/Makefile
+++ b/mpibzip2/Makefile
@@ -17,7 +17,7 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=	-e 's,/usr,${PREFIX},g'
-SUBST_SED.prefix+=	-e 's,@PREFIX@,${PREFIX},'
+SUBST_VARS.prefix=	PREFIX
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
diff --git a/mtd-utils/Makefile b/mtd-utils/Makefile
index 5a867765fd..77fd10e99e 100644
--- a/mtd-utils/Makefile
+++ b/mtd-utils/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c c++
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	Makefile
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.paths=	PREFIX
 SUBST_STAGE.paths=	post-patch
 
 pre-build:
diff --git a/multiminer/Makefile b/multiminer/Makefile
index 555708e964..4ef81a641e 100644
--- a/multiminer/Makefile
+++ b/multiminer/Makefile
@@ -15,7 +15,7 @@ DEPENDS+=	bfgminer>=3.9.0:../../wip/bfgminer
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	multiminer	
-SUBST_SED.path=		-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.path=	PREFIX
 SUBST_MESSAGE.path=	"Fixing path."
 
 post-extract:
diff --git a/nag/Makefile b/nag/Makefile
index 64f84e5f09..5f245dd34d 100644
--- a/nag/Makefile
+++ b/nag/Makefile
@@ -48,7 +48,7 @@ USE_PKGINSTALL=		YES
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	nag.conf.dist
-SUBST_SED.files=	-e "s|@NAGDIR@|${NAGDIR}|g"
+SUBST_VARS.files=	NAGDIR
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 PKG_USERS_VARS+=	APACHE_USER
diff --git a/nss-hg/Makefile b/nss-hg/Makefile
index 1e151f5a7f..34b70e8334 100644
--- a/nss-hg/Makefile
+++ b/nss-hg/Makefile
@@ -75,11 +75,11 @@ NSS_MINOR_VERSION=	${NSS_RELEASE:S/3.//:C/\.[0-9]*//}
 NSS_PATCH_VERSION=	${NSS_RELEASE:C/[0-9.]*\.//}
 
 SUBST_CLASSES+=		config
-SUBST_SED.config+=	-e "s,@PREFIX@,${PREFIX},g"
-SUBST_SED.config+=	-e "s,@NSS_MAJOR_VERSION@,${NSS_MAJOR_VERSION},"
-SUBST_SED.config+=	-e "s,@NSS_MINOR_VERSION@,${NSS_MINOR_VERSION},"
-SUBST_SED.config+=	-e "s,@NSS_PATCH_VERSION@,${NSS_PATCH_VERSION},"
-SUBST_SED.config+=	-e "s!@COMPILER_RPATH_FLAG@!${COMPILER_RPATH_FLAG}!"
+SUBST_VARS.config=	PREFIX
+SUBST_VARS.config+=	NSS_MAJOR_VERSION
+SUBST_VARS.config+=	NSS_MINOR_VERSION
+SUBST_VARS.config+=	NSS_PATCH_VERSION
+SUBST_VARS.config+=	COMPILER_RPATH_FLAG
 SUBST_SED.config+=	-e "s,@PTHREAD@,${BUILDLINK_LIBS.pthread:Q},"
 SUBST_STAGE.config=	pre-build
 SUBST_MESSAGE.config=	Preparing *-config files.
diff --git a/nx-client-bin/Makefile b/nx-client-bin/Makefile
index 06e4d5aaa5..515472b32d 100644
--- a/nx-client-bin/Makefile
+++ b/nx-client-bin/Makefile
@@ -24,9 +24,9 @@ EMUL_MODULES.linux=	compat png x11
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/${NX_SCRIPT}
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_SED.paths+=	-e 's,@NX@,${NX},g'
+SUBST_VARS.paths=	PREFIX
+SUBST_VARS.paths+=	SH
+SUBST_VARS.paths+=	NX
 SUBST_STAGE.paths=	post-patch
 
 INSTALLATION_DIRS=	bin
diff --git a/pal/Makefile b/pal/Makefile
index e659881b14..e37ebd53f0 100644
--- a/pal/Makefile
+++ b/pal/Makefile
@@ -23,10 +23,10 @@ SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Fixing hardcoded paths
 SUBST_FILES.path=	Makefile.defs Makefile input.c ../pal.conf
-SUBST_SED.path=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.path+=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
-SUBST_SED.path+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.path+=	-e 's,@EGDIR@,${EGDIR},g'
+SUBST_VARS.path=	PKG_SYSCONFDIR
+SUBST_VARS.path+=	PKGMANDIR
+SUBST_VARS.path+=	PREFIX
+SUBST_VARS.path+=	EGDIR
 
 EGDIR=			${PREFIX}/share/examples/pal
 
diff --git a/pkgmanager/Makefile b/pkgmanager/Makefile
index 08a21b4fb9..385b64c9ed 100644
--- a/pkgmanager/Makefile
+++ b/pkgmanager/Makefile
@@ -36,8 +36,8 @@ SUBST_MESSAGE.clocc=	Fixing clocc root directory in clocc.lisp
 SUBST_CLASSES+=		wrapper
 SUBST_STAGE.wrapper=	post-patch
 SUBST_FILES.wrapper=	pkgmanager-${PKGMGR_VERSION:Q}/src/pkgmanager-wrapper.sh
-SUBST_SED.wrapper=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.wrapper+=	-e "s|@MAKE@|${MAKE}|g"
+SUBST_VARS.wrapper=	PREFIX
+SUBST_VARS.wrapper+=	MAKE
 SUBST_SED.wrapper+=	-e "s|@DBDIR@|${PKG_DBDIR}|g"
 SUBST_MESSAGE.wrapper=	Fixing prefix in pkgmanager shell script wrapper
 
diff --git a/psybnc/Makefile b/psybnc/Makefile
index de481aea47..12898473fb 100644
--- a/psybnc/Makefile
+++ b/psybnc/Makefile
@@ -21,7 +21,7 @@ CONF_FILES=		share/examples/psybnc/psybnc.conf \
 
 SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	tools/autoconf.c
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 SUBST_STAGE.prefix=	post-patch
 SUBST_CLASSES+=		openssl
 SUBST_FILES.openssl=	makefile.out
diff --git a/py-jabber-aimt/Makefile b/py-jabber-aimt/Makefile
index 018186525a..2fcda87b04 100644
--- a/py-jabber-aimt/Makefile
+++ b/py-jabber-aimt/Makefile
@@ -75,15 +75,15 @@ SUBST_FILES.paths=	config_example.xml
 SUBST_FILES.paths+=	src/langs/__init__.py
 SUBST_FILES.paths+=	PyAIMt.py
 SUBST_FILES.paths+=	src/main.py
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	TRANSPORTDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	JABBER_PIDDIR
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-icqt/Makefile b/py-jabber-icqt/Makefile
index 4157d20371..2afea88803 100644
--- a/py-jabber-icqt/Makefile
+++ b/py-jabber-icqt/Makefile
@@ -77,16 +77,16 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing Paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	config_example.xml PyICQt.py src/main.py
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@PYTHONBIN@,${PYTHONBIN},g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	TRANSPORTDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	JABBER_PIDDIR
+SUBST_VARS.paths+=	PYTHONBIN
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-idavoll/Makefile b/py-jabber-idavoll/Makefile
index 3b914ef65a..11c26c423f 100644
--- a/py-jabber-idavoll/Makefile
+++ b/py-jabber-idavoll/Makefile
@@ -51,15 +51,15 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing Paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	example-config.xml
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
+SUBST_VARS.paths=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	JABBER_PIDDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	TRANSPORTDIR
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-palaver/Makefile b/py-jabber-palaver/Makefile
index 7e071fda88..8850e941a8 100644
--- a/py-jabber-palaver/Makefile
+++ b/py-jabber-palaver/Makefile
@@ -53,15 +53,15 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing Paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	example-config.xml
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
+SUBST_VARS.paths=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	JABBER_PIDDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	TRANSPORTDIR
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-punjab/Makefile b/py-jabber-punjab/Makefile
index 7c96417162..7738d4636f 100644
--- a/py-jabber-punjab/Makefile
+++ b/py-jabber-punjab/Makefile
@@ -51,15 +51,15 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing Paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	example-config.xml
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
+SUBST_VARS.paths=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	JABBER_PIDDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	TRANSPORTDIR
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-jabber-yahoo-transport/Makefile b/py-jabber-yahoo-transport/Makefile
index d9913b448e..b6369150a6 100644
--- a/py-jabber-yahoo-transport/Makefile
+++ b/py-jabber-yahoo-transport/Makefile
@@ -71,15 +71,15 @@ SUBST_MESSAGE.paths=	Localizing Paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	config_example.xml
 SUBST_FILES.paths+=	config.py
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+=	-e 's,@TRANSPORTDIR@,${TRANSPORTDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_SPOOLDIR@,${JABBER_SPOOLDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_TRANSDIR@,${JABBER_TRANSDIR},g'
-SUBST_SED.paths+=	-e 's,@JABBER_GROUP@,${JABBER_GROUP},g'
-SUBST_SED.paths+=	-e 's,@JABBER_USER@,${JABBER_USER},g'
-SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
+SUBST_VARS.paths+=	TRANSPORTDIR
+SUBST_VARS.paths+=	JABBER_SPOOLDIR
+SUBST_VARS.paths+=	JABBER_TRANSDIR
+SUBST_VARS.paths+=	JABBER_GROUP
+SUBST_VARS.paths+=	JABBER_USER
+SUBST_VARS.paths+=	JABBER_LOGDIR
+SUBST_VARS.paths+=	PREFIX
+SUBST_VARS.paths+=	JABBER_PIDDIR
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/qbittorrent/Makefile b/qbittorrent/Makefile
index 251401257f..f8caf07c64 100644
--- a/qbittorrent/Makefile
+++ b/qbittorrent/Makefile
@@ -25,7 +25,7 @@ INSTALLATION_DIRS+=	bin
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	configure
-SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.paths=	PREFIX
 SUBST_MESSAGE.paths=	Fixing paths.
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/roadfighter/Makefile b/roadfighter/Makefile
index 159fa447ba..5065c51bb6 100644
--- a/roadfighter/Makefile
+++ b/roadfighter/Makefile
@@ -23,7 +23,7 @@ SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-install
 SUBST_FILES.prefix=	roadfighter.sh
 SUBST_MESSAGE.prefix=	Fixing PREFIX.
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_VARS.prefix=	PREFIX
 
 pre-patch:
 	${MV} ${WRKSRC}/src/sge/* ${WRKSRC}
diff --git a/sbcl-git/Makefile b/sbcl-git/Makefile
index b42c7b4327..e6694e4de7 100644
--- a/sbcl-git/Makefile
+++ b/sbcl-git/Makefile
@@ -56,14 +56,14 @@ SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		install.sh src/runtime/runtime.c doc/sbcl.1
-SUBST_SED.fix-paths=		-e 's,@PREFIX@,${PREFIX},g'
+SUBST_VARS.fix-paths=		PREFIX
 #SUBST_SED.fix-paths+=		-e 's,/var/log,${VARBASE}/log,g'
 
 SUBST_CLASSES+=			fix-gtar
 SUBST_STAGE.fix-gtar=		pre-configure
 SUBST_MESSAGE.fix-gtar=		Fixing GNU tar references.
 SUBST_FILES.fix-gtar=		contrib/asdf-install/installer.lisp
-SUBST_SED.fix-gtar=		-e 's,@GTAR@,${GTAR},'
+SUBST_VARS.fix-gtar=		GTAR
 
 pre-build:
 	cd ${WRKSRC} && ${ECHO} '"1.0.99"' > version.lisp-expr
diff --git a/send-pr/Makefile b/send-pr/Makefile
index fa7ef87e29..cbe7b3540d 100644
--- a/send-pr/Makefile
+++ b/send-pr/Makefile
@@ -41,7 +41,7 @@ SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		post-patch
 SUBST_MESSAGE.fix-paths=	Fixing paths
 SUBST_FILES.fix-paths+=		send-pr.NetBSD.conf
-SUBST_SED.fix-paths+=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.fix-paths=		PKG_SYSCONFDIR
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 INSTALLATION_DIRS+=	share/gnats/dist ${EGDIR}
diff --git a/shaarli/Makefile b/shaarli/Makefile
index 49f3097752..897ce1f864 100644
--- a/shaarli/Makefile
+++ b/shaarli/Makefile
@@ -49,7 +49,7 @@ SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_FILES.files=	apache.conf.dist
 SUBST_FILES.files+=	index.php
-SUBST_SED.files=	-e "s|@RCDIR@|${RCDIR}|g"
+SUBST_VARS.files=	RCDIR
 SUBST_SED.files+=	-e "s|@DATADIR@|${VARBASE}/shaarli/data|g"
 SUBST_SED.files+=	-e "s|@CACHEDIR@|${VARBASE}/shaarli/tmp|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
diff --git a/smtp-gated/Makefile b/smtp-gated/Makefile
index 51f0f9dab1..09f38c33eb 100644
--- a/smtp-gated/Makefile
+++ b/smtp-gated/Makefile
@@ -29,9 +29,9 @@ MESSAGE_SUBST+=		SMTP_GATED_GROUP=${SMTP_GATED_GROUP:Q}
 
 SUBST_CLASSES+=		conf
 SUBST_FILES.conf=	${WRKDIR}/smtp-gated.conf
-SUBST_SED.conf=		-e 's,@SMTP_GATED_GROUP@,${SMTP_GATED_GROUP},g'
-SUBST_SED.conf+=	-e 's,@SMTP_GATED_USER@,${SMTP_GATED_USER},g'
-SUBST_SED.conf+=	-e 's,@VARBASE@,${VARBASE},g'
+SUBST_VARS.conf=	SMTP_GATED_GROUP
+SUBST_VARS.conf+=	SMTP_GATED_USER
+SUBST_VARS.conf+=	VARBASE
 SUBST_STAGE.conf=	post-patch
 
 DOCDIR=			${PREFIX}/share/doc/smtp-gated
diff --git a/symon/Makefile b/symon/Makefile
index 7884dc5bf9..8415db73dc 100644
--- a/symon/Makefile
+++ b/symon/Makefile
@@ -42,7 +42,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_FILES.paths=	symon/symon.8 symux/symux.8
 SUBST_FILES.paths+=	symux/c_smrrds.sh
-SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_VARS.paths=	PKG_SYSCONFDIR
 SUBST_SED.paths+=	-e 's,@PKG_PREFIX@,${PREFIX},g'
 SUBST_STAGE.paths=	post-patch
 
diff --git a/teamspeak/Makefile b/teamspeak/Makefile
index ae89fc11fa..9fedc4fd08 100644
--- a/teamspeak/Makefile
+++ b/teamspeak/Makefile
@@ -18,7 +18,7 @@ SUBST_CLASSES+=		ts
 SUBST_STAGE.ts=		post-configure
 SUBST_FILES.ts+=	teamspeak.sh
 SUBST_SED.ts+=		-e 's|@BASEDIR@|${TS_BASEDIR}|g'
-SUBST_SED.ts+=		-e 's|@SH@|${SH}|g'
+SUBST_VARS.ts=		SH
 
 TS_BASEDIR=		${PREFIX}/lib/${PKGNAME_NOREV}
 TS_SRCDIR=		${WRKSRC}/setup.data/image
diff --git a/todotxt-git/Makefile b/todotxt-git/Makefile
index 78c8eabcd2..b5ae426feb 100644
--- a/todotxt-git/Makefile
+++ b/todotxt-git/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/todo.txt-cli
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix+=	todo.sh
-SUBST_SED.prefix+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},"
+SUBST_VARS.prefix=	PKG_SYSCONFDIR
 
 USE_TOOLS+=	bash
 REPLACE_BASH=	todo.sh
diff --git a/torcs/Makefile b/torcs/Makefile
index 1072af517c..dfd4ab0e70 100644
--- a/torcs/Makefile
+++ b/torcs/Makefile
@@ -39,13 +39,13 @@ SUBST_CLASSES+=			fix-bash
 SUBST_STAGE.fix-bash=		pre-configure
 SUBST_MESSAGE.fix-bash=		Fixing path to bash interpreter.
 SUBST_FILES.fix-bash=		Make-default.mk src/linux/torcs.in
-SUBST_SED.fix-bash=		-e 's,@BASH@,${BASH},g'
+SUBST_VARS.fix-bash=		BASH
 
 SUBST_CLASSES+=			fix-mkdir
 SUBST_STAGE.fix-mkdir=		pre-configure
 SUBST_MESSAGE.fix-mkdir=	Fixing mkdir use in installation scripts.
 SUBST_FILES.fix-mkdir=		mkinstalldirs
-SUBST_SED.fix-mkdir=		-e 's,@INSTALL_DATA_DIR@,${INSTALL_DATA_DIR},g'
+SUBST_VARS.fix-mkdir=		INSTALL_DATA_DIR
 
 BUILD_TARGET=
 INSTALL_TARGET=		install datainstall
diff --git a/ups-monitor/Makefile b/ups-monitor/Makefile
index e93d617ed0..76c6abb2a9 100644
--- a/ups-monitor/Makefile
+++ b/ups-monitor/Makefile
@@ -18,13 +18,13 @@ PYTHON_VERSIONS_INCOMPATIBLE=	36 37 # py-ORBit via py-gnome2
 SUBST_CLASSES+=		py
 SUBST_STAGE.py=		post-patch
 SUBST_FILES.py=		eggtray/Makefile.in
-SUBST_SED.py=		-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|"
+SUBST_VARS.py=		PYVERSSUFFIX
 SUBST_MESSAGE.py=	Fixing Python version.
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	eggtray/Makefile.in
-SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|"
+SUBST_VARS.prefix=	PREFIX
 SUBST_MESSAGE.prefix=	Fixing prefix.
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/vpnc/Makefile b/vpnc/Makefile
index ea779cc291..06962e952b 100644
--- a/vpnc/Makefile
+++ b/vpnc/Makefile
@@ -27,12 +27,12 @@ SUBST_MESSAGE.paths=	fixing pathnames
 SUBST_STAGE.paths=	post-patch
 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/vpr/Makefile b/vpr/Makefile
index b2e93ed547..db06e3463c 100644
--- a/vpr/Makefile
+++ b/vpr/Makefile
@@ -21,7 +21,7 @@ SUBST_CLASSES+=		x11
 SUBST_STAGE.x11=	post-patch
 SUBST_MESSAGE.x11=	Fixing X11 LD flags.
 SUBST_FILES.x11=	vpr/makefile
-SUBST_SED.x11=		-e "s|@X11_LDFLAGS@|${X11_LDFLAGS}|g"
+SUBST_VARS.x11=		X11_LDFLAGS
 
 INSTALLATION_DIRS=	bin