Update to 1.112.1 after a repo-copy from gnomelibs.

24 files changed, 141 insertions, 434 deletions

diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
deleted file mode 100644
index d8cf6b134f16..000000000000
--- a/x11/libgnome/files/patch-aa
+++ /dev/null
@@ -1,58 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Mon Jan 14 11:58:21 2002
-+++ configure	Mon Jan 14 12:00:15 2002
-@@ -8775,7 +8775,7 @@
- else
-   
-   save_LDFLAGS="$LDFLAGS"
--  LDFLAGS="$LDFLAGS `glib-config --libs gmodule`"
-+  LDFLAGS="$LDFLAGS `$GLIB_CONFIG --libs gmodule`"
-   if test "$cross_compiling" = yes; then
-   ac_cv_gmodule=yes
- else
-@@ -10394,7 +10394,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lm $LIBS"
-+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10400 "configure"
- #include "confdefs.h"
-@@ -13483,13 +13483,13 @@
- SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
- 
- ART_LIBS="-lart_lgpl"
--GNOME_LIBS="-lgnome -lgnomesupport $LIBGNOME_LIBS"
-+GNOME_LIBS="-lgnome -lgnomesupport -lintl $LIBGNOME_LIBS"
- GNOMEUI_LIBS="-lgnomeui $ART_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $GNOME_LIBS"
- GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
- ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
- 
- GNOME_LIBDIR='-L${libdir}'
--GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
-+GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
- GNOME_IDLDIR='-I${datadir}/idl'
- 
- 
-@@ -13887,6 +13887,7 @@
- s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
- s%@MAINT@%$MAINT%g
- s%@cflags_set@%$cflags_set%g
-+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
- s%@GTK_CONFIG@%$GTK_CONFIG%g
- s%@GTK_CFLAGS@%$GTK_CFLAGS%g
- s%@GTK_LIBS@%$GTK_LIBS%g
-@@ -14356,10 +14357,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
deleted file mode 100644
index 0d8f8a75ea9d..000000000000
--- a/x11/libgnome/files/patch-ac
+++ /dev/null
@@ -1,62 +0,0 @@
---- gnome-config.in.orig	Wed Oct 20 07:36:58 1999
-+++ gnome-config.in	Tue Feb 15 20:50:22 2000
-@@ -19,7 +19,7 @@
- pkglibdir=${libdir}/@PACKAGE@
- pkgincludedir=${includedir}/@PACKAGE@
- MODULE_VERSION=@PACKAGE@-@VERSION@
--module_dirs="$libdir"
-+module_dirs="$sysconfdir:%%LOCALBASE%%/etc"
- 
- # stolen from autoconf
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-@@ -65,20 +65,21 @@
- 
- Known values for LIBRARY are:
- 
--    glib	(calls glib-config)
-+    glib	(calls @GLIB_CONFIG@)
-     idl         (to be used with orbit-idl)
-     gnome
-     gnomeui
-     gnorba
--    gtk		(calls gtk-config)
-+    gtk		(calls @GTK_CONFIG@)
-     gtkxmhtml	(only --libs)
-     zvt		(only --libs)
- 
- If LIBRARY is none of these,
-     
--    ${libdir}/<LIBRARY>Conf.sh
-+    ${sysconfdir}/<LIBRARY>Conf.sh
-+and %%LOCALBASE%%/etc/<LIBRARY>Conf.sh
- 
--is looked in for the necessary information.  Those currently installed 
-+are looked in for the necessary information.  Those currently installed 
- appear to be:
- 
- EOF
-@@ -161,19 +162,19 @@
- 	usage 1
- 	;;
-     glib)
--	the_libs="$the_libs `glib-config --libs`"
--	the_flags="$the_flags `glib-config --cflags`"
-+	the_libs="$the_libs `@GLIB_CONFIG@ --libs`"
-+	the_flags="$the_flags `@GLIB_CONFIG@ --cflags`"
- 	;;
-     gtk)
--	the_libs="$the_libs `gtk-config --libs`"
--	the_flags="$the_flags `gtk-config --cflags`"
-+	the_libs="$the_libs `@GTK_CONFIG@ --libs`"
-+	the_flags="$the_flags `@GTK_CONFIG@ --cflags`"
- 	;;
-     gnome)
-        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-   	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
- 	;;
-     gnomeui)
--	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lungif @GNOMEUI_LIBS@"
- 	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
- 	;;
-     gtkxmhtml)
diff --git a/x11/libgnome/files/patch-ad b/x11/libgnome/files/patch-ad
deleted file mode 100644
index 32e656859e37..000000000000
--- a/x11/libgnome/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnome/gnome-help.c.orig	Thu Apr  8 15:01:21 1999
-+++ libgnome/gnome-help.c	Mon Jul 12 10:29:11 1999
-@@ -69,7 +69,7 @@
- 		lang= language_list->data;
- 		
- 		buf= g_string_new (NULL);
--		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
- 		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
- 		p = strrchr (res, '#');
- 		if (p) {
-@@ -118,7 +118,7 @@
- 	if (!res)
- 	{
- 		buf = g_string_new(NULL);
--		g_string_sprintf(buf, "gnome/help/%s/C/%s", app, path);
-+		g_string_sprintf(buf, "help/%s/C/%s", app, path);
- 		res = (gchar *)gnome_unconditional_datadir_file(buf->str);
- 		g_string_free(buf, TRUE);
- 	}
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag
deleted file mode 100644
index 1045193a6db5..000000000000
--- a/x11/libgnome/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgnome/gnome-util.c.orig	Fri Apr 23 16:14:08 1999
-+++ libgnome/gnome-util.c	Mon Jul 12 10:31:19 1999
-@@ -371,8 +371,9 @@
- 	int i;
- 	char *shell;
- 	static char *shells [] = {
--		"/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh",
--		"/bin/csh", "/bin/sh", 0
-+		"/bin/csh", "/bin/sh", "/bin/tcsh", "%%LOCALBASE%%/bin/tcsh",
-+		"%%LOCALBASE%%/bin/bash", "%%LOCALBASE%%/bin/ksh",
-+		"%%LOCALBASE%%/bin/zsh", 0
- 	};
- 
- 	if ((shell = getenv ("SHELL"))){
diff --git a/x11/libgnome/files/patch-ba b/x11/libgnome/files/patch-ba
deleted file mode 100644
index d26ccd3bfc85..000000000000
--- a/x11/libgnome/files/patch-ba
+++ /dev/null
@@ -1,7 +0,0 @@
---- Makefile.in.orig	Sun Jan 21 16:37:06 2001
-+++ Makefile.in	Mon Jan 22 14:07:50 2001
-@@ -163,3 +163,3 @@
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = gnomeConf.sh
diff --git a/x11/libgnome/files/patch-bb b/x11/libgnome/files/patch-bb
deleted file mode 100644
index a1daaf14fc52..000000000000
--- a/x11/libgnome/files/patch-bb
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- gtk-xmhtml/Makefile.in.orig	Mon Jan 14 12:02:33 2002
-+++ gtk-xmhtml/Makefile.in	Mon Jan 14 12:03:13 2002
-@@ -151,7 +151,7 @@
- libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml
- 
- INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
--           -DWITH_GTK -DDEBUG -DGNOME_LIB
-+           -DWITH_GTK -DGNOME_LIB
- 
- 
- lib_LTLIBRARIES = libgtkxmhtml.la
-@@ -204,7 +204,7 @@
- 	toolkit.h
- 
- 
--libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir)
-+libgtkxmhtml_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS)
- 
- noinst_PROGRAMS = htmltest
-@@ -520,7 +520,7 @@
- uninstall-am: uninstall-libLTLIBRARIES \
- 		uninstall-libgtkxmhtmlincludeHEADERS
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc
deleted file mode 100644
index fc6ef3c2f524..000000000000
--- a/x11/libgnome/files/patch-bc
+++ /dev/null
@@ -1,7 +0,0 @@
---- libgnome/Makefile.in.orig	Sun Jan 21 16:37:20 2001
-+++ libgnome/Makefile.in	Mon Jan 22 13:45:00 2001
-@@ -170,3 +170,3 @@
- 
--libgnome_la_LDFLAGS = -version-info 36:3:4 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 5:0:0 #-rpath $(libdir)
- libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd
deleted file mode 100644
index 8aaaa45d346d..000000000000
--- a/x11/libgnome/files/patch-bd
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomeui/Makefile.in.orig	Wed Jan 24 14:25:06 2001
-+++ libgnomeui/Makefile.in	Thu Jan 25 10:17:02 2001
-@@ -201,3 +201,3 @@
- 
--libgnomeui_la_LDFLAGS = -version-info 46:1:14 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
-@@ -260,3 +260,3 @@
- gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo
--PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS =  $(bin_PROGRAMS)
- 
diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be
deleted file mode 100644
index 4dfb80f96b5d..000000000000
--- a/x11/libgnome/files/patch-be
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnorba/Makefile.in.orig	Thu Oct  7 11:35:06 1999
-+++ libgnorba/Makefile.in	Wed Oct 13 21:19:16 1999
-@@ -182,7 +182,7 @@
- libgnorbainclude_HEADERS =  	gnorba.h 						gnome-factory.h						gnome-unknown.h						Table.h
- 
- 
--libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
- 
- loadshlib_SOURCES = loadshlib.c
-@@ -225,7 +225,7 @@
- gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \
- gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \
- goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo
--libgnorbagtk_la_LDFLAGS = 
-+libgnorbagtk_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- libgnorbagtk_la_LIBADD = 
- libgnorbagtk_la_OBJECTS =  gnome-factory-skels.lo gnome-factory-stubs.lo \
- gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \
diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf
deleted file mode 100644
index 4e10c904b528..000000000000
--- a/x11/libgnome/files/patch-bf
+++ /dev/null
@@ -1,20 +0,0 @@
---- support/Makefile.in.orig	Thu Apr  8 11:33:39 1999
-+++ support/Makefile.in	Thu Apr  8 08:46:59 1999
-@@ -148,7 +148,7 @@
- mcserv = @mcserv@
- need_gnome_support = @need_gnome_support@
- 
--supportexecincludedir = $(pkglibdir)/include
-+supportexecincludedir = $(includedir)
- 
- INCLUDES = -D_GNU_SOURCE
- 
-@@ -170,7 +170,7 @@
- 
- libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
- libgnomesupport_la_LIBADD = @LTLIBOBJS@
--libgnomesupport_la_LDFLAGS = -version-info 0:0:0
-+libgnomesupport_la_LDFLAGS = -version-info 5:0:0
- 
- BUILT_SOURCES = gnomesupport.h
- 
diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg
deleted file mode 100644
index 8b76c27b44ab..000000000000
--- a/x11/libgnome/files/patch-bg
+++ /dev/null
@@ -1,17 +0,0 @@
---- zvt/Makefile.in.orig	Sun Jan 21 16:37:29 2001
-+++ zvt/Makefile.in	Mon Jan 22 13:46:50 2001
-@@ -22,3 +22,3 @@
- bindir = @bindir@
--sbindir = @sbindir@
-+sbindir = @bindir@
- libexecdir = @libexecdir@
-@@ -158,3 +158,3 @@
- 
--libzvt_la_LDFLAGS = -version-info 4:10:2 -rpath $(libdir)
-+libzvt_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
- 
-@@ -194,3 +194,3 @@
- update.lo vt.lo zvtterm.lo
--PROGRAMS =  $(noinst_PROGRAMS) $(sbin_PROGRAMS)
-+PROGRAMS =  $(sbin_PROGRAMS)
- 
diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi
deleted file mode 100644
index 1debdb2d3658..000000000000
--- a/x11/libgnome/files/patch-bi
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- libart_lgpl/Makefile.in.orig	Mon Jan 14 12:04:21 2002
-+++ libart_lgpl/Makefile.in	Mon Jan 14 12:05:37 2002
-@@ -145,7 +145,7 @@
- 	libart-features.c
- 
- 
--libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
-+libart_lgpl_la_LDFLAGS = -version-info 5:0:0
- libart_lgpl_la_LIBADD = -lm
- 
- libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
-@@ -204,10 +204,10 @@
- testuta_DEPENDENCIES = $(DEPS)
- testuta_LDADD = $(LDADDS) -lm
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = libart.m4
- 
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = libartConf.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -790,7 +790,7 @@
- 		uninstall-man uninstall-confexecDATA \
- 		uninstall-m4dataDATA uninstall-libart_lgplincHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
- 		$(HEADERS) config.h
- all-redirect: all-recursive-am
- install-strip:
diff --git a/x11/libgnome/files/patch-bj b/x11/libgnome/files/patch-bj
deleted file mode 100644
index cd77cec42761..000000000000
--- a/x11/libgnome/files/patch-bj
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./zvt/gnome-pty-helper.c.org       Sat Mar 18 02:57:13 2000
-+++ ./zvt/gnome-pty-helper.c   Sun Aug  5 11:37:41 2001
-@@ -41,6 +41,7 @@
- #include <limits.h>
- #include <unistd.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <signal.h>
- #include <fcntl.h>
- #include <termios.h>
-@@ -115,7 +116,7 @@
- #endif
- #endif /* CMSG_DATA */
-
--#define CONTROLLEN (sizeof (struct cmsghdr)  + sizeof (int))
-+#define CONTROLLEN (sizeof (struct cmsghdr)  + sizeof (long))
-
- static struct cmsghdr *cmptr;
-
---- ./zvt/subshell.c.org       Mon May 22 17:24:16 2000
-+++ ./zvt/subshell.c   Sun Aug  5 11:35:50 2001
-@@ -102,7 +102,7 @@
- #endif /* CMSG_DATA */
-
- static struct cmsghdr *cmptr;
--#define CONTROLLEN  sizeof (struct cmsghdr) + sizeof (int)
-+#define CONTROLLEN  sizeof (struct cmsghdr) + sizeof (long)
-
- static int
- receive_fd (int helper_fd)
diff --git a/x11/libgnome/files/patch-bk b/x11/libgnome/files/patch-bk
deleted file mode 100644
index a04008ce47c0..000000000000
--- a/x11/libgnome/files/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./zvt/subshell-includes.h.org	Wed Oct 20 05:51:19 1999
-+++ ./zvt/subshell-includes.h	Fri Mar 10 17:21:01 2000
-@@ -12,6 +12,7 @@
- #include <sys/resource.h>
- #include <limits.h>
- #include <fcntl.h>
-+#include <sys/param.h>
- #include <sys/signal.h> 
- #include <stdlib.h>	/* For errno, putenv, etc.	      */
- #include <errno.h>	/* For errno on SunOS systems	      */
diff --git a/x11/libgnome/files/patch-bl b/x11/libgnome/files/patch-bl
deleted file mode 100644
index 6e87d04eb50c..000000000000
--- a/x11/libgnome/files/patch-bl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- libgnomeui/gnome-init.c.orig	Thu Aug 16 21:15:48 2001
-+++ libgnomeui/gnome-init.c	Wed Aug 22 16:15:00 2001
-@@ -205,32 +205,8 @@
- 	switch(reason) {
- 	case POPT_CALLBACK_REASON_PRE:
-                 {
--                        char *ctype, *old_ctype = NULL;
--                        gboolean ctype_set;
--
-                         gnome_segv_setup (FALSE);
--                        ctype = setlocale (LC_CTYPE, NULL);
--
--                        if (!strcmp(ctype, "C")) {
--                                old_ctype = g_strdup (getenv ("LC_CTYPE"));
--                                putenv ("LC_CTYPE=en_US");
--                                ctype_set = TRUE;
--                        } else
--                                ctype_set = FALSE;
--
-                         gtk_set_locale ();
--
--                        if (ctype_set) {
--                                char *setme;
--
--                                if (old_ctype) {
--                                        setme = g_strconcat ("LC_CTYPE=", old_ctype, NULL);
--                                        g_free(old_ctype);
--                                } else
--                                        setme = "LC_CTYPE=";
--
--                                putenv (setme);
--                        }
-                         client = gnome_master_client();
-                 }
- 		break;
diff --git a/x11/libgnome/files/patch-bm b/x11/libgnome/files/patch-bm
deleted file mode 100644
index ab6caa847240..000000000000
--- a/x11/libgnome/files/patch-bm
+++ /dev/null
@@ -1,11 +0,0 @@
---- zvt/vt.h.orig	Sat Sep  9 01:33:07 2000
-+++ zvt/vt.h	Sat Sep  9 01:35:18 2000
-@@ -23,7 +23,7 @@
- 
- #include <unistd.h>
- 
--#include "lists.h"
-+#include <zvt/lists.h>
- 
- /* for utf-8 input support */
- #define ZVT_UTF 1
diff --git a/x11/libgnome/files/patch-bn b/x11/libgnome/files/patch-bn
deleted file mode 100644
index b00458878bea..000000000000
--- a/x11/libgnome/files/patch-bn
+++ /dev/null
@@ -1,13 +0,0 @@
---- devel-docs/Makefile.in.orig	Sun Jan 21 16:37:33 2001
-+++ devel-docs/Makefile.in	Tue Jan 23 23:12:20 2001
-@@ -158,4 +158,4 @@
- 
--docdir = $(prefix)/doc
--doc_DATA = $(TEXT_FILES)
-+docdir = 
-+doc_DATA = 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -185,3 +185,2 @@
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(docdir)
- 	@list='$(doc_DATA)'; for p in $$list; do \
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
new file mode 100644
index 000000000000..e7df520cedc5
--- /dev/null
+++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- help-converters/gnome-vfs-module/Makefile.in.orig	Wed Feb 27 15:17:54 2002
++++ help-converters/gnome-vfs-module/Makefile.in	Wed Feb 27 15:34:24 2002
+@@ -134,12 +134,12 @@
+ cxxflags_set = @cxxflags_set@
+ gnomelocaledir = @gnomelocaledir@
+ 
+-INCLUDES =  	-I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)				
++INCLUDES =  	-DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir)						$(HELP_VFS_MODULE_CFLAGS)				
+ 
+ 
+ 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
new file mode 100644
index 000000000000..bbc397d6883b
--- /dev/null
+++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::help-method.c
@@ -0,0 +1,38 @@
+
+$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
new file mode 100644
index 000000000000..6d4fea21f0b7
--- /dev/null
+++ b/x11/libgnome/files/patch-help-converters::info::Makefile.in
@@ -0,0 +1,14 @@
+
+$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
new file mode 100644
index 000000000000..221f00345893
--- /dev/null
+++ b/x11/libgnome/files/patch-help-converters::info::main.c
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- help-converters/info/main.c	2002/02/20 18:02:08	1.1
++++ help-converters/info/main.c	2002/02/20 18:08:43
+@@ -87,13 +87,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);
+ 
+ 	    for(i = 0; i < ndirs; i++)
diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in
new file mode 100644
index 000000000000..9344c3d4ae50
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libgnome/Makefile.in	2002/02/20 17:59:50	1.1
++++ libgnome/Makefile.in	2002/02/20 18:00:10
+@@ -147,7 +147,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-ltmain.sh b/x11/libgnome/files/patch-ltmain.sh
index 3084634cf3b8..91713d2306f8 100644
--- a/x11/libgnome/files/patch-ltmain.sh
+++ b/x11/libgnome/files/patch-ltmain.sh
@@ -1,19 +1,36 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Tue Jan 22 06:35:12 2002
-+++ ltmain.sh	Fri Feb  8 01:27:17 2002
-@@ -1799,6 +1799,9 @@
- 	  # rhapsody is a little odd...
- 	  deplibs="$deplibs -framework System"
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
- 	  # Add libc to deplibs on all other systems.
- 	  deplibs="$deplibs -lc"
-@@ -3360,10 +3366,12 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
++	compiler_flags="$compiler_flags -pthread"
++	continue
++	;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -2412,6 +2420,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11/libgnome/files/patch-po::Makefile.in.in b/x11/libgnome/files/patch-po::Makefile.in.in
deleted file mode 100644
index 68b6a8c98491..000000000000
--- a/x11/libgnome/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/01/14 11:02:35	1.1
-+++ po/Makefile.in.in	2002/01/14 11:02:49
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \