[pkgsrc/trunk]: pkgsrc/mail/qmail Depend on new enough sysutils/checkpassword...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20e6ab94d9b5
branches:  trunk
changeset: 311104:20e6ab94d9b5
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Aug 01 07:10:27 2018 +0000

description:
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.

diffstat:

 mail/qmail/Makefile   |   4 ++--
 mail/qmail/options.mk |  14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diffs (55 lines):

diff -r 0a376ca726cd -r 20e6ab94d9b5 mail/qmail/Makefile
--- a/mail/qmail/Makefile       Wed Aug 01 07:07:16 2018 +0000
+++ b/mail/qmail/Makefile       Wed Aug 01 07:10:27 2018 +0000
@@ -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/
 
diff -r 0a376ca726cd -r 20e6ab94d9b5 mail/qmail/options.mk
--- a/mail/qmail/options.mk     Wed Aug 01 07:07:16 2018 +0000
+++ b/mail/qmail/options.mk     Wed Aug 01 07:10:27 2018 +0000
@@ -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 @@
 .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 @@
 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"