Use different fix for a problem with libglade2 - one which doesn't break gtk13

itself.

9 files changed, 30 insertions, 63 deletions

diff --git a/x11-toolkits/gtk13/files/patch-ak b/x11-toolkits/gtk13/files/patch-ak
index 52ac9374177d..a53b424ae785 100644
--- a/x11-toolkits/gtk13/files/patch-ak
+++ b/x11-toolkits/gtk13/files/patch-ak
@@ -1,11 +1,14 @@
---- gdk/Makefile.in	2000/11/20 14:59:03	1.1
-+++ gdk/Makefile.in	2000/11/20 15:01:41
-@@ -228,7 +228,7 @@
+
+$FreeBSD$
+
+--- 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 @@
  #
  # Rule to install gdkconfig.h header file
  #
 -configexecincludedir = $(libdir)/gtk-2.0/include
-+configexecincludedir = $(prefix)/include/gtk-2.0/gtk
++configexecincludedir = $(prefix)/include/gtk-2.0/gdk
  
- BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk13/files/patch-gdk::gdktypes.h b/x11-toolkits/gtk13/files/patch-gdk::gdktypes.h
deleted file mode 100644
index 35e6a55e29b3..000000000000
--- a/x11-toolkits/gtk13/files/patch-gdk::gdktypes.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gdk/gdktypes.h	2002/02/14 10:01:48	1.1
-+++ gdk/gdktypes.h	2002/02/14 10:01:59
-@@ -48,7 +48,7 @@
-  * itself, but also occasionally when compiling programs that use GDK
-  * (or GTK). One such setting is what windowing API backend is in use.
-  */
--#include <gdkconfig.h>
-+#include <gtk/gdkconfig.h>
- 
- /* some common magic values */
- #define GDK_CURRENT_TIME     0L
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 4d8c9d541cd3..75073a2fe615 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -11,6 +11,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
+include/gtk-2.0/gdk/gdkconfig.h
 include/gtk-2.0/gdk/gdkcursor.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
@@ -35,7 +36,6 @@ include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
 include/gtk-2.0/gdk/gdkx.h
-include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index 52ac9374177d..a53b424ae785 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,11 +1,14 @@
---- gdk/Makefile.in	2000/11/20 14:59:03	1.1
-+++ gdk/Makefile.in	2000/11/20 15:01:41
-@@ -228,7 +228,7 @@
+
+$FreeBSD$
+
+--- 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 @@
  #
  # Rule to install gdkconfig.h header file
  #
 -configexecincludedir = $(libdir)/gtk-2.0/include
-+configexecincludedir = $(prefix)/include/gtk-2.0/gtk
++configexecincludedir = $(prefix)/include/gtk-2.0/gdk
  
- BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk::gdktypes.h b/x11-toolkits/gtk20/files/patch-gdk::gdktypes.h
deleted file mode 100644
index 35e6a55e29b3..000000000000
--- a/x11-toolkits/gtk20/files/patch-gdk::gdktypes.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gdk/gdktypes.h	2002/02/14 10:01:48	1.1
-+++ gdk/gdktypes.h	2002/02/14 10:01:59
-@@ -48,7 +48,7 @@
-  * itself, but also occasionally when compiling programs that use GDK
-  * (or GTK). One such setting is what windowing API backend is in use.
-  */
--#include <gdkconfig.h>
-+#include <gtk/gdkconfig.h>
- 
- /* some common magic values */
- #define GDK_CURRENT_TIME     0L
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 4d8c9d541cd3..75073a2fe615 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -11,6 +11,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
+include/gtk-2.0/gdk/gdkconfig.h
 include/gtk-2.0/gdk/gdkcursor.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
@@ -35,7 +36,6 @@ include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
 include/gtk-2.0/gdk/gdkx.h
-include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h
diff --git a/x11-toolkits/gtk30/files/patch-ak b/x11-toolkits/gtk30/files/patch-ak
index 52ac9374177d..a53b424ae785 100644
--- a/x11-toolkits/gtk30/files/patch-ak
+++ b/x11-toolkits/gtk30/files/patch-ak
@@ -1,11 +1,14 @@
---- gdk/Makefile.in	2000/11/20 14:59:03	1.1
-+++ gdk/Makefile.in	2000/11/20 15:01:41
-@@ -228,7 +228,7 @@
+
+$FreeBSD$
+
+--- 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 @@
  #
  # Rule to install gdkconfig.h header file
  #
 -configexecincludedir = $(libdir)/gtk-2.0/include
-+configexecincludedir = $(prefix)/include/gtk-2.0/gtk
++configexecincludedir = $(prefix)/include/gtk-2.0/gdk
  
- BUILT_SOURCES = stamp-gc-h #note: not gdkconfig.h
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk30/files/patch-gdk::gdktypes.h b/x11-toolkits/gtk30/files/patch-gdk::gdktypes.h
deleted file mode 100644
index 35e6a55e29b3..000000000000
--- a/x11-toolkits/gtk30/files/patch-gdk::gdktypes.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- gdk/gdktypes.h	2002/02/14 10:01:48	1.1
-+++ gdk/gdktypes.h	2002/02/14 10:01:59
-@@ -48,7 +48,7 @@
-  * itself, but also occasionally when compiling programs that use GDK
-  * (or GTK). One such setting is what windowing API backend is in use.
-  */
--#include <gdkconfig.h>
-+#include <gtk/gdkconfig.h>
- 
- /* some common magic values */
- #define GDK_CURRENT_TIME     0L
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 4d8c9d541cd3..75073a2fe615 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -11,6 +11,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
 include/gtk-2.0/gdk/gdk.h
 include/gtk-2.0/gdk/gdkcolor.h
+include/gtk-2.0/gdk/gdkconfig.h
 include/gtk-2.0/gdk/gdkcursor.h
 include/gtk-2.0/gdk/gdkdnd.h
 include/gtk-2.0/gdk/gdkdrawable.h
@@ -35,7 +36,6 @@ include/gtk-2.0/gdk/gdktypes.h
 include/gtk-2.0/gdk/gdkvisual.h
 include/gtk-2.0/gdk/gdkwindow.h
 include/gtk-2.0/gdk/gdkx.h
-include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h