4 files changed, 85 insertions, 22 deletions
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index b8d01f27d00..895d210370a 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/11 02:12:36 xtraeme Exp $
 #
 
 DISTNAME=	libbonoboui-2.4.3
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS=		gnome2-dirs>=1.1:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
@@ -27,14 +27,14 @@ PKGCONFIG_OVERRIDE=	bonobo/libbonoboui-2.0.pc.in
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/libgnome/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
new file mode 100644
index 00000000000..b3c1f291be2
--- /dev/null
+++ b/devel/libbonoboui/buildlink3.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libbonoboui.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libbonoboui
+.endif
+
+.if !empty(LIBBONOBOUI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libbonoboui
+BUILDLINK_DEPENDS.libbonoboui+=		libbonoboui>=2.4.1nb2
+BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # LIBBONOBOUI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 24f7d6e3fec..0058d9ee3e0 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/11 02:12:36 xtraeme Exp $
 #
 
 DISTNAME=	libgnomeui-2.4.0.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
@@ -37,12 +37,12 @@ post-configure:
 		${PKGCONFIG_BASE}.tmp
 	${MV} ${PKGCONFIG_BASE}.tmp ${PKGCONFIG_BASE}
 
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
-.include "../../devel/libbonoboui/buildlink2.mk"
-.include "../../devel/libgnome/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
+.include "../../audio/esound/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
new file mode 100644
index 00000000000..9e14acc0ee1
--- /dev/null
+++ b/devel/libgnomeui/buildlink3.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:12:36 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgnomeui.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgnomeui
+.endif
+
+.if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgnomeui
+BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.4.0.1nb2
+BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
+
+.include "../../audio/esound/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+
+.endif # LIBGNOMEUI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}