Update to 0.7.0

5 files changed, 50 insertions, 31 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 52fc9112d68e..bad6c65b1826 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gdk-pixbuf
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/gdk-pixbuf
+MASTER_SITE_SUBDIR=	unstable/sources/gdk-pixbuf
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 54d5de90bf89..745400f6ea6c 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1 +1 @@
-MD5 (gdk-pixbuf-0.6.0.tar.gz) = 9e9d0312d24280731ba05a6c0bdc1689
+MD5 (gdk-pixbuf-0.7.0.tar.gz) = 546ab59b3c56b83a76a511456a341303
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index 34be74f14b74..975a032330f4 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -1,21 +1,21 @@
---- gdk-pixbuf/Makefile.in.orig	Mon Feb 21 18:25:11 2000
-+++ gdk-pixbuf/Makefile.in	Mon Feb 21 23:55:30 2000
-@@ -216,14 +216,14 @@
+--- gdk-pixbuf/Makefile.in.orig	Wed Apr 12 21:00:11 2000
++++ gdk-pixbuf/Makefile.in	Thu Apr 13 11:39:26 2000
+@@ -211,14 +211,14 @@
  AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
  
- LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
--@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
--@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS)
-+@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS)
+ LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
+-@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule
+-@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
++@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) -lgmodule12
++@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
  @INSIDE_GNOME_LIBS_TRUE@testpixbuf_drawable_LDADD = $(LDADDS)
  @INSIDE_GNOME_LIBS_FALSE@testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
  @INSIDE_GNOME_LIBS_TRUE@testpixbuf_scale_LDADD = $(LDADDS)
  @INSIDE_GNOME_LIBS_FALSE@testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
--@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) $(LIBART_LIBS) -lgmodule
--@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
-+@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) $(LIBART_LIBS)
-+@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS)
+-@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule
+-@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
++@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule12
++@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule12
  
- GDK_PIXBUF_LIBS = $(LIBART_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
  
diff --git a/graphics/gdk-pixbuf/files/patch-ad b/graphics/gdk-pixbuf/files/patch-ad
index abd997ea53ac..ea0bfaabf84c 100644
--- a/graphics/gdk-pixbuf/files/patch-ad
+++ b/graphics/gdk-pixbuf/files/patch-ad
@@ -1,5 +1,5 @@
---- gdk-pixbuf-config.in.orig	Sat Jan 29 23:25:44 2000
-+++ gdk-pixbuf-config.in	Mon Feb 21 23:54:45 2000
+--- gdk-pixbuf-config.in.orig	Mon Apr 10 20:56:56 2000
++++ gdk-pixbuf-config.in	Thu Apr 13 11:40:34 2000
 @@ -42,11 +42,11 @@
        if test @includedir@ != /usr/include ; then
          includes=-I@includedir@
@@ -9,8 +9,8 @@
        ;;
      --libs)
        libdirs=-L@libdir@
--      echo $libdirs -lgdk_pixbuf `libart-config --libs` `gtk-config --libs`
-+      echo $libdirs -lgdk_pixbuf `libart-config --libs` `@GTK_CONFIG@ --libs`
+-      echo $libdirs -lgdk_pixbuf `gtk-config --libs`
++      echo $libdirs -lgdk_pixbuf `@GTK_CONFIG@ --libs`
        ;;
      *)
        echo "${usage}" 1>&2
diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist
index c36791563977..fced2cbcda86 100644
--- a/graphics/gdk-pixbuf/pkg-plist
+++ b/graphics/gdk-pixbuf/pkg-plist
@@ -5,21 +5,39 @@ include/gdk-pixbuf/gdk-pixbuf.h
 include/gdk-pixbuf/gdk-pixbuf-features.h
 include/gdk-pixbuf/gdk-pixbuf-loader.h
 include/gdk-pixbuf/gnome-canvas-pixbuf.h
-lib/gdk-pixbuf/loaders/libpixbuf-bmp.so
-lib/gdk-pixbuf/loaders/libpixbuf-gif.so
-lib/gdk-pixbuf/loaders/libpixbuf-ico.so
-lib/gdk-pixbuf/loaders/libpixbuf-jpeg.so
-lib/gdk-pixbuf/loaders/libpixbuf-png.so
-lib/gdk-pixbuf/loaders/libpixbuf-pnm.so
-lib/gdk-pixbuf/loaders/libpixbuf-ras.so
-lib/gdk-pixbuf/loaders/libpixbuf-tiff.so
-lib/gdk-pixbuf/loaders/libpixbuf-xpm.so
+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.1
+lib/libgdk_pixbuf.so.2
 lib/libgnomecanvaspixbuf.a
 lib/libgnomecanvaspixbuf.so
-lib/libgnomecanvaspixbuf.so.0
+lib/libgnomecanvaspixbuf.so.1
 share/aclocal/gdk-pixbuf.m4
 share/gnome/html/gdk-pixbuf-decl.txt
 share/gnome/html/gdk-pixbuf-sections.txt
@@ -41,6 +59,7 @@ 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/r15.html
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/gnome/html/gdk-pixbuf