[pkgsrc/trunk]: pkgsrc/mail/qmail Use SUBST_VARS where applicable.

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4bb42088efd
branches:  trunk
changeset: 365820:f4bb42088efd
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jul 27 02:18:05 2017 +0000

description:
Use SUBST_VARS where applicable.

diffstat:

 mail/qmail/Makefile   |  7 ++-----
 mail/qmail/options.mk |  4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diffs (39 lines):

diff -r e6f3a9b34fd8 -r f4bb42088efd mail/qmail/Makefile
--- a/mail/qmail/Makefile       Thu Jul 27 02:11:52 2017 +0000
+++ b/mail/qmail/Makefile       Thu Jul 27 02:18:05 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2017/07/21 04:07:01 schmonz Exp $
+# $NetBSD: Makefile,v 1.88 2017/07/27 02:18:05 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
@@ -117,10 +117,7 @@
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     README.*
-SUBST_SED.paths=       -e 's|@PKGNAME@|${PKGNAME:Q}|g'
-SUBST_SED.paths+=      -e 's|@PKG_INFO@|${PKG_INFO:Q}|g'
-SUBST_SED.paths+=      -e 's|@PREFIX@|${PREFIX:Q}|g'
-SUBST_SED.paths+=      -e 's|@GREP@|${GREP:Q}|g'
+SUBST_VARS.paths=      PKGNAME PKG_INFO PREFIX GREP
 
 SUBST_FILES.djbware+=  cdb_seek.c dns.c
 
diff -r e6f3a9b34fd8 -r f4bb42088efd mail/qmail/options.mk
--- a/mail/qmail/options.mk     Thu Jul 27 02:11:52 2017 +0000
+++ b/mail/qmail/options.mk     Thu Jul 27 02:18:05 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.42 2017/07/21 04:07:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.43 2017/07/27 02:18:05 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai qmail-rejectutils qmail-srs sasl syncdir tls
@@ -121,7 +121,7 @@
 SUBST_CLASSES+=                        srsreadme
 SUBST_STAGE.srsreadme=         do-configure
 SUBST_FILES.srsreadme=         README.srs
-SUBST_SED.srsreadme=           -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR:Q}|g'
+SUBST_VARS.srsreadme=          PKG_SYSCONFDIR
 PLIST.srs=                     yes
 MESSAGE_SRC+=                  ${PKGDIR}/MESSAGE.srs
 READMES+=                      README.srs