diff options
author | schmonz <schmonz> | 2004-08-23 03:30:20 +0000 |
---|---|---|
committer | schmonz <schmonz> | 2004-08-23 03:30:20 +0000 |
commit | 02ac6209b5edd647f734e4b0f1a581761320036f (patch) | |
tree | 612dedd1f11aea0ddc2f8559bddda06d600aadc9 /mail | |
parent | ef0d95afb307b5ddf39569bf3e2e1b61a122df8a (diff) | |
download | pkgsrc-02ac6209b5edd647f734e4b0f1a581761320036f.tar.gz |
qmail-qfilter-queue is a script I wrote, not part of qmail-qfilter,
so it's moving to qmail-run. Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/qmail-qfilter/MESSAGE | 13 | ||||
-rw-r--r-- | mail/qmail-qfilter/Makefile | 12 | ||||
-rw-r--r-- | mail/qmail-qfilter/PLIST | 3 | ||||
-rw-r--r-- | mail/qmail-qfilter/files/qmail-qfilter-queue.sh | 28 |
4 files changed, 3 insertions, 53 deletions
diff --git a/mail/qmail-qfilter/MESSAGE b/mail/qmail-qfilter/MESSAGE deleted file mode 100644 index 7a5f3d729bc..00000000000 --- a/mail/qmail-qfilter/MESSAGE +++ /dev/null @@ -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 --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile index a4d112705f1..03b82232171 100644 --- a/mail/qmail-qfilter/Makefile +++ b/mail/qmail-qfilter/Makefile @@ -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 @@ DEPENDS+= qmail>=1.03nb9:../../mail/qmail 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 @@ do-configure: ${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 --git a/mail/qmail-qfilter/PLIST b/mail/qmail-qfilter/PLIST index c51de0ebc88..5d79f1d9fbe 100644 --- a/mail/qmail-qfilter/PLIST +++ b/mail/qmail-qfilter/PLIST @@ -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 --git a/mail/qmail-qfilter/files/qmail-qfilter-queue.sh b/mail/qmail-qfilter/files/qmail-qfilter-queue.sh deleted file mode 100644 index 9abbe7175fe..00000000000 --- a/mail/qmail-qfilter/files/qmail-qfilter-queue.sh +++ /dev/null @@ -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} |