Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_153290680483130"
MIME-Version: 1.0
Date: Sun, 29 Jul 2018 23:26:44 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/qmail
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20180729232644.B3D09FBEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_153290680483130
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Sun Jul 29 23:26:44 UTC 2018

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/mail/qmail/options.mk

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


--_----------=_153290680483130
Content-Disposition: inline
Content-Length: 2634
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.95 pkgsrc/mail/qmail/Makefile:1.96
--- pkgsrc/mail/qmail/Makefile:1.95	Wed Jul 25 16:42:36 2018
+++ pkgsrc/mail/qmail/Makefile	Sun Jul 29 23:26:44 2018
@@ -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 @@ HOMEPAGE=		http://qmail.org/netqmail/
 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]*

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.49 pkgsrc/mail/qmail/options.mk:1.50
--- pkgsrc/mail/qmail/options.mk:1.49	Wed Jul  4 13:40:24 2018
+++ pkgsrc/mail/qmail/options.mk	Sun Jul 29 23:26:44 2018
@@ -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_CAT.${EAI_PATCH}=	${SED} \
 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+=			SERVERCERT=${PKG_SYSCO
 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


--_----------=_153290680483130--