From 8b6d5bddf99313a22ce6368ddb7dd37d86267bbd Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 30 Jul 2018 00:02:39 +0000 Subject: [PATCH] Add 'inet6' option to control dependency on ucspi-tcp{6,}. Bump version. --- sysutils/daemontools-run/Makefile | 7 ++++--- sysutils/daemontools-run/options.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 sysutils/daemontools-run/options.mk diff --git a/sysutils/daemontools-run/Makefile b/sysutils/daemontools-run/Makefile index f183d7d4cc9b..e0c9e819d641 100644 --- 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 new file mode 100644 index 000000000000..ef66b51f3b2c --- /dev/null +++ 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