Update "gnome-libs" to version 0.30.1.

2 files changed, 23 insertions, 40 deletions

diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 9b1efc03b24..d035efb90d5 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,12 +1,8 @@
-$NetBSD: patch-aa,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: patch-aa,v 1.2 1998/10/04 23:42:01 tron Exp $
 
-Use our own version of libtool
-Set CPPFLAGS correctly so that it finds all the pre-req header files
-Comment out erroneous settings of the INSTALL variable.
-
---- configure.orig	Fri Aug  7 02:01:30 1998
-+++ configure	Fri Aug 14 14:59:42 1998
-@@ -78,6 +78,9 @@
+--- configure.orig	Tue Sep 29 01:46:18 1998
++++ configure	Mon Oct  5 00:25:16 1998
+@@ -86,6 +86,9 @@
  # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
@@ -16,7 +12,7 @@ Comment out erroneous settings of the INSTALL variable.
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
  
-@@ -1621,6 +1624,7 @@
+@@ -1629,6 +1632,7 @@
  
  
  # Always use our own libtool.
@@ -24,7 +20,7 @@ Comment out erroneous settings of the INSTALL variable.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  
-@@ -1700,6 +1704,7 @@
+@@ -1708,6 +1712,7 @@
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
@@ -32,7 +28,7 @@ Comment out erroneous settings of the INSTALL variable.
  
  
  echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-@@ -6711,10 +6716,10 @@
+@@ -7260,10 +7265,10 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -47,18 +43,3 @@ Comment out erroneous settings of the INSTALL variable.
  
    echo creating "$ac_file"
    rm -f "$ac_file"
-@@ -6980,10 +6985,10 @@
-       *) # 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
-+#  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/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac
index 280a6876556..0f61cb933d3 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,22 +1,24 @@
-$NetBSD: patch-ac,v 1.1 1998/09/04 22:14:26 agc Exp $
+$NetBSD: patch-ac,v 1.2 1998/10/04 23:42:01 tron Exp $
 
-Use NetBSD's libtool
-
---- libgtktty/configure	1998/09/01 21:20:44	1.1
-+++ libgtktty/configure	1998/09/01 21:21:08
-@@ -1936,6 +1936,7 @@
+--- libgnome/Makefile.in.orig	Tue Sep 29 01:46:58 1998
++++ libgnome/Makefile.in	Mon Oct  5 01:20:21 1998
+@@ -136,7 +136,7 @@
  
+ lib_LTLIBRARIES = libgnome.la
  
- # Always use our own libtool.
-+if false; then
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-scoredir=$(localstatedir)/games
++scoredir=/var/games
  
+ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
  
-@@ -2015,6 +2016,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
+@@ -487,8 +487,8 @@
  
  
+ install-data-local:
+-	$(mkinstalldirs) $(scoredir)
+-	-chgrp games $(scoredir) && chmod g=rwXs $(scoredir)
++#	$(mkinstalldirs) $(scoredir)
++#	-chgrp games $(scoredir) && chmod g=rwXs $(scoredir)
  
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.