bl3ify

21 files changed, 298 insertions, 107 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index e9946d12d8a..60aa7b1b50d 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/10 11:52:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/11 05:03:41 xtraeme Exp $
 #
 
 DISTNAME=	file-roller-2.4.4
@@ -17,7 +17,7 @@ DEPENDS+=		unzip>=5.50nb2:../../archivers/unzip
 DEPENDS+=		zip>=2.3nb2:../../archivers/zip
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
@@ -37,12 +37,12 @@ PREFIX.zip_DEFAULT=	${LOCALBASE}
 CPPFLAGS+=		-DFILEROLLER_ZIP=\"\\\"${PREFIX.zip}/bin/zip\\\"\"
 
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/libgnome/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 3a9730c9b93..e87edf9989f 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2004/01/22 08:02:16 grant Exp $
+# $NetBSD: Makefile.common,v 1.15 2004/02/11 05:28:58 xtraeme Exp $
 #
 
 DISTNAME?=		libgda-1.0.0
@@ -12,7 +12,7 @@ HOMEPAGE?=		http://www.gnome-db.org/
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -27,9 +27,9 @@ PKG_SYSCONFSUBDIR=	libgda
 EGDIR=			${PREFIX}/share/examples/libgda
 CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
 
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/libxslt/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
new file mode 100644
index 00000000000..96caaabedf2
--- /dev/null
+++ b/databases/libgda/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgda.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgda
+.endif
+
+.if !empty(LIBGDA_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgda
+BUILDLINK_DEPENDS.libgda+=		libgda>=0.99.0nb1
+BUILDLINK_PKGSRCDIR.libgda?=		../../databases/libgda
+
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+
+.endif # LIBGDA_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index d429c45f89c..d5c9e0e8264 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/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:28:58 xtraeme Exp $
 #
 
 DISTNAME=		libgnomedb-1.0.0
@@ -17,7 +17,7 @@ DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
@@ -29,13 +29,13 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 GCONF2_SCHEMAS=		libgnomedb.schemas
 
-.include "../../databases/libgda/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../databases/libgda/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libbonoboui/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
new file mode 100644
index 00000000000..b275c01ee7f
--- /dev/null
+++ b/databases/libgnomedb/buildlink3.mk
@@ -0,0 +1,29 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:28:58 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgnomedb.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgnomedb
+.endif
+
+.if !empty(LIBGNOMEDB_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgnomedb
+BUILDLINK_DEPENDS.libgnomedb+=		libgnomedb>=1.0.0nb5
+BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
+
+.include "../../databases/libgda/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # LIBGNOMEDB_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
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/+$//}
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index a45b4312e70..f1ae7424ff6 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 05:07:12 xtraeme Exp $
 #
 
 DISTNAME=		gconf-editor-2.4.0
@@ -14,12 +14,12 @@ COMMENT=		Editor for the GConf configuration system
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ccb5872372f..4868ac3fea5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/11 05:15:40 xtraeme Exp $
 #
 
 DISTNAME=		gedit-2.4.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_PERL5=		build
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
@@ -28,12 +28,12 @@ GCONF2_SCHEMAS=		gedit.schemas
 CONFIGURE_ARGS+=	--enable-schemas-install
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/eel2/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../textproc/aspell/buildlink2.mk"
-.include "../../x11/gtksourceview/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/aspell/buildlink3.mk"
+.include "../../x11/gtksourceview/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index dd6309a92b7..91eea63a349 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/11 04:58:15 xtraeme Exp $
 #
 
 DISTNAME=	eog-2.5.1
@@ -17,24 +17,24 @@ DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS= 	eog.schemas
 
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/eel2/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/libbonoboui/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../sysutils/gnome-vfs2/buildlink2.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../print/libgnomeprint/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
+.include "../../devel/eel2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 512cc0d77ff..8c2edd0f93d 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/23 12:18:54 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/11 04:58:15 xtraeme Exp $
 
 DISTNAME=	libexif-0.5.12
 PKGREVISION=	1
@@ -9,12 +9,12 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://libexif.sourceforge.net/
 COMMENT=	EXIF file library
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	libexif/libexif.pc.in
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk
new file mode 100644
index 00000000000..3e00fb2b0bc
--- /dev/null
+++ b/graphics/libexif/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 04:58:15 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libexif.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBEXIF_BUILDLINK3_MK:=	${LIBEXIF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libexif
+.endif
+
+.if !empty(LIBEXIF_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libexif
+BUILDLINK_DEPENDS.libexif+=		libexif>=0.5.12
+BUILDLINK_PKGSRCDIR.libexif?=		../../graphics/libexif
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+.endif # LIBEXIF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 050ada7f1d9..da4a00fd1ba 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/11 05:05:39 xtraeme Exp $
 #
 
 DISTNAME=		gcalctool-4.3.38
@@ -15,18 +15,18 @@ BUILD_USES_MSGFMT=	YES
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_PKGLOCALEDIR=	yes
 
 GCONF2_SCHEMAS=		gcalctool.schemas
 
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libgnome/buildlink2.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
+.include "../../devel/libgnome/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 955fa1cadc0..3c127ae7959 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/11 05:20:54 xtraeme Exp $
 #
 
 DISTNAME=		ggv-2.4.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_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
@@ -25,9 +25,9 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GCONF2_SCHEMAS= 	ggv.schemas
 
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../print/libgnomeprintui/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libgnomeui/buildlink2.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 7c02b310a91..eb1b823d6d6 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/02/09 00:48:07 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/11 05:41:22 xtraeme Exp $
 #
 
 DISTNAME=	metacity-2.6.3
@@ -14,7 +14,7 @@ COMMENT=	GNOME-compliant window manager
 BUILD_USES_MSGFMT=	YES
 DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
@@ -27,10 +27,10 @@ PKGCONFIG_OVERRIDE=	${WRKSRC}/src/libmetacity-private.pc.in
 GCONF2_SCHEMAS=		metacity.schemas
 
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../net/ORBit2/buildlink2.mk"
-.include "../../x11/startup-notification/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
new file mode 100644
index 00000000000..f6ba0d0a16e
--- /dev/null
+++ b/wm/metacity/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:41:22 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use metacity.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	metacity
+.endif
+
+.if !empty(METACITY_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			metacity
+BUILDLINK_DEPENDS.metacity+=		metacity>=2.6.3nb1
+BUILDLINK_PKGSRCDIR.metacity?=		../../wm/metacity
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+
+.endif # METACITY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index b39b44d2181..6fc3437a695 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/07 15:21:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/11 05:11:07 xtraeme Exp $
 #
 
 DISTNAME=	gtksourceview-0.7.0
@@ -13,7 +13,7 @@ COMMENT=	Text widget that extends GTK2's GtkTextView widget
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
@@ -26,11 +26,11 @@ CONFIGURE_ARGS=		--disable-build-tests
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../print/libgnomeprint/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtksourceview/buildlink3.mk b/x11/gtksourceview/buildlink3.mk
new file mode 100644
index 00000000000..88d8fbe50e2
--- /dev/null
+++ b/x11/gtksourceview/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:11:07 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gtksourceview.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GTKSOURCEVIEW_BUILDLINK3_MK:=	${GTKSOURCEVIEW_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gtksourceview
+.endif
+
+.if !empty(GTKSOURCEVIEW_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gtksourceview
+BUILDLINK_DEPENDS.gtksourceview+=		gtksourceview>=0.7.0nb8
+BUILDLINK_PKGSRCDIR.gtksourceview?=		../../x11/gtksourceview
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # GTKSOURCEVIEW_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}