diff options
| author | schmonz <schmonz@pkgsrc.org> | 2007-02-08 09:04:48 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2007-02-08 09:04:48 +0000 |
| commit | 3b08111102869db7a411d1ef6e0af265b11c8821 (patch) | |
| tree | 108b7b1a842ddc2f47af1e96ba1c9e3ec8fbe3df /mail/qmail-run | |
| parent | 87f4c9063549327ae456a7acba8a3487193f1cb1 (diff) | |
| download | pkgsrc-3b08111102869db7a411d1ef6e0af265b11c8821.tar.gz | |
Cosmetic only:
* SUBST_FILES is already relative to ${WRKSRC}.
* s/@PREFIX@/@LOCALBASE@/ when running programs from other packages.
Diffstat (limited to 'mail/qmail-run')
| -rw-r--r-- | mail/qmail-run/Makefile | 7 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmail-procmail.sh | 2 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmail-qfilter-queue.sh | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index dbe799a4acc..ec7cd82e6d4 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -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 @@ MAKEVARS+= PKG_SYSCONFDIR.qmail-run .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 --git a/mail/qmail-run/files/qmail-procmail.sh b/mail/qmail-run/files/qmail-procmail.sh index 69d66cf88a6..32f97c2d705 100644 --- a/mail/qmail-run/files/qmail-procmail.sh +++ b/mail/qmail-run/files/qmail-procmail.sh @@ -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 --git a/mail/qmail-run/files/qmail-qfilter-queue.sh b/mail/qmail-run/files/qmail-qfilter-queue.sh index 1e715e43de2..9ea994b88da 100644 --- a/mail/qmail-run/files/qmail-qfilter-queue.sh +++ b/mail/qmail-run/files/qmail-qfilter-queue.sh @@ -30,6 +30,6 @@ else [ -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} |