Upgrade to 0.30.

3 files changed, 20 insertions, 170 deletions

diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index e8b35ad..f4cbc51 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,198 +1,48 @@
---- configure.orig	Fri Aug 14 07:36:30 1998
-+++ configure	Thu Sep 17 19:42:01 1998
-@@ -78,6 +78,8 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+CFLAGS='-I../intl -I/usr/X11R6/include -I/usr/local/include'
-+LDFLAGS='-L/usr/X11R6/lib -L/usr/local/lib'
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
- 
-@@ -1837,18 +1839,18 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
-      fi
-   fi
- 
--  # Extract the first word of "gtk-config", so it can be a program name with args.
--set dummy gtk-config; ac_word=$2
-+  # Extract the first word of "gtk11-config", so it can be a program name with args.
-+set dummy gtk11-config; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1854: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
-@@ -1930,16 +1932,16 @@
-       (gtk_minor_version != $gtk_config_minor_version) ||
-       (gtk_micro_version != $gtk_config_micro_version))
-     {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-              gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** was found! If gtk11-config was correct, then it is best\n");
-       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-       printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
-       printf("*** before re-running configure\n");
-     } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -1968,10 +1970,10 @@
-         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-         printf("***\n");
-         printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
-         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
-         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-         printf("*** so that the correct libraries are found at run-time))\n");
-       }
-@@ -2002,10 +2004,10 @@
-   else
-      echo "$ac_t""no" 1>&6
-      if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** The gtk11-config script installed by GTK could not be found"
-        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-        echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
-+       echo "*** full path to gtk11-config."
-      else
-        if test -f conf.gtktest ; then
-         :
-@@ -2047,7 +2049,7 @@
-    echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" 
-+          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" 
- fi
- rm -f conftest*
-           CFLAGS="$ac_save_CFLAGS"
-@@ -5847,16 +5849,16 @@
+--- configure.orig	Wed Sep 23 23:37:33 1998
++++ configure	Sat Sep 26 22:02:01 1998
+@@ -6129,16 +6129,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5853: checking for tiffio.h" >&5
+-echo "configure:6135: checking for tiffio.h" >&5
 +  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5853: checking for tiff34/tiffio.h" >&5
++echo "configure:6135: checking for tiff34/tiffio.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 5858 "configure"
+ #line 6140 "configure"
  #include "confdefs.h"
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5920,16 +5922,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5926: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5926: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 5931 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:5936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -5993,16 +5995,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
--echo "configure:5999: checking for tiffio.h" >&5
-+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
-+echo "configure:5999: checking for tiff34/tiffio.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6004 "configure"
- #include "confdefs.h"
--#include <tiffio.h>
-+#include <tiff34/tiffio.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6073,16 +6075,16 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-+  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6079: checking for gif_lib.h" >&5
-+echo "configure:6079: checking for giflib/gif_lib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 6084 "configure"
- #include "confdefs.h"
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6149,16 +6151,16 @@
+ { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6209,16 +6209,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6155: checking for gif_lib.h" >&5
+-echo "configure:6215: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6155: checking for giflib/gif_lib.h" >&5
++echo "configure:6215: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6160 "configure"
+ #line 6220 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6362,7 +6364,7 @@
+ { (eval echo configure:6225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6842,7 +6842,7 @@
  GNOME_LIBDIR='-L${libdir}'
  GNOME_INCLUDEDIR='-I${includedir}'
  if test "$need_gnome_support" = yes; then
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index 88f5d38..c3b4928 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -1,15 +1,15 @@
---- gnome-config.in.orig	Wed Aug 26 19:16:24 1998
-+++ gnome-config.in	Wed Aug 26 19:16:57 1998
-@@ -36,7 +36,7 @@
-     glib	(calls glib-config)
+--- gnome-config.in.orig	Mon Sep 21 23:15:02 1998
++++ gnome-config.in	Sat Sep 26 22:12:16 1998
+@@ -45,7 +45,7 @@
      gnome
      gnomeui
+     gnorba
 -    gtk		(calls gtk-config)
 +    gtk11	(calls gtk11-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
-@@ -92,9 +92,9 @@
+@@ -116,9 +116,9 @@
  	the_libs="$the_libs `glib-config --libs`"
  	the_flags="$the_flags `glib-config --cflags`"
  	;;
diff --git a/x11/gnomelibs/files/patch-ad b/x11/gnomelibs/files/patch-ad
index 7cc2032..dc6621a 100644
--- a/x11/gnomelibs/files/patch-ad
+++ b/x11/gnomelibs/files/patch-ad
@@ -1,5 +1,5 @@
---- libgnome/gnome-help.c.orig	Tue Sep  1 13:30:25 1998
-+++ libgnome/gnome-help.c	Tue Sep  1 13:30:44 1998
+--- libgnome/gnome-help.c.orig	Fri Jul 24 02:08:29 1998
++++ libgnome/gnome-help.c	Sat Sep 26 22:12:34 1998
 @@ -35,7 +35,7 @@
        lang= language_list->data;