[pkgsrc/trunk]: pkgsrc/mail/qmail Add 'inet6' and 'pam' options to control de...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c074f4dbdfff
branches:  trunk
changeset: 383382:c074f4dbdfff
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jul 29 23:26:44 2018 +0000

description:
Add 'inet6' and 'pam' options to control dependencies on ucspi-tcp{6,}
and checkpassword{-pam,}. Add dependency on ucspi-ssl to 'tls' option.
Bump PKGREVISION.

diffstat:

 mail/qmail/Makefile   |   6 ++----
 mail/qmail/options.mk |  17 +++++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r a00b350b37d3 -r c074f4dbdfff mail/qmail/Makefile
--- a/mail/qmail/Makefile       Sun Jul 29 23:23:27 2018 +0000
+++ b/mail/qmail/Makefile       Sun Jul 29 23:26:44 2018 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.95 2018/07/25 16:42:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.96 2018/07/29 23:26:44 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           34
+PKGREVISION=           35
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -12,9 +12,7 @@
 COMMENT=               Secure, reliable, efficient, simple, and fast MTA
 LICENSE=               public-domain
 
-DEPENDS+=              checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
 
 CONFLICTS+=            courier-maildirmake-[0-9]*
 CONFLICTS+=            courier-mta-[0-9]*
diff -r a00b350b37d3 -r c074f4dbdfff mail/qmail/options.mk
--- a/mail/qmail/options.mk     Sun Jul 29 23:23:27 2018 +0000
+++ b/mail/qmail/options.mk     Sun Jul 29 23:26:44 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.49 2018/07/04 13:40:24 jperkin Exp $
+# $NetBSD: options.mk,v 1.50 2018/07/29 23:26:44 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
-PKG_SUPPORTED_OPTIONS+=                eai sasl syncdir tls
+PKG_SUPPORTED_OPTIONS+=                eai inet6 pam sasl syncdir tls
 PKG_SUPPORTED_OPTIONS+=                qmail-customerror qmail-rejectutils qmail-srs
 PKG_SUGGESTED_OPTIONS+=                eai sasl syncdir tls
 PKG_SUGGESTED_OPTIONS+=                qmail-customerror qmail-rejectutils qmail-srs
@@ -65,6 +65,12 @@
 PATCH_DIST_STRIP.${EAI_PATCH}= -p1
 .endif
 
+.if !empty(PKG_OPTIONS:Mpam)
+DEPENDS+=                      checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam
+.else
+DEPENDS+=                      checkpassword-[0-9]*:../../sysutils/checkpassword
+.endif
+
 .if !empty(PKG_OPTIONS:Mqmail-customerror)
 QMAILPATCHES+=                 customerror:${CUSTOMERROR_PATCH}
 CUSTOMERROR_PATCH=             qmail-queue-custom-error-v2.netqmail-1.05.patch
@@ -143,8 +149,15 @@
 MESSAGE_SUBST+=                        CLIENTCERT=${PKG_SYSCONFDIR:Q}/control/clientcert.pem
 MESSAGE_SUBST+=                        QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
 MESSAGE_SUBST+=                        QMAIL_QMAIL_GROUP=${QMAIL_QMAIL_GROUP:Q}
+DEPENDS+=                      ucspi-ssl-[0-9]*:../../net/ucspi-ssl
 .  endif
 .else
 BUILDLINK_TRANSFORM+=          rm:-lssl
 BUILDLINK_TRANSFORM+=          rm:-lcrypto
+.if !empty(PKG_OPTIONS:Minet6)
+DEPENDS+=                      ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
+.else
+DEPENDS+=                      ucspi-tcp-[0-9]*:../../net/ucspi-tcp
 .endif
+
+.endif