summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-24 03:26:45 +0000
committerjlam <jlam@pkgsrc.org>2004-01-24 03:26:45 +0000
commita7d877ca6ae0e78f0eb4e0e03e41202252e9f94f (patch)
tree4963c5656e148ab0bec2e19df9ec8ccd15d2789f /net
parent01a5abff019d79930d9efe12799eb86c320e2823 (diff)
downloadpkgsrc-a7d877ca6ae0e78f0eb4e0e03e41202252e9f94f.tar.gz
Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives a value only once due to the multiple inclusion protection in the bulldlink3.mk files. In the case where a package includes several buildlink3.mk files that each want a slightly different version of another dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the strictest <pkg> dependency to be matched.
Diffstat (limited to 'net')
-rw-r--r--net/ORBit/buildlink3.mk4
-rw-r--r--net/openslp/buildlink3.mk4
-rw-r--r--net/socks4/buildlink3.mk4
-rw-r--r--net/socks5/buildlink3.mk4
4 files changed, 8 insertions, 8 deletions
diff --git a/net/ORBit/buildlink3.mk b/net/ORBit/buildlink3.mk
index 9bd3a375914..fe7d0b0ccae 100644
--- a/net/ORBit/buildlink3.mk
+++ b/net/ORBit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/22 12:53:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ORBIT_BUILDLINK3_MK:= ${ORBIT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= ORBit
.if !empty(ORBIT_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= ORBit
-BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.15nb5
+BUILDLINK_DEPENDS.ORBit+= ORBit>=0.5.15nb5
BUILDLINK_PKGSRCDIR.ORBit?= ../../net/ORBit
. include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/net/openslp/buildlink3.mk b/net/openslp/buildlink3.mk
index f75485c9cf2..04f67eea011 100644
--- a/net/openslp/buildlink3.mk
+++ b/net/openslp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSLP_BUILDLINK3_MK:= ${OPENSLP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= openslp
.if !empty(OPENSLP_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= openslp
-BUILDLINK_DEPENDS.openslp?= openslp>=1.0.1
+BUILDLINK_DEPENDS.openslp+= openslp>=1.0.1
BUILDLINK_PKGSRCDIR.openslp?= ../../net/openslp
.endif # OPENSLP_BUILDLINK3_MK
diff --git a/net/socks4/buildlink3.mk b/net/socks4/buildlink3.mk
index 36ceed50ba6..5122784290d 100644
--- a/net/socks4/buildlink3.mk
+++ b/net/socks4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS4_BUILDLINK3_MK:= ${SOCKS4_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= socks4
.if !empty(SOCKS4_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= socks4
-BUILDLINK_DEPENDS.socks4?= socks4>=2.2
+BUILDLINK_DEPENDS.socks4+= socks4>=2.2
BUILDLINK_PKGSRCDIR.socks4?= ../../net/socks4
BUILDLINK_TRANSFORM+= l:socks:socks4
diff --git a/net/socks5/buildlink3.mk b/net/socks5/buildlink3.mk
index e8805f938bb..48e23cb6881 100644
--- a/net/socks5/buildlink3.mk
+++ b/net/socks5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:46 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SOCKS5_BUILDLINK3_MK:= ${SOCKS5_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+= socks5
.if !empty(SOCKS5_BUILDLINK3_MK:M+)
BUILDLINK_PACKAGES+= socks5
-BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2
+BUILDLINK_DEPENDS.socks5+= socks5>=1.0.2
BUILDLINK_PKGSRCDIR.socks5?= ../../net/socks5
.endif # SOCKS5_BUILDLINK3_MK