diff options
-rw-r--r-- | graphics/librsvg2-gtk2/Makefile | 4 | ||||
-rw-r--r-- | graphics/librsvg2/Makefile | 20 | ||||
-rw-r--r-- | graphics/librsvg2/Makefile.common | 6 | ||||
-rw-r--r-- | graphics/librsvg2/buildlink3.mk | 32 | ||||
-rw-r--r-- | textproc/libcroco/Makefile | 14 | ||||
-rw-r--r-- | textproc/libcroco/buildlink3.mk | 27 | ||||
-rw-r--r-- | x11/eterm/Makefile | 12 |
7 files changed, 87 insertions, 28 deletions
diff --git a/graphics/librsvg2-gtk2/Makefile b/graphics/librsvg2-gtk2/Makefile index edf9599e220..d257c05ad63 100644 --- a/graphics/librsvg2-gtk2/Makefile +++ b/graphics/librsvg2-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/11 06:22:08 xtraeme Exp $ # .include "../../graphics/librsvg2/Makefile.common" @@ -14,6 +14,6 @@ INSTALL_DIRS= ${WRKSRC}/gtk-engine ${WRKSRC}/gdk-pixbuf-loader GTK2_LOADERS= YES -.include "../../graphics/librsvg2/buildlink2.mk" +.include "../../graphics/librsvg2/buildlink3.mk" .include "../../x11/gtk2/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 9ba12774038..3544f6d533d 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/11 06:22:08 xtraeme Exp $ # .include "Makefile.common" @@ -8,13 +8,13 @@ PKGREVISION= 6 CONFIGURE_ARGS+= --disable-pixbuf-loader -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../graphics/libart2/buildlink2.mk" -.include "../../textproc/libxml2/buildlink2.mk" -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/libgsf/buildlink2.mk" -.include "../../devel/pango/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/popt/buildlink2.mk" -.include "../../textproc/libcroco/buildlink2.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libart2/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgsf/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../textproc/libcroco/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common index 5bf929461f2..e45315bc65f 100644 --- a/graphics/librsvg2/Makefile.common +++ b/graphics/librsvg2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2004/01/22 12:43:10 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2004/02/11 06:22:08 xtraeme Exp $ # DISTNAME= librsvg-2.5.0 @@ -13,7 +13,7 @@ COMMENT= SVG library for GNOME2 DISTINFO_FILE= ${.CURDIR}/../../graphics/librsvg2/distinfo PATCHDIR= ${.CURDIR}/../../graphics/librsvg2/patches -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -24,4 +24,4 @@ CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --with-gimp=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/librsvg2 -.include "../../x11/gtk2/buildlink2.mk" +.include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/librsvg2/buildlink3.mk b/graphics/librsvg2/buildlink3.mk new file mode 100644 index 00000000000..40534bcd5e6 --- /dev/null +++ b/graphics/librsvg2/buildlink3.mk @@ -0,0 +1,32 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:22:08 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use librsvg2. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBRSVG2_BUILDLINK3_MK:= ${LIBRSVG2_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= librsvg2 +.endif + +.if !empty(LIBRSVG2_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= librsvg2 +BUILDLINK_DEPENDS.librsvg2+= librsvg2>=2.5.0nb4 +BUILDLINK_PKGSRCDIR.librsvg2?= ../../graphics/librsvg2 + +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/libart2/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgsf/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../textproc/libcroco/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" + +.endif # LIBRSVG2_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 885836bf515..9436b2382ee 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2004/02/11 06:18:33 xtraeme Exp $ # DISTNAME= libcroco-0.4.0 @@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.freespiders.org/projects/libcroco/ COMMENT= Toolkit to parse and manipulate CSS (Cascading Style Sheets) -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_X11= yes @@ -23,9 +23,9 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcroco.pc.in CONFIGURE_ARGS+= --enable-seleng=yes CONFIGURE_ARGS+= --enable-layeng=yes -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../devel/pango/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../textproc/libxml2/buildlink2.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk new file mode 100644 index 00000000000..7d81a95668d --- /dev/null +++ b/textproc/libcroco/buildlink3.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 06:18:33 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use libcroco. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBCROCO_BUILDLINK3_MK:= ${LIBCROCO_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= libcroco +.endif + +.if !empty(LIBCROCO_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libcroco +BUILDLINK_DEPENDS.libcroco+= libcroco>=0.4.0 +BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco + +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/pango/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" + +.endif # LIBCROCO_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index e277403efd2..a72f6433b0c 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2004/01/11 19:41:39 cjep Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/11 06:12:20 xtraeme Exp $ # DISTNAME= Eterm-0.9.2 PKGNAME= ${DISTNAME:S/^E/e/} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eterm/} \ ftp://ftp.dti.ad.jp/pub/X/Eterm/ @@ -22,9 +22,9 @@ ETERM_SRCS= ${DISTNAME}${EXTRACT_SUFX} PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ Eterm-bg-tile.tar.gz -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES -USE_X11BASE= YES +USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES @@ -58,7 +58,7 @@ post-extract: ${PAX} -O -zrf ${DISTDIR}/$$f; \ done -.include "../../devel/libast/buildlink2.mk" -.include "../../graphics/imlib2/buildlink2.mk" +.include "../../devel/libast/buildlink3.mk" +.include "../../graphics/imlib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |