[pkgsrc/trunk]: pkgsrc Let installed ucspi-tcp6 satisfy ucspi-tcp dependency.

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcecc8ae4ec4
branches:  trunk
changeset: 317594:fcecc8ae4ec4
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jan 10 13:23:16 2019 +0000

description:
Let installed ucspi-tcp6 satisfy ucspi-tcp dependency.

diffstat:

 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(-)

diffs (73 lines):

diff -r b35ade842890 -r fcecc8ae4ec4 mail/qmail-conf/options.mk
--- a/mail/qmail-conf/options.mk        Thu Jan 10 13:02:41 2019 +0000
+++ b/mail/qmail-conf/options.mk        Thu Jan 10 13:23:16 2019 +0000
@@ -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 @@
 .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 -r b35ade842890 -r fcecc8ae4ec4 net/publicfile/options.mk
--- a/net/publicfile/options.mk Thu Jan 10 13:02:41 2019 +0000
+++ b/net/publicfile/options.mk Thu Jan 10 13:23:16 2019 +0000
@@ -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 @@
 .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 -r b35ade842890 -r fcecc8ae4ec4 net/ucspi-ssl/options.mk
--- a/net/ucspi-ssl/options.mk  Thu Jan 10 13:02:41 2019 +0000
+++ b/net/ucspi-ssl/options.mk  Thu Jan 10 13:23:16 2019 +0000
@@ -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 @@
 .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 -r b35ade842890 -r fcecc8ae4ec4 sysutils/daemontools-run/options.mk
--- a/sysutils/daemontools-run/options.mk       Thu Jan 10 13:02:41 2019 +0000
+++ b/sysutils/daemontools-run/options.mk       Thu Jan 10 13:23:16 2019 +0000
@@ -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