CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jul 27 02:18:05 UTC 2017

Modified Files:
        pkgsrc/mail/qmail: Makefile options.mk

Log Message:
Use SUBST_VARS where applicable.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mail/qmail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.87 pkgsrc/mail/qmail/Makefile:1.88
--- pkgsrc/mail/qmail/Makefile:1.87     Fri Jul 21 04:07:01 2017
+++ pkgsrc/mail/qmail/Makefile  Thu Jul 27 02:18:05 2017
@@ -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_SED.catpages+=       -e 's|.*"tcp-enviro
 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
 

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.42 pkgsrc/mail/qmail/options.mk:1.43
--- pkgsrc/mail/qmail/options.mk:1.42   Fri Jul 21 04:07:01 2017
+++ pkgsrc/mail/qmail/options.mk        Thu Jul 27 02:18:05 2017
@@ -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_SED.srsinclude=               -e 's|/usr/local/
 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