From 5c4202e9df42b1abff069c6f30a5c701664851b1 Mon Sep 17 00:00:00 2001 From: schmonz Date: Thu, 10 Jan 2019 13:23:16 +0000 Subject: Let installed ucspi-tcp6 satisfy ucspi-tcp dependency. --- mail/qmail-conf/options.mk | 4 ++-- net/publicfile/options.mk | 4 ++-- net/ucspi-ssl/options.mk | 4 ++-- sysutils/daemontools-run/options.mk | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mail/qmail-conf/options.mk b/mail/qmail-conf/options.mk index 58f609c7301..71ebd32cd21 100644 --- a/mail/qmail-conf/options.mk +++ b/mail/qmail-conf/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/07/29 23:20:30 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2019/01/10 13:23:16 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail-conf PKG_SUPPORTED_OPTIONS+= inet6 pam @@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS+= inet6 pam .if !empty(PKG_OPTIONS:Minet6) DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 .else -DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp +DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp .endif .if !empty(PKG_OPTIONS:Mpam) diff --git a/net/publicfile/options.mk b/net/publicfile/options.mk index a704f321523..4fc3c949d6f 100644 --- a/net/publicfile/options.mk +++ b/net/publicfile/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2018/07/29 23:46:21 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2019/01/10 13:23:16 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.publicfile PKG_SUPPORTED_OPTIONS+= inet6 @@ -8,5 +8,5 @@ PKG_SUPPORTED_OPTIONS+= inet6 .if !empty(PKG_OPTIONS:Minet6) DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 .else -DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp +DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp .endif diff --git a/net/ucspi-ssl/options.mk b/net/ucspi-ssl/options.mk index 852db3aafa2..c483a78911e 100644 --- a/net/ucspi-ssl/options.mk +++ b/net/ucspi-ssl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2018/10/14 12:21:11 schmonz Exp $ +# $NetBSD: options.mk,v 1.8 2019/01/10 13:23:16 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ucspi-ssl PKG_SUPPORTED_OPTIONS+= inet6 perl @@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS+= inet6 perl .if !empty(PKG_OPTIONS:Minet6) DEPENDS+= ucspi-tcp6>=1.10:../../net/ucspi-tcp6 .else -DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp +DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp .endif PLIST_VARS+= perl diff --git a/sysutils/daemontools-run/options.mk b/sysutils/daemontools-run/options.mk index ef66b51f3b2..2fce3f57f6e 100644 --- a/sysutils/daemontools-run/options.mk +++ b/sysutils/daemontools-run/options.mk @@ -1,12 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2018/07/30 00:02:39 schmonz Exp $ +# $NetBSD: options.mk,v 1.2 2019/01/10 13:23:16 schmonz Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.daemontools-run -PKG_SUPPORTED_OPTIONS+= inet6 +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 +DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 .else -DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp +DEPENDS+= {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp .endif -- cgit v1.2.3