Update to 2.9.0.

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

8 files changed, 139 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..307fd6fc2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed Aug  3 18:09:32 2005
++++ Makefile.in	Wed Aug  3 18:10:01 2005
+@@ -288,7 +288,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
+ 
+ # require automake 1.4
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..3e30b6eef
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -0,0 +1,15 @@
+
+$FreeBSD: ports/x11-toolkits/gtk20/files/patch-ak,v 1.9 2006/03/15 05:50:51 marcus Exp $
+  $MCom: ports-stable/x11-toolkits/gtk20/files/patch-ak,v 1.6 2006/03/08 20:28:38 mezz 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..1bedfdf55
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in
@@ -0,0 +1,15 @@
+--- gdk-pixbuf/Makefile.in.orig	Wed Mar  2 15:56:36 2005
++++ gdk-pixbuf/Makefile.in	Wed Mar  2 15:57:08 2005
+@@ -519,10 +519,10 @@
+ 
+ bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
+ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
+-gdk_pixbuf_csource_LDADD = $(LDADDS)
++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
+-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
new file mode 100644
index 000000000..610ece8f3
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -0,0 +1,16 @@
+--- gtk/Makefile.in.orig	Sat May  6 04:47:11 2006
++++ gtk/Makefile.in	Sat May  6 04:48:06 2006
+@@ -1009,11 +1009,11 @@ LDADDS = \
+ bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache
+ 
+ gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
+-gtk_query_immodules_2_0_LDADD = $(LDADDS)
++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
+ 
+ gtk_query_immodules_2_0_SOURCES = queryimmodules.c
+ 
+-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
++gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ 
+ gtk_update_icon_cache_SOURCES = updateiconcache.c
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
new file mode 100644
index 000000000..f875c2e79
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c
@@ -0,0 +1,49 @@
+--- gtk/gtkiconcache.c.orig	Mon Aug 29 07:05:13 2005
++++ gtk/gtkiconcache.c	Sat Nov 19 19:14:10 2005
+@@ -75,6 +75,37 @@
+     }
+ }
+ 
++static gboolean
++is_uptodate (const char *dirname, time_t cache_mtime)
++{
++  GDir *dir;
++  const char *filename;
++  gboolean uptodate = TRUE;
++
++  dir = g_dir_open (dirname, 0, NULL);
++  if (! dir)
++    return TRUE;
++
++  while (uptodate && (filename = g_dir_read_name (dir)))
++    if (filename[0] != '.')
++      {
++	char *pathname;
++	struct stat st;
++
++	pathname = g_build_filename (dirname, filename, NULL);
++	if (g_stat (pathname, &st) >= 0
++	    && (cache_mtime < st.st_mtime
++		|| (S_ISDIR (st.st_mode)
++		    && ! is_uptodate (pathname, cache_mtime))))
++	    uptodate = FALSE;
++	g_free(pathname);
++      }
++
++  g_dir_close(dir);
++
++  return uptodate;
++}
++
+ GtkIconCache *
+ _gtk_icon_cache_new_for_path (const gchar *path)
+ {
+@@ -106,7 +137,7 @@
+     goto done;
+ 
+   /* Verify cache is uptodate */
+-  if (st.st_mtime < path_st.st_mtime)
++  if (st.st_mtime < path_st.st_mtime || ! is_uptodate(path, st.st_mtime))
+     {
+       GTK_NOTE (ICONTHEME, 
+ 		g_print ("cache outdated\n"));
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;
+