BUILDLINK_DEPENDS.<pkg> lines should _always_ use += to _append_ to the

existing value.  This is critical to set the correct list of dependencies
for a package.

17 files changed, 89 insertions, 128 deletions

diff --git a/archivers/liblzo/buildlink3.mk b/archivers/liblzo/buildlink3.mk
index 84b176c246f..8f7184faca0 100644
--- a/archivers/liblzo/buildlink3.mk
+++ b/archivers/liblzo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/09 20:25:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBLZO_BUILDLINK3_MK:=	${LIBLZO_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	liblzo
 
 .if !empty(LIBLZO_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		liblzo
-BUILDLINK_DEPENDS.liblzo?=	liblzo>=1.08
+BUILDLINK_DEPENDS.liblzo+=	liblzo>=1.08
 BUILDLINK_PKGSRCDIR.liblzo?=	../../archivers/liblzo
 .endif # LIBLZO_BUILDLINK3_MK
 
diff --git a/audio/id3lib/buildlink3.mk b/audio/id3lib/buildlink3.mk
index 85b5463c432..57a6d511d08 100644
--- a/audio/id3lib/buildlink3.mk
+++ b/audio/id3lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/08 17:08:13 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ID3LIB_BUILDLINK3_MK:=	${ID3LIB_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	id3lib
 
 .if !empty(ID3LIB_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			id3lib
-BUILDLINK_DEPENDS.id3lib?=		id3lib>=3.8.3
+BUILDLINK_DEPENDS.id3lib+=		id3lib>=3.8.3
 BUILDLINK_PKGSRCDIR.id3lib?=		../../audio/id3lib
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index cc393170dfa..2fb4e477734 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,6 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 01:23:43 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,12 +9,11 @@ BUILDLINK_DEPENDS+=	musicbrainz
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			musicbrainz
-BUILDLINK_DEPENDS.musicbrainz?=		musicbrainz>=2.0.2
-BUILDLINK_PKGSRCDIR.musicbrainz?=		../../audio/musicbrainz
-
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
+BUILDLINK_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
+BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
 
+.  include "../../devel/pkgconfig/buildlink3.mk"
+.  include "../../textproc/expat/buildlink3.mk"
 .endif # MUSICBRAINZ_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/taglib/buildlink3.mk b/audio/taglib/buildlink3.mk
index 3579a1463bb..3ef19a4f63b 100644
--- a/audio/taglib/buildlink3.mk
+++ b/audio/taglib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 00:42:45 chris Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TAGLIB_BUILDLINK3_MK:=	${TAGLIB_BUILDLINK3_MK}+
@@ -8,10 +8,9 @@ BUILDLINK_DEPENDS+=	taglib
 .endif
 
 .if !empty(TAGLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			taglib
-BUILDLINK_DEPENDS.taglib?=		taglib>=1.0
-BUILDLINK_PKGSRCDIR.taglib?=		../../audio/taglib
-
+BUILDLINK_PACKAGES+=		taglib
+BUILDLINK_DEPENDS.taglib+=	taglib>=1.0
+BUILDLINK_PKGSRCDIR.taglib?=	../../audio/taglib
 .endif # TAGLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 7044c4881eb..c7d4ffa3114 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/07 17:44:10 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -8,15 +8,14 @@ BUILDLINK_DEPENDS+=	rrdtool
 .endif
 
 .if !empty(RRDTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			rrdtool
-BUILDLINK_DEPENDS.rrdtool?=		rrdtool>=1.0.40nb2
-BUILDLINK_PKGSRCDIR.rrdtool?=		../../databases/rrdtool
-
-.include "../../graphics/freetype-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../www/cgilib/buildlink3.mk"
+BUILDLINK_PACKAGES+=		rrdtool
+BUILDLINK_DEPENDS.rrdtool+=	rrdtool>=1.0.40nb2
+BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 
+.  include "../../graphics/freetype-lib/buildlink3.mk"
+.  include "../../graphics/gd/buildlink3.mk"
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../www/cgilib/buildlink3.mk"
 .endif # RRDTOOL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glib2/buildlink3.mk b/devel/glib2/buildlink3.mk
index 8f48408b6bd..47537e68f94 100644
--- a/devel/glib2/buildlink3.mk
+++ b/devel/glib2/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 10:49:53 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIB2_BUILDLINK3_MK:=	${GLIB2_BUILDLINK3_MK}+
@@ -9,13 +8,12 @@ BUILDLINK_DEPENDS+=	glib2
 .endif
 
 .if !empty(GLIB2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			glib2
-BUILDLINK_DEPENDS.glib2?=		glib2>=2.2.3nb1
-BUILDLINK_PKGSRCDIR.glib2?=		../../devel/glib2
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_PACKAGES+=		glib2
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.2.3nb1
+BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
 
+.  include "../../converters/libiconv/buildlink3.mk"
+.  include "../../devel/gettext-lib/buildlink3.mk"
 .endif # GLIB2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 39361325ba1..069062f3cd9 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 14:29:29 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -9,17 +8,16 @@ BUILDLINK_DEPENDS+=	Xft2
 .endif
 
 .if !empty(XFT2_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			Xft2
-BUILDLINK_DEPENDS.Xft2?=		Xft2>=2.1.2nb1
-BUILDLINK_PKGSRCDIR.Xft2?=		../../fonts/Xft2
+BUILDLINK_PACKAGES+=		Xft2
+BUILDLINK_DEPENDS.Xft2+=	Xft2>=2.1.2nb1
+BUILDLINK_PKGSRCDIR.Xft2?=	../../fonts/Xft2
 
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.0.9
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.0.9
 
+.  include "../../devel/zlib/buildlink3.mk"
+.  include "../../fonts/fontconfig/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../x11/Xrender/buildlink3.mk"
 .endif # XFT2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index 10fec3d93d9..e180501103b 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,11 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/05 20:34:17 garbled Exp $
-#
-# This Makefile fragment is included by packages that use openrm-devel.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENRM_DEVEL_BUILDLINK3_MK:=	${OPENRM_DEVEL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -14,13 +9,12 @@ BUILDLINK_DEPENDS+=	openrm-devel
 
 .if !empty(OPENRM_DEVEL_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			openrm-devel
-BUILDLINK_DEPENDS.openrm-devel?=		openrm-devel>=1.5.1
-BUILDLINK_PKGSRCDIR.openrm-devel?=		../../graphics/OpenRM
-
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/Mesa/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+BUILDLINK_DEPENDS.openrm-devel+=	openrm-devel>=1.5.1
+BUILDLINK_PKGSRCDIR.openrm-devel?=	../../graphics/OpenRM
 
+.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../graphics/Mesa/buildlink3.mk"
+.  include "../../mk/pthread.buildlink3.mk"
 .endif # OPENRM_DEVEL_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 44c4dc69439..8033e179e9a 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:16:43 recht Exp $
-#
-# This Makefile fragment is included by packages that use cairo.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -13,16 +8,15 @@ BUILDLINK_DEPENDS+=	cairo
 .endif
 
 .if !empty(CAIRO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			cairo
-BUILDLINK_DEPENDS.cairo?=		cairo>=0.1.17
-BUILDLINK_PKGSRCDIR.cairo?=		../../graphics/cairo
+BUILDLINK_PACKAGES+=		cairo
+BUILDLINK_DEPENDS.cairo+=	cairo>=0.1.17
+BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 
-BUILDLINK_DEPENDS.freetype2=  freetype2>=2.1.5
-
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/libpixman/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+BUILDLINK_DEPENDS.freetype2+=  freetype2>=2.1.5
 
+.  include "../../fonts/Xft2/buildlink3.mk"
+.  include "../../graphics/freetype2/buildlink3.mk"
+.  include "../../graphics/libpixman/buildlink3.mk"
 .endif # CAIRO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 943dac1ce58..932ba23a190 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:31:35 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -10,13 +9,12 @@ BUILDLINK_DEPENDS+=	libgdiplus
 
 .if !empty(LIBGDIPLUS_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			libgdiplus
-BUILDLINK_DEPENDS.libgdiplus?=		libgdiplus>=0.1
-BUILDLINK_PKGSRCDIR.libgdiplus?=		../../graphics/libgdiplus
-
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+BUILDLINK_DEPENDS.libgdiplus+=		libgdiplus>=0.1
+BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 
+.  include "../../graphics/cairo/buildlink3.mk"
+.  include "../../lang/mono/buildlink3.mk"
+.  include "../../x11/Xrender/buildlink3.mk"
 .endif # LIBGDIPLUS_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/libpixman/buildlink3.mk b/graphics/libpixman/buildlink3.mk
index 3fb23b8ae26..2aae0310ab6 100644
--- a/graphics/libpixman/buildlink3.mk
+++ b/graphics/libpixman/buildlink3.mk
@@ -1,7 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/02/03 12:07:57 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBPIXMAN_BUILDLINK3_MK:=	${LIBPIXMAN_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -9,10 +8,9 @@ BUILDLINK_DEPENDS+=	libpixman
 .endif
 
 .if !empty(LIBPIXMAN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			libpixman
-BUILDLINK_DEPENDS.libpixman?=		libpixman>=0.1.0
-BUILDLINK_PKGSRCDIR.libpixman?=		../../graphics/libpixman
-
+BUILDLINK_PACKAGES+=		libpixman
+BUILDLINK_DEPENDS.libpixman+=	libpixman>=0.1.0
+BUILDLINK_PKGSRCDIR.libpixman?=	../../graphics/libpixman
 .endif # LIBPIXMAN_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk
index 83d57d8e9fe..3416e9bb48f 100644
--- a/lang/mono/buildlink3.mk
+++ b/lang/mono/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 12:30:11 recht Exp $
-#
-# This Makefile fragment is included by packages that use mono.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MONO_BUILDLINK3_MK:=	${MONO_BUILDLINK3_MK}+
@@ -13,13 +8,12 @@ BUILDLINK_DEPENDS+=	mono
 .endif
 
 .if !empty(MONO_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			mono
-BUILDLINK_DEPENDS.mono?=		mono>=0.30
-BUILDLINK_PKGSRCDIR.mono?=		../../lang/mono
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
+BUILDLINK_PACKAGES+=		mono
+BUILDLINK_DEPENDS.mono+=	mono>=0.30
+BUILDLINK_PKGSRCDIR.mono?=	../../lang/mono
 
+.  include "../../devel/glib2/buildlink3.mk"
+.  include "../../textproc/icu/buildlink3.mk"
 .endif # MONO_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/pdflib/buildlink3.mk b/print/pdflib/buildlink3.mk
index 3da064ed83d..5815ac97e02 100644
--- a/print/pdflib/buildlink3.mk
+++ b/print/pdflib/buildlink3.mk
@@ -1,9 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/08 23:17:10 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use pdflib.
-#
-# This file was created automatically using createbuildlink-3.0.
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:32 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PDFLIB_BUILDLINK3_MK:=	${PDFLIB_BUILDLINK3_MK}+
@@ -13,13 +8,12 @@ BUILDLINK_DEPENDS+=	pdflib
 .endif
 
 .if !empty(PDFLIB_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			pdflib
-BUILDLINK_DEPENDS.pdflib?=		pdflib>=4.0.3nb2
-BUILDLINK_PKGSRCDIR.pdflib?=		../../print/pdflib
-
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
+BUILDLINK_PACKAGES+=		pdflib
+BUILDLINK_DEPENDS.pdflib+=	pdflib>=4.0.3nb2
+BUILDLINK_PKGSRCDIR.pdflib?=	../../print/pdflib
 
+.  include "../../graphics/png/buildlink3.mk"
+.  include "../../graphics/tiff/buildlink3.mk"
 .endif # PDFLIB_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/libgpg-error/buildlink3.mk b/security/libgpg-error/buildlink3.mk
index faafa2f1430..fd76de8f135 100644
--- a/security/libgpg-error/buildlink3.mk
+++ b/security/libgpg-error/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/09 20:28:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGPG_ERROR_BUILDLINK3_MK:=	${LIBGPG_ERROR_BUILDLINK3_MK}+
@@ -9,7 +9,7 @@ BUILDLINK_DEPENDS+=	libgpg-error
 
 .if !empty(LIBGPG_ERROR_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			libgpg-error
-BUILDLINK_DEPENDS.libgpg-error?=	libgpg-error>=0.6
+BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=0.6
 BUILDLINK_PKGSRCDIR.libgpg-error?=	../../security/libgpg-error
 
 .  include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/textproc/icu/buildlink3.mk b/textproc/icu/buildlink3.mk
index 2313d9497ec..e552dd1e828 100644
--- a/textproc/icu/buildlink3.mk
+++ b/textproc/icu/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 10:44:28 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ICU_BUILDLINK3_MK:=	${ICU_BUILDLINK3_MK}+
@@ -9,10 +8,9 @@ BUILDLINK_DEPENDS+=	icu
 .endif
 
 .if !empty(ICU_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			icu
-BUILDLINK_DEPENDS.icu?=		icu>=2.6.1
-BUILDLINK_PKGSRCDIR.icu?=		../../textproc/icu
-
+BUILDLINK_PACKAGES+=		icu
+BUILDLINK_DEPENDS.icu+=		icu>=2.6.1
+BUILDLINK_PKGSRCDIR.icu?=	../../textproc/icu
 .endif # ICU_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/libxml2/buildlink3.mk b/textproc/libxml2/buildlink3.mk
index 3bebb2ed454..4c1251d1701 100644
--- a/textproc/libxml2/buildlink3.mk
+++ b/textproc/libxml2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/01 10:28:48 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBXML2_BUILDLINK3_MK:=	${LIBXML2_BUILDLINK3_MK}+
@@ -9,11 +9,11 @@ BUILDLINK_DEPENDS+=	libxml2
 
 .if !empty(LIBXML2_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=		libxml2
-BUILDLINK_DEPENDS.libxml2?=	libxml2>=2.6.2
+BUILDLINK_DEPENDS.libxml2+=	libxml2>=2.6.2
 BUILDLINK_PKGSRCDIR.libxml2?=	../../textproc/libxml2
 
-.  include "../../devel/zlib/buildlink3.mk"
 .  include "../../converters/libiconv/buildlink3.mk"
+.  include "../../devel/zlib/buildlink3.mk"
 .endif # LIBXML2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/render/buildlink3.mk b/x11/render/buildlink3.mk
index 968b7684c81..58f9b04cbe3 100644
--- a/x11/render/buildlink3.mk
+++ b/x11/render/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/03 01:41:49 recht Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/09 23:56:33 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RENDER_BUILDLINK3_MK:=	${RENDER_BUILDLINK3_MK}+
@@ -9,10 +8,9 @@ BUILDLINK_DEPENDS+=	render
 .endif
 
 .if !empty(RENDER_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+=			render
-BUILDLINK_DEPENDS.render?=		render>=0.8
-BUILDLINK_PKGSRCDIR.render?=		../../x11/render
-
+BUILDLINK_PACKAGES+=		render
+BUILDLINK_DEPENDS.render+=	render>=0.8
+BUILDLINK_PKGSRCDIR.render?=	../../x11/render
 .endif # RENDER_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}