Remove the GNOME 2.1 ports. These have been merged into FreeBSD CVS

as GNOME 2.2....next up, GNOME 2.3.


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

8 files changed, 0 insertions, 204 deletions

diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
deleted file mode 100644
index 131cf3baa..000000000
--- a/x11/libgnome/files/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD$
-
---- 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
deleted file mode 100644
index d5a0a23fd..000000000
--- a/x11/libgnome/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Fri Nov  1 06:34:11 2002
-+++ configure	Sat Nov  9 02:15:02 2002
-@@ -7964,6 +7964,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'
-@@ -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 d8569e65c..000000000
--- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- help-converters/gnome-vfs-module/Makefile.in.orig	Tue Nov  5 00:53:20 2002
-+++ help-converters/gnome-vfs-module/Makefile.in	Tue Nov  5 00:56:05 2002
-@@ -138,15 +138,15 @@
- cxxflags_set = @cxxflags_set@
- gnomelocaledir = @gnomelocaledir@
- 
--INCLUDES = \
--	-I$(top_srcdir)					\
-+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 = \
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 bbc397d68..000000000
--- 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 6d4fea21f..000000000
--- 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 cd3f6f1c8..000000000
--- 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-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
deleted file mode 100644
index 21a31faff..000000000
--- a/x11/libgnome/files/patch-libgnome::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnome/Makefile.in.orig	Tue Nov  5 00:56:43 2002
-+++ libgnome/Makefile.in	Tue Nov  5 00:58:40 2002
-@@ -149,6 +149,8 @@
- libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
- 
- INCLUDES = \
-+	-DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \
-+	-DX11BASE="\"$(X11BASE)"\"				\
- 	-I..							\
- 	-I$(srcdir)/..						\
- 	$(WARN_CFLAGS)						\
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
deleted file mode 100644
index eddd1f28d..000000000
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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;