diff options
| author | jlam <jlam> | 2002-08-28 15:49:04 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-28 15:49:04 +0000 |
| commit | ce13d2f11e9ebe8288fe188a31aa78022d2e8cc5 (patch) | |
| tree | 490e64bb0aabf3f0badbcae41aed871953b6d1f4 /graphics | |
| parent | 6ec0a07e33d476a9bd1acbfe5b6ca5a5fc3b43a9 (diff) | |
| download | pkgsrc-ce13d2f11e9ebe8288fe188a31aa78022d2e8cc5.tar.gz | |
Convert gdk-pixbuf-gnome from buildlink1 to buildlink2, and remove the
special buildlink1 handling in the common Makefile.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gdk-pixbuf-gnome/Makefile | 11 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/Makefile.common | 9 |
2 files changed, 7 insertions, 13 deletions
diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile index ec37562875d..7a5aecbf8a6 100644 --- a/graphics/gdk-pixbuf-gnome/Makefile +++ b/graphics/gdk-pixbuf-gnome/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.16 2002/08/25 19:22:47 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2002/08/28 15:49:06 jlam Exp $ PKGNAME= ${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/} COMMENT= the GNOME image loading library GNOME canvas support add-on CONFLICTS+= gdk-pixbuf<0.10.1 -USE_BUILDLINK_ONLY= # defined +USE_X11= # defined +USE_BUILDLINK2= # defined BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1 .include "../gdk-pixbuf/Makefile.common" @@ -22,7 +23,7 @@ do-install: ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \ ${INSTALL_TARGET} -.include "../../graphics/gdk-pixbuf/buildlink.mk" -.include "../../x11/gnome-libs/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.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 90450caa633..144feb11c94 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2002/08/25 18:39:03 jlam Exp $ +# $NetBSD: Makefile.common,v 1.25 2002/08/28 15:49:04 jlam Exp $ # DISTNAME= gdk-pixbuf-0.17.0 @@ -32,14 +32,7 @@ pre-configure: ${LOCALBASE}/bin/automake -a --foreign -i; \ ${LOCALBASE}/bin/autoconf -.if defined(USE_BUILDLINK2) .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" -.else -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/tiff/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.endif |