bl3ify

5 files changed, 76 insertions, 21 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index e32f797568f..f722bfad065 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/11 05:32:21 xtraeme Exp $
 #
 
 DISTNAME=		glade-2.0.1
@@ -15,16 +15,16 @@ COMMENT=		User interface builder for the GTK2+ toolkit and GNOME2
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../databases/libgnomedb/buildlink2.mk"
-.include "../../devel/gail/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../databases/libgnomedb/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index ee040188559..368fc18393c 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/11 05:43:54 xtraeme Exp $
 #
 
 DISTNAME=	libgsf-1.8.2
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 structured file library
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
@@ -22,11 +22,11 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgsf-gnome-1.pc.in
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/libgsf
 
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgsf/buildlink3.mk b/devel/libgsf/buildlink3.mk
new file mode 100644
index 00000000000..cc025bb220a
--- /dev/null
+++ b/devel/libgsf/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:43:54 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgsf.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGSF_BUILDLINK3_MK:=	${LIBGSF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgsf
+.endif
+
+.if !empty(LIBGSF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgsf
+BUILDLINK_DEPENDS.libgsf+=		libgsf>=1.8.2nb3
+BUILDLINK_PKGSRCDIR.libgsf?=		../../devel/libgsf
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.endif # LIBGSF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index c8411a7b090..9fd0841eff5 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/22 08:24:30 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/11 05:38:35 xtraeme Exp $
 #
 
 DISTNAME=	libwnck-2.4.0.1
@@ -14,7 +14,7 @@ COMMENT=	Library to write pagers and tasklists
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
@@ -22,8 +22,8 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	libwnck-1.0.pc.in
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../x11/startup-notification/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libwnck/buildlink3.mk b/devel/libwnck/buildlink3.mk
new file mode 100644
index 00000000000..937cea395cb
--- /dev/null
+++ b/devel/libwnck/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:38:35 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libwnck.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBWNCK_BUILDLINK3_MK:=	${LIBWNCK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libwnck
+.endif
+
+.if !empty(LIBWNCK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libwnck
+BUILDLINK_DEPENDS.libwnck+=		libwnck>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.libwnck?=		../../devel/libwnck
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # LIBWNCK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}