Update gdk-pixbuf to 0.9.0. Changes from version 0.8.0:

* Integrated John Harper's patch to provide an Xlib-only version of
  gdk-pixbuf.  Now plain Xlib apps such as Sawfish can use gdk-pixbuf
  (John Harper, Federico).

* Animation bounding box fixes (Larry).

* Important error-handling fixes to the JPEG and PNG loaders (Michael,
  Larry).

* Miscellaneous build fixes (Darin, Frank, Mathieu).

* New flashy demo program of the scaling and compositing functions
  (Federico).

* New appendix in the programmer's documentation describing how to
  port applications from Imlib to gdk-pixbuf (Federico).

8 files changed, 64 insertions, 59 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index e5f7482b083..ee34ca4f0a8 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2000/07/05 23:59:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/10/17 23:59:59 jlam Exp $
 #
 
-DISTNAME=		gdk-pixbuf-0.8.0
-PKGNAME=		${DISTNAME}nb1
+DISTNAME=		gdk-pixbuf-0.9.0
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
 
@@ -11,23 +10,28 @@ HOMEPAGE=		http://www.gnome.org/
 
 DEPENDS+=		gnome-libs>=1.0.53:../../x11/gnome-libs
 
-GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
-CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+=		X11BASE="${X11BASE}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 .include "../../mk/bsd.prefs.mk"
 .if (${OBJECT_FMT} == "ELF")
-PLIST_SRC=	${PKGDIR}/PLIST.elf
+PLIST_SRC=		${PKGDIR}/PLIST.elf
 .endif
-PLIST_SRC+=	${PKGDIR}/PLIST.mi
+PLIST_SRC+=		${PKGDIR}/PLIST.mi
+
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+
+post-install:
+	${TEST} ${PREFIX} = ${LOCALBASE} || \
+	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
+		${LOCALBASE}/share/aclocal/libart.m4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gdk-pixbuf/files/md5 b/graphics/gdk-pixbuf/files/md5
index 4d8a01be1e0..62e4ac22eac 100644
--- a/graphics/gdk-pixbuf/files/md5
+++ b/graphics/gdk-pixbuf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/05/30 19:30:23 drochner Exp $
+$NetBSD: md5,v 1.3 2000/10/17 23:59:59 jlam Exp $
 
-MD5 (gdk-pixbuf-0.8.0.tar.gz) = 2933ed5874290b80ff8c4831917e74b7
+MD5 (gdk-pixbuf-0.9.0.tar.gz) = 7cdb44cfc573fb492f203fdf1d69908c
diff --git a/graphics/gdk-pixbuf/files/patch-sum b/graphics/gdk-pixbuf/files/patch-sum
index 98ee60e7b16..ecd89ab4ddc 100644
--- a/graphics/gdk-pixbuf/files/patch-sum
+++ b/graphics/gdk-pixbuf/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/07/10 21:28:07 tron Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/17 23:59:59 jlam Exp $
 
-MD5 (patch-aa) = d67fccc65a7b9b338a34ec71e2248f12
-MD5 (patch-ab) = 5d7e0db3e5be0b6b7acb8bed6463ca4f
-MD5 (patch-ac) = edd3e219956b5cfefffdf5005008de4e
+MD5 (patch-ac) = 45c4ab8ac8aa72de4971b689e38017c5
diff --git a/graphics/gdk-pixbuf/patches/patch-aa b/graphics/gdk-pixbuf/patches/patch-aa
deleted file mode 100644
index 702c09fbeb5..00000000000
--- a/graphics/gdk-pixbuf/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/01/02 15:08:16 rh Exp $
-
---- doc/Makefile.in.orig	Tue Nov  9 22:48:23 1999
-+++ doc/Makefile.in	Sun Jan  2 13:17:56 2000
-@@ -291,8 +291,6 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
- 	  echo '-- Fixing Crossreferences' ; \
- 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
- 	fi)
diff --git a/graphics/gdk-pixbuf/patches/patch-ab b/graphics/gdk-pixbuf/patches/patch-ab
deleted file mode 100644
index 5faba356078..00000000000
--- a/graphics/gdk-pixbuf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/05/30 19:31:51 drochner Exp $
-
---- ltconfig.orig	Sat May 27 23:25:42 2000
-+++ ltconfig	Sat May 27 23:26:02 2000
-@@ -1246,7 +1246,7 @@
-     *)
-       # ancient GNU ld didn't support --whole-archive et. al.
-       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-       else
-         whole_archive_flag_spec=
-       fi
diff --git a/graphics/gdk-pixbuf/patches/patch-ac b/graphics/gdk-pixbuf/patches/patch-ac
index 108fa94ce23..132e873088c 100644
--- a/graphics/gdk-pixbuf/patches/patch-ac
+++ b/graphics/gdk-pixbuf/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/07/10 21:28:08 tron Exp $
+$NetBSD: patch-ac,v 1.3 2000/10/18 00:00:00 jlam Exp $
 
---- gdk-pixbuf-config.in.orig	Tue Apr 11 03:56:56 2000
-+++ gdk-pixbuf-config.in	Thu Jul  6 15:32:03 2000
+--- gdk-pixbuf-config.in.orig	Mon Apr 10 21:56:56 2000
++++ gdk-pixbuf-config.in
 @@ -46,7 +46,7 @@
        ;;
      --libs)
        libdirs=-L@libdir@
 -      echo $libdirs -lgdk_pixbuf `gtk-config --libs`
-+      echo $libdirs -lgdk_pixbuf `gtk-config --libs` -ltiff -ljpeg -lz
++      echo $libdirs -lgdk_pixbuf `gtk-config --libs` @LIBTIFF@ @LIBJPEG@ @LIBPNG@
        ;;
      *)
        echo "${usage}" 1>&2
diff --git a/graphics/gdk-pixbuf/pkg/PLIST.elf b/graphics/gdk-pixbuf/pkg/PLIST.elf
index c5acea19154..0050301fa30 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST.elf
+++ b/graphics/gdk-pixbuf/pkg/PLIST.elf
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.elf,v 1.1 2000/07/05 23:49:30 hubertf Exp $
+@comment $NetBSD: PLIST.elf,v 1.2 2000/10/18 00:00:00 jlam Exp $
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1.0
@@ -26,3 +26,5 @@ lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1.0
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1.0
+@dirrm lib/gdk-pixbuf/loaders
+@dirrm lib/gdk-pixbuf
diff --git a/graphics/gdk-pixbuf/pkg/PLIST.mi b/graphics/gdk-pixbuf/pkg/PLIST.mi
index 6d9cfa4bec0..3417f5de9ec 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST.mi
+++ b/graphics/gdk-pixbuf/pkg/PLIST.mi
@@ -1,23 +1,34 @@
-@comment $NetBSD: PLIST.mi,v 1.1 2000/07/05 23:49:30 hubertf Exp $
+@comment $NetBSD: PLIST.mi,v 1.2 2000/10/18 00:00:00 jlam Exp $
 bin/gdk-pixbuf-config
-include/gdk-pixbuf/gdk-pixbuf.h
 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/libgdk_pixbuf.so.2.0
+lib/gdk_pixbufConf.sh
+lib/gdk_pixbuf_xlibConf.sh
+lib/gnomecanvaspixbufConf.sh
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.la
-lib/libgnomecanvaspixbuf.so.1.0
-lib/libgnomecanvaspixbuf.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/gdk_pixbufConf.sh
-lib/gnomecanvaspixbufConf.sh
+lib/libgnomecanvaspixbuf.la
+lib/libgnomecanvaspixbuf.so.1.0
 share/aclocal/gdk-pixbuf.m4
-share/gnome/html/gdk-pixbuf.html
-share/gnome/html/gdk-pixbuf.hierarchy
-share/gnome/html/gdk-pixbuf.types
 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
@@ -25,6 +36,10 @@ 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
@@ -32,9 +47,21 @@ 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/r14.html
+share/gnome/html/gdk-pixbuf/index.html
+share/gnome/html/gdk-pixbuf/license.html
 share/gnome/html/gdk-pixbuf/r15.html
-@dirrm include/gdk-pixbuf
-@dirrm lib/gdk-pixbuf/loaders
-@dirrm lib/gdk-pixbuf
+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
+@dirrm include/gdk-pixbuf
+@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gdk-pixbuf.m4 ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4
+@unexec test %D = ${LOCALBASE} || rm -f ${LOCALBASE}/share/aclocal/gdk-pixbuf.m4