Split off gnome part of gdk-pixbuf into gdk-pixbuf-gnome package,

so that not all programs depending on gdk-pixbuf have to depend on
gnome-libs.

3 files changed, 43 insertions, 35 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 4008927ac32..451f89c6eb7 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,37 +1,18 @@
-# $NetBSD: Makefile,v 1.9 2000/11/26 19:55:39 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 2000/11/29 17:24:53 wiz Exp $
 #
+.include "Makefile.common"
 
-DISTNAME=		gdk-pixbuf-0.9.0
-CATEGORIES=		graphics devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
+PKGNAME=	${DISTNAME}nb1
 
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.gnome.org/
-
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		automake:../../devel/automake
-DEPENDS+=		gnome-libs>=1.0.53:../../x11/gnome-libs
-
-USE_GMAKE=		# defined
-USE_X11BASE=		# defined
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
-
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
-
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} automake
+post-patch:
+	${SED} "s/BUILD_CANVAS=yes/BUILD_CANVAS=no/g" \
+		${WRKSRC}/configure.in > ${WRKSRC}/.tmp \
+	&& ${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure.in
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
-		${LOCALBASE}/share/aclocal/libart.m4
+	${LN} -fs ${PREFIX}/share/aclocal/gdk-pixbuf.m4 \
+		${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
+	${RM} ${PREFIX}/lib/gnomecanvaspixbufConf.sh
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
new file mode 100644
index 00000000000..0f2ecacc05e
--- /dev/null
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile.common,v 1.1 2000/11/29 17:24:53 wiz Exp $
+#
+
+DISTNAME=		gdk-pixbuf-0.9.0
+CATEGORIES=		graphics devel
+MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
+
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		automake:../../devel/automake
+DEPENDS+=		png>=1.0.8:../../graphics/png
+DEPENDS+=		tiff>=3.5.5:../../graphics/tiff
+DEPENDS+=		jpeg-6b:../../graphics/jpeg
+
+USE_GMAKE=		# defined
+USE_X11BASE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+
+FILESDIR=		${.CURDIR}/../gdk-pixbuf/files
+PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
+
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} autoconf && ${SETENV} automake
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index ccf5f630083..48e1d9f5a0f 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2000/11/26 19:55:40 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/11/29 17:24:54 wiz Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
 include/gdk-pixbuf/gdk-pixbuf.h
-include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
@@ -35,16 +34,12 @@ lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
 lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
-lib/gnomecanvaspixbufConf.sh
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.la
 lib/libgdk_pixbuf.so.2.0
 lib/libgdk_pixbuf_xlib.a
 lib/libgdk_pixbuf_xlib.la
 lib/libgdk_pixbuf_xlib.so.2.0
-lib/libgnomecanvaspixbuf.a
-lib/libgnomecanvaspixbuf.la
-lib/libgnomecanvaspixbuf.so.1.0
 share/aclocal/gdk-pixbuf.m4
 share/gnome/html/gdk-pixbuf-decl.txt
 share/gnome/html/gdk-pixbuf-sections.txt