CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan 14 23:00:32 UTC 2017

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

Log Message:
Conditionalize spamdyke and stunnel dependencies on "sasl" and "tls"
options, respectively. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/qmail-run/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-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.30 pkgsrc/mail/qmail-run/Makefile:1.31
--- pkgsrc/mail/qmail-run/Makefile:1.30 Mon Jan  9 05:03:51 2017
+++ pkgsrc/mail/qmail-run/Makefile      Sat Jan 14 23:00:31 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2017/01/09 05:03:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2017/01/14 23:00:31 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20170109
+DISTNAME=              qmail-run-20170114
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -13,8 +13,6 @@ LICENSE=              2-clause-bsd
 DEPENDS+=              mess822-[0-9]*:../../mail/mess822
 DEPENDS_QMAIL=         qmail>=1.03nb8:../../mail/qmail
 DEPENDS+=              ${DEPENDS_QMAIL}
-DEPENDS+=              spamdyke-[0-9]*:../../mail/spamdyke
-DEPENDS+=              stunnel-[0-9]*:../../security/stunnel
 
 CONFLICTS+=            qmail-qfilter-1.5nb1
 
@@ -59,6 +57,8 @@ SUBST_SED.paths+=     -e 's,@PKGNAME@,${PKGN
 SUBST_SED.paths+=      -e 's,@TRUE@,${TRUE},g'
 SUBST_STAGE.paths=     post-patch
 
+.include "options.mk"
+
 post-extract:
        for f in README.pkgsrc mailer.conf spamdyke-ofmipd.conf stunnel.conf; do \
            ${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f;                        \

Added files:

Index: pkgsrc/mail/qmail-run/options.mk
diff -u /dev/null pkgsrc/mail/qmail-run/options.mk:1.1
--- /dev/null   Sat Jan 14 23:00:32 2017
+++ pkgsrc/mail/qmail-run/options.mk    Sat Jan 14 23:00:31 2017
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2017/01/14 23:00:31 schmonz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail-run
+PKG_SUPPORTED_OPTIONS+=        sasl tls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msasl)
+DEPENDS+=              spamdyke-[0-9]*:../../mail/spamdyke
+.endif
+
+.if !empty(PKG_OPTIONS:Mtls)
+DEPENDS+=              stunnel-[0-9]*:../../security/stunnel
+.endif