[pkgsrc/trunk]: pkgsrc/mail/qmail-qfilter qmail-qfilter-queue is a script I w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3446cc399e5
branches:  trunk
changeset: 479809:b3446cc399e5
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Aug 23 03:30:20 2004 +0000

description:
qmail-qfilter-queue is a script I wrote, not part of qmail-qfilter,
so it's moving to qmail-run. Bump PKGREVISION.

diffstat:

 mail/qmail-qfilter/MESSAGE                      |  13 -----------
 mail/qmail-qfilter/Makefile                     |  12 +--------
 mail/qmail-qfilter/PLIST                        |   3 +-
 mail/qmail-qfilter/files/qmail-qfilter-queue.sh |  28 -------------------------
 4 files changed, 3 insertions(+), 53 deletions(-)

diffs (98 lines):

diff -r b6e06db59cbf -r b3446cc399e5 mail/qmail-qfilter/MESSAGE
--- a/mail/qmail-qfilter/MESSAGE        Mon Aug 23 03:03:08 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2004/07/21 22:53:36 schmonz Exp $
-
-This package provides a simple script that runs all the filters in
-${PKG_SYSCONFDIR} whose filenames match "qfilter-*".
-These filters will be executed in sort(1) order with no arguments.
-
-To use this script to filter messages arriving via SMTP:
-- Set qmailsmtpd_postenv="QMAILQUEUE=${PREFIX}/bin/qmail-qfilter-queue"
-    in /etc/rc.conf.
-- Restart qmail-smtpd.
-
-===========================================================================
diff -r b6e06db59cbf -r b3446cc399e5 mail/qmail-qfilter/Makefile
--- a/mail/qmail-qfilter/Makefile       Mon Aug 23 03:03:08 2004 +0000
+++ b/mail/qmail-qfilter/Makefile       Mon Aug 23 03:30:20 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/08/22 13:47:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2004/08/23 03:30:20 schmonz Exp $
 #
 
 DISTNAME=              qmail-qfilter-1.5
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 
@@ -15,9 +15,6 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_BUILDLINK3=                yes
-USE_PKGINSTALL=                yes
-PKG_SYSCONFSUBDIR=     qmail-qfilters
-MAKE_DIRS+=            ${PKG_SYSCONFDIR}
 
 REPLACE_PERL=          samples/block-long-dates                        \
                        samples/deny-filetypes                          \
@@ -31,13 +28,8 @@
        ${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
        ${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
 
-post-build:
-       @${SED} ${FILES_SUBST_SED} ${FILESDIR}/qmail-qfilter-queue.sh   \
-               > ${WRKDIR}/qmail-qfilter-queue
-
 do-install:
        cd ${WRKSRC} && ./installer && ./instcheck
-       ${INSTALL_SCRIPT} ${WRKDIR}/qmail-qfilter-queue ${PREFIX}/bin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qmail-qfilter
        for i in ${REPLACE_PERL}; do                                    \
                ${INSTALL_SCRIPT} ${WRKSRC}/$${i}                       \
diff -r b6e06db59cbf -r b3446cc399e5 mail/qmail-qfilter/PLIST
--- a/mail/qmail-qfilter/PLIST  Mon Aug 23 03:03:08 2004 +0000
+++ b/mail/qmail-qfilter/PLIST  Mon Aug 23 03:30:20 2004 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/21 22:53:36 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/23 03:30:20 schmonz Exp $
 bin/qmail-qfilter
-bin/qmail-qfilter-queue
 man/man1/qmail-qfilter.1
 share/examples/qmail-qfilter/block-long-dates
 share/examples/qmail-qfilter/deny-filetypes
diff -r b6e06db59cbf -r b3446cc399e5 mail/qmail-qfilter/files/qmail-qfilter-queue.sh
--- a/mail/qmail-qfilter/files/qmail-qfilter-queue.sh   Mon Aug 23 03:03:08 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#!@SH@
-#
-# Wrapper for qmail-queue that filters messages before injecting
-#   into the queue.
-#
-# Using this wrapper, executable filters:
-# * Must be placed in @PKG_SYSCONFDIR@
-# * Must have filenames matching "qfilter-*"
-# * Will be executed with no arguments
-# * Will be executed in sort(1) order
-
-possible_qfilters=`@ECHO@ @PKG_SYSCONFDIR@/qfilter-* | @SORT@`
-qfilters=""
-
-if [ "${possible_qfilters}" = "@PKG_SYSCONFDIR@/qfilter-*" ]; then
-       qfilters="@CAT@"
-else
-       for qfilter in ${possible_qfilters}; do
-               if [ -x "${qfilter}" ]; then
-                       qfilters="${qfilters} ${qfilter}"
-               fi
-       done
-       [ -z "${qfilters}" ] && qfilters="@CAT@"
-fi
-
-qfilter_cmd="@PREFIX@/bin/qmail-qfilter `@ECHO@ ${qfilters} | @SED@ -e 's| | -- |g'`"
-
-exec ${qfilter_cmd}