CVS commit: pkgsrc/mail/qmail-conf

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Jul 29 23:20:31 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-conf: Makefile
Added Files:
        pkgsrc/mail/qmail-conf: options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/mail/qmail-conf/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-conf/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-conf/Makefile
diff -u pkgsrc/mail/qmail-conf/Makefile:1.31 pkgsrc/mail/qmail-conf/Makefile:1.32
--- pkgsrc/mail/qmail-conf/Makefile:1.31        Wed Jul 25 16:32:34 2018
+++ pkgsrc/mail/qmail-conf/Makefile     Sun Jul 29 23:20:30 2018
@@ -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
 

Added files:

Index: pkgsrc/mail/qmail-conf/options.mk
diff -u /dev/null pkgsrc/mail/qmail-conf/options.mk:1.1
--- /dev/null   Sun Jul 29 23:20:31 2018
+++ pkgsrc/mail/qmail-conf/options.mk   Sun Jul 29 23:20:30 2018
@@ -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