Update "gtk--" package to version 1.0.3 include in GNOME 1.0.53 release

and enable GNOME support. Changes since version 1.0.0:
- uncommented Gtk_CheckMenuItem::set_state(bool)
- new string vector based ctors for Gtk_CList and Gtk_CTree.
- misc. other changes/fixes to Gtk_CTree.
- fixed Gtk_CTreeNode::node_nth_child_real
- Improvements to list wrappers and portablity fixes. (world)
- Ctree, Style, Clist improvements (Dukes)
- Fixed drag_begin. (Dukes)
- ItemFactory interface changes. (Dukes&Tero)
- Fixed global trashcan problem -- critical. (Stephane Conversy)
- Gdk-- bug in reference counting. (Ewen McNeill)
- Missing ctors in gdk--.  (Dukes)
- Gnome-- item fixes (Herbert Valerio Riedel)
- Numerous package fixes.

5 files changed, 163 insertions, 121 deletions

diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 6c0c2357693..91438d71704 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,21 +1,16 @@
-# $NetBSD: Makefile,v 1.8 1999/10/23 00:05:17 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/14 23:36:24 tron Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
 #
 
-DISTNAME=	Gtk---1.0.0
-PKGNAME=	gtk---1.0.0
+DISTNAME=	Gtk---1.0.3
+PKGNAME=	gtk---1.0.3
 CATEGORIES=	x11 devel
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/gtk--/ \
-		ftp://gd.tuwien.ac.at/graphics/gimp/gtk/gtk--/ \
-		ftp://ftp.u-aizu.ac.jp/pub/graphics/tools/gimp/gtk/gtk--/ \
-		ftp://ftp.flirble.org/pub/X/gimp/gtk/gtk--/ \
-		http://lazy.ton.tut.fi/terop/iki/gtk/ \
-		http://gd.tuwien.ac.at/graphics/gimp/gtk/gtk--/
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://lazy.ton.tut.fi/gtk--/gtk--.html
 
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
 BUILD_DEPENDS+=	gm4:../../devel/m4
 
 USE_LIBTOOL=	yes
@@ -23,6 +18,12 @@ USE_X11BASE=	yes
 USE_GMAKE=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-gnome
+
+PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+
+post-install:
+	${TEST} ${PREFIX} = ${LOCALBASE} || \
+	${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \
+	  ${LOCALBASE}/share/aclocal/gtk--.m4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk--/files/md5 b/x11/gtk--/files/md5
index 15c4ec4c11a..02c9222395f 100644
--- a/x11/gtk--/files/md5
+++ b/x11/gtk--/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/03/14 17:12:53 rh Exp $
+$NetBSD: md5,v 1.3 1999/11/14 23:36:26 tron Exp $
 
-MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
diff --git a/x11/gtk--/files/patch-sum b/x11/gtk--/files/patch-sum
index f49dbc05499..a69b35cf014 100644
--- a/x11/gtk--/files/patch-sum
+++ b/x11/gtk--/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:26 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/14 23:36:26 tron Exp $
 
-MD5 (patch-af) = a9ca9e2a48898462ac03e1232449e70f
+MD5 (patch-af) = 920eecbca989dd5ed85237ad30d30a32
 MD5 (patch-ag) = f506e01307364cead73593ec109895ee
 MD5 (patch-ah) = f65a029f379fbf8274f297d501c1c0e8
diff --git a/x11/gtk--/patches/patch-af b/x11/gtk--/patches/patch-af
index 871d241e238..fb8a0a75fc6 100644
--- a/x11/gtk--/patches/patch-af
+++ b/x11/gtk--/patches/patch-af
@@ -1,24 +1,24 @@
-$NetBSD: patch-af,v 1.1 1999/03/14 17:12:54 rh Exp $
+$NetBSD: patch-af,v 1.2 1999/11/14 23:36:27 tron Exp $
 
---- configure.orig	Tue Mar  9 02:53:45 1999
-+++ configure	Wed Mar 10 20:44:43 1999
-@@ -1699,6 +1699,7 @@
-   ac_tool_prefix=
+--- configure.orig	Tue Sep 28 22:07:12 1999
++++ configure	Sun Nov 14 22:59:48 1999
+@@ -1698,6 +1698,7 @@
  fi
  
+ 
 +if false; then
+ # Check for any special flags to pass to ltconfig.
+ #
+ # the following will cause an existing older ltconfig to fail, so
+@@ -1999,6 +2000,7 @@
+ 
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1931,6 +1932,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -4046,10 +4048,12 @@
+@@ -4166,10 +4168,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/x11/gtk--/pkg/PLIST b/x11/gtk--/pkg/PLIST
index 0c478162d82..af4be8382fb 100644
--- a/x11/gtk--/pkg/PLIST
+++ b/x11/gtk--/pkg/PLIST
@@ -1,23 +1,107 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/14 17:12:54 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/11/14 23:36:27 tron Exp $
 bin/gensig
 bin/gtkmm-config
+include/gdk--.h
 include/gdk--/bitmap.h
+include/gdk--/color.h
 include/gdk--/colormap.h
+include/gdk--/drawable.h
+include/gdk--/extra/imlib.h
+include/gdk--/font.h
 include/gdk--/gc.h
+include/gdk--/image.h
+include/gdk--/list.h
 include/gdk--/main.h
-include/gdk--/color.h
-include/gdk--/drawable.h
 include/gdk--/pixmap.h
-include/gdk--/font.h
 include/gdk--/types.h
-include/gdk--/window.h
 include/gdk--/visual.h
-include/gdk--/image.h
-include/gdk--/list.h
-include/gdk--/extra/imlib.h
-include/gdk--.h
+include/gdk--/window.h
+include/glib--.h
+include/gnome--.h
+include/gnome--/about.h
+include/gnome--/app.h
+include/gnome--/appbar.h
+include/gnome--/canvas-ellipse.h
+include/gnome--/canvas-group.h
+include/gnome--/canvas-image.h
+include/gnome--/canvas-item.h
+include/gnome--/canvas-line.h
+include/gnome--/canvas-rect-ellipse.h
+include/gnome--/canvas-rect.h
+include/gnome--/canvas-text.h
+include/gnome--/canvas-widget.h
+include/gnome--/canvas.h
+include/gnome--/color-picker.h
+include/gnome--/dialog.h
+include/gnome--/functions.h
+include/gnome--/icon-list.h
+include/gnome--/main.h
+include/gnome--/pixmap.h
+include/gtk--.h
+include/gtk--/accelgroup.h
+include/gtk--/accellabel.h
+include/gtk--/adjustment.h
+include/gtk--/alignment.h
+include/gtk--/arg.h
+include/gtk--/arrow.h
+include/gtk--/aspectframe.h
+include/gtk--/base.h
+include/gtk--/bin.h
+include/gtk--/box.h
+include/gtk--/button.h
+include/gtk--/buttonbox.h
+include/gtk--/calendar.h
+include/gtk--/checkbutton.h
+include/gtk--/checkmenuitem.h
+include/gtk--/clist.h
+include/gtk--/colorselection.h
+include/gtk--/combo.h
+include/gtk--/container.h
+include/gtk--/ctree.h
+include/gtk--/curve.h
+include/gtk--/data.h
+include/gtk--/dialog.h
+include/gtk--/drawingarea.h
+include/gtk--/editable.h
+include/gtk--/entry.h
+include/gtk--/eventbox.h
+include/gtk--/fileselection.h
+include/gtk--/fixed.h
+include/gtk--/fontselection.h
+include/gtk--/frame.h
+include/gtk--/handlebox.h
+include/gtk--/image.h
+include/gtk--/inputdialog.h
+include/gtk--/invisible.h
+include/gtk--/item.h
+include/gtk--/itemfactory.h
+include/gtk--/label.h
+include/gtk--/layout.h
+include/gtk--/list.h
+include/gtk--/listitem.h
+include/gtk--/main.h
+include/gtk--/menu.h
+include/gtk--/menubar.h
+include/gtk--/menufactory.h
+include/gtk--/menuitem.h
+include/gtk--/menupath.h
+include/gtk--/menushell.h
+include/gtk--/misc.h
+include/gtk--/notebook.h
+include/gtk--/object.h
+include/gtk--/optionmenu.h
+include/gtk--/packer.h
+include/gtk--/paned.h
+include/gtk--/pixmap.h
+include/gtk--/plug.h
+include/gtk--/preview.h
+include/gtk--/private/about_p.h
+include/gtk--/private/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
 include/gtk--/private/adjustment_p.h
 include/gtk--/private/alignment_p.h
+include/gtk--/private/app_p.h
+include/gtk--/private/appbar_p.h
 include/gtk--/private/arg_p.h
 include/gtk--/private/arrow_p.h
 include/gtk--/private/aspectframe_p.h
@@ -26,12 +110,25 @@ include/gtk--/private/bin_p.h
 include/gtk--/private/box_p.h
 include/gtk--/private/button_p.h
 include/gtk--/private/buttonbox_p.h
+include/gtk--/private/calendar_p.h
+include/gtk--/private/canvas-ellipse_p.h
+include/gtk--/private/canvas-group_p.h
+include/gtk--/private/canvas-image_p.h
+include/gtk--/private/canvas-item_p.h
+include/gtk--/private/canvas-line_p.h
+include/gtk--/private/canvas-rect-ellipse_p.h
+include/gtk--/private/canvas-rect_p.h
+include/gtk--/private/canvas-text_p.h
+include/gtk--/private/canvas-widget_p.h
+include/gtk--/private/canvas_p.h
 include/gtk--/private/checkbutton_p.h
 include/gtk--/private/checkmenuitem_p.h
 include/gtk--/private/clist_p.h
+include/gtk--/private/color-picker_p.h
 include/gtk--/private/colorselection_p.h
 include/gtk--/private/combo_p.h
 include/gtk--/private/container_p.h
+include/gtk--/private/ctree_p.h
 include/gtk--/private/curve_p.h
 include/gtk--/private/data_p.h
 include/gtk--/private/dialog_p.h
@@ -41,17 +138,23 @@ include/gtk--/private/entry_p.h
 include/gtk--/private/eventbox_p.h
 include/gtk--/private/fileselection_p.h
 include/gtk--/private/fixed_p.h
+include/gtk--/private/fontselection_p.h
 include/gtk--/private/frame_p.h
 include/gtk--/private/handlebox_p.h
+include/gtk--/private/icon-list_p.h
 include/gtk--/private/image_p.h
 include/gtk--/private/inputdialog_p.h
+include/gtk--/private/invisible_p.h
 include/gtk--/private/item_p.h
+include/gtk--/private/itemfactory_p.h
 include/gtk--/private/label_p.h
+include/gtk--/private/layout_p.h
 include/gtk--/private/list_p.h
 include/gtk--/private/listitem_p.h
 include/gtk--/private/main_p.h
 include/gtk--/private/menu_p.h
 include/gtk--/private/menubar_p.h
+include/gtk--/private/menufactory_p.h
 include/gtk--/private/menuitem_p.h
 include/gtk--/private/menupath_p.h
 include/gtk--/private/menushell_p.h
@@ -59,9 +162,12 @@ include/gtk--/private/misc_p.h
 include/gtk--/private/notebook_p.h
 include/gtk--/private/object_p.h
 include/gtk--/private/optionmenu_p.h
+include/gtk--/private/packer_p.h
 include/gtk--/private/paned_p.h
 include/gtk--/private/pixmap_p.h
+include/gtk--/private/plug_p.h
 include/gtk--/private/preview_p.h
+include/gtk--/private/progress_p.h
 include/gtk--/private/progressbar_p.h
 include/gtk--/private/radiobutton_p.h
 include/gtk--/private/radiomenuitem_p.h
@@ -72,6 +178,7 @@ include/gtk--/private/scale_p.h
 include/gtk--/private/scrollbar_p.h
 include/gtk--/private/scrolledwindow_p.h
 include/gtk--/private/separator_p.h
+include/gtk--/private/socket_p.h
 include/gtk--/private/spinbutton_p.h
 include/gtk--/private/statusbar_p.h
 include/gtk--/private/style_p.h
@@ -86,65 +193,7 @@ include/gtk--/private/treeitem_p.h
 include/gtk--/private/viewport_p.h
 include/gtk--/private/widget_p.h
 include/gtk--/private/window_p.h
-include/gtk--/private/accelgroup_p.h
-include/gtk--/private/accellabel_p.h
-include/gtk--/private/calendar_p.h
-include/gtk--/private/ctree_p.h
-include/gtk--/private/fontselection_p.h
-include/gtk--/private/invisible_p.h
-include/gtk--/private/itemfactory_p.h
-include/gtk--/private/layout_p.h
-include/gtk--/private/menufactory_p.h
-include/gtk--/private/packer_p.h
-include/gtk--/private/plug_p.h
-include/gtk--/private/progress_p.h
-include/gtk--/private/socket_p.h
-include/gtk--/adjustment.h
-include/gtk--/alignment.h
-include/gtk--/arg.h
-include/gtk--/arrow.h
-include/gtk--/aspectframe.h
-include/gtk--/base.h
-include/gtk--/bin.h
-include/gtk--/box.h
-include/gtk--/button.h
-include/gtk--/buttonbox.h
-include/gtk--/checkbutton.h
-include/gtk--/checkmenuitem.h
-include/gtk--/clist.h
-include/gtk--/colorselection.h
-include/gtk--/combo.h
-include/gtk--/container.h
-include/gtk--/curve.h
-include/gtk--/data.h
-include/gtk--/dialog.h
-include/gtk--/drawingarea.h
-include/gtk--/editable.h
-include/gtk--/entry.h
-include/gtk--/eventbox.h
-include/gtk--/fileselection.h
-include/gtk--/fixed.h
-include/gtk--/frame.h
-include/gtk--/handlebox.h
-include/gtk--/image.h
-include/gtk--/inputdialog.h
-include/gtk--/item.h
-include/gtk--/label.h
-include/gtk--/list.h
-include/gtk--/listitem.h
-include/gtk--/main.h
-include/gtk--/menu.h
-include/gtk--/menubar.h
-include/gtk--/menuitem.h
-include/gtk--/menupath.h
-include/gtk--/menushell.h
-include/gtk--/misc.h
-include/gtk--/notebook.h
-include/gtk--/object.h
-include/gtk--/optionmenu.h
-include/gtk--/paned.h
-include/gtk--/pixmap.h
-include/gtk--/preview.h
+include/gtk--/progress.h
 include/gtk--/progressbar.h
 include/gtk--/radiobutton.h
 include/gtk--/radiomenuitem.h
@@ -155,6 +204,7 @@ include/gtk--/scale.h
 include/gtk--/scrollbar.h
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -169,39 +219,28 @@ include/gtk--/treeitem.h
 include/gtk--/viewport.h
 include/gtk--/widget.h
 include/gtk--/window.h
-include/gtk--/accelgroup.h
-include/gtk--/accellabel.h
-include/gtk--/calendar.h
-include/gtk--/ctree.h
-include/gtk--/fontselection.h
-include/gtk--/invisible.h
-include/gtk--/itemfactory.h
-include/gtk--/layout.h
-include/gtk--/menufactory.h
-include/gtk--/packer.h
-include/gtk--/plug.h
-include/gtk--/progress.h
-include/gtk--/socket.h
-include/gtk--sigslot.h
-include/gtk--sigcpp.h
-include/gtk--sigproxy.h
-include/gtk--.h
 include/gtk--sig.h
-include/gtk--sigconn.h
 include/gtk--sigcommon.h
-include/glib--.h
+include/gtk--sigconn.h
+include/gtk--sigcpp.h
+include/gtk--sigproxy.h
+include/gtk--sigslot.h
 lib/Gtk--/include/gdk--config.h
 lib/Gtk--/include/gtk--config.h
-lib/libgdkmm.so.1.0
+lib/gnomemmConf.sh
 lib/libgdkmm.a
-lib/libgtkmm.so.5.0
+lib/libgdkmm.so.1.0
+lib/libgnomemm.a
+lib/libgnomemm.so.7.0
 lib/libgtkmm.a
-man/man3/G_SList_Iterator.3
+lib/libgtkmm.so.7.0
 man/man3/G_IntList.3
 man/man3/G_IntList_Iterator.3
 man/man3/G_List.3
+man/man3/G_List_ConstIterator.3
 man/man3/G_List_Cpp_Iterator.3
 man/man3/G_List_Iterator.3
+man/man3/G_SList_Iterator.3
 man/man3/GtkBase.3
 man/man3/GtkBaseClass.3
 man/man3/Gtk_AccelEntry.3
@@ -330,10 +369,12 @@ man/man3/Toolbar_Child.3
 man/man3/_gtk_string.3
 man/man3/gtkmm_add_signal_class.3
 share/aclocal/gtk--.m4
-@unexec rmdir %D/share/aclocal 2>/dev/null || true
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
-@dirrm include/gtk--/private
-@dirrm include/gtk--
+@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk--.m4 ${LOCALBASE}/share/aclocal/gtk--.m4
+@unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk--.m4
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gnome--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--