Update to 0.10.1, which fixes quite a few bugs since 0.9.

8 files changed, 73 insertions, 62 deletions

diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 8796c020909..418a5663ac3 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2001/03/04 18:27:35 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/18 04:33:55 mjl Exp $
 
 .include "../gdk-pixbuf/Makefile.common"
 
-PKGNAME=	${DISTNAME:S/-0/-gnome-0/}nb2
+PKGNAME=	${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
 
 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.0nb2:../../graphics/gdk-pixbuf
+DEPENDS+=	gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
 
-CONFLICTS+=	gdk-pixbuf<0.9.0nb2
+CONFLICTS+=	gdk-pixbuf<0.10.1
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/gdk-pixbuf/gnome-canvas-pixbuf.h \
diff --git a/graphics/gdk-pixbuf-gnome/pkg/PLIST b/graphics/gdk-pixbuf-gnome/pkg/PLIST
index f9e8768de14..310023f5dd0 100644
--- a/graphics/gdk-pixbuf-gnome/pkg/PLIST
+++ b/graphics/gdk-pixbuf-gnome/pkg/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2001/03/04 18:27:35 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/03/18 04:33:55 mjl Exp $
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
-lib/libgnomecanvaspixbuf.a
-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
+lib/libgnomecanvaspixbuf.so.1
+lib/libgnomecanvaspixbuf.so
+lib/libgnomecanvaspixbuf.la
+lib/libgnomecanvaspixbuf.a
 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/a2605.html
 share/gnome/html/gdk-pixbuf/a3640.html
 share/gnome/html/gdk-pixbuf/a3652.html
@@ -25,8 +25,8 @@ 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-xlib-rendering.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
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 167d1e3e2de..7a7ddb455ac 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2001/03/04 18:27:34 tron Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/18 04:33:53 mjl Exp $
 #
 .include "Makefile.common"
 
-PKGNAME=	${DISTNAME}nb2
+PKGNAME=	${DISTNAME}
 
 COMMENT=	the GNOME image loading library
 
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 998e633f8c7..754fa4aafde 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2001/03/04 18:27:35 tron Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/03/18 04:33:53 mjl Exp $
 #
 
-DISTNAME=		gdk-pixbuf-0.9.0
+DISTNAME=		gdk-pixbuf-0.10.1
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
 
diff --git a/graphics/gdk-pixbuf/files/md5 b/graphics/gdk-pixbuf/files/md5
index 62e4ac22eac..d593d6ea0c4 100644
--- a/graphics/gdk-pixbuf/files/md5
+++ b/graphics/gdk-pixbuf/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/10/17 23:59:59 jlam Exp $
+$NetBSD: md5,v 1.4 2001/03/18 04:33:53 mjl Exp $
 
-MD5 (gdk-pixbuf-0.9.0.tar.gz) = 7cdb44cfc573fb492f203fdf1d69908c
+SHA1 (gdk-pixbuf-0.10.1.tar.gz) = d91342c6a13efcab572fc670ba7613c47dc42023
diff --git a/graphics/gdk-pixbuf/files/patch-sum b/graphics/gdk-pixbuf/files/patch-sum
index e37008da578..1dd699bfe6e 100644
--- a/graphics/gdk-pixbuf/files/patch-sum
+++ b/graphics/gdk-pixbuf/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/11/26 19:55:40 mycroft Exp $
+$NetBSD: patch-sum,v 1.7 2001/03/18 04:33:53 mjl Exp $
 
-MD5 (patch-ac) = 45c4ab8ac8aa72de4971b689e38017c5
-MD5 (patch-ad) = 8fea0d2fa7eb54517b42ddaab8248c8a
+SHA1 (patch-ac) = efeb07a327c866bee7ddddbd94a7fae214e4c4d8
+SHA1 (patch-ad) = 8841c915841c2ec71082a8894b12038b97bb2088
diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad
index bba43d51099..dc2ef46a105 100644
--- a/graphics/gdk-pixbuf/patches/patch-ad
+++ b/graphics/gdk-pixbuf/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/11/26 19:55:40 mycroft Exp $
+$NetBSD: patch-ad,v 1.2 2001/03/18 04:33:54 mjl Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Sat Aug 26 04:54:42 2000
-+++ gdk-pixbuf/Makefile.am	Sun Nov 26 19:24:09 2000
-@@ -24,63 +24,63 @@
+--- gdk-pixbuf/Makefile.am.orig	Thu Mar  1 00:05:34 2001
++++ gdk-pixbuf/Makefile.am	Sun Mar 18 04:57:50 2001
+@@ -24,70 +24,70 @@
  # The PNG plugin.
  #
  libpixbufloader_png_la_SOURCES = io-png.c
@@ -74,4 +74,12 @@ $NetBSD: patch-ad,v 1.1 2000/11/26 19:55:40 mycroft Exp $
 +libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
  libpixbufloader_bmp_la_LIBADD =
  
+ #
+ # The XBM loader
+ #
+ libpixbufloader_xbm_la_SOURCES = io-xbm.c
+-libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
+ libpixbufloader_xbm_la_LIBADD =
+ 
  if HAVE_PNG
diff --git a/graphics/gdk-pixbuf/pkg/PLIST b/graphics/gdk-pixbuf/pkg/PLIST
index 8fa2c9ba95c..80c9e9e6394 100644
--- a/graphics/gdk-pixbuf/pkg/PLIST
+++ b/graphics/gdk-pixbuf/pkg/PLIST
@@ -1,49 +1,52 @@
-@comment $NetBSD: PLIST,v 1.9 2001/03/04 18:27:35 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/03/18 04:33:54 mjl Exp $
 bin/gdk-pixbuf-config
-include/gdk-pixbuf/gdk-pixbuf-features.h
+include/gdk-pixbuf/gdk-pixbuf.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-xlib.h
 include/gdk-pixbuf/gdk-pixbuf-xlibrgb.h
-include/gdk-pixbuf/gdk-pixbuf.h
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.a
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.la
+lib/libgdk_pixbuf.so.2.0
+lib/libgdk_pixbuf.so.2
+lib/libgdk_pixbuf.so
+lib/libgdk_pixbuf.la
+lib/libgdk_pixbuf.a
+lib/libgdk_pixbuf_xlib.so.2.0
+lib/libgdk_pixbuf_xlib.so.2
+lib/libgdk_pixbuf_xlib.so
+lib/libgdk_pixbuf_xlib.la
+lib/libgdk_pixbuf_xlib.a
+lib/gdk-pixbuf/loaders/libpixbufloader-png.so
+lib/gdk-pixbuf/loaders/libpixbufloader-png.la
+lib/gdk-pixbuf/loaders/libpixbufloader-png.a
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.la
+lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.a
 lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.a
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.la
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.la
+lib/gdk-pixbuf/loaders/libpixbufloader-gif.a
 lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.a
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.la
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
-lib/gdk-pixbuf/loaders/libpixbufloader-png.a
-lib/gdk-pixbuf/loaders/libpixbufloader-png.la
-lib/gdk-pixbuf/loaders/libpixbufloader-png.so
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.a
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.la
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.a
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ico.a
 lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.a
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.la
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.la
+lib/gdk-pixbuf/loaders/libpixbufloader-ras.a
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.la
+lib/gdk-pixbuf/loaders/libpixbufloader-tiff.a
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-pnm.a
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.la
+lib/gdk-pixbuf/loaders/libpixbufloader-bmp.a
+lib/gdk-pixbuf/loaders/libpixbufloader-xbm.so
+lib/gdk-pixbuf/loaders/libpixbufloader-xbm.la
+lib/gdk-pixbuf/loaders/libpixbufloader-xbm.a
 lib/gdk_pixbufConf.sh
 lib/gdk_pixbuf_xlibConf.sh
-lib/libgdk_pixbuf.a
-lib/libgdk_pixbuf.la
-lib/libgdk_pixbuf.so
-lib/libgdk_pixbuf.so.2
-lib/libgdk_pixbuf.so.2.0
-lib/libgdk_pixbuf_xlib.a
-lib/libgdk_pixbuf_xlib.la
-lib/libgdk_pixbuf_xlib.so
-lib/libgdk_pixbuf_xlib.so.2
-lib/libgdk_pixbuf_xlib.so.2.0
 share/aclocal/gdk-pixbuf.m4
 @dirrm lib/gdk-pixbuf/loaders
 @dirrm lib/gdk-pixbuf