Update to 1.3.12.

3 files changed, 32 insertions, 32 deletions

diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index 9c59e21..59fee01 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Fri Sep 21 22:06:14 2001
-+++ gtk/gtkrc.c	Wed Oct 24 10:31:00 2001
-@@ -359,7 +359,7 @@
+--- 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
- #ifndef G_OS_WIN32
 -	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);
- #else
- 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
- #endif
-@@ -453,7 +453,7 @@
+     }
+ 
+   return result;
+@@ -418,7 +418,7 @@
+     }
    else
      {
- #ifndef G_OS_WIN32
 -      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
-+      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
- #else
-       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
- #endif
++      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-ae b/x11-toolkits/gtk20/files/patch-ae
index 04e0e19..49b83e0 100644
--- a/x11-toolkits/gtk20/files/patch-ae
+++ b/x11-toolkits/gtk20/files/patch-ae
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 17 23:13:16 2001
-+++ configure	Sun Apr 29 14:55:08 2001
-@@ -3842,7 +3842,7 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
+--- configure.orig	Mon Dec 24 01:02:02 2001
++++ configure	Fri Jan 18 11:15:57 2002
+@@ -9794,7 +9794,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
 -		   DATADIRNAME=lib
 +		   DATADIRNAME=share
  fi
- rm -f conftest*
- 		INSTOBJEXT=.mo 	
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 		INSTOBJEXT=.mo
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index a7e7df3..cd1b949 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Wed Oct 24 10:31:32 2001
-+++ gtk/Makefile.in	Wed Oct 24 10:33:05 2001
-@@ -166,7 +166,7 @@
- 
- SUBDIRS = stock-icons
- 
--INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_VERSION@\"				-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"		-DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"		-DG_DISABLE_CONST_RETURNS				-I$(top_builddir)/gtk					-I$(top_srcdir) -I../gdk				-I$(top_srcdir)/gdk					-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf		@GTK_DEBUG_FLAGS@					@GTK_DEP_CFLAGS@				@STRIP_END@
- 
- 
- gtarget = @gdktarget@
+--- gtk/Makefile.in.orig	Fri Jan 18 11:03:21 2002
++++ gtk/Makefile.in	Fri Jan 18 11:18:26 2002
+@@ -176,7 +176,7 @@
+ 	-DG_LOG_DOMAIN=\"Gtk\"				\
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+ 	-DGTK_VERSION=\"@GTK_VERSION@\"			\
+ 	-DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"	\