[pkgsrc/trunk]: pkgsrc/mail/qmail-run Cosmetic only:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd5ff1defaee
branches:  trunk
changeset: 525166:cd5ff1defaee
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Feb 08 09:04:48 2007 +0000

description:
Cosmetic only:
* SUBST_FILES is already relative to ${WRKSRC}.
* s/@PREFIX@/@LOCALBASE@/ when running programs from other packages.

diffstat:

 mail/qmail-run/Makefile                     |  7 +++----
 mail/qmail-run/files/qmail-procmail.sh      |  2 +-
 mail/qmail-run/files/qmail-qfilter-queue.sh |  2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r ee9fc0afbd6c -r cd5ff1defaee mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile   Thu Feb 08 00:25:13 2007 +0000
+++ b/mail/qmail-run/Makefile   Thu Feb 08 09:04:48 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/10 22:59:26 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2007/02/08 09:04:48 schmonz Exp $
 #
 
 DISTNAME=              qmail-run-20060604
@@ -42,9 +42,8 @@
 .endif
 
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     ${WRKDIR}/mailer.conf  ${WRKDIR}/qmail-procmail
-SUBST_FILES.paths+=    ${WRKDIR}/qmail-qfilter-queue
-SUBST_FILES.paths+=    ${WRKDIR}/qmail-qread-client
+SUBST_FILES.paths=     mailer.conf qmail-procmail qmail-qfilter-queue
+SUBST_FILES.paths+=    qmail-qread-client
 SUBST_SED.paths+=      -e 's,@LOCALBASE@,${LOCALBASE},g'
 SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
diff -r ee9fc0afbd6c -r cd5ff1defaee mail/qmail-run/files/qmail-procmail.sh
--- a/mail/qmail-run/files/qmail-procmail.sh    Thu Feb 08 00:25:13 2007 +0000
+++ b/mail/qmail-run/files/qmail-procmail.sh    Thu Feb 08 09:04:48 2007 +0000
@@ -4,7 +4,7 @@
 # Written by Philip Hands. Distributed under the GNU GPL.
 # Modified slightly by Dave Sill.
 
-@PREFIX@/bin/preline @LOCALBASE@/bin/procmail && exit 0
+@LOCALBASE@/bin/preline @LOCALBASE@/bin/procmail && exit 0
 
 # check if procmail returned EX_TEMPFAIL (75)
 [ $? = 75 ] && exit 111
diff -r ee9fc0afbd6c -r cd5ff1defaee mail/qmail-run/files/qmail-qfilter-queue.sh
--- a/mail/qmail-run/files/qmail-qfilter-queue.sh       Thu Feb 08 00:25:13 2007 +0000
+++ b/mail/qmail-run/files/qmail-qfilter-queue.sh       Thu Feb 08 09:04:48 2007 +0000
@@ -30,6 +30,6 @@
        [ -z "${qfilters}" ] && qfilters="@CAT@"
 fi
 
-qfilter_cmd="@PREFIX@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
+qfilter_cmd="@LOCALBASE@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
 
 exec ${qfilter_cmd}