diff options
author | jlam <jlam> | 2004-02-15 12:47:35 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-02-15 12:47:35 +0000 |
commit | 6b829a371cff5e13b9c984951390c31c0a701ca0 (patch) | |
tree | 3bc0ad62a785bfde20997b72bb7bbe45c89cc6e6 /graphics | |
parent | 78dfcaacddf0edfc1f3f2a29e99a8a59bad400fa (diff) | |
download | pkgsrc-6b829a371cff5e13b9c984951390c31c0a701ca0.tar.gz |
bl3ify
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gdk-pixbuf-gnome/Makefile | 15 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/Makefile.common | 13 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/buildlink3.mk | 21 |
3 files changed, 34 insertions, 15 deletions
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile index ffde5e91831..c82b61bc7ec 100644 --- a/graphics/gdk-pixbuf-gnome/Makefile +++ b/graphics/gdk-pixbuf-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/01/03 18:49:42 reed Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/15 12:47:35 jlam Exp $ .include "../../graphics/gdk-pixbuf/Makefile.common" @@ -8,12 +8,14 @@ COMMENT= The GNOME image loading library GNOME canvas support add-on CONFLICTS+= gdk-pixbuf<0.10.1 -USE_X11= # defined -# don't enable the next line -- else the package will conflict -# with gtk2! -# CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +# Don't enable the next line or we'll conflict with gtk2! +#CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html + CONFIGURE_ARGS+= --enable-gtk-doc=no +.include "../../graphics/gdk-pixbuf/buildlink3.mk" +.include "../../x11/gnome-libs/buildlink3.mk" + do-install: ${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \ ${PREFIX}/include/gdk-pixbuf-1.0/gdk-pixbuf @@ -26,7 +28,4 @@ do-install: ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \ ${INSTALL_TARGET} -.include "../../graphics/gdk-pixbuf/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index a8f87798bb6..dcb3448ed6e 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,5 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2004/02/14 17:21:41 jlam Exp $ -# +# $NetBSD: Makefile.common,v 1.36 2004/02/15 12:47:35 jlam Exp $ DISTNAME= gdk-pixbuf-${VER}.0 PKGREVISION= 1 @@ -12,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/ VER= 0.22 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_X11BASE= YES USE_LIBTOOL= YES @@ -26,7 +25,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} DISTINFO_FILE= ${.CURDIR}/../gdk-pixbuf/distinfo PATCHDIR= ${.CURDIR}/../gdk-pixbuf/patches -.include "../../graphics/jpeg/buildlink2.mk" -.include "../../graphics/png/buildlink2.mk" -.include "../../graphics/tiff/buildlink2.mk" -.include "../../x11/gtk/buildlink2.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../x11/gtk/buildlink3.mk" diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk new file mode 100644 index 00000000000..93412e3cb61 --- /dev/null +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -0,0 +1,21 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/15 12:47:35 jlam Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GDK_PIXBUF_BUILDLINK3_MK:= ${GDK_PIXBUF_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gdk-pixbuf +.endif + +.if !empty(GDK_PIXBUF_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gdk-pixbuf +BUILDLINK_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 +BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf + +. include "../../graphics/jpeg/buildlink3.mk" +. include "../../graphics/png/buildlink3.mk" +. include "../../graphics/tiff/buildlink3.mk" +. include "../../x11/gtk/buildlink3.mk" +.endif # GDK_PIXBUF_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |