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

NetBSD · Jul 30, 2018 · 8b6d5bd · 8b6d5bd
1 parent 632c3e1
commit 8b6d5bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/sysutils/daemontools-run/Makefile b/sysutils/daemontools-run/Makefile
@@ -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-run
 .  endif
 .endif
 
+.include "options.mk"
+
 do-install:
 	${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/daemontools-run
 

diff --git a/sysutils/daemontools-run/options.mk b/sysutils/daemontools-run/options.mk
@@ -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