CVS commit: pkgsrc/sysutils/daemontools-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jul 30 00:02:39 UTC 2018

Modified Files:
        pkgsrc/sysutils/daemontools-run: Makefile
Added Files:
        pkgsrc/sysutils/daemontools-run: options.mk

Log Message:
Add 'inet6' option to control dependency on ucspi-tcp{6,}. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/daemontools-run/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools-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/sysutils/daemontools-run/Makefile
diff -u pkgsrc/sysutils/daemontools-run/Makefile:1.7 pkgsrc/sysutils/daemontools-run/Makefile:1.8
--- pkgsrc/sysutils/daemontools-run/Makefile:1.7        Wed Jul 25 16:32:34 2018
+++ pkgsrc/sysutils/daemontools-run/Makefile    Mon Jul 30 00:02:39 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2018/07/25 16:32:34 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/30 00:02:39 schmonz Exp $
 #
 
-DISTNAME=              daemontools-run-20180725
+DISTNAME=              daemontools-run-20180730
 CATEGORIES=            sysutils
 MASTER_SITES=          # empty
 DISTFILES=             # empty
@@ -12,7 +12,6 @@ LICENSE=              2-clause-bsd
 
 DEPENDS_DAEMONTOOLS=   daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS+=              ${DEPENDS_DAEMONTOOLS}
-DEPENDS+=              ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
 
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
@@ -46,6 +45,8 @@ MAKEVARS+=    PKG_SYSCONFDIR.daemontools-ru
 .  endif
 .endif
 
+.include "options.mk"
+
 do-install:
        ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/daemontools-run
 

Added files:

Index: pkgsrc/sysutils/daemontools-run/options.mk
diff -u /dev/null pkgsrc/sysutils/daemontools-run/options.mk:1.1
--- /dev/null   Mon Jul 30 00:02:40 2018
+++ pkgsrc/sysutils/daemontools-run/options.mk  Mon Jul 30 00:02:39 2018
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2018/07/30 00:02:39 schmonz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.daemontools-run
+PKG_SUPPORTED_OPTIONS+=                inet6
+
+.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