Update to 0.9.0

5 files changed, 58 insertions, 43 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index c5b24c6f4149..90bfdbd3b736 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gdk-pixbuf
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 2924b6c34423..983f2546f476 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1 +1 @@
-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-ab b/graphics/gdk-pixbuf/files/patch-ab
index b6eed4679061..86f79f8be981 100644
--- a/graphics/gdk-pixbuf/files/patch-ab
+++ b/graphics/gdk-pixbuf/files/patch-ab
@@ -1,11 +1,7 @@
---- Makefile.in.orig	Sat Jan 22 17:28:45 2000
-+++ Makefile.in	Fri Jan 28 10:44:24 2000
-@@ -108,7 +108,7 @@
- 
- bin_SCRIPTS = gdk-pixbuf-config
+--- Makefile.in.orig	Sun Aug 27 18:48:23 2000
++++ Makefile.in	Mon Aug 28 10:14:58 2000
+@@ -109,3 +109,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
- confexec_DATA =  	gdk_pixbufConf.sh			gnomecanvaspixbufConf.sh
- 
- 
+ confexec_DATA =  	gdk_pixbufConf.sh			gdk_pixbuf_xlibConf.sh			gnomecanvaspixbufConf.sh
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index 3a9b5a1764ab..eac708432de8 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -1,79 +1,89 @@
---- gdk-pixbuf/Makefile.in.orig	Mon May 22 21:52:31 2000
-+++ gdk-pixbuf/Makefile.in	Fri Jul 14 16:11:07 2000
-@@ -119,63 +119,63 @@
+--- gdk-pixbuf/Makefile.in.orig	Sun Aug 27 18:48:25 2000
++++ gdk-pixbuf/Makefile.in	Mon Aug 28 10:23:26 2000
+@@ -121,64 +121,64 @@
+ # The PNG plugin.
  #
  libpixbufloader_png_la_SOURCES = io-png.c
- libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_png_la_LIBADD = $(LIBPNG)
++libpixbufloader_png_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The JPEG loader
  #
  libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
- libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
++libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The XPM loader
  #
  libpixbufloader_xpm_la_SOURCES = io-xpm.c
- libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_xpm_la_LIBADD = 
++libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The GIF loader
  #
  libpixbufloader_gif_la_SOURCES = io-gif.c
- libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_gif_la_LIBADD = 
++libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The ICO loader
  #
  libpixbufloader_ico_la_SOURCES = io-ico.c
- libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_ico_la_LIBADD = 
++libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The RAS loader
  #
  libpixbufloader_ras_la_SOURCES = io-ras.c
- libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_ras_la_LIBADD = 
++libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The TIFF loader
  #
  libpixbufloader_tiff_la_SOURCES = io-tiff.c
- libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
++libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The PNM loader
  #
  libpixbufloader_pnm_la_SOURCES = io-pnm.c
- libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_pnm_la_LIBADD = 
++libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The BMP loader
  #
  libpixbufloader_bmp_la_SOURCES = io-bmp.c
- libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
 -libpixbufloader_bmp_la_LIBADD = 
++libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
 +libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  @HAVE_PNG_TRUE@PNG_LIB = libpixbufloader-png.la
  
-@@ -212,16 +212,16 @@
+@@ -216,16 +216,16 @@
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
  
  LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist
index 44705f74047b..2408638b186b 100644
--- a/graphics/gdk-pixbuf/pkg-plist
+++ b/graphics/gdk-pixbuf/pkg-plist
@@ -1,40 +1,28 @@
 bin/gdk-pixbuf-config
 etc/gdk_pixbufConf.sh
+etc/gdk_pixbuf_xlibConf.sh
 etc/gnomecanvaspixbufConf.sh
-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/gdk-pixbuf/loaders/libpixbufloader-bmp.a
 lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so
-lib/gdk-pixbuf/loaders/libpixbufloader-bmp.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-gif.so
-lib/gdk-pixbuf/loaders/libpixbufloader-gif.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-ico.so
-lib/gdk-pixbuf/loaders/libpixbufloader-ico.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so
-lib/gdk-pixbuf/loaders/libpixbufloader-jpeg.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-png.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-png.so
-lib/gdk-pixbuf/loaders/libpixbufloader-png.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so
-lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-ras.so
-lib/gdk-pixbuf/loaders/libpixbufloader-ras.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so
-lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so.1
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.a 
 lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so
-lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so.1
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.so
 lib/libgdk_pixbuf.so.2
+lib/libgdk_pixbuf_xlib.a
+lib/libgdk_pixbuf_xlib.so
+lib/libgdk_pixbuf_xlib.so.2
 lib/libgnomecanvaspixbuf.a
 lib/libgnomecanvaspixbuf.so
 lib/libgnomecanvaspixbuf.so.1
@@ -44,6 +32,11 @@ 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
@@ -51,6 +44,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
@@ -58,8 +55,20 @@ 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
+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 share/gnome/html
 @dirrm include/gdk-pixbuf