bl3ify

4 files changed, 91 insertions, 23 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index e2010d99e77..7c3bd711ca3 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/11 02:34:55 xtraeme Exp $
 #
 
 DISTNAME=	libgnomeprint-2.4.2
@@ -13,14 +13,14 @@ COMMENT=	Library for the GNOME2 Printing Architecture
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-BUILDLINK_DEPENDS.freetype2=	freetype2>=2.1.4
+BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.4
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgnomeprint/libgnomeprint-2.2.pc.in
@@ -31,8 +31,9 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=		USE_CUPS
+
 .if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-.include "../../print/cups/buildlink2.mk"
+.include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-cups
 PLIST_SUBST+=		USE_CUPS=
 .else
@@ -46,11 +47,11 @@ PLIST_SUBST+=		USE_CUPS="@comment "
 CONFIGURE_ENV+=		libltdl_cv_shlibext=so
 .endif
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/pango/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
new file mode 100644
index 00000000000..8c2318a03b9
--- /dev/null
+++ b/print/libgnomeprint/buildlink3.mk
@@ -0,0 +1,35 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgnomeprint.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgnomeprint
+.endif
+
+.if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgnomeprint
+BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.4.2nb1
+BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.  if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
+.    include "../../print/cups/buildlink3.mk"
+.  endif
+
+.endif # LIBGNOMEPRINT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 53815544fe4..169d48b4b4e 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/02/11 02:34:55 xtraeme Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.4.2
@@ -14,7 +14,7 @@ COMMENT=	Graphical library for the GNOME2 Printing Architecture
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
@@ -26,14 +26,14 @@ PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.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/pkgconfig/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/libart2/buildlink2.mk"
-.include "../../graphics/libgnomecanvas/buildlink2.mk"
-.include "../../print/libgnomeprint/buildlink2.mk"
-.include "../../textproc/libxml2/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/pkgconfig/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
new file mode 100644
index 00000000000..8ea2a5c9c3d
--- /dev/null
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -0,0 +1,32 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 02:34:55 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libgnomeprintui.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBGNOMEPRINTUI_BUILDLINK3_MK:=	${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libgnomeprintui
+.endif
+
+.if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libgnomeprintui
+BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.4.2nb1
+BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../print/libgnomeprint/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.endif # LIBGNOMEPRINTUI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}