Update gtk-- to 1.2.1. Changes from (ancient) 1.0.3 include many, many

fixes and added functionality.  Libsigc++ and gnome-- have been split away
into separate software packages.

Closes PR#10213 by Bernd Sieker <bsieker@freenet.de>.

7 files changed, 61 insertions, 254 deletions

diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index d74b387cba9..c8d1aa49eda 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,30 +1,34 @@
-# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:45 rh Exp $
+# $NetBSD: Makefile,v 1.13 2000/07/15 09:48:12 jlam Exp $
 # FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
 #
 
-DISTNAME=	Gtk---1.0.3
-PKGNAME=	gtk---1.0.3
-CATEGORIES=	x11 devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/releases/gnome-1.0.53/}
+DISTNAME=		gtkmm-1.2.1
+PKGNAME=		gtk---1.2.1
+CATEGORIES=		x11 devel
+MASTER_SITES=		http://download.sourceforge.net/gtkmm/ \
+			${MASTER_SITE_GNOME:=stable/sources/gtkmm/}
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://lazy.ton.tut.fi/gtk--/gtk--.html
+MAINTAINER=		bsieker@freenet.de
+HOMEPAGE=		http://gtkmm.sourceforge.net/
 
-DEPENDS+=	gnome-libs-*:../../x11/gnome-libs
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gm4:../../devel/m4
+BUILD_DEPENDS+=		gm4:../../devel/m4
+DEPENDS+=		gtk+>=1.2.7:../../x11/gtk
+DEPENDS+=		libsigc++>=1.0.1:../../devel/libsigc++
 
-USE_PKGLIBTOOL=	yes
-USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_X11BASE=		# defined
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		# defined
+USE_GMAKE=		# defined
+USE_PERL5=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/scripts/ltconfig
 
-M4=		${LOCALBASE}/bin/gm4
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+M4=			${LOCALBASE}/bin/gm4
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/gtk--.m4 \
-	  ${LOCALBASE}/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 02c9222395f..5614f14e6d4 100644
--- a/x11/gtk--/files/md5
+++ b/x11/gtk--/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/11/14 23:36:26 tron Exp $
+$NetBSD: md5,v 1.4 2000/07/15 09:48:13 jlam Exp $
 
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.1.tar.gz) = 70a95d054f2c641f3d5a8f82639aa985
diff --git a/x11/gtk--/files/patch-sum b/x11/gtk--/files/patch-sum
index f3d5536884c..e08b2e6b08f 100644
--- a/x11/gtk--/files/patch-sum
+++ b/x11/gtk--/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/05/02 18:48:44 danw Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/15 09:48:13 jlam Exp $
 
-MD5 (patch-af) = e6234d2aabb5c84c3217c86cb86551a0
-MD5 (patch-ag) = f506e01307364cead73593ec109895ee
-MD5 (patch-ah) = f65a029f379fbf8274f297d501c1c0e8
+MD5 (patch-ag) = 762209c07ebcef1bf48dbf203fff1deb
+MD5 (patch-ah) = 652d97e8d56534d8a46aed69aeb86886
diff --git a/x11/gtk--/patches/patch-af b/x11/gtk--/patches/patch-af
deleted file mode 100644
index f96a7b85cc6..00000000000
--- a/x11/gtk--/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2000/05/02 18:48:44 danw Exp $
-
---- 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'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/x11/gtk--/patches/patch-ag b/x11/gtk--/patches/patch-ag
index d65d21a2723..682b651cf97 100644
--- a/x11/gtk--/patches/patch-ag
+++ b/x11/gtk--/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 1999/03/14 17:12:54 rh Exp $
+$NetBSD: patch-ag,v 1.2 2000/07/15 09:48:13 jlam Exp $
 
---- gdk--/gdk--/Makefile.in.orig	Tue Mar  9 02:57:22 1999
-+++ gdk--/gdk--/Makefile.in	Wed Mar 10 20:53:39 1999
-@@ -123,7 +123,7 @@
+--- gdk--/gdk--/Makefile.in.orig	Sat May 20 14:51:19 2000
++++ gdk--/gdk--/Makefile.in	Sat Jul 15 04:28:08 2000
+@@ -100,7 +100,7 @@
  
- libgdkmm_la_SOURCES =  	bitmap.cc    colormap.cc  font.cc      main.cc      window.cc 	color.cc     drawable.cc  gc.cc        pixmap.cc    visual.cc         image.cc
+ libgdkmm_la_SOURCES =  	bitmap.cc    colormap.cc  font.cc      main.cc      window.cc 	color.cc     drawable.cc  gc.cc        pixmap.cc    visual.cc         image.cc     types.cc     cursor.cc
  
 -libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE)
 +libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION)
  
  libgdkmmincludedir = $(includedir)/gdk--
- libgdkmminclude_HEADERS =  	bitmap.h      colormap.h    gc.h          main.h 	color.h       drawable.h    pixmap.h 	font.h        types.h       window.h      visual.h         image.h       list.h
+ libgdkmminclude_HEADERS =  	bitmap.h      colormap.h    gc.h          main.h 	color.h       drawable.h    pixmap.h 	font.h        types.h       window.h      visual.h         image.h       list.h        cursor.h
diff --git a/x11/gtk--/patches/patch-ah b/x11/gtk--/patches/patch-ah
index 6b1f0621956..049492fdfd3 100644
--- a/x11/gtk--/patches/patch-ah
+++ b/x11/gtk--/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1 1999/03/14 17:12:54 rh Exp $
+$NetBSD: patch-ah,v 1.2 2000/07/15 09:48:13 jlam Exp $
 
---- src/gtk--/Makefile.in.orig	Tue Mar  9 02:57:49 1999
-+++ src/gtk--/Makefile.in	Wed Mar 10 20:54:33 1999
-@@ -155,7 +155,7 @@
+--- src/gtk--/Makefile.in.orig	Sat May 20 14:51:35 2000
++++ src/gtk--/Makefile.in	Sat Jul 15 04:28:44 2000
+@@ -133,7 +133,7 @@
  
  # This builds the library
- libgtkmm_la_SOURCES = $(gtkmmc)
+ libgtkmm_la_SOURCES = $(gtkmmc) gtk--.cc proxy.cc base.cc marshal.cc
 -libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -release $(GTKMM_RELEASE) -no-undefined
 +libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -no-undefined
  libgtkmm_la_INCLUDES = $(GTK_CFLAGS)
- libgtkmm_la_LIBADD = $(GTK_LIBS) @LA_FILES@
- libgtkmm_la_DEPENDENCIES = @LA_FILES@
+ libgtkmm_la_LIBADD = $(GTK_LIBS) $(gtkmmla)
+ #libgtkmm_la_DEPENDENCIES = $(gtkmmla) 
diff --git a/x11/gtk--/pkg/PLIST b/x11/gtk--/pkg/PLIST
index af4be8382fb..0ee9caea006 100644
--- a/x11/gtk--/pkg/PLIST
+++ b/x11/gtk--/pkg/PLIST
@@ -1,12 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 1999/11/14 23:36:27 tron Exp $
-bin/gensig
+@comment $NetBSD: PLIST,v 1.4 2000/07/15 09:48:13 jlam Exp $
 bin/gtkmm-config
-include/gdk--.h
+bin/gtkmmconvert
 include/gdk--/bitmap.h
 include/gdk--/color.h
 include/gdk--/colormap.h
+include/gdk--/cursor.h
 include/gdk--/drawable.h
-include/gdk--/extra/imlib.h
 include/gdk--/font.h
 include/gdk--/gc.h
 include/gdk--/image.h
@@ -17,32 +16,11 @@ include/gdk--/types.h
 include/gdk--/visual.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
@@ -71,20 +49,19 @@ include/gtk--/fontselection.h
 include/gtk--/frame.h
 include/gtk--/handlebox.h
 include/gtk--/image.h
+include/gtk--/imageloader.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--/marshal.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
@@ -95,14 +72,10 @@ 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
 include/gtk--/private/base_p.h
@@ -111,20 +84,9 @@ 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
@@ -141,12 +103,10 @@ 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
@@ -154,9 +114,7 @@ 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
 include/gtk--/private/misc_p.h
 include/gtk--/private/notebook_p.h
@@ -172,7 +130,6 @@ include/gtk--/private/progressbar_p.h
 include/gtk--/private/radiobutton_p.h
 include/gtk--/private/radiomenuitem_p.h
 include/gtk--/private/range_p.h
-include/gtk--/private/rc_p.h
 include/gtk--/private/ruler_p.h
 include/gtk--/private/scale_p.h
 include/gtk--/private/scrollbar_p.h
@@ -183,6 +140,7 @@ include/gtk--/private/spinbutton_p.h
 include/gtk--/private/statusbar_p.h
 include/gtk--/private/style_p.h
 include/gtk--/private/table_p.h
+include/gtk--/private/tearoffmenuitem_p.h
 include/gtk--/private/text_p.h
 include/gtk--/private/tipsquery_p.h
 include/gtk--/private/togglebutton_p.h
@@ -195,10 +153,10 @@ include/gtk--/private/widget_p.h
 include/gtk--/private/window_p.h
 include/gtk--/progress.h
 include/gtk--/progressbar.h
+include/gtk--/proxy.h
 include/gtk--/radiobutton.h
 include/gtk--/radiomenuitem.h
 include/gtk--/range.h
-include/gtk--/rc.h
 include/gtk--/ruler.h
 include/gtk--/scale.h
 include/gtk--/scrollbar.h
@@ -209,6 +167,7 @@ include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
 include/gtk--/table.h
+include/gtk--/tearoffmenuitem.h
 include/gtk--/text.h
 include/gtk--/tipsquery.h
 include/gtk--/togglebutton.h
@@ -219,162 +178,27 @@ include/gtk--/treeitem.h
 include/gtk--/viewport.h
 include/gtk--/widget.h
 include/gtk--/window.h
-include/gtk--sig.h
-include/gtk--sigcommon.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/gnomemmConf.sh
+lib/gtkmm/include/gdk--config.h
+lib/gtkmm/include/gtk--config.h
+lib/gtkmm/proc/convert.m4
+lib/gtkmm/proc/doc1.m4
+lib/gtkmm/proc/gtkconvert.m4
+lib/gtkmm/proc/gtkmmproc
+lib/gtkmm/proc/list.m4
+lib/gtkmm/proc/stage1.m4
 lib/libgdkmm.a
+lib/libgdkmm.la
 lib/libgdkmm.so.1.0
-lib/libgnomemm.a
-lib/libgnomemm.so.7.0
 lib/libgtkmm.a
-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
-man/man3/Gtk_AccelGroup.3
-man/man3/Gtk_AccelLabel.3
-man/man3/Gtk_Adjustment.3
-man/man3/Gtk_Alignment.3
-man/man3/Gtk_ArgBase.3
-man/man3/Gtk_ArgObject.3
-man/man3/Gtk_ArgSimple.3
-man/man3/Gtk_ArgString.3
-man/man3/Gtk_Arrow.3
-man/man3/Gtk_AspectFrame.3
-man/man3/Gtk_Base.3
-man/man3/Gtk_Base_Class.3
-man/man3/Gtk_Bin.3
-man/man3/Gtk_Box.3
-man/man3/Gtk_Button.3
-man/man3/Gtk_ButtonBox.3
-man/man3/Gtk_CList.3
-man/man3/Gtk_CTree.3
-man/man3/Gtk_CTreeNode.3
-man/man3/Gtk_CTreeRow.3
-man/man3/Gtk_Calendar.3
-man/man3/Gtk_CheckButton.3
-man/man3/Gtk_CheckMenuItem.3
-man/man3/Gtk_ColorSelection.3
-man/man3/Gtk_ColorSelectionDialog.3
-man/man3/Gtk_Combo.3
-man/man3/Gtk_Container.3
-man/man3/Gtk_Curve.3
-man/man3/Gtk_Data.3
-man/man3/Gtk_Dialog.3
-man/man3/Gtk_DrawingArea.3
-man/man3/Gtk_Editable.3
-man/man3/Gtk_Entry.3
-man/man3/Gtk_EventBox.3
-man/man3/Gtk_FileSelection.3
-man/man3/Gtk_Fixed.3
-man/man3/Gtk_FontSelection.3
-man/man3/Gtk_FontSelectionDialog.3
-man/man3/Gtk_Frame.3
-man/man3/Gtk_GammaCurve.3
-man/man3/Gtk_HBox.3
-man/man3/Gtk_HButtonBox.3
-man/man3/Gtk_HPaned.3
-man/man3/Gtk_HRuler.3
-man/man3/Gtk_HScale.3
-man/man3/Gtk_HScrollbar.3
-man/man3/Gtk_HSeparator.3
-man/man3/Gtk_HandleBox.3
-man/man3/Gtk_Image.3
-man/man3/Gtk_InputDialog.3
-man/man3/Gtk_Invisible.3
-man/man3/Gtk_Item.3
-man/man3/Gtk_ItemFactory.3
-man/man3/Gtk_ItemFactory_Menu.3
-man/man3/Gtk_ItemFactory_MenuBar.3
-man/man3/Gtk_ItemFactory_OptionMenu.3
-man/man3/Gtk_Label.3
-man/man3/Gtk_Layout.3
-man/man3/Gtk_List.3
-man/man3/Gtk_ListItem.3
-man/man3/Gtk_Main.3
-man/man3/Gtk_Menu.3
-man/man3/Gtk_MenuBar.3
-man/man3/Gtk_MenuFactory.3
-man/man3/Gtk_MenuItem.3
-man/man3/Gtk_MenuPath.3
-man/man3/Gtk_MenuShell.3
-man/man3/Gtk_Misc.3
-man/man3/Gtk_Notebook.3
-man/man3/Gtk_NotebookPage.3
-man/man3/Gtk_Object.3
-man/man3/Gtk_ObjectHandle.3
-man/man3/Gtk_ObjectHandle_ref.3
-man/man3/Gtk_OptionMenu.3
-man/man3/Gtk_Packer.3
-man/man3/Gtk_Paned.3
-man/man3/Gtk_Pixmap.3
-man/man3/Gtk_Plug.3
-man/man3/Gtk_Preview.3
-man/man3/Gtk_Progress.3
-man/man3/Gtk_ProgressBar.3
-man/man3/Gtk_RC.3
-man/man3/Gtk_RadioButton.3
-man/man3/Gtk_RadioMenuItem.3
-man/man3/Gtk_Range.3
-man/man3/Gtk_RcStyle.3
-man/man3/Gtk_Ruler.3
-man/man3/Gtk_Scale.3
-man/man3/Gtk_Scrollbar.3
-man/man3/Gtk_ScrolledWindow.3
-man/man3/Gtk_Separator.3
-man/man3/Gtk_Socket.3
-man/man3/Gtk_SpinButton.3
-man/man3/Gtk_Statusbar.3
-man/man3/Gtk_Style.3
-man/man3/Gtk_Table.3
-man/man3/Gtk_Text.3
-man/man3/Gtk_TipsQuery.3
-man/man3/Gtk_ToggleButton.3
-man/man3/Gtk_Toolbar.3
-man/man3/Gtk_Tooltips.3
-man/man3/Gtk_Trashcan.3
-man/man3/Gtk_Trashcan_Helper.3
-man/man3/Gtk_Tree.3
-man/man3/Gtk_TreeItem.3
-man/man3/Gtk_VBox.3
-man/man3/Gtk_VButtonBox.3
-man/man3/Gtk_VPaned.3
-man/man3/Gtk_VRuler.3
-man/man3/Gtk_VScale.3
-man/man3/Gtk_VScrollbar.3
-man/man3/Gtk_VSeparator.3
-man/man3/Gtk_Viewport.3
-man/man3/Gtk_Widget.3
-man/man3/Gtk_Window.3
-man/man3/ItemFactoryConnector.3
-man/man3/ItemFactoryConnectorBase.3
-man/man3/MenuFactoryConnector.3
-man/man3/MenuFactoryConnectorBase.3
-man/man3/ToolbarConnector.3
-man/man3/ToolbarConnectorBase.3
-man/man3/Toolbar_Child.3
-man/man3/_gtk_string.3
-man/man3/gtkmm_add_signal_class.3
+lib/libgtkmm.la
+lib/libgtkmm.so.0.1
 share/aclocal/gtk--.m4
 @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--
+include/gdk--.h
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gnome--
-@dirrm include/gdk--/extra
 @dirrm include/gdk--