Update to "gtk+-1.0.0" using changes supplied by Bernd Sieker.

2 files changed, 18 insertions, 154 deletions

diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 82604ca4206..44d805920d1 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,157 +1,11 @@
---- glib/configure.orig	Wed Jan 28 13:28:59 1998
-+++ glib/configure	Wed Jan 28 13:31:16 1998
-@@ -561,6 +561,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
-+INSTALL=""         # added to make it work with NetBSD pkg system.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:566: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
-@@ -1405,72 +1406,6 @@
+--- configure.orig	Sat Apr 11 14:26:55 1998
++++ configure	Sat Apr 11 14:29:01 1998
+@@ -645,7 +645,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:1409: checking for ${CC-cc} option to accept ANSI C" >&5
--if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX			-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  cat > conftest.$ac_ext <<EOF
--#line 1425 "configure"
--#include "confdefs.h"
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--
--int main() {
--
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--
--; return 0; }
--EOF
--if { (eval echo configure:1462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  am_cv_prog_cc_stdc="$ac_arg"; break
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--done
--CC="$ac_save_CC"
--
--fi
--
- if test -z "$am_cv_prog_cc_stdc"; then
-   echo "$ac_t""none needed" 1>&6
- else
---- configure	1998/02/13 13:53:58	1.1
-+++ configure	1998/02/13 13:54:09
-@@ -1497,71 +1497,6 @@
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:1501: checking for ${CC-cc} option to accept ANSI C" >&5
--if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX			-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  cat > conftest.$ac_ext <<EOF
--#line 1517 "configure"
--#include "confdefs.h"
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--
--int main() {
--
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--
--; return 0; }
--EOF
--if { (eval echo configure:1554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  am_cv_prog_cc_stdc="$ac_arg"; break
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--done
--CC="$ac_save_CC"
--
--fi
- 
- if test -z "$am_cv_prog_cc_stdc"; then
-   echo "$ac_t""none needed" 1>&6
+ echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+ echo "configure:652: checking whether build environment is sane" >&5
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
new file mode 100644
index 00000000000..8f27a009567
--- /dev/null
+++ b/x11/gtk/patches/patch-ab
@@ -0,0 +1,10 @@
+--- glib/configure.orig	Sat Apr 11 14:29:32 1998
++++ glib/configure	Sat Apr 11 14:30:28 1998
+@@ -570,6 +570,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:573: checking for a BSD compatible install" >&5
++INSTALL=""
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6