From 1f87f5d76c3748068f3ff77cc1bd58693d6ede16 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Tue, 10 Feb 2004 01:56:42 +0000 Subject: [PATCH] bl3ify --- devel/atk/Makefile | 10 +++++----- devel/atk/buildlink3.mk | 25 +++++++++++++++++++++++++ devel/glib2/Makefile | 12 ++++++------ devel/pango/Makefile | 14 +++++++------- devel/pango/buildlink3.mk | 27 +++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 18 deletions(-) create mode 100644 devel/atk/buildlink3.mk create mode 100644 devel/pango/buildlink3.mk diff --git a/devel/atk/Makefile b/devel/atk/Makefile index d9b0e199005d..5f27fffd77ee 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/22 08:24:28 grant Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/10 01:56:42 xtraeme Exp $ # DISTNAME= atk-1.4.1 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://developer.gnome.org/projects/gap/ COMMENT= Set of interfaces for accessibility -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes @@ -24,8 +24,8 @@ CONFIGURE_ARGS+= --with-html-dir="${LOCALBASE}/share/doc/html" # glib-mkenums overflows a 2048kb stack on atkobject.h UNLIMIT_RESOURCES= stacksize -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk new file mode 100644 index 000000000000..fa3ed35ece9c --- /dev/null +++ b/devel/atk/buildlink3.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 01:56:42 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use atk. +# +# This file was created automatically using createbuildlink-3.0. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +ATK_BUILDLINK3_MK:= ${ATK_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= atk +.endif + +.if !empty(ATK_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= atk +BUILDLINK_DEPENDS.atk?= atk>=1.4.1 +BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" + +.endif # ATK_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index d298d7d72328..933d80ea4de9 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/01/22 08:24:29 grant Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/10 01:56:42 xtraeme Exp $ DISTNAME= glib-2.2.3 PKGREVISION= 1 @@ -14,7 +14,7 @@ HOMEPAGE= http://www.gtk.org/docs/glib_toc.html COMMENT= Some useful routines for C programming BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_PERL5= yes @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --includedir=${PREFIX}/include/glib CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -.include "../../converters/libiconv/buildlink2.mk" +.include "../../converters/libiconv/buildlink3.mk" .if defined(ICONV_IS_GNU) CONFIGURE_ARGS+= --with-libiconv=gnu @@ -40,8 +40,8 @@ CONFIGURE_ARGS+= --with-libiconv=gnu TEST_TARGET= check -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 934c1c6e6c1e..54055be250c0 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2004/01/22 13:39:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2004/02/10 01:56:42 xtraeme Exp $ # DISTNAME= pango-1.2.5 @@ -13,7 +13,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.pango.org/ COMMENT= Library for layout and rendering of text -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make USE_X11= yes @@ -33,10 +33,10 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --with-qt=no -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/zlib/buildlink2.mk" -.include "../../fonts/Xft2/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pango/buildlink3.mk b/devel/pango/buildlink3.mk new file mode 100644 index 000000000000..c75483678288 --- /dev/null +++ b/devel/pango/buildlink3.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 01:56:42 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use pango. +# +# This file was created automatically using createbuildlink-3.0. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PANGO_BUILDLINK3_MK:= ${PANGO_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pango +.endif + +.if !empty(PANGO_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= pango +BUILDLINK_DEPENDS.pango?= pango>=1.2.5nb1 +BUILDLINK_PKGSRCDIR.pango?= ../../devel/pango + +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" + +.endif # PANGO_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}