Unbroken gtk--

PR:		11532
Submitted by:	Yukihiro Nakai nacai@iname.com

18 files changed, 1014 insertions, 120 deletions

diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk--/distinfo b/x11-toolkits/gtk--/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtk--/distinfo
+++ b/x11-toolkits/gtk--/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtk--/pkg-plist
+++ b/x11-toolkits/gtk--/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk--2/distinfo b/x11-toolkits/gtk--2/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtk--2/distinfo
+++ b/x11-toolkits/gtk--2/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtk--2/pkg-plist
+++ b/x11-toolkits/gtk--2/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/distinfo b/x11-toolkits/gtkmm12/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtkmm12/distinfo
+++ b/x11-toolkits/gtkmm12/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtkmm12/pkg-plist
+++ b/x11-toolkits/gtkmm12/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm20/distinfo b/x11-toolkits/gtkmm20/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtkmm20/distinfo
+++ b/x11-toolkits/gtkmm20/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtkmm20/pkg-plist
+++ b/x11-toolkits/gtkmm20/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 31592a26bb7c..815531b7e083 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -1,31 +1,65 @@
 # New ports collection makefile for:   gtk--
-# Version required:    0.9.14
+# Version required:    1.0.0
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/10/20 07:35:11 asami Exp $
+# $Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp $
 #
 
-DISTNAME=	Gtk---0.9.14
-PKGNAME=	gtk---0.9.14
+DISTNAME=	Gtk---1.0.0
+PKGNAME=	gtk---1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	nacai@iname.com
 
-BROKEN=		build
-
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-# Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
-#GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 # for the future GNOME support
-#CONFIGURE_ARGS=	--with-gnome=${X11BASE}
+CONFIGURE_ARGS=		--enable-static=yes # --with-gnome=${X11BASE}
+CONFIGURE_ENV+=		RANLIB=":" GNOMEMM_FALSE="true"\
+			GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_GMAKE=	yes
 
+MAN3=  G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
+	G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \
+	Gtk_AccelEntry.3 Gtk_AccelGroup.3 Gtk_AccelLabel.3 Gtk_Adjustment.3 \
+	Gtk_Alignment.3 Gtk_ArgBase.3 Gtk_ArgObject.3 Gtk_ArgSimple.3 \
+	Gtk_ArgString.3 Gtk_Arrow.3 Gtk_AspectFrame.3 Gtk_Base.3 \
+	Gtk_Base_Class.3 Gtk_Bin.3 Gtk_Box.3 Gtk_Button.3 Gtk_ButtonBox.3 \
+	Gtk_CList.3 Gtk_CTree.3 Gtk_CTreeNode.3 Gtk_CTreeRow.3 Gtk_Calendar.3 \
+	Gtk_CheckButton.3 Gtk_CheckMenuItem.3 Gtk_ColorSelection.3 \
+	Gtk_ColorSelectionDialog.3 Gtk_Combo.3 Gtk_Container.3 Gtk_Curve.3 \
+	Gtk_Data.3 Gtk_Dialog.3 Gtk_DrawingArea.3 Gtk_Editable.3 Gtk_Entry.3 \
+	Gtk_EventBox.3 Gtk_FileSelection.3 Gtk_Fixed.3 Gtk_FontSelection.3 \
+	Gtk_FontSelectionDialog.3 Gtk_Frame.3 Gtk_GammaCurve.3 Gtk_HBox.3 \
+	Gtk_HButtonBox.3 Gtk_HPaned.3 Gtk_HRuler.3 Gtk_HScale.3 \
+	Gtk_HScrollbar.3 Gtk_HSeparator.3 Gtk_HandleBox.3 Gtk_Image.3 \
+	Gtk_InputDialog.3 Gtk_Invisible.3 Gtk_Item.3 Gtk_ItemFactory.3 \
+	Gtk_ItemFactory_Menu.3 Gtk_ItemFactory_MenuBar.3 \
+	Gtk_ItemFactory_OptionMenu.3 Gtk_Label.3 Gtk_Layout.3 Gtk_List.3 \
+	Gtk_ListItem.3 Gtk_Main.3 Gtk_Menu.3 Gtk_MenuBar.3 Gtk_MenuFactory.3 \
+	Gtk_MenuItem.3 Gtk_MenuPath.3 Gtk_MenuShell.3 Gtk_Misc.3 \
+	Gtk_Notebook.3 Gtk_NotebookPage.3 Gtk_Object.3 Gtk_ObjectHandle.3 \
+	Gtk_ObjectHandle_ref.3 Gtk_OptionMenu.3 Gtk_Packer.3 Gtk_Paned.3 \
+	Gtk_Pixmap.3 Gtk_Plug.3 Gtk_Preview.3 Gtk_Progress.3 Gtk_ProgressBar.3 \
+	Gtk_RC.3 Gtk_RadioButton.3 Gtk_RadioMenuItem.3 Gtk_Range.3 \
+	Gtk_RcStyle.3 Gtk_Ruler.3 Gtk_Scale.3 Gtk_Scrollbar.3 \
+	Gtk_ScrolledWindow.3 Gtk_Separator.3 Gtk_Socket.3 Gtk_SpinButton.3 \
+	Gtk_Statusbar.3 Gtk_Style.3 Gtk_Table.3 Gtk_Text.3 Gtk_TipsQuery.3 \
+	Gtk_ToggleButton.3 Gtk_Toolbar.3 Gtk_Tooltips.3 Gtk_Trashcan.3 \
+	Gtk_Trashcan_Helper.3 Gtk_Tree.3 Gtk_TreeItem.3 Gtk_VBox.3 \
+	Gtk_VButtonBox.3 Gtk_VPaned.3 Gtk_VRuler.3 Gtk_VScale.3 \
+	Gtk_VScrollbar.3 Gtk_VSeparator.3 Gtk_Viewport.3 Gtk_Widget.3 \
+	Gtk_Window.3 MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
+	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
+	_gtk_string.3 gtkmm_add_signal_class.3
+
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index c3f1636e8277..5941e6c0ca46 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1 +1,2 @@
-MD5 (Gtk---0.9.14.tar.gz) = d06ab557247b3b223c6661d41633f256
+MD5 (Gtk---1.0.0.tar.gz) = 0fc011d97e099766166f8689bd8880d4
+MD5 (gtkmm_1_0_patch_itemfactory.txt) = 2c490af479d3442e7e6894b0eaa597cb
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index f048bbca9fec..4fc958e96bab 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -1,9 +1,27 @@
 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--/pixmap.h
+include/gdk--/types.h
+include/gdk--/visual.h
+include/gdk--/window.h
+include/glib--.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
@@ -11,11 +29,11 @@ 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--/colorselectiondialog.h
 include/gtk--/combo.h
 include/gtk--/container.h
 include/gtk--/ctree.h
@@ -30,13 +48,14 @@ include/gtk--/fileselection.h
 include/gtk--/fixed.h
 include/gtk--/fontselection.h
 include/gtk--/frame.h
-include/gtk--/gc.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
@@ -50,19 +69,106 @@ 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/accelgroup_p.h
+include/gtk--/private/accellabel_p.h
+include/gtk--/private/adjustment_p.h
+include/gtk--/private/alignment_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
+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/checkbutton_p.h
+include/gtk--/private/checkmenuitem_p.h
+include/gtk--/private/clist_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
+include/gtk--/private/drawingarea_p.h
+include/gtk--/private/editable_p.h
+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/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
+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
+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
+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
+include/gtk--/private/table_p.h
+include/gtk--/private/text_p.h
+include/gtk--/private/tipsquery_p.h
+include/gtk--/private/togglebutton_p.h
+include/gtk--/private/toolbar_p.h
+include/gtk--/private/tooltips_p.h
+include/gtk--/private/tree_p.h
+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--/progress.h
 include/gtk--/progressbar.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
 include/gtk--/scrolledwindow.h
 include/gtk--/separator.h
+include/gtk--/socket.h
 include/gtk--/spinbutton.h
 include/gtk--/statusbar.h
 include/gtk--/style.h
@@ -83,14 +189,22 @@ 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/libgtkmm-1.1.a
-lib/libgtkmm-1.1.la
-lib/libgtkmm-1.1.so
-lib/libgtkmm-1.1.so.1.1
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+lib/libgdkmm.a
+lib/libgdkmm.la
+lib/libgdkmm-1.0.so.1
+lib/libgdkmm.so
+lib/libgtkmm.a
+lib/libgtkmm.la
+lib/libgtkmm-1.0.so.5
+lib/libgtkmm.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/aclocal/gtk--.m4
-@dirrm include/gtk--
 @dirrm lib/Gtk--/include
 @dirrm lib/Gtk--
+@dirrm include/gtk--/private
+@dirrm include/gtk--
+@dirrm include/gdk--/extra
+@dirrm include/gdk--