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

5 files changed, 57 insertions, 179 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index b951a0e2834..6d1977c9446 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	gtk
-# Version required:			0.99.3
+# Version required:			1.0.0
 # Date created:				29 January 1998
 # Whom:					bsieker@techfak.uni-bielefeld.de
 #
-# $NetBSD: Makefile,v 1.5 1998/03/10 16:33:33 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/14 23:15:59 tron Exp $
 
-DISTNAME=	gtk+-0.99.3
+DISTNAME=	gtk+-1.0.0
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/  \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/ \
-		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.0/ \
+		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.0/ \
+		ftp://ftp.flirble.org/pub/X/gimp/pub/gtk/v1.0/
 
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 
diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5
index ab92d8b7481..47427fe36b9 100644
--- a/x11/gtk/files/md5
+++ b/x11/gtk/files/md5
@@ -1 +1 @@
-MD5 (gtk+-0.99.3.tar.gz) = 3d170742fef6e7816c14e4175b0c16f9
+MD5 (gtk+-1.0.0.tar.gz) = 9459cc56e82b9e21583715907febe235
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
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 8aa07b84455..d57f2908494 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,15 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 1998/02/24 20:53:13 tron Exp $
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-include/glib.h
-include/glibconfig.h
+@comment $NetBSD: PLIST,v 1.5 1998/04/14 23:16:00 tron Exp $
+bin/gtk-config
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -17,14 +7,15 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
+include/glib.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
-include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkbbox.h
+include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -35,16 +26,18 @@ include/gtk/gtkcombo.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkcurve.h
 include/gtk/gtkdata.h
+include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
+include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
-include/gtk/gtkgc.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
 include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
+include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -62,7 +55,6 @@ include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenufactory.h
 include/gtk/gtkmenuitem.h
 include/gtk/gtkmenushell.h
@@ -73,10 +65,12 @@ include/gtk/gtkoptionmenu.h
 include/gtk/gtkpaned.h
 include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
+include/gtk/gtkprivate.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
+include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
@@ -84,15 +78,18 @@ include/gtk/gtkscrolledwindow.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
 include/gtk/gtksignal.h
-include/gtk/gtkstyle.h
+include/gtk/gtkspinbutton.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
+include/gtk/gtktipsquery.h
 include/gtk/gtktogglebutton.h
 include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
+include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -104,19 +101,36 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/gtk/gtktypebuiltins.h
+lib/glib/include/glibconfig.h
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so.1.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so.1.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so.1.0
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/glib.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir
 info/gdk.info
+info/glib.info
 info/gtk.info
 info/gtk.info-1
 info/gtk.info-2
 info/gtk.info-3
 info/gtk.info-4
+info/gtk.info-5
+share/aclocal/gtk.m4
 @exec ([ ! -f %D/info/dir ] && /usr/bin/sed -ne '1,/Menu:/p' ${LOCALBASE}/info/dir > %D/info/dir) || /usr/bin/true
 @exec install-info %D/info/gdk.info %D/info/dir
+@exec install-info %D/info/glib.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
 @exec /sbin/ldconfig || /usr/bin/true
 @unexec /sbin/ldconfig || /usr/bin/true
+@dirrm share/aclocal
+@dirrm lib/glib/include
+@dirrm lib/glib
 @dirrm include/gtk
 @dirrm include/gdk