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, 26 insertions, 26 deletions

diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index b2aec64cb9d..c58a13f362f 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/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_IMAGE_BUILDLINK3_MK:=	${SDL_IMAGE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_image
 
 .if !empty(SDL_IMAGE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		SDL_image
-BUILDLINK_DEPENDS.SDL_image?=	SDL_image>=1.2.2nb2
+BUILDLINK_DEPENDS.SDL_image+=	SDL_image>=1.2.2nb2
 BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 
diff --git a/graphics/aalib-x11/buildlink3.mk b/graphics/aalib-x11/buildlink3.mk
index 4ba5d611199..89950604460 100644
--- a/graphics/aalib-x11/buildlink3.mk
+++ b/graphics/aalib-x11/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AALIB_X11_BUILDLINK3_MK:=	${AALIB_X11_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=		aalib-x11
 
 .if !empty(AALIB_X11_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		aalib-x11
-BUILDLINK_DEPENDS.aalib-x11?=	aalib-x11>=1.4.0.4nb1
+BUILDLINK_DEPENDS.aalib-x11+=	aalib-x11>=1.4.0.4nb1
 BUILDLINK_PKGSRCDIR.aalib-x11?=	../../graphics/aalib-x11
 
 BUILDLINK_FILES.aalib-x11=	include/aalib-x11.h
diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk
index 9e1e5bb486f..6ad85f44019 100644
--- a/graphics/freetype-lib/buildlink3.mk
+++ b/graphics/freetype-lib/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FREETYPE_BUILDLINK3_MK:=	${FREETYPE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	freetype
 
 .if !empty(FREETYPE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		freetype
-BUILDLINK_DEPENDS.freetype?=	freetype-lib>=1.3.1nb1
+BUILDLINK_DEPENDS.freetype+=	freetype-lib>=1.3.1nb1
 BUILDLINK_PKGSRCDIR.freetype?=	../../graphics/freetype-lib
 
 .  include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 12b9737dd70..f28349c2360 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/23 11:48:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GD_BUILDLINK3_MK:=	${GD_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gd
 
 .if !empty(GD_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gd
-BUILDLINK_DEPENDS.gd?=		gd>=2.0.15
+BUILDLINK_DEPENDS.gd+=		gd>=2.0.15
 BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 
 USE_X11=	yes
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index 9cdcb82c634..fb23956ac26 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	glut
 
 .if !empty(GLUT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		glut
-BUILDLINK_DEPENDS.glut?=	glut>=${MESA_VERSION}
+BUILDLINK_DEPENDS.glut+=	glut>=${MESA_VERSION}
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 
 .  include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 893f5cc0afa..f4aef70ad00 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/22 11:04:59 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 IMLIB_BUILDLINK3_MK:=	${IMLIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	imlib
 
 .if !empty(IMLIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		imlib
-BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.14nb5
+BUILDLINK_DEPENDS.imlib+=	imlib>=1.9.14nb5
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
 .  include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk
index 9b7d841107c..4f114a2f1c3 100644
--- a/graphics/jpeg/buildlink3.mk
+++ b/graphics/jpeg/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 JPEG_BUILDLINK3_MK:=	${JPEG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	jpeg
 
 .if !empty(JPEG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		jpeg
-BUILDLINK_DEPENDS.jpeg?=	jpeg>=6b
+BUILDLINK_DEPENDS.jpeg+=	jpeg>=6b
 BUILDLINK_PKGSRCDIR.jpeg?=	../../graphics/jpeg
 .endif	# JPEG_BUILDLINK3_MK
 
diff --git a/graphics/lcms/buildlink3.mk b/graphics/lcms/buildlink3.mk
index 45717d7d9b2..0fdf4e29740 100644
--- a/graphics/lcms/buildlink3.mk
+++ b/graphics/lcms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 00:56:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LCMS_BUILDLINK3_MK:=	${LCMS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	lcms
 
 .if !empty(LCMS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		lcms
-BUILDLINK_DEPENDS.lcms?=	lcms>=1.06
+BUILDLINK_DEPENDS.lcms+=	lcms>=1.06
 BUILDLINK_PKGSRCDIR.lcms?=	../../graphics/lcms
 BUILDLINK_INCDIRS.lcms?=	include/lcms
 .endif # LCMS_BUILDLINK3_MK
diff --git a/graphics/libungif/buildlink3.mk b/graphics/libungif/buildlink3.mk
index 76cda0b5be1..7447352a96e 100644
--- a/graphics/libungif/buildlink3.mk
+++ b/graphics/libungif/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBUNGIF_BUILDLINK3_MK:=	${LIBUNGIF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libungif
 
 .if !empty(LIBUNGIF_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libungif
-BUILDLINK_DEPENDS.libungif?=	libungif>=4.1.0
+BUILDLINK_DEPENDS.libungif+=	libungif>=4.1.0
 BUILDLINK_PKGSRCDIR.libungif?=	../../graphics/libungif
 .endif	# LIBUNGIF_BUILDLINK3_MK
 
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index df0329f365e..1de48ec02ed 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 00:59:26 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MNG_BUILDLINK3_MK:=	${MNG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	mng
 
 .if !empty(MNG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		mng
-BUILDLINK_DEPENDS.mng?=		mng>=1.0.0
+BUILDLINK_DEPENDS.mng+=		mng>=1.0.0
 BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
 
 .  include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/netpbm/buildlink3.mk b/graphics/netpbm/buildlink3.mk
index ce68bae2615..17e5bbed837 100644
--- a/graphics/netpbm/buildlink3.mk
+++ b/graphics/netpbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/22 11:02:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NETPBM_BUILDLINK3_MK:=	${NETPBM_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	netpbm
 
 .if !empty(NETPBM_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		netpbm
-BUILDLINK_DEPENDS.netpbm?=	netpbm>=10.11.6
+BUILDLINK_DEPENDS.netpbm+=	netpbm>=10.11.6
 BUILDLINK_PKGSRCDIR.netpbm?=	../../graphics/netpbm
 
 .  include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index e5cbb396229..9589b3d6aaf 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=	${PNG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	png
 
 .if !empty(PNG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		png
-BUILDLINK_DEPENDS.png?=		png>=1.2.4
+BUILDLINK_DEPENDS.png+=		png>=1.2.4
 BUILDLINK_PKGSRCDIR.png?=	../../graphics/png
 
 .  include "../../devel/zlib/buildlink3.mk"
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index 0f2e7af874f..6c33e6d4c0e 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/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:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TIFF_BUILDLINK3_MK:=	${TIFF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tiff
 
 .if !empty(TIFF_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		tiff
-BUILDLINK_DEPENDS.tiff?=	tiff>=3.5.4
+BUILDLINK_DEPENDS.tiff+=	tiff>=3.5.4
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 
 .  include "../../devel/zlib/buildlink3.mk"