3 files changed, 19 insertions, 45 deletions

diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
index 592577b0bd6c..9c59e21c2577 100644
--- a/x11-toolkits/gtk20/files/patch-ad
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- gtk/gtkrc.c.orig	Sun Apr 29 00:15:37 2001
-+++ gtk/gtkrc.c	Mon May 14 14:49:02 2001
-@@ -333,7 +333,7 @@
+--- 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 @@
  	result = g_strdup (im_module_file);
        else
  #ifndef G_OS_WIN32
--	result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
-+	result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+-	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_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
+ 	result = g_build_filename (get_gtk_win32_directory ("gtk-2.0"), "gtk.immodules", NULL);
  #endif
-@@ -439,7 +439,7 @@
+@@ -453,7 +453,7 @@
    else
      {
  #ifndef G_OS_WIN32
--      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
-+      str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
+-      str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL);
++      str = g_build_filename (GTK_SYSCONFDIR, "gtkrc", NULL);
  #else
-       str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
+       str = g_build_filename (get_gtk_win32_directory (""), "gtkrc", NULL);
  #endif
diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag
index 80e8096f3e26..a7e7df3d7490 100644
--- a/x11-toolkits/gtk20/files/patch-ag
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- gtk/Makefile.in.orig	Mon May 14 13:48:47 2001
-+++ gtk/Makefile.in	Mon May 14 13:50:45 2001
-@@ -158,7 +158,7 @@
+--- 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_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_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_DEP_CFLAGS@				@STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"				-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-DGTK_VERSION=\"@GTK_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_DEP_CFLAGS@				@STRIP_END@
+-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@
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index e2d0389ddd02..32c2663f049f 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- docs/Makefile.in.orig	Mon May 14 13:52:10 2001
-+++ docs/Makefile.in	Mon May 14 13:52:40 2001
-@@ -130,7 +130,7 @@
+--- docs/Makefile.in.orig	Wed Oct 24 10:33:45 2001
++++ docs/Makefile.in	Wed Oct 24 10:33:46 2001
+@@ -136,7 +136,7 @@
  LT_RELEASE = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
  MAINT = @MAINT@
@@ -11,30 +11,4 @@ $FreeBSD$
 +MAKEINFO = @MAKEINFO@ --no-split
  MKINSTALLDIRS = @MKINSTALLDIRS@
  OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
-@@ -156,13 +156,13 @@
- 
- SUBDIRS = tutorial faq reference
- 
--man_MANS = gtk-config.1
-+man_MANS = gtk-config-2.0.1
- 
- EXTRA_DIST =  	Changes-1.2.txt				Changes-2.0.txt				debugging.txt				defsformat.txt				developers.txt				dnd_internals.txt			make-todo				refcounting.txt				styles.txt				text_widget.txt 			widget_system.txt 			generation.txt			        README.linux-fb  	                gtk-config.txt  	        	gtk-config.1.in				gtkdocs_fix
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES =  gtk-config.1
-+CONFIG_CLEAN_FILES =  gtk-config-2.0.1
- man1dir = $(mandir)/man1
- MANS = $(man_MANS)
- 
-@@ -185,6 +185,9 @@
- 
- gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
- 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+gtk-config-2.0.1: gtk-config.1
-+	cp gtk-config.1 gtk-config-2.0.1
- 
- install-man1:
- 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ OBJEXT = @OBJEXT@