3 files changed, 27 insertions, 25 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index f9fe83e99f05..48785f45de8e 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	gdk-pixbuf
-PORTVERSION=	0.14.0
+PORTVERSION=	0.15.0
 CATEGORIES?=	graphics
 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 14e0c0fb8d91..058a980aff19 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1 +1 @@
-MD5 (gdk-pixbuf-0.14.0.tar.gz) = f913a10d2c61846dcd0a8ed5f1f45c1e
+MD5 (gdk-pixbuf-0.15.0.tar.gz) = dc2a33d719de48161f38027a4d770ea8
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index 1a6c79d1163b..c1ff03370b05 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -1,99 +1,101 @@
 
 $FreeBSD$
 
---- gdk-pixbuf/Makefile.in.orig	Fri Oct 26 11:01:20 2001
-+++ gdk-pixbuf/Makefile.in	Fri Oct 26 11:04:15 2001
-@@ -125,70 +125,70 @@
+--- gdk-pixbuf/Makefile.in.orig	Mon Jan 21 10:57:36 2002
++++ gdk-pixbuf/Makefile.in	Mon Jan 21 11:04:53 2002
+@@ -129,71 +129,71 @@
  # The PNG plugin.
  #
  libpixbufloader_png_la_SOURCES = io-png.c
 -libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_png_la_LIBADD = $(LIBPNG)
+-libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_png_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(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_LIBADD = $(LIBJPEG)
+-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(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_LIBADD = $(LIBTIFF)
+-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(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_LIBADD = 
+-libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
-+libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
++libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  #
  # The XBM loader
  #
  libpixbufloader_xbm_la_SOURCES = io-xbm.c
 -libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
+-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
 +libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
- libpixbufloader_xbm_la_LIBADD = 
++libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
  
  @HAVE_PNG_TRUE@PNG_LIB = libpixbufloader-png.la
-@@ -230,11 +230,11 @@
+ 
+@@ -234,11 +234,11 @@
  
  LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)