Update to 2.5.0.

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

5 files changed, 111 insertions, 0 deletions

diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
new file mode 100644
index 000000000..0f5331a05
--- /dev/null
+++ b/x11/libgnome/files/patch-ag
@@ -0,0 +1,22 @@
+
+$FreeBSD: ports/x11/libgnome/files/patch-ag,v 1.10 2003/09/18 12:55:46 bland Exp $
+
+--- libgnome/gnome-util.c	2002/03/19 17:16:21	1.1
++++ libgnome/gnome-util.c	2002/03/19 17:21:31
+@@ -67,11 +67,11 @@
+ 	static char *shells [] = {
+ 		/* Note that on some systems shells can also
+ 		 * be installed in /usr/bin */
+-		"/bin/bash", "/usr/bin/bash",
+-		"/bin/zsh", "/usr/bin/zsh",
+-		"/bin/tcsh", "/usr/bin/tcsh",
+-		"/bin/ksh", "/usr/bin/ksh",
+-		"/bin/csh", "/bin/sh", 0
++		"/bin/csh", "/bin/sh",
++		LOCALBASE "/bin/bash",
++		LOCALBASE "/bin/zsh",
++		LOCALBASE "/bin/ksh",
++		0
+ 	};
+ 
+ 	if (geteuid () == getuid () &&
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
new file mode 100644
index 000000000..8111dd90a
--- /dev/null
+++ b/x11/libgnome/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Mon Aug 11 15:31:05 2003
++++ configure	Mon Aug 11 15:31:06 2003
+@@ -19070,6 +19070,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/libgnome/files/patch-intltool-merge.in b/x11/libgnome/files/patch-intltool-merge.in
new file mode 100644
index 000000000..54c8a2331
--- /dev/null
+++ b/x11/libgnome/files/patch-intltool-merge.in
@@ -0,0 +1,11 @@
+--- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
++++ intltool-merge.in	Wed Nov 12 15:31:54 2003
+@@ -858,7 +858,7 @@
+     if ($MULTIPLE_OUTPUT) {
+         for my $lang (sort keys %po_files_by_lang) {
+ 	    if ( ! -e $lang ) {
+-	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
+             }
+             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+             my $tree = readXml($FILE);
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
new file mode 100644
index 000000000..4a73422b2
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -0,0 +1,11 @@
+--- libgnome/Makefile.in.orig	Sat Jun 14 05:07:39 2003
++++ libgnome/Makefile.in	Sat Jun 14 05:10:06 2003
+@@ -156,7 +156,7 @@
+ 
+ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
+ 
+-INCLUDES =  	-I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
++INCLUDES =  	-DPREFIX=\""$(PREFIX)"\" -DLOCALBASE=\""$(LOCALBASE)"\" -DX11BASE=\""$(X11BASE)"\" -I..								-I$(srcdir)/..							$(WARN_CFLAGS)							$(LIBGNOME_CFLAGS)						-DG_DISABLE_DEPRECATED						-DLIBGNOME_PREFIX=\""$(prefix)"\"				-DLIBGNOME_LIBDIR=\""$(libdir)"\"				-DLIBGNOME_DATADIR=\""$(datadir)"\"				-DLIBGNOME_BINDIR=\""$(bindir)"\"				-DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\"			-DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\"			-DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\"			-DVERSION=\""$(VERSION)"\"					-DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\"			-DG_LOG_DOMAIN=\"Gnome\"
+ 
+ 
+ libgnome_2_la_SOURCES =  	libgnometypebuiltins.h		libgnometypebuiltins.c		gnome-config.c			gnome-sound.c			gnome-triggers.c		gnome-triggersP.h		gnome-program.c			gnome-help.c			gnome-exec.c			gnome-gconf.c			gnome-gconfP.h			gnome-i18n.c			gnome-i18nP.h			gnome-url.c			gnome-util.c			gnome-score.c			gnome-init.c
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
new file mode 100644
index 000000000..eddd1f28d
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -0,0 +1,57 @@
+--- libgnome/gnome-program.c.orig	Fri Mar 22 11:02:45 2002
++++ libgnome/gnome-program.c	Mon May 20 18:28:24 2002
+@@ -882,12 +882,12 @@
+ 	attr_rel = "";
+ 	break;
+     case GNOME_FILE_DOMAIN_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/sounds";
+ 	break;
+     case GNOME_FILE_DOMAIN_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	break;
+@@ -899,7 +899,7 @@
+     case GNOME_FILE_DOMAIN_HELP:
+ 	prefix_rel = "/share/gnome/help";
+ 	attr_name = GNOME_PARAM_GNOME_DATADIR;
+-	attr_rel = "/gnome/help";
++	attr_rel = "/help";
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_LIBDIR:
+ 	prefix_rel = "/lib";
+@@ -914,13 +914,13 @@
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_SOUND:
+-	prefix_rel = "/share/sounds";
++	prefix_rel = "/share/gnome/sounds";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/sounds";
+ 	search_path = FALSE;
+ 	break;
+     case GNOME_FILE_DOMAIN_APP_PIXMAP:
+-	prefix_rel = "/share/pixmaps";
++	prefix_rel = "/share/gnome/pixmaps";
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 	attr_rel = "/pixmaps";
+ 	search_path = FALSE;
+@@ -941,12 +941,12 @@
+ 
+ 	attr_name = GNOME_PARAM_APP_DATADIR;
+ 
+-	len = strlen ("/gnome/help/") + 
++	len = strlen ("/help/") + 
+ 		strlen (program->_priv->app_id) + 1;
+ 	attr_rel = g_alloca (len);
+ 	if (attr_rel == NULL /* bad things */)
+ 		return NULL;
+-	g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id);
++	g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id);
+ 
+ 	search_path = FALSE;
+ 	break;