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.

13 files changed, 28 insertions, 28 deletions

diff --git a/devel/SDL/buildlink3.mk b/devel/SDL/buildlink3.mk
index 1fc2defd0c5..672633f1591 100644
--- a/devel/SDL/buildlink3.mk
+++ b/devel/SDL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SDL_BUILDLINK3_MK:=	${SDL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL
 
 .if !empty(SDL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		SDL
-BUILDLINK_DEPENDS.SDL?=		SDL>=1.2.5nb5
+BUILDLINK_DEPENDS.SDL+=		SDL>=1.2.5nb5
 BUILDLINK_PKGSRCDIR.SDL?=	../../devel/SDL
 
 USE_X11=		YES
diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk
index 9c23a33ea9c..ce74026c3f0 100644
--- a/devel/boehm-gc/buildlink3.mk
+++ b/devel/boehm-gc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BOEHM_GC_BUILDLINK3_MK:=	${BOEHM_GC_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	boehm-gc
 
 .if !empty(BOEHM_GC_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		boehm-gc
-BUILDLINK_DEPENDS.boehm-gc?=	boehm-gc>=6.2nb1
+BUILDLINK_DEPENDS.boehm-gc+=	boehm-gc>=6.2nb1
 BUILDLINK_PKGSRCDIR.boehm-gc?=	../../devel/boehm-gc
 .endif	# BOEHM_GC_BUILDLINK3_MK
 
diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk
index c1320712457..d6cc356a51a 100644
--- a/devel/dlcompat/buildlink3.mk
+++ b/devel/dlcompat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DLCOMPAT_BUILDLINK3_MK:=	${DLCOMPAT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	dlcompat
 
 .if !empty(DLCOMPAT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		dlcompat
-BUILDLINK_DEPENDS.dlcompat?=	dlcompat>=20020606
+BUILDLINK_DEPENDS.dlcompat+=	dlcompat>=20020606
 BUILDLINK_PKGSRCDIR.dlcompat?=	../../devel/dlcompat
 .endif  # DLCOMPAT_BUILDLINK3_MK
 
diff --git a/devel/glib/buildlink3.mk b/devel/glib/buildlink3.mk
index 221739bd8a7..244cc256fec 100644
--- a/devel/glib/buildlink3.mk
+++ b/devel/glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB_BUILDLINK3_MK:=	${GLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	glib
 
 .if !empty(GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		glib
-BUILDLINK_DEPENDS.glib?=	glib>=1.2.10nb5
+BUILDLINK_DEPENDS.glib+=	glib>=1.2.10nb5
 BUILDLINK_PKGSRCDIR.glib?=	../../devel/glib
 
 PTHREAD_OPTS+=	require
diff --git a/devel/gmp/buildlink3.mk b/devel/gmp/buildlink3.mk
index 31abbc44875..d900d94807c 100644
--- a/devel/gmp/buildlink3.mk
+++ b/devel/gmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/19 13:15:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GMP_BUILDLINK3_MK:=	${GMP_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gmp
 
 .if !empty(GMP_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gmp
-BUILDLINK_DEPENDS.gmp?=		gmp>=4.1.2
+BUILDLINK_DEPENDS.gmp+=		gmp>=4.1.2
 BUILDLINK_PKGSRCDIR.gmp?=	../../devel/gmp
 
 .endif # GMP_BUILDLINK3_MK
diff --git a/devel/libmm/buildlink3.mk b/devel/libmm/buildlink3.mk
index 392d91e616e..e9559b91cce 100644
--- a/devel/libmm/buildlink3.mk
+++ b/devel/libmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBMM_BUILDLINK3_MK:=	${LIBMM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libmm
 
 .if !empty(LIBMM_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libmm
-BUILDLINK_DEPENDS.libmm?=	libmm>=1.2.1
+BUILDLINK_DEPENDS.libmm+=	libmm>=1.2.1
 BUILDLINK_PKGSRCDIR.libmm?=	../../devel/libmm
 .endif	# LIBMM_BUILDLINK3_MK
 
diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk
index 617a47d7b02..d049cda198a 100644
--- a/devel/libslang/buildlink3.mk
+++ b/devel/libslang/buildlink3.mk
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSLANG_BUILDLINK3_MK:=	${LIBSLANG_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	libslang
 .endif
 
 .if !empty(LIBSLANG_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
 BUILDLINK_PACKAGES+=		libslang
-BUILDLINK_DEPENDS.libslang?=	libslang>=1.4.9nb1
+BUILDLINK_DEPENDS.libslang+=	libslang>=1.4.9nb1
 BUILDLINK_PKGSRCDIR.libslang?=	../../devel/libslang
 
 # Debian adds a dependency on ncurses.
diff --git a/devel/pcre/buildlink3.mk b/devel/pcre/buildlink3.mk
index ae222579a22..3337cb02ed2 100644
--- a/devel/pcre/buildlink3.mk
+++ b/devel/pcre/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PCRE_BUILDLINK3_MK:=	${PCRE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pcre
 
 .if !empty(PCRE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		pcre
-BUILDLINK_DEPENDS.pcre?=	pcre>=3.4nb1
+BUILDLINK_DEPENDS.pcre+=	pcre>=3.4nb1
 BUILDLINK_PKGSRCDIR.pcre?=	../../devel/pcre
 .endif	# PCRE_BUILDLINK3_MK
 
diff --git a/devel/pkgconfig/buildlink3.mk b/devel/pkgconfig/buildlink3.mk
index b71c4bad5cd..7cacbe29aa5 100644
--- a/devel/pkgconfig/buildlink3.mk
+++ b/devel/pkgconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PKGCONFIG_BUILDLINK3_MK:=	${PKGCONFIG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pkgconfig
 
 .if !empty(PKGCONFIG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		pkgconfig
-BUILDLINK_DEPENDS.pkgconfig?=	pkgconfig>=0.15.0
+BUILDLINK_DEPENDS.pkgconfig+=	pkgconfig>=0.15.0
 BUILDLINK_PKGSRCDIR.pkgconfig?=	../../devel/pkgconfig
 BUILDLINK_DEPMETHOD.pkgconfig?=	build
 
diff --git a/devel/popt/buildlink3.mk b/devel/popt/buildlink3.mk
index 3145b0464f2..db0126022d1 100644
--- a/devel/popt/buildlink3.mk
+++ b/devel/popt/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 POPT_BUILDLINK3_MK:=	${POPT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	popt
 
 .if !empty(POPT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		popt
-BUILDLINK_DEPENDS.popt?=	popt>=1.7nb3
+BUILDLINK_DEPENDS.popt+=	popt>=1.7nb3
 BUILDLINK_PKGSRCDIR.popt?=	../../devel/popt
 
 .  include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk
index 550a96453a0..29d9ec708e1 100644
--- a/devel/pth/buildlink3.mk
+++ b/devel/pth/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTH_BUILDLINK3_MK:=	${PTH_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	pth
 
 .if !empty(PTH_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		pth
-BUILDLINK_DEPENDS.pth?=		pth>=2.0.0
+BUILDLINK_DEPENDS.pth+=		pth>=2.0.0
 BUILDLINK_PKGSRCDIR.pth?=	../../devel/pth
 .endif	# PTH_BUILDLINK3_MK
 
diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk
index a4d073bb888..20aa33634e0 100644
--- a/devel/pthread-sem/buildlink3.mk
+++ b/devel/pthread-sem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/01/20 21:29:10 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pthread-sem.
 #
@@ -12,7 +12,7 @@ BUILDLINK_DEPENDS+=	pthread-sem
 
 .if !empty(PTHREAD_SEM_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			pthread-sem
-BUILDLINK_DEPENDS.pthread-sem?=		pthread-sem>=1.0
+BUILDLINK_DEPENDS.pthread-sem+=		pthread-sem>=1.0
 BUILDLINK_PKGSRCDIR.pthread-sem?=	../../devel/pthread-sem
 
 .endif # PTHREAD_SEM_BUILDLINK3_MK
diff --git a/devel/smpeg/buildlink3.mk b/devel/smpeg/buildlink3.mk
index c5934824516..47f7528bf59 100644
--- a/devel/smpeg/buildlink3.mk
+++ b/devel/smpeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SPMEG_BUILDLINK3_MK:=	${SPMEG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	smpeg
 
 .if !empty(SPMEG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		smpeg
-BUILDLINK_DEPENDS.smpeg?=	smpeg>=0.4.4nb3
+BUILDLINK_DEPENDS.smpeg+=	smpeg>=0.4.4nb3
 BUILDLINK_PKGSRCDIR.smpeg?=	../../devel/smpeg
 
 .  include "../../devel/SDL/buildlink3.mk"