Update to 2.5.6 from the ports-experimental module.

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

10 files changed, 149 insertions, 0 deletions

diff --git a/x11-toolkits/gtk20/files/patch-Makefile.in b/x11-toolkits/gtk20/files/patch-Makefile.in
new file mode 100644
index 000000000..c47baaab5
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Jan 22 19:40:10 2004
++++ Makefile.in	Thu Jan 22 19:40:52 2004
+@@ -286,7 +286,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
+ 
+ # require automake 1.4
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
new file mode 100644
index 000000000..e9e4f314a
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -0,0 +1,23 @@
+
+$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-ag b/x11-toolkits/gtk20/files/patch-ag
new file mode 100644
index 000000000..b34d2b3f2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ag
@@ -0,0 +1,19 @@
+--- gtk/Makefile.in.orig	Fri Oct 24 21:45:12 2003
++++ gtk/Makefile.in	Fri Oct 24 21:46:49 2003
+@@ -301,7 +301,7 @@
+ 	-DGTK_LIBDIR=\"$(libdir)\"			\
+ 	-DGTK_DATADIR=\"$(datadir)\"			\
+ 	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
++	-DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\"	\
+ 	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
+ 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
+ 	-DGTK_HOST=\"$(host)\"				\
+@@ -856,6 +856,7 @@
+ TEST_DEPS = $(DEPS) gtk.immodules
+ 
+ LDADDS = \
++	$(GLIB_LIBS)							\
+ 	$(gtktargetlib)							\
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+ 	$(top_builddir)/gdk/$(gdktargetlib)
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
new file mode 100644
index 000000000..88bfe209d
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Fri Oct 24 21:47:52 2003
++++ docs/Makefile.in	Fri Oct 24 23:35:09 2003
+@@ -179,7 +179,7 @@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ MS_LIB_AVAILABLE_FALSE = @MS_LIB_AVAILABLE_FALSE@
diff --git a/x11-toolkits/gtk20/files/patch-ai b/x11-toolkits/gtk20/files/patch-ai
new file mode 100644
index 000000000..a04d08ef5
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ai
@@ -0,0 +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@
+ 
+-SUBDIRS = gdk-pixbuf gdk gtk
++SUBDIRS = #gdk-pixbuf gdk gtk
+ subdir = docs/reference
+ 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
new file mode 100644
index 000000000..182426010
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,14 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.5 2004/04/05 03:11:37 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 @@
+ #
+ # Rule to install gdkconfig.h header file
+ #
+-configexecincludedir = $(libdir)/gtk-2.0/include
++configexecincludedir = $(prefix)/include/gtk-2.0
+ 
+ #note: not gdkconfig.h
+ BUILT_SOURCES = stamp-gc-h @REBUILD@ gdkenumtypes.c gdkenumtypes.h
diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
new file mode 100644
index 000000000..c2cb10b54
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,13 @@
+--- gdk-pixbuf/Makefile.in.orig	Thu Nov 20 15:39:55 2003
++++ gdk-pixbuf/Makefile.in	Thu Nov 20 15:40:17 2003
+@@ -517,7 +517,9 @@
+ 
+ 
+ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
+-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
++LDADDS = \
++	 $(GLIB_LIBS)				\
++	 libgdk_pixbuf-$(GTK_API_VERSION).la
+ 
+ noinst_PROGRAMS = test-gdk-pixbuf
+ test_gdk_pixbuf_LDADD = $(LDADDS)
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c
new file mode 100644
index 000000000..e725de399
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c
@@ -0,0 +1,13 @@
+--- gtk/gtkentry.c.orig	Wed Aug 25 12:44:23 2004
++++ gtk/gtkentry.c	Wed Aug 25 12:44:52 2004
+@@ -1670,8 +1670,9 @@
+ 				    event->x + entry->scroll_offset, event->y))
+ 	{
+ 	  GdkDragContext *context;
++	  guint actions;
+ 	  GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
+-	  guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY;
++	  actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY;
+ 
+ 	  gtk_target_list_add_text_targets (target_list);
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
new file mode 100644
index 000000000..9546b6463
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c
@@ -0,0 +1,23 @@
+--- gtk/gtkicontheme.c.orig	Wed Aug 18 11:45:13 2004
++++ gtk/gtkicontheme.c	Sat Sep  4 16:26:21 2004
+@@ -537,7 +537,7 @@
+   xdg_data_dirs = g_get_system_data_dirs ();
+   for (i = 0; xdg_data_dirs[i]; i++) ;
+ 
+-  priv->search_path_len = i + 3;
++  priv->search_path_len = (i * 2) + 3;
+   
+   priv->search_path = g_new (char *, priv->search_path_len);
+   
+@@ -545,8 +545,10 @@
+   priv->search_path[i++] = g_build_filename (g_get_home_dir (), ".icons", NULL);
+   priv->search_path[i++] = g_build_filename (g_get_user_data_dir (), "icons", NULL);
+   
+-  for (j = 0; xdg_data_dirs[j]; j++) 
++  for (j = 0; xdg_data_dirs[j]; j++) {
+     priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
++    priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
++  }
+ 
+   priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
new file mode 100644
index 000000000..b39aaedd0
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- 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 = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
+ 
+   ptr = xdg_data_dirs;
+