update to 1.2.1

"many fixes and enhancements"

3 files changed, 47 insertions, 23 deletions

diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 36492a10c14..5e462f8b28c 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,18 +1,26 @@
-$NetBSD: patch-aa,v 1.9 2000/05/02 18:48:43 danw Exp $
+$NetBSD: patch-aa,v 1.10 2000/05/30 19:23:48 drochner Exp $
 
---- configure.orig	Tue Feb 22 15:29:37 2000
-+++ configure	Mon Mar 13 23:08:16 2000
-@@ -2077,7 +2077,9 @@
+--- configure.orig	Sat May 20 20:55:16 2000
++++ configure	Fri May 26 23:39:02 2000
+@@ -2000,7 +2000,7 @@
  fi
+ rm -f confcache
  
- # Always use our own libtool.
+-
 +if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+@@ -2029,7 +2029,7 @@
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+ exec 5>>./config.log
+-
 +fi
  
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
-@@ -5587,7 +5589,7 @@
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:2036: checking whether to enable maintainer-specific portions of Makefiles" >&5
+@@ -5304,7 +5304,7 @@
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
@@ -21,7 +29,7 @@ $NetBSD: patch-aa,v 1.9 2000/05/02 18:48:43 danw Exp $
  
  
  echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6
-@@ -10496,7 +10498,7 @@
+@@ -10213,7 +10213,7 @@
  GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
diff --git a/x11/gnome-libs/patches/patch-ah b/x11/gnome-libs/patches/patch-ah
index 5f1a1fdd491..5a757c8b93c 100644
--- a/x11/gnome-libs/patches/patch-ah
+++ b/x11/gnome-libs/patches/patch-ah
@@ -1,14 +1,21 @@
-$NetBSD: patch-ah,v 1.3 1999/11/15 18:47:56 rh Exp $
+$NetBSD: patch-ah,v 1.4 2000/05/30 19:23:48 drochner Exp $
 
---- libart_lgpl/configure.orig	Mon Nov 15 19:20:56 1999
-+++ libart_lgpl/configure	Mon Nov 15 19:20:56 1999
-@@ -1624,7 +1624,9 @@
- fi
+--- libart_lgpl/configure.orig	Sat May 20 20:55:17 2000
++++ libart_lgpl/configure	Sat May 27 10:57:15 2000
+@@ -1437,6 +1437,8 @@
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
  
- # Always use our own libtool.
 +if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+ case "$lt_target" in
+@@ -1577,6 +1579,7 @@
+ # clobbered by the next message.
+ exec 5>>./config.log
+ 
 +fi
  
- # Check for any special flags to pass to ltconfig.
- libtool_flags=
+ echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+ echo "configure:1583: checking whether to enable maintainer-specific portions of Makefiles" >&5
diff --git a/x11/gnome-libs/patches/patch-aj b/x11/gnome-libs/patches/patch-aj
index d1773f569b9..55ade992b94 100644
--- a/x11/gnome-libs/patches/patch-aj
+++ b/x11/gnome-libs/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.1 1999/05/01 15:10:42 tron Exp $
+$NetBSD: patch-aj,v 1.2 2000/05/30 19:23:48 drochner Exp $
 
---- gnome-config.in.orig	Mon Feb 15 19:05:33 1999
-+++ gnome-config.in	Sat May  1 16:56:02 1999
-@@ -213,7 +213,7 @@
+--- gnome-config.in.orig	Tue Sep  7 21:25:26 1999
++++ gnome-config.in	Tue May 30 17:56:22 2000
+@@ -40,6 +40,8 @@
+     module_dirs="$extra:$module_dirs"
+ done
+ 
++module_dirs="XXXLOCALBASEXXX/lib:$module_dirs"
++
+ usage()
+ {
+     exit_code=$1
+@@ -239,7 +241,7 @@
      case "$i" in
      # a library, save it for later, in reverse order
      -l*) rev_libs="$i $rev_libs" ;;