5 files changed, 21 insertions, 35 deletions

diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
index a04d08ef58b3..a7c07057c598 100644
--- a/x11-toolkits/gtk20/files/patch-ai
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in.orig	Fri Oct 24 23:38:06 2003
-+++ docs/reference/Makefile.in	Fri Oct 24 23:48:00 2003
-@@ -286,7 +286,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- docs/reference/Makefile.in.orig	2008-02-23 10:25:17.000000000 -0500
++++ docs/reference/Makefile.in	2008-02-23 10:26:36.000000000 -0500
+@@ -372,7 +372,7 @@
+ 	&& DISPLAY=:$$XID && export DISPLAY
  
--SUBDIRS = gdk-pixbuf gdk gtk
-+SUBDIRS = #gdk-pixbuf gdk gtk
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk libgail-util
++SUBDIRS = # gdk-pixbuf gdk gtk libgail-util
  subdir = docs/reference
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index af39120b2088..7f8e0eb0c02d 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.8 2007/12/01 05:56:33 marcus Exp $
-
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
 @@ -315,7 +315,7 @@
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
new file mode 100644
index 000000000000..c687dec4009b
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtksignal.h
@@ -0,0 +1,13 @@
+--- gtk/gtksignal.h.orig	2008-06-12 01:40:59.000000000 -0400
++++ gtk/gtksignal.h	2008-06-11 18:21:47.000000000 -0400
+@@ -29,7 +29,9 @@
+ #ifndef __GTK_SIGNAL_H__
+ #define __GTK_SIGNAL_H__
+ 
+-#include <gtk/gtk.h>
++#include <gtk/gtkenums.h>
++#include <gtk/gtktypeutils.h>
++#include <gtk/gtkobject.h>
+ #include <gtk/gtkmarshal.h>
+ 
+ G_BEGIN_DECLS
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
deleted file mode 100644
index e0fd02d4fbac..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
-+++ gtk/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
-@@ -204,7 +204,7 @@
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "/usr/local/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
deleted file mode 100644
index b64106809ef6..000000000000
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
-+++ gtk/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
-@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
- #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
- #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
- #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
-+#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
-+#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
- 
- #endif
-