4 files changed, 42 insertions, 22 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 7d7d7ea99040..8b57556f6f19 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	gdk-pixbuf
-# Version required:	0.3
+# Version required:	0.4
 # Date created:		5th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gdk-pixbuf-0.3
+DISTNAME=	gdk-pixbuf-0.4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gdk-pixbuf
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 59ef8c62575a..91612f3f48a4 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1 +1 @@
-MD5 (gdk-pixbuf-0.3.tar.gz) = e4f6c284723e77439700aaa6cbb854fc
+MD5 (gdk-pixbuf-0.4.tar.gz) = 7aac45182713540bb6c29a1ec85096c7
diff --git a/graphics/gdk-pixbuf/files/patch-aa b/graphics/gdk-pixbuf/files/patch-aa
index 4350a5e95c49..d8bf8f92e969 100644
--- a/graphics/gdk-pixbuf/files/patch-aa
+++ b/graphics/gdk-pixbuf/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Wed Oct 20 17:15:24 1999
-+++ configure	Fri Oct 22 10:26:25 1999
-@@ -3028,8 +3028,8 @@
+--- configure.orig	Tue Nov  9 15:22:08 1999
++++ configure	Mon Nov 15 14:07:02 1999
+@@ -3078,8 +3078,8 @@
  #define USE_GMODULE 1
  EOF
  
@@ -11,24 +11,25 @@
     
     
     echo "$ac_t""yes" 1>&6
-@@ -3561,8 +3561,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgif echo "configure: warning: *** Native GIF support will not be built" 1>&2;
--	gifok=no $LIBS"
-+LIBS="-lgif $GTK_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3568 "configure"
- #include "confdefs.h"
---- Makefile.in.orig	Wed Oct 20 17:34:44 1999
-+++ Makefile.in	Fri Oct 22 10:22:14 1999
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
+--- Makefile.in.orig	Tue Nov  9 15:48:21 1999
++++ Makefile.in	Mon Nov 15 14:07:45 1999
+@@ -100,7 +100,7 @@
+ 
+ SUBDIRS = src doc
  
- SUBDIRS = src
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
  confexec_DATA = gdk_pixbufConf.sh
  
  EXTRA_DIST = configure acconfig.h gdk_pixbufConf.sh.in
+--- src/Makefile.in.orig	Tue Nov  9 15:48:22 1999
++++ src/Makefile.in	Mon Nov 15 14:10:26 1999
+@@ -125,7 +125,7 @@
+ 
+ LDADDS = libgdk_pixbuf.la $(LIBART_LIBS) $(GLIB_LIBS)
+ 
+-testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS) -lgmodule
++testpixbuf_LDADD = $(LDADDS) $(LIBART_LIBS) $(GNOME_LIBS)
+ 
+ #
+ # The GdkPixBuf library
diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist
index 8c9cdf2bcf9f..da628c12f857 100644
--- a/graphics/gdk-pixbuf/pkg-plist
+++ b/graphics/gdk-pixbuf/pkg-plist
@@ -1,15 +1,34 @@
 etc/gdk_pixbufConf.sh
 include/gdk-pixbuf/gdk-pixbuf.h
+include/gdk-pixbuf/gdk-pixbuf-loader.h
+include/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gdk-pixbuf/loaders/libpixbuf-gif.so
 lib/gdk-pixbuf/loaders/libpixbuf-jpeg.so
 lib/gdk-pixbuf/loaders/libpixbuf-png.so
+lib/gdk-pixbuf/loaders/libpixbuf-ras.so
 lib/gdk-pixbuf/loaders/libpixbuf-tiff.so
 lib/gdk-pixbuf/loaders/libpixbuf-xpm.so
 lib/libgdk_pixbuf.a
 lib/libgdk_pixbuf.so
 lib/libgdk_pixbuf.so.1
+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/book1.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-gdk-pixbuf-io.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
+share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
+share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
+share/gnome/html/gdk-pixbuf/r14.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
 @dirrm include/gdk-pixbuf
 @dirrm lib/gdk-pixbuf/loaders
 @dirrm lib/gdk-pixbuf