diff -Naur libgnome-2.0.6.old/configure libgnome-2.0.6.new/configure
--- libgnome-2.0.6.old/configure	Thu Nov 21 00:47:30 2002
+++ libgnome-2.0.6.new/configure	Sat Jan 18 17:04:46 2003
@@ -5246,7 +5246,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $tmp_verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
@@ -7522,6 +7522,11 @@
   *-solaris*)
 cat >>confdefs.h <<\EOF
 #define HAVE_MAN_DEBUG 1
+EOF
+;;
+  *-darwin*)
+cat >>confdefs.h <<\EOF
+#define HAVE_MAN_WHEREIS 1
 EOF
 ;;
   esac
diff -Naur libgnome-2.0.6.old/help-converters/gnome-vfs-module/Makefile.in libgnome-2.0.6.new/help-converters/gnome-vfs-module/Makefile.in
--- libgnome-2.0.6.old/help-converters/gnome-vfs-module/Makefile.in	Thu Nov 21 00:51:20 2002
+++ libgnome-2.0.6.new/help-converters/gnome-vfs-module/Makefile.in	Sat Jan 18 17:04:46 2003
@@ -143,7 +143,7 @@
 
 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 -Naur libgnome-2.0.6.old/libgnome/gnome-config.c libgnome-2.0.6.new/libgnome/gnome-config.c
--- libgnome-2.0.6.old/libgnome/gnome-config.c	Wed Jun 12 05:31:20 2002
+++ libgnome-2.0.6.new/libgnome/gnome-config.c	Sat Jan 18 17:04:46 2003
@@ -100,6 +100,31 @@
 
 static TProfile *Current = 0;
 
+#ifndef HAVE_STRTOK_R
+static char *
+strtok_r (char *s, const char *delim, char **save_ptr)
+{
+	char *token;
+
+	if (s == NULL)
+		s = *save_ptr;
+
+	s += strspn (s, delim);
+	if (*s == '\0')
+		return NULL;
+
+	token = s;
+	s = strpbrk (token, delim);
+	if (s == NULL) {
+		*save_ptr = strchr (token, '\0');
+	} else {
+		*s = '\0';
+		*save_ptr = s + 1;
+	}
+	return token;
+}
+#endif
+
 /*
  * This one keeps track of all of the opened files
  */
diff -Naur libgnome-2.0.6.old/libgnome/gnome-init.h libgnome-2.0.6.new/libgnome/gnome-init.h
--- libgnome-2.0.6.old/libgnome/gnome-init.h	Mon Dec  3 20:29:38 2001
+++ libgnome-2.0.6.new/libgnome/gnome-init.h	Sat Jan 18 17:04:46 2003
@@ -32,8 +32,8 @@
 G_BEGIN_DECLS
 
 /* This is where the user specific files are stored under $HOME */
-#define GNOME_DOT_GNOME		".gnome2/"
-#define GNOME_DOT_GNOME_PRIVATE	".gnome2_private/"
+#define GNOME_DOT_GNOME		".gnome2"
+#define GNOME_DOT_GNOME_PRIVATE	".gnome2_private"
 
 #define LIBGNOME_MODULE libgnome_module_info_get()
 const GnomeModuleInfo *libgnome_module_info_get (void) G_GNUC_CONST;
diff -Naur libgnome-2.0.6.old/libgnome/gnome-score.c libgnome-2.0.6.new/libgnome/gnome-score.c
--- libgnome-2.0.6.old/libgnome/gnome-score.c	Sat Jun  1 12:14:48 2002
+++ libgnome-2.0.6.new/libgnome/gnome-score.c	Sat Jan 18 17:04:46 2003
@@ -73,6 +73,31 @@
 
 /********************** internal functions ***********************************/
 
+#ifndef HAVE_STRTOK_R
+static char *
+strtok_r (char *s, const char *delim, char **save_ptr)
+{
+	char *token;
+
+	if (s == NULL)
+		s = *save_ptr;
+
+	s += strspn (s, delim);
+	if (*s == '\0')
+		return NULL;
+
+	token = s;
+	s = strpbrk (token, delim);
+	if (s == NULL) {
+		*save_ptr = strchr (token, '\0');
+	} else {
+		*s = '\0';
+		*save_ptr = s + 1;
+	}
+	return token;
+}
+#endif
+
 static gchar *
 gnome_get_score_file_name (const gchar * progname, const gchar * level)
 {
diff -Naur libgnome-2.0.6.old/libgnome/gnome-util.h libgnome-2.0.6.new/libgnome/gnome-util.h
--- libgnome-2.0.6.old/libgnome/gnome-util.h	Sun Jun  2 10:41:45 2002
+++ libgnome-2.0.6.new/libgnome/gnome-util.h	Sat Jan 18 17:04:46 2003
@@ -49,7 +49,7 @@
 /* very similar to above, but adds $HOME/.gnome2/ to beginning
  * This is meant to be the most useful version.
  */
-#define gnome_util_home_file(afile) (g_strconcat(g_get_home_dir(), "/", GNOME_DOT_GNOME, (afile), NULL))
+#define gnome_util_home_file(afile) (g_build_filename (g_get_home_dir(), "/", GNOME_DOT_GNOME, (afile), NULL))
 
 /* Find the name of the user's shell.  */
 char *gnome_util_user_shell (void);
diff -Naur libgnome-2.0.6.old/libgnome/parse-path.cP libgnome-2.0.6.new/libgnome/parse-path.cP
--- libgnome-2.0.6.old/libgnome/parse-path.cP	Mon Dec  3 20:29:38 2001
+++ libgnome-2.0.6.new/libgnome/parse-path.cP	Sat Jan 18 17:04:46 2003
@@ -85,9 +85,9 @@
 			p->file++;
 
 		if (priv){
-			p->file = g_strconcat (g_get_home_dir(), "/", GNOME_DOT_GNOME_PRIVATE, (p->file), NULL);
+			p->file = g_build_filename (g_get_home_dir(), GNOME_DOT_GNOME_PRIVATE, (p->file), NULL);
 		} else {
-			p->file = g_strconcat (g_get_home_dir(), "/", GNOME_DOT_GNOME, (p->file), NULL);
+			p->file = g_build_filename (g_get_home_dir(), GNOME_DOT_GNOME, (p->file), NULL);
 		}
 	}
 	if (p->file    == GNOME_CONFIG_PARSE_ERROR ||
diff -Naur libgnome-2.0.6.old/ltmain.sh libgnome-2.0.6.new/ltmain.sh
--- libgnome-2.0.6.old/ltmain.sh	Thu Nov 21 00:47:14 2002
+++ libgnome-2.0.6.new/ltmain.sh	Sat Jan 18 17:04:46 2003
@@ -2894,6 +2894,11 @@
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
 	  eval cmds=\"$archive_cmds\"
 	fi
 	save_ifs="$IFS"; IFS='~'
@@ -3948,10 +3953,10 @@
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-	  if test "$installed" = no && test $need_relink = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
+#	  if test "$installed" = no && test $need_relink = yes; then
+#	    $echo >> $output "\
+#relink_command=\"$relink_command\""
+#	  fi
 	done
       fi