Update to 2.4.0

This was accidently missed from recent mega GNOME 2.2 -> 2.4 update.

Reported by: Pav Lucistnik <pav@oook.cz>

7 files changed, 7 insertions, 158 deletions

diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
index d5a0a23..8111dd9 100644
--- a/x11/libgnome/files/patch-configure
+++ b/x11/libgnome/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Nov  1 06:34:11 2002
-+++ configure	Sat Nov  9 02:15:02 2002
-@@ -7964,6 +7964,7 @@
+--- 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"
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8335,7 +8336,7 @@
- 
- 
-   case $host in
--  *-linux-gnu | *-irix6*)
-+  *-linux-gnu | *-irix6* | *-freebsd*)
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MAN_WHEREIS 1
- _ACEOF
diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
deleted file mode 100644
index bd3027d..0000000
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Sun May 25 01:15:30 2003
-+++ help-converters/gnome-vfs-module/Makefile.in	Sun May 25 01:17:17 2003
-@@ -147,12 +147,12 @@
- cxxflags_set = @cxxflags_set@
- gnomelocaledir = @gnomelocaledir@
- 
--INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
-+INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir)				$(HELP_VFS_MODULE_CFLAGS)		    -DSERVERDIR=\"$(libexecdir)\"
- 
- 
- modules_LTLIBRARIES = libvfs-help.la
- 
--module_flags = -export_dynamic -avoid-version
-+module_flags = -export_dynamic -avoid-version -module
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- libvfs_help_la_SOURCES =  	help-method.c		help-method.h		
diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c
deleted file mode 100644
index bbc397d..0000000
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- help-converters/gnome-vfs-module/help-method.c.orig	Sat Jan 26 17:43:22 2002
-+++ help-converters/gnome-vfs-module/help-method.c	Wed Feb 20 20:01:17 2002
-@@ -371,7 +371,7 @@
-                 else
-                         buf = g_strdup_printf ("gnome/help/%s/%s/%s", base_name, lang, old_uri);
- 
--		new_uri = g_strdup_printf ("/usr/share/%s", buf);
-+		new_uri = g_strdup_printf (PREFIX "/share/%s", buf);
- /*  gnome_unconditional_datadir_file (buf); */
- 		g_free (buf);
- 
-@@ -394,7 +394,7 @@
-                                         
-                                         old_help = g_strdup_printf ("gnome/help/%s/%s/index.html", base_name, lang);
-                                         new_uri_with_extension = 
--                                                g_strdup_printf ("/usr/share/%s",
-+                                                g_strdup_printf (PREFIX "/share/%s",
-                                                                  old_help);
-                                       
- /* gnome_unconditional_datadir_file (old_help); */
-@@ -530,10 +530,10 @@
-         int i;
- 
-         /* Check some hardcoded locations. */
--        if (strncmp (file, "/usr/info/", strlen ("/usr/info/")) == 0 ||
--            strncmp (file, "/usr/local/info/", strlen ("/usr/local/info/")) ||
--            strncmp (file, "/usr/gnome/info/", strlen ("/usr/gnome/info/")) ||
--	    strncmp (file, "/usr/share/info/", strlen ("/usr/share/info/"))) {
-+        if (strncmp (file, "/usr/share/info/", strlen ("/usr/share/info/")) == 0 ||
-+            strncmp (file, LOCALBASE "/info/", strlen (LOCALBASE "/info/")) ||
-+            strncmp (file, X11BASE "/info/", strlen (X11BASE "/info/")) || 
-+	    strncmp (file, PREFIX "/info/", strlen (PREFIX "/info/"))) {
-                 return TRUE;
-         }
- 
diff --git a/x11/libgnome/files/patch-help-converters::info::Makefile.in b/x11/libgnome/files/patch-help-converters::info::Makefile.in
deleted file mode 100644
index 6d4fea2..0000000
--- a/x11/libgnome/files/patch-help-converters::info::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- help-converters/info/Makefile.in	2002/02/20 18:09:43	1.1
-+++ help-converters/info/Makefile.in	2002/02/20 18:10:02
-@@ -134,7 +134,7 @@
- cxxflags_set = @cxxflags_set@
- gnomelocaledir = @gnomelocaledir@
- 
--INCLUDES = $(LIBGNOME_CFLAGS)
-+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" $(LIBGNOME_CFLAGS)
- 
- bin_PROGRAMS = gnome2-info2html
- 
diff --git a/x11/libgnome/files/patch-help-converters::info::main.c b/x11/libgnome/files/patch-help-converters::info::main.c
deleted file mode 100644
index cd3f6f1..0000000
--- a/x11/libgnome/files/patch-help-converters::info::main.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- help-converters/info/main.c.orig	Mon Aug  5 14:06:06 2002
-+++ help-converters/info/main.c	Wed Aug  7 01:52:35 2002
-@@ -104,13 +104,15 @@
-                 char buf[PATH_MAX];
- 
-                 /* First, find the directory that the info file is in. */
--                dirs[0] = "/usr/info";
--                dirs[1] = "/usr/share/info";
-+		dirs[0] = "/usr/share/info";
-+		dirs[1] = PREFIX "/info";
-+		dirs[2] = LOCALBASE "/info";
-+		dirs[3] = X11BASE "/info";
-                 /* We now have at least one directory to look in. This is
-                  * necessary because we may not have an 'INFOPATH' set */
--                ndirs = 2;
-+                ndirs = 4;
-                 if(infopath) {
--                        for (ndirs = 2, ctmp = strtok(infopath, ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":")) {
-+                        for (ndirs = 4, ctmp = strtok(infopath, ":"); ndirs < 64 && ctmp; ndirs++, ctmp = strtok(NULL, ":")) {
-                                 dirs[ndirs] = strdup(ctmp);
-                         }
-                 }
diff --git a/x11/libgnome/files/patch-help-converters_man_gnome-man2html.c b/x11/libgnome/files/patch-help-converters_man_gnome-man2html.c
deleted file mode 100644
index cdfbd7c..0000000
--- a/x11/libgnome/files/patch-help-converters_man_gnome-man2html.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- help-converters/man/gnome-man2html.c.orig	Thu Jul 24 14:06:36 2003
-+++ help-converters/man/gnome-man2html.c	Thu Jul 24 14:06:06 2003
-@@ -129,6 +129,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <time.h>
- #include <sys/time.h>
-@@ -3727,6 +3728,9 @@
- main(int argc, char **argv)
- {
- 	char *t=NULL;
-+#ifdef __FreeBSD__
-+	char *source=NULL;
-+#endif
- 	int i,len;
- 	char *buf;
- 	char *h = '\0';
-@@ -3845,6 +3849,20 @@
- 		 * right.
- 		 */
- 		
-+#ifdef __FreeBSD__
-+		if ((source =  strstr(output, "source: ")) != NULL)
-+		{
-+		    	int j;
-+		    	for(i = 8, j = 0; i < strlen(source); i++)
-+			{
-+			    	if (!g_ascii_isspace((unsigned char)source[i]) && source[i] != ')')
-+				{
-+				    	output[j++] = source[i];
-+				}
-+			}
-+			output[j] = '\0';
-+		}
-+#else
- 		len = strlen(output);
- 		for(i = 0; i < len; i++)
- 		{
-@@ -3855,8 +3873,7 @@
- 		i = strlen(output) - 1;
- 		while (g_ascii_isspace((unsigned char)output[i])) 
- 			output[i--] = '\0';
--
--		
-+#endif
- 		if (output[0]) {
- #ifdef HAVE_LIBBZ2
- 		  if(strstr(output,".bz2"))
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
index 0b4a1ab..4a73422 100644
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -1,11 +1,11 @@
---- libgnome/Makefile.in.orig	Sun May 25 01:18:04 2003
-+++ libgnome/Makefile.in	Sun May 25 01:19:56 2003
-@@ -157,7 +157,7 @@
+--- 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\"
++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