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.

4 files changed, 27 insertions, 43 deletions

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/+$//}