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.

11 files changed, 40 insertions, 23 deletions

diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index 8d0018fdc9d..bdd72d89779 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:45 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		SDL_mixer
-BUILDLINK_DEPENDS.SDL_mixer?=	SDL_mixer>=1.2.5nb1
+BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb1
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index 1e6137a01c3..2fd3aa958a5 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/15 09:11:02 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	arts
 
 .if !empty(ARTS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		arts
-BUILDLINK_DEPENDS.arts?=	arts>=1.1.4nb1
+BUILDLINK_DEPENDS.arts+=	arts>=1.1.4nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 .  include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/esound/buildlink3.mk b/audio/esound/buildlink3.mk
index ba168194fac..c63a79a48e4 100644
--- a/audio/esound/buildlink3.mk
+++ b/audio/esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ESOUND_BUILDLINK3_MK:=	${ESOUND_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	esound
 
 .if !empty(ESOUND_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		esound
-BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
+BUILDLINK_DEPENDS.esound+=	esound>=0.2.18
 BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
 
 .  include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
new file mode 100644
index 00000000000..8b644b6766e
--- /dev/null
+++ b/audio/flac/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 03:26:46 jlam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+FLAC_BUILDLINK3_MK:=	${FLAC_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	flac
+.endif
+
+.if !empty(FLAC_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		flac
+BUILDLINK_DEPENDS.flac+=	flac>=1.1.0nb1
+BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
+
+.  include "../../audio/libogg/buildlink3.mk"
+.endif # FLAC_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index a3f6aee27a6..bfe8325dfbb 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/11 18:47:34 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libao
 
 .if !empty(LIBAO_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libao
-BUILDLINK_DEPENDS.libao?=	libao>=0.8.4
+BUILDLINK_DEPENDS.libao+=	libao>=0.8.4
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/audio/libaudiofile/buildlink3.mk b/audio/libaudiofile/buildlink3.mk
index 2044ebd4e6d..ac25ea15552 100644
--- a/audio/libaudiofile/buildlink3.mk
+++ b/audio/libaudiofile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/10 17:47:38 cjep Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AUDIOFILE_BUILDLINK3_MK:=	${AUDIOFILE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	audiofile
 
 .if !empty(AUDIOFILE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		audiofile
-BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
+BUILDLINK_DEPENDS.audiofile+=	libaudiofile>=0.2.1
 BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
 .endif	# AUDIOFILE_BUILDLINK3_MK
 
diff --git a/audio/libcddb/buildlink3.mk b/audio/libcddb/buildlink3.mk
index a3632ddac57..7a05d4b1040 100644
--- a/audio/libcddb/buildlink3.mk
+++ b/audio/libcddb/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/17 15:32:33 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBCDDB_BUILDLINK3_MK:=	${LIBCDDB_BUILDLINK3_MK}+
@@ -9,9 +8,9 @@ BUILDLINK_DEPENDS+=	libcddb
 .endif
 
 .if !empty(LIBCDDB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libcddb
-BUILDLINK_DEPENDS.libcddb?=		libcddb>=0.9.4
-BUILDLINK_PKGSRCDIR.libcddb?=		../../audio/libcddb
+BUILDLINK_PACKAGES+=		libcddb
+BUILDLINK_DEPENDS.libcddb+=	libcddb>=0.9.4
+BUILDLINK_PKGSRCDIR.libcddb?=	../../audio/libcddb
 
 .include "../../misc/libcdio/buildlink3.mk"
 
diff --git a/audio/libogg/buildlink3.mk b/audio/libogg/buildlink3.mk
index cc0a831914c..c17e422f9fb 100644
--- a/audio/libogg/buildlink3.mk
+++ b/audio/libogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBOGG_BUILDLINK3_MK:=	${LIBOGG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libogg
 
 .if !empty(LIBOGG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libogg
-BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
+BUILDLINK_DEPENDS.libogg+=	libogg>=1.0.0.8
 BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
 .endif	# LIBOGG_BUILDLINK3_MK
 
diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk
index 18aeccbb062..1d35e8a1b7f 100644
--- a/audio/libvorbis/buildlink3.mk
+++ b/audio/libvorbis/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/17 15:46:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVORBIS_BUILDLINK3_MK:=	${LIBVORBIS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libvorbis
 
 .if !empty(LIBVORBIS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libvorbis
-BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.1
+BUILDLINK_DEPENDS.libvorbis+=	libvorbis>=1.0.1
 BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
 
 .  include "../../audio/libogg/buildlink3.mk"
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index 5eb5722160c..8a1455c4e19 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/21 18:22:39 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NAS_BUILDLINK3_MK:=	${NAS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	nas
 
 .if !empty(NAS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		nas
-BUILDLINK_DEPENDS.nas?=		nas>=1.4.2
+BUILDLINK_DEPENDS.nas+=		nas>=1.4.2
 BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
 .endif	# NAS_BUILDLINK3_MK
 
diff --git a/audio/oss/buildlink3.mk b/audio/oss/buildlink3.mk
index a1ae73e0ef7..64a4f1c87da 100644
--- a/audio/oss/buildlink3.mk
+++ b/audio/oss/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/07 01:14:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OSS_BUILDLINK3_MK:=	${OSS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	oss
 
 .if !empty(OSS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		oss
-BUILDLINK_DEPENDS.oss?=		oss-[0-9]*
+BUILDLINK_DEPENDS.oss+=		oss-[0-9]*
 BUILDLINK_PKGSRCDIR.oss?=	../../audio/oss
 BUILDLINK_INCDIRS.oss=		include lib/oss/include