bl3ify

3 files changed, 45 insertions, 14 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 9cec9dae2ed..5342258e932 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.41 2004/02/10 02:04:54 xtraeme Exp $
 #
 
 DISTNAME=		gtk+-2.2.4
@@ -15,7 +15,7 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		The GIMP Toolkit - libraries for building X11 user interfaces
 
 BUILD_USES_MSGFMT=	yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
@@ -44,14 +44,14 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/engines
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/modules
 
-.include "../../devel/atk/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/pango/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
new file mode 100644
index 00000000000..27ea7df2efb
--- /dev/null
+++ b/x11/gtk2/buildlink3.mk
@@ -0,0 +1,31 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 02:04:54 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use gtk2+.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GTK2+_BUILDLINK3_MK:=	${GTK2+_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gtk2+
+.endif
+
+.if !empty(GTK2+_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gtk2+
+BUILDLINK_DEPENDS.gtk2+?=		gtk2+>=2.2.4nb3
+BUILDLINK_PKGSRCDIR.gtk2+?=		../../x11/gtk2
+
+.include "../../devel/atk/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+
+.endif # GTK2+_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk2/modules.mk b/x11/gtk2/modules.mk
index 122096c9b11..52705bb83f0 100644
--- a/x11/gtk2/modules.mk
+++ b/x11/gtk2/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.3 2004/01/26 14:59:46 jmmv Exp $
+# $NetBSD: modules.mk,v 1.4 2004/02/10 02:04:54 xtraeme Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -33,7 +33,7 @@ DEINSTALL_EXTRA_TMPL+=	../../x11/gtk2/files/loaders.tmpl
 USE_PKGINSTALL=		YES
 .endif
 
-USE_BUILDLINK2=		YES
-.include "../../x11/gtk2/buildlink2.mk"
+USE_BUILDLINK3=		YES
+.include "../../x11/gtk2/buildlink3.mk"
 
 .endif			# GTK2_MODULES_MK