Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

2 files changed, 67 insertions, 6 deletions

diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index a6e8fbc286f0..20702046e4a8 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue May 28 02:02:29 2002
-+++ configure	Tue May 28 02:03:10 2002
-@@ -7381,6 +7381,7 @@
+--- configure.orig	Tue Aug 12 03:36:10 2003
++++ configure	Tue Aug 12 10:30:37 2003
+@@ -18129,6 +18129,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9979,7 +9980,7 @@
+@@ -20408,12 +20409,12 @@
  
  YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
  
 -YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
 +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
  
- echo "$as_me:9984: checking for bzread in -lbz2" >&5
- echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
+ 
+ 
+   case $host in
+-  *-linux-gnu | *-irix6*)
++  *-linux-gnu | *-irix6* | *-freebsd*)
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_MAN_WHEREIS 1
+ _ACEOF
diff --git a/x11/yelp/files/patch-src_man2html_yelp-man2html.c b/x11/yelp/files/patch-src_man2html_yelp-man2html.c
new file mode 100644
index 000000000000..e30c81ba0d7e
--- /dev/null
+++ b/x11/yelp/files/patch-src_man2html_yelp-man2html.c
@@ -0,0 +1,55 @@
+--- src/man2html/yelp-man2html.c.orig	Tue Jun 24 05:03:50 2003
++++ src/man2html/yelp-man2html.c	Thu Aug 14 15:47:14 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,24 @@
+ 		 * 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 {
++			i = strlen(output) - 1;
++			while (g_ascii_isspace((unsigned char)output[i])) 
++				output[i--] = '\0';
++		}
++#else
+ 		len = strlen(output);
+ 		for(i = 0; i < len; i++)
+ 		{
+@@ -3855,8 +3877,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"))