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.

66 files changed, 154 insertions, 137 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
 
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk
index a57b5ef3ccb..010d2af1f85 100644
--- a/databases/db3/buildlink3.mk
+++ b/databases/db3/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}+
 DB3_BUILDLINK3_MK:=	${DB3_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	db3
 
 .if !empty(DB3_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		db3
-BUILDLINK_DEPENDS.db3?=		db3>=2.9.2
+BUILDLINK_DEPENDS.db3+=		db3>=2.9.2
 BUILDLINK_PKGSRCDIR.db3?=	../../databases/db3
 .endif	# DB3_BUILDLINK3_MK
 
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 3cf4daaa6f8..2a721a41f6c 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DB4_BUILDLINK3_MK:=	${DB4_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	db4
 
 .if !empty(DB4_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		db4
-BUILDLINK_DEPENDS.db4?=		db4>=4.1.25
+BUILDLINK_DEPENDS.db4+=		db4>=4.1.25
 BUILDLINK_PKGSRCDIR.db4?=	../../databases/db4
 BUILDLINK_INCDIRS.db4?=		include/db4
 .endif	# DB4_BUILDLINK3_MK
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index 233faca64b5..2427141b0b7 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			mysql-client
-BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.23.58
+BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=3.23.58
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 31c6d889b33..a75cc6f29fc 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,17 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/01/21 14:08:24 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	openldap
 .endif
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-.  include "../../mk/bsd.prefs.mk"
-
 BUILDLINK_PACKAGES+=		openldap
-BUILDLINK_DEPENDS.openldap?=	openldap>=2.1.22
+BUILDLINK_DEPENDS.openldap+=	openldap>=2.1.22
 BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
 
 .  if defined(USE_SASL2) && (${USE_SASL2} == "YES")
diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk
index 026ab44e23c..0d7fe065057 100644
--- a/databases/p5-DBI/buildlink3.mk
+++ b/databases/p5-DBI/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}+
 P5_DBI_BUILDLINK3_MK:=	${P5_DBI_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	p5-DBI
 
 .if !empty(P5_DBI_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		p5-DBI
-BUILDLINK_DEPENDS.p5-DBI?=	p5-DBI>=1.30
+BUILDLINK_DEPENDS.p5-DBI+=	p5-DBI>=1.30
 BUILDLINK_PKGSRCDIR.p5-DBI?=	../../databases/p5-DBI
 BUILDLINK_INCDIRS.p5-DBI?=	${PERL5_SUB_INSTALLSITEARCH}/auto/DBI
 
diff --git a/databases/postgresql-lib/buildlink3.mk b/databases/postgresql-lib/buildlink3.mk
index 4c2cdcdf4da..01dbf164097 100644
--- a/databases/postgresql-lib/buildlink3.mk
+++ b/databases/postgresql-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:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 POSTGRESQL_LIB_BUILDLINK3_MK:=	${POSTGRESQL_LIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	postgresql-lib
 
 .if !empty(POSTGRESQL_LIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			postgresql-lib
-BUILDLINK_DEPENDS.postgresql-lib?=	postgresql-lib>=7.3.1
+BUILDLINK_DEPENDS.postgresql-lib+=	postgresql-lib>=7.3.1
 BUILDLINK_PKGSRCDIR.postgresql-lib?=	../../databases/postgresql-lib
 BUILDLINK_INCDIRS.postgresql-lib?=	include/postgresql
 
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"
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index bd6ee0a0d02..d2521ffcbd3 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/24 01:57:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:46 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 FONTCONFIG_BUILDLINK3_MK:=	${FONTCONFIG_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	fontconfig
 
 .if !empty(FONTCONFIG_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			fontconfig
-BUILDLINK_DEPENDS.fontconfig?=		fontconfig>=2.1nb1
+BUILDLINK_DEPENDS.fontconfig+=		fontconfig>=2.1nb1
 BUILDLINK_PKGSRCDIR.fontconfig?=	../../fonts/fontconfig
 
 BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.0.9
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"
diff --git a/lang/libperl/buildlink3.mk b/lang/libperl/buildlink3.mk
index 5a00c656103..cbb8422756c 100644
--- a/lang/libperl/buildlink3.mk
+++ b/lang/libperl/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}+
 LIBPERL_BUILDLINK3_MK:=	${LIBPERL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libperl
 
 .if !empty(LIBPERL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libperl
-BUILDLINK_DEPENDS.libperl?=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
+BUILDLINK_DEPENDS.libperl+=	{libperl>=${LIBPERL5_REQD},perl>=5.8.0}
 BUILDLINK_PKGSRCDIR.libperl?=	../../lang/libperl
 
 LIBPERL5_REQD?=		${PERL5_REQD}
diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk
index 6b50672782a..af71a8ded04 100644
--- a/lang/ocaml/buildlink3.mk
+++ b/lang/ocaml/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}+
 OCAML_BUILDLINK3_MK:=	${OCAML_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	ocaml
 
 .if !empty(OCAML_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		ocaml
-BUILDLINK_DEPENDS.ocaml?=	ocaml>=3.06
+BUILDLINK_DEPENDS.ocaml+=	ocaml>=3.06
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 BUILDLINK_DEPMETHOD.ocaml?=	build
 .endif	# OCAML_BUILDLINK3_MK
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 5300e0a1eab..a21424b3487 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/01/19 23:50:20 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/01/24 03:26:47 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
 USE_PERL5?=	run
 PERL5_REQD?=	5.0
 
-BUILDLINK_DEPENDS.perl?=	perl>=${PERL5_REQD}
+BUILDLINK_DEPENDS.perl+=	perl>=${PERL5_REQD}
 BUILDLINK_PKGSRCDIR.perl?=	${PERL5_PKGSRCDIR}
 
 .  if !empty(USE_PERL5:M[bB][uU][iI][lL][dD])
diff --git a/lang/tcl/buildlink3.mk b/lang/tcl/buildlink3.mk
index 4ce8be95b67..71884a9bc43 100644
--- a/lang/tcl/buildlink3.mk
+++ b/lang/tcl/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}+
 TCL_BUILDLINK3_MK:=	${TCL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tcl
 
 .if !empty(TCL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		tcl
-BUILDLINK_DEPENDS.tcl?=		tcl>=8.3.4
+BUILDLINK_DEPENDS.tcl+=		tcl>=8.3.4
 BUILDLINK_PKGSRCDIR.tcl?=	../../lang/tcl
 
 BUILDLINK_FILES.tcl=	bin/tclsh*
diff --git a/misc/libcdio/buildlink3.mk b/misc/libcdio/buildlink3.mk
index 0c39d6e6324..a6a7d3916f3 100644
--- a/misc/libcdio/buildlink3.mk
+++ b/misc/libcdio/buildlink3.mk
@@ -1,4 +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:47 jlam Exp $
 #
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	libcdio
 
 .if !empty(LIBCDIO_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			libcdio
-BUILDLINK_DEPENDS.libcdio?=		libcdio>=0.65
+BUILDLINK_DEPENDS.libcdio+=		libcdio>=0.65
 BUILDLINK_PKGSRCDIR.libcdio?=		../../misc/libcdio
 
 .endif # LIBCDIO_BUILDLINK3_MK
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
 
diff --git a/pkgtools/libnbcompat/buildlink3.mk b/pkgtools/libnbcompat/buildlink3.mk
index 3a57c2f68b8..efd2159d834 100644
--- a/pkgtools/libnbcompat/buildlink3.mk
+++ b/pkgtools/libnbcompat/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}+
 LIBNBCOMPAT_BUILDLINK3_MK:=	${LIBNBCOMPAT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libnbcompat
 
 .if !empty(LIBNBCOMPAT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			libnbcompat
-BUILDLINK_DEPENDS.libnbcompat?=		libnbcompat>=20030830
+BUILDLINK_DEPENDS.libnbcompat+=		libnbcompat>=20030830
 BUILDLINK_PKGSRCDIR.libnbcompat?=	../../pkgtools/libnbcompat
 BUILDLINK_DEPMETHOD.libnbcompat?=	build
 BUILDLINK_LDADD.libnbcompat=		-lnbcompat
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index 939f4618a31..c8132ee16ca 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/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}+
 CUPS_BUILDLINK3_MK:=	${CUPS_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cups
 
 .if !empty(CUPS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		cups
-BUILDLINK_DEPENDS.cups?=	cups>=1.1.14nb1
+BUILDLINK_DEPENDS.cups+=	cups>=1.1.14nb1
 BUILDLINK_PKGSRCDIR.cups?=	../../print/cups
 
 .  include "../../graphics/png/buildlink3.mk"
diff --git a/security/cyrus-sasl2/buildlink3.mk b/security/cyrus-sasl2/buildlink3.mk
index 45c106b53a4..dc69722feb1 100644
--- a/security/cyrus-sasl2/buildlink3.mk
+++ b/security/cyrus-sasl2/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}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cyrus-sasl
 
 .if !empty(CYRUS_SASL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			cyrus-sasl
-BUILDLINK_DEPENDS.cyrus-sasl?=		cyrus-sasl>=2.1.12
+BUILDLINK_DEPENDS.cyrus-sasl+=		cyrus-sasl>=2.1.12
 BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl2
 .endif	# CYRUS_SASL_BUILDLINK3_MK
 
diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk
index 5bbec4c325b..f453f23ac8a 100644
--- a/security/libcrack/buildlink3.mk
+++ b/security/libcrack/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBCRACK_BUILDLINK3_MK:=	${LIBCRACK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libcrack
 
 .if !empty(LIBCRACK_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libcrack
-BUILDLINK_DEPENDS.libcrack?=	libcrack>=2.7
+BUILDLINK_DEPENDS.libcrack+=	libcrack>=2.7
 BUILDLINK_PKGSRCDIR.libcrack?=	../../security/libcrack
 .endif	# LIBCRACK_BUILDLINK3_MK
 
diff --git a/security/rsaref/buildlink3.mk b/security/rsaref/buildlink3.mk
index 6f4d7bf49e9..0e1c04c2699 100644
--- a/security/rsaref/buildlink3.mk
+++ b/security/rsaref/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RSAREF_BUILDLINK3_MK:=	${RSAREF_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	rsaref
 
 .if !empty(RSAREF_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		rsaref
-BUILDLINK_DEPENDS.rsaref?=	rsaref-2.0p3
+BUILDLINK_DEPENDS.rsaref+=	rsaref-2.0p3
 BUILDLINK_PKGSRCDIR.rsaref?=	../../security/rsaref
 .endif	# RSAREF_BUILDLINK3_MK
 
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 62c4f619493..91deb6683db 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	expat
 
 .if !empty(EXPAT_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		expat
-BUILDLINK_DEPENDS.expat?=	expat>=1.95.4
+BUILDLINK_DEPENDS.expat+=	expat>=1.95.4
 BUILDLINK_PKGSRCDIR.expat?=	../../textproc/expat
 .endif	# EXPAT_BUILDLINK3_MK
 
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 1fab0099213..c981842490f 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	apache
 
 .if !empty(APACHE_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		apache
-BUILDLINK_DEPENDS.apache?=	apache{,6}-1.3.*
+BUILDLINK_DEPENDS.apache+=	apache{,6}-1.3.*
 BUILDLINK_PKGSRCDIR.apache?=	../../lang/apache
 .  if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=	full
diff --git a/www/cgilib/buildlink3.mk b/www/cgilib/buildlink3.mk
index 7e1ab69dbee..a9876805d81 100644
--- a/www/cgilib/buildlink3.mk
+++ b/www/cgilib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/01/23 11:53:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CGILIB_BUILDLINK3_MK:=	${CGILIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	cgilib
 
 .if !empty(CGILIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		cgilib
-BUILDLINK_DEPENDS.cgilib?=	cgilib>=0.5nb1
+BUILDLINK_DEPENDS.cgilib+=	cgilib>=0.5nb1
 BUILDLINK_PKGSRCDIR.cgilib?=	../../www/cgilib
 .endif # CGILIB_BUILDLINK3_MK
 
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 479dcd71691..cb9294ee99e 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XRANDR_BUILDLINK3_MK:=	${XRANDR_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	Xrandr
 BUILDLINK_IS_BUILTIN.Xrender?=	no
 
 .if !empty(XRANDR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.Xrandr?=	Xrandr>=1.0.1
+BUILDLINK_DEPENDS.Xrandr+=	Xrandr>=1.0.1
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 BUILDLINK_PACKAGES+=		Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index aa0c3855514..72c3b345bb9 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/22 13:53:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+=	gnome-libs
 
 .if !empty(GNOME_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			gnome-libs
-BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.2nb1
+BUILDLINK_DEPENDS.gnome-libs+=		gnome-libs>=1.4.2nb1
 BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 
 .  include "../../audio/esound/buildlink3.mk"
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index 84369d1187d..f4fd8b408af 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/15 20:50:15 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	gtk
 
 .if !empty(GTK_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		gtk
-BUILDLINK_DEPENDS.gtk?=		gtk+>=1.2.10
+BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
 BUILDLINK_RECOMMENDED.gtk?=	gtk+>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 
diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk
index 375ea138104..ab1d5f62763 100644
--- a/x11/tk/buildlink3.mk
+++ b/x11/tk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	tk
 
 .if !empty(TK_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		tk
-BUILDLINK_DEPENDS.tk?=		tk>=8.3.4
+BUILDLINK_DEPENDS.tk+=		tk>=8.3.4
 BUILDLINK_PKGSRCDIR.tk?=	../../x11/tk
 
 BUILDLINK_FILES.tk=	bin/wish*
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 63658ef464f..ce3ad1e5a72 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/01/05 11:05:47 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/01/24 03:26:48 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XCURSOR_BUILDLINK3_MK:=	${XCURSOR_BUILDLINK3_MK}+
@@ -10,7 +10,7 @@ BUILDLINK_DEPENDS+=	xcursor
 BUILDLINK_IS_BUILTIN.xcursor?=	no
 
 .if !empty(XCURSOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xcursor?=	xcursor>=1.1.1
+BUILDLINK_DEPENDS.xcursor+=	xcursor>=1.1.1
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
 BUILDLINK_PACKAGES+=		xcursor
 .endif	# XCURSOR_BUILDLINK3_MK