CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Aug  1 07:10:27 UTC 2018

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

Log Message:
Depend on new enough sysutils/checkpassword{,-pam} such that qmail-run
can (by itself depending on pkgtools/pkg_alternatives) expect to find
"nbcheckpassword".

Remove 'qmail-rejectutils' option, which will become an unconditional
dependency in qmail-run.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.50 -r1.51 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.96 pkgsrc/mail/qmail/Makefile:1.97
--- pkgsrc/mail/qmail/Makefile:1.96     Sun Jul 29 23:26:44 2018
+++ pkgsrc/mail/qmail/Makefile  Wed Aug  1 07:10:27 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2018/07/29 23:26:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.97 2018/08/01 07:10:27 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           35
+PKGREVISION=           36
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.50 pkgsrc/mail/qmail/options.mk:1.51
--- pkgsrc/mail/qmail/options.mk:1.50   Sun Jul 29 23:26:44 2018
+++ pkgsrc/mail/qmail/options.mk        Wed Aug  1 07:10:27 2018
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.50 2018/07/29 23:26:44 schmonz Exp $
+# $NetBSD: options.mk,v 1.51 2018/08/01 07:10:27 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai inet6 pam sasl syncdir tls
-PKG_SUPPORTED_OPTIONS+=                qmail-customerror qmail-rejectutils qmail-srs
+PKG_SUPPORTED_OPTIONS+=                qmail-customerror qmail-srs
 PKG_SUGGESTED_OPTIONS+=                eai sasl syncdir tls
-PKG_SUGGESTED_OPTIONS+=                qmail-customerror qmail-rejectutils qmail-srs
+PKG_SUGGESTED_OPTIONS+=                qmail-customerror qmail-srs
 
 # Formerly optional patches, now unconditionally applied:
 QMAILPATCHES=                  netqmail:${DEFAULT_DISTFILES}
@@ -66,9 +66,9 @@ PATCH_DIST_STRIP.${EAI_PATCH}=        -p1
 .endif
 
 .if !empty(PKG_OPTIONS:Mpam)
-DEPENDS+=                      checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam
+DEPENDS+=                      checkpassword-pam>=0.99nb1:../../sysutils/checkpassword-pam
 .else
-DEPENDS+=                      checkpassword-[0-9]*:../../sysutils/checkpassword
+DEPENDS+=                      checkpassword>=0.90nb1:../../sysutils/checkpassword
 .endif
 
 .if !empty(PKG_OPTIONS:Mqmail-customerror)
@@ -79,10 +79,6 @@ SITES.${CUSTOMERROR_PATCH}=  https://note
 PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1
 .endif
 
-.if !empty(PKG_OPTIONS:Mqmail-rejectutils)
-DEPENDS+=                      qmail-rejectutils-[0-9]*:../../mail/qmail-rejectutils
-.endif
-
 PLIST_VARS+=                   srs
 .if !empty(PKG_OPTIONS:Mqmail-srs)
 .  include "../../mail/libsrs2/buildlink3.mk"