CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May 28 12:57:36 UTC 2018

Modified Files:
        pkgsrc/mail/qmail: Makefile PLIST options.mk

Log Message:
Extract qmail-rejectutils to standalone package. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mail/qmail/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/qmail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.92 pkgsrc/mail/qmail/Makefile:1.93
--- pkgsrc/mail/qmail/Makefile:1.92     Sun Aug 13 23:42:55 2017
+++ pkgsrc/mail/qmail/Makefile  Mon May 28 12:57:36 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2017/08/13 23:42:55 schmonz Exp $
+# $NetBSD: Makefile,v 1.93 2018/05/28 12:57:36 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           32
+PKGREVISION=           33
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -176,10 +176,6 @@ post-install:
 
        cd ${WRKSRC} && ${MAKE} instcheck install-destdir
 
-       for i in ${REJECTUTILS}; do                                     \
-               ${INSTALL_PROGRAM} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/bin/$$i; \
-       done
-
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}${SHAREDIR}/setup
        for i in ${SETUP_PROGRAMS}; do                                  \
                ${INSTALL_PROGRAM} ${WRKSRC}/$$i                        \

Index: pkgsrc/mail/qmail/PLIST
diff -u pkgsrc/mail/qmail/PLIST:1.19 pkgsrc/mail/qmail/PLIST:1.20
--- pkgsrc/mail/qmail/PLIST:1.19        Mon Jan  1 22:29:41 2018
+++ pkgsrc/mail/qmail/PLIST     Mon May 28 12:57:36 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/01/01 22:29:41 rillig Exp $
+@comment $NetBSD: PLIST,v 1.20 2018/05/28 12:57:36 schmonz Exp $
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -24,19 +24,12 @@ bin/qmail-newu
 bin/qmail-pop3d
 bin/qmail-popup
 bin/qmail-pw2u
-${PLIST.rejectutils}bin/qmail-qfilter-ofmipd-queue
-${PLIST.rejectutils}bin/qmail-qfilter-smtpd-queue
-${PLIST.rejectutils}bin/qmail-qfilter-viruscan
 bin/qmail-qmqpc
 bin/qmail-qmqpd
 bin/qmail-qmtpd
 bin/qmail-qread
 bin/qmail-qstat
 bin/qmail-queue
-${PLIST.rejectutils}bin/qmail-rcptcheck
-${PLIST.rejectutils}bin/qmail-rcptcheck-badrcptto
-${PLIST.rejectutils}bin/qmail-rcptcheck-qregex
-${PLIST.rejectutils}bin/qmail-rcptcheck-realrcptto
 bin/qmail-remote
 bin/qmail-rspawn
 bin/qmail-send

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.47 pkgsrc/mail/qmail/options.mk:1.48
--- pkgsrc/mail/qmail/options.mk:1.47   Sun Oct 29 00:46:14 2017
+++ pkgsrc/mail/qmail/options.mk        Mon May 28 12:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.47 2017/10/29 00:46:14 schmonz Exp $
+# $NetBSD: options.mk,v 1.48 2018/05/28 12:57:36 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai sasl syncdir tls
@@ -73,21 +73,8 @@ SITES.${CUSTOMERROR_PATCH}=  https://note
 PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1
 .endif
 
-PLIST_VARS+=                   rejectutils
 .if !empty(PKG_OPTIONS:Mqmail-rejectutils)
-QMAILPATCHES+=                 rejectutils:${REJECTUTILS_PATCH}
-REJECTUTILS_PATCH=             netqmail-1.06-rejectutils-20170720.patch
-PATCHFILES+=                   ${REJECTUTILS_PATCH}
-SITES.${REJECTUTILS_PATCH}=    https://schmonz.com/qmail/rejectutils/
-DJB_BUILD_TARGETS+=            rejectutils
-PLIST.rejectutils=             yes
-REJECTUTILS=                   qmail-qfilter-ofmipd-queue      \
-                               qmail-qfilter-smtpd-queue       \
-                               qmail-qfilter-viruscan          \
-                               qmail-rcptcheck                 \
-                               qmail-rcptcheck-badrcptto       \
-                               qmail-rcptcheck-qregex          \
-                               qmail-rcptcheck-realrcptto
+DEPENDS+=                      qmail-rejectutils-[0-9]*:../../mail/qmail-rejectutils
 .endif
 
 PLIST_VARS+=                   srs