Move documentation from "gdk-pixbuf" to "gdk-pixbuf-gnome" package because

the documentation is part of the GNOME documentation. Bump version number
of both packages to "0.9.0nb2".

5 files changed, 72 insertions, 62 deletions

diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index fb7288e42f1..8796c020909 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,21 +1,26 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:20 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2001/03/04 18:27:35 tron Exp $
+
 .include "../gdk-pixbuf/Makefile.common"
 
-PKGNAME=	${DISTNAME:S/-0/-gnome-0/}nb1
+PKGNAME=	${DISTNAME:S/-0/-gnome-0/}nb2
 
 COMMENT=	the GNOME image loading library GNOME canvas support add-on
 
 DEPENDS+=	gnome-libs>=1.0.53:../../x11/gnome-libs
-DEPENDS+=	gdk-pixbuf>=0.9.0nb1:../../graphics/gdk-pixbuf
+DEPENDS+=	gdk-pixbuf>=0.9.0nb2:../../graphics/gdk-pixbuf
+
+CONFLICTS+=	gdk-pixbuf<0.9.0nb2
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
-		 ${PREFIX}/include/gdk-pixbuf
+	  ${PREFIX}/include/gdk-pixbuf
 	${INSTALL_DATA} ${WRKSRC}/gnomecanvaspixbufConf.sh \
-		 ${PREFIX}/lib
+	  ${PREFIX}/lib
 	cd ${WRKSRC}/gdk-pixbuf && \
-		${SH} ../libtool  --mode=install ${INSTALL_DATA} \
-			libgnomecanvaspixbuf.la ${PREFIX}/lib
+	${SH} ../libtool --mode=install ${INSTALL_DATA} \
+	  libgnomecanvaspixbuf.la ${PREFIX}/lib
+	cd ${WRKSRC}/doc && \
+	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} \
+	  ${INSTALL_TARGET}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf-gnome/pkg/PLIST b/graphics/gdk-pixbuf-gnome/pkg/PLIST
index c6e16b622c0..f9e8768de14 100644
--- a/graphics/gdk-pixbuf-gnome/pkg/PLIST
+++ b/graphics/gdk-pixbuf-gnome/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/03/04 18:27:35 tron Exp $
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.a
@@ -6,3 +6,46 @@ lib/libgnomecanvaspixbuf.la
 lib/libgnomecanvaspixbuf.so
 lib/libgnomecanvaspixbuf.so.1
 lib/libgnomecanvaspixbuf.so.1.0
+share/gnome/html/gdk-pixbuf-decl.txt
+share/gnome/html/gdk-pixbuf-sections.txt
+share/gnome/html/gdk-pixbuf.hierarchy
+share/gnome/html/gdk-pixbuf.html
+share/gnome/html/gdk-pixbuf.types
+share/gnome/html/gdk-pixbuf/a2605.html
+share/gnome/html/gdk-pixbuf/a3640.html
+share/gnome/html/gdk-pixbuf/a3652.html
+share/gnome/html/gdk-pixbuf/a3694.html
+share/gnome/html/gdk-pixbuf/a3716.html
+share/gnome/html/gdk-pixbuf/book1.html
+share/gnome/html/gdk-pixbuf/compiling.html
+share/gnome/html/gdk-pixbuf/extra-configuration-options.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-animation.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-creating.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-from-drawables.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-rendering.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-scaling.html
+share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html
+share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
+share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
+share/gnome/html/gdk-pixbuf/index.html
+share/gnome/html/gdk-pixbuf/license.html
+share/gnome/html/gdk-pixbuf/r15.html
+share/gnome/html/gdk-pixbuf/r27.html
+share/gnome/html/gdk-pixbuf/x2624.html
+share/gnome/html/gdk-pixbuf/x2676.html
+share/gnome/html/gdk-pixbuf/x3659.html
+share/gnome/html/gdk-pixbuf/x3671.html
+share/gnome/html/gdk-pixbuf/x3711.html
+share/gnome/html/gdk-pixbuf/x3713.html
+share/gnome/html/gdk-pixbuf/x3723.html
+share/gnome/html/gdk-pixbuf/x3735.html
+share/gnome/html/gdk-pixbuf/x3765.html
+share/gnome/html/gdk-pixbuf/x3787.html
+@dirrm share/gnome/html/gdk-pixbuf
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index e46c6ba9581..167d1e3e2de 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:22:20 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/04 18:27:34 tron Exp $
 #
 .include "Makefile.common"
 
-PKGNAME=	${DISTNAME}nb1
+PKGNAME=	${DISTNAME}nb2
 
 COMMENT=	the GNOME image loading library
 
 post-patch:
-	${SED} "s/BUILD_CANVAS=yes/BUILD_CANVAS=no/g" \
-		${WRKSRC}/configure.in > ${WRKSRC}/.tmp \
-	&& ${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure.in
+	${SED} -e 's/BUILD_CANVAS=yes/BUILD_CANVAS=no/g' \
+	  ${WRKSRC}/configure.in >${WRKSRC}/.tmp && \
+	${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure.in
+
+post-configure:
+	${SED} -e 's/ doc$$//' ${WRKSRC}/Makefile >${WRKSRC}/.tmp && \
+	${MV} ${WRKSRC}/.tmp ${WRKSRC}/Makefile
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index b426b27be0f..998e633f8c7 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2001/02/26 17:01:59 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2001/03/04 18:27:35 tron Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.9.0
@@ -24,12 +24,13 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+M4=			${LOCALBASE}/bin/gm4
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 FILESDIR=		${.CURDIR}/../gdk-pixbuf/files
 PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
 
 pre-configure:
-	cd ${WRKSRC}							\
-		&& ${SETENV} ${LOCALBASE}/bin/autoconf			\
-		&& ${SETENV} ${LOCALBASE}/bin/automake
+	cd ${WRKSRC} && \
+	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoconf && \
+	${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/automake
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index 081d32a472a..8fa2c9ba95c 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/03/04 18:27:35 tron Exp $
 bin/gdk-pixbuf-config
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
@@ -45,49 +45,6 @@ lib/libgdk_pixbuf_xlib.so
 lib/libgdk_pixbuf_xlib.so.2
 lib/libgdk_pixbuf_xlib.so.2.0
 share/aclocal/gdk-pixbuf.m4
-share/gnome/html/gdk-pixbuf-decl.txt
-share/gnome/html/gdk-pixbuf-sections.txt
-share/gnome/html/gdk-pixbuf.hierarchy
-share/gnome/html/gdk-pixbuf.html
-share/gnome/html/gdk-pixbuf.types
-share/gnome/html/gdk-pixbuf/a2605.html
-share/gnome/html/gdk-pixbuf/a3640.html
-share/gnome/html/gdk-pixbuf/a3652.html
-share/gnome/html/gdk-pixbuf/a3694.html
-share/gnome/html/gdk-pixbuf/a3716.html
-share/gnome/html/gdk-pixbuf/book1.html
-share/gnome/html/gdk-pixbuf/compiling.html
-share/gnome/html/gdk-pixbuf/extra-configuration-options.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-animation.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-creating.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-file-loading.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-from-drawables.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-from-drawables.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-init.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rendering.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-xlib-rgb.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-rendering.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-scaling.html
-share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html
-share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
-share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
-share/gnome/html/gdk-pixbuf/index.html
-share/gnome/html/gdk-pixbuf/license.html
-share/gnome/html/gdk-pixbuf/r15.html
-share/gnome/html/gdk-pixbuf/r27.html
-share/gnome/html/gdk-pixbuf/x2624.html
-share/gnome/html/gdk-pixbuf/x2676.html
-share/gnome/html/gdk-pixbuf/x3659.html
-share/gnome/html/gdk-pixbuf/x3671.html
-share/gnome/html/gdk-pixbuf/x3711.html
-share/gnome/html/gdk-pixbuf/x3713.html
-share/gnome/html/gdk-pixbuf/x3723.html
-share/gnome/html/gdk-pixbuf/x3735.html
-share/gnome/html/gdk-pixbuf/x3765.html
-share/gnome/html/gdk-pixbuf/x3787.html
-@unexec rmdir -p %D/share/gnome/html/gdk-pixbuf 2>/dev/null || true
 @dirrm lib/gdk-pixbuf/loaders
 @dirrm lib/gdk-pixbuf
 @dirrm include/gdk-pixbuf