Update to 2.6.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3256 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 14 insertions, 38 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 45dd3c471..7563afa83 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.5.6
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.5,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.5/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 97d5af7d9..8fc65c77d 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gtk+-2.5.6.tar.bz2) = 38e829970c1629ff19b15cae83f42425
-SIZE (gnome2/gtk+-2.5.6.tar.bz2) = 8810721
+MD5 (gnome2/gtk+-2.6.0.tar.bz2) = ca717c728264fa0b3302ca00da2bcfe4
+SIZE (gnome2/gtk+-2.6.0.tar.bz2) = 10924415
 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c
 SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
deleted file mode 100644
index e9e4f314a..000000000
--- a/x11-toolkits/gtk20/files/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ad,v 1.13 2004/04/05 03:11:37 marcus Exp $
-
---- gtk/gtkrc.c.orig	Thu Dec 13 21:51:18 2001
-+++ gtk/gtkrc.c	Fri Jan 18 11:14:14 2002
-@@ -336,7 +336,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL);
-     }
- 
-   return result;
-@@ -418,7 +418,7 @@
-     }
-   else
-     {
--      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL);
- 
-       gtk_rc_add_default_file (str);
-       g_free (str);
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
index 9100294fe..d393bd3df 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
@@ -1,16 +1,16 @@
---- gtk/gtkiconcache.c.orig	Mon Nov 22 21:39:32 2004
-+++ gtk/gtkiconcache.c	Mon Nov 22 21:39:53 2004
-@@ -20,6 +20,8 @@
- #include <config.h>
+--- gtk/gtkiconcache.c.orig	Sun Dec 12 16:09:13 2004
++++ gtk/gtkiconcache.c	Thu Dec 16 17:09:23 2004
+@@ -21,6 +21,8 @@
  #include "gtkdebug.h"
  #include "gtkiconcache.h"
+ #include <glib/gstdio.h>
 +#include <sys/types.h>
 +#include <sys/stat.h>
  
  #ifdef HAVE_MMAP
  #include <sys/mman.h>
-@@ -27,8 +29,6 @@
- #ifdef G_OS_WIN32
+@@ -29,8 +31,6 @@
+ #include <windows.h>
  #include <io.h>
  #endif
 -#include <sys/types.h>
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 43e8c5c7b..b0f58c67e 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -253,16 +253,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/libgdk-x11-2.0.a
 lib/libgdk-x11-2.0.so
-lib/libgdk-x11-2.0.so.506
+lib/libgdk-x11-2.0.so.600
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.so
-lib/libgdk_pixbuf-2.0.so.506
+lib/libgdk_pixbuf-2.0.so.600
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.so
-lib/libgdk_pixbuf_xlib-2.0.so.506
+lib/libgdk_pixbuf_xlib-2.0.so.600
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.so
-lib/libgtk-x11-2.0.so.506
+lib/libgtk-x11-2.0.so.600
 libdata/pkgconfig/gdk-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-2.0.pc
 libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc