CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jan 10 13:23:16 UTC 2019

Modified Files:
        pkgsrc/mail/qmail-conf: options.mk
        pkgsrc/net/publicfile: options.mk
        pkgsrc/net/ucspi-ssl: options.mk
        pkgsrc/sysutils/daemontools-run: options.mk

Log Message:
Let installed ucspi-tcp6 satisfy ucspi-tcp dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/qmail-conf/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/publicfile/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/ucspi-ssl/options.mk
cvs rdiff -u -r1.1 -r1.2 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/mail/qmail-conf/options.mk
diff -u pkgsrc/mail/qmail-conf/options.mk:1.1 pkgsrc/mail/qmail-conf/options.mk:1.2
--- pkgsrc/mail/qmail-conf/options.mk:1.1       Sun Jul 29 23:20:30 2018
+++ pkgsrc/mail/qmail-conf/options.mk   Thu Jan 10 13:23:16 2019
@@ -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)

Index: pkgsrc/net/publicfile/options.mk
diff -u pkgsrc/net/publicfile/options.mk:1.1 pkgsrc/net/publicfile/options.mk:1.2
--- pkgsrc/net/publicfile/options.mk:1.1        Sun Jul 29 23:46:21 2018
+++ pkgsrc/net/publicfile/options.mk    Thu Jan 10 13:23:16 2019
@@ -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

Index: pkgsrc/net/ucspi-ssl/options.mk
diff -u pkgsrc/net/ucspi-ssl/options.mk:1.7 pkgsrc/net/ucspi-ssl/options.mk:1.8
--- pkgsrc/net/ucspi-ssl/options.mk:1.7 Sun Oct 14 12:21:11 2018
+++ pkgsrc/net/ucspi-ssl/options.mk     Thu Jan 10 13:23:16 2019
@@ -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

Index: pkgsrc/sysutils/daemontools-run/options.mk
diff -u pkgsrc/sysutils/daemontools-run/options.mk:1.1 pkgsrc/sysutils/daemontools-run/options.mk:1.2
--- pkgsrc/sysutils/daemontools-run/options.mk:1.1      Mon Jul 30 00:02:39 2018
+++ pkgsrc/sysutils/daemontools-run/options.mk  Thu Jan 10 13:23:16 2019
@@ -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