[pkgsrc/trunk]: pkgsrc/mail/qmail-conf Add 'inet6' and 'pam' options to contr...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d38cf377d6f4
branches:  trunk
changeset: 311003:d38cf377d6f4
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jul 29 23:20:30 2018 +0000

description:
Add 'inet6' and 'pam' options to control dependencies on ucspi-tcp{6,}
and checkpassword{-pam,}. While here, update HOMEPAGE and MASTER_SITES.
Bump PKGREVISION.

diffstat:

 mail/qmail-conf/Makefile   |  15 ++++++---------
 mail/qmail-conf/options.mk |  18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diffs (57 lines):

diff -r 3200943b40ef -r d38cf377d6f4 mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile  Sun Jul 29 22:21:08 2018 +0000
+++ b/mail/qmail-conf/Makefile  Sun Jul 29 23:20:30 2018 +0000
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.31 2018/07/25 16:32:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/29 23:20:30 schmonz Exp $
 #
 
 DISTNAME=              qmail-conf-0.60
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            mail
-MASTER_SITES=          http://www.din.or.jp/~ushijima/qmail-conf/
+MASTER_SITES=          http://woodsheep.jp/qmail-conf/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
+SITES.djbdns-1.05.tar.gz=http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-#HOMEPAGE=             http://www.din.or.jp/~ushijima/qmail-conf.html
+HOMEPAGE=              http://woodsheep.jp/qmail-conf.html
 COMMENT=               Collection of tools for setting up qmail services
 
-DEPENDS+=              checkpassword-[0-9]*:../../sysutils/checkpassword
 DEPENDS+=              daemontools>=0.70:../../sysutils/daemontools
 DEPENDS+=              qmail>=1.03nb7:../../mail/qmail
-DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
-
-SITES.djbdns-1.05.tar.gz=      http://cr.yp.to/djbdns/ ftp://cr.yp.to/djbdns/
 
 DJB_RESTRICTED=                NO
-DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp
+DJB_CONFIG_CMDS=       ${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
 
 SUBST_FILES.djbware+=  ../djbdns-1.05/error.h
 
diff -r 3200943b40ef -r d38cf377d6f4 mail/qmail-conf/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qmail-conf/options.mk        Sun Jul 29 23:20:30 2018 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2018/07/29 23:20:30 schmonz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail-conf
+PKG_SUPPORTED_OPTIONS+=        inet6 pam
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
+.else
+DEPENDS+=              ucspi-tcp-[0-9]*:../../net/ucspi-tcp
+.endif
+
+.if !empty(PKG_OPTIONS:Mpam)
+DEPENDS+=              checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam
+.else
+DEPENDS+=              checkpassword-[0-9]*:../../sysutils/checkpassword
+.endif