summaryrefslogtreecommitdiff
path: root/mail/pfqueue
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-05-23 19:22:54 +0000
committerrillig <rillig@pkgsrc.org>2019-05-23 19:22:54 +0000
commitcabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5 (patch)
treedfd45506cac9c8adb60a55d809ab0dbc4d5a750e /mail/pfqueue
parentafe0216c35d9e0e0b96fe80eb38badf368ef84a7 (diff)
downloadpkgsrc-cabadf3d995dfdb93e43fa33e676fdfbb6f7d1f5.tar.gz
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.
Diffstat (limited to 'mail/pfqueue')
-rw-r--r--mail/pfqueue/Makefile4
-rw-r--r--mail/pfqueue/options.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index 6bbcd2388e7..3b558a2a134 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/23 19:23:07 rillig Exp $
#
DISTNAME= pfqueue-0.5.6
@@ -34,7 +34,7 @@ SUBST_CLASSES+= conf
SUBST_MESSAGE.conf= Fixing path to config file
SUBST_STAGE.conf= pre-configure
SUBST_FILES.conf= pfqconfig.c pfqueue.conf.5
-SUBST_SED.conf= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
+SUBST_VARS.conf= PKG_SYSCONFDIR
post-install:
${INSTALL_DATA} ${FILESDIR}/pfqueue.conf ${DESTDIR}${PREFIX}/share/examples/pfqueue
diff --git a/mail/pfqueue/options.mk b/mail/pfqueue/options.mk
index a08a21048a5..670a4caacd4 100644
--- a/mail/pfqueue/options.mk
+++ b/mail/pfqueue/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: options.mk,v 1.3 2019/05/23 19:23:07 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pfqueue
@@ -37,4 +37,4 @@ SUBST_CLASSES+= backends
SUBST_STAGE.backends= pre-configure
SUBST_MESSAGE.backends= Enabling backends
SUBST_FILES.backends= backends/Makefile.in
-SUBST_SED.backends= -e 's|@PFQ_BACKENDS@|${PFQ_BACKENDS:Q}|'
+SUBST_VARS.backends= PFQ_BACKENDS