Update to 1.2.0

18 files changed, 162 insertions, 414 deletions

diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtk--/distinfo b/x11-toolkits/gtk--/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtk--/distinfo
+++ b/x11-toolkits/gtk--/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtk--/pkg-plist
+++ b/x11-toolkits/gtk--/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtk--2/distinfo b/x11-toolkits/gtk--2/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtk--2/distinfo
+++ b/x11-toolkits/gtk--2/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtk--2/pkg-plist
+++ b/x11-toolkits/gtk--2/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtkmm12/distinfo b/x11-toolkits/gtkmm12/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtkmm12/distinfo
+++ b/x11-toolkits/gtkmm12/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtkmm12/pkg-plist
+++ b/x11-toolkits/gtkmm12/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtkmm20/distinfo b/x11-toolkits/gtkmm20/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtkmm20/distinfo
+++ b/x11-toolkits/gtkmm20/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtkmm20/pkg-plist
+++ b/x11-toolkits/gtkmm20/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 8cfdc97c230..c51279f689e 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -5,16 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gtk--
-PORTVERSION= 	1.0.3
+PORTNAME=	gtkmm
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/Gtk--
-DISTNAME=	Gtk---${PORTVERSION}
+MASTER_SITES=	http://download.sourceforge.net/gtkmm/
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -28,42 +27,6 @@ CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
-MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
-	G_List_ConstIterator.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 ItemFactoryConnector.3 ItemFactoryConnectorBase.3 \
-	MenuFactoryConnector.3 MenuFactoryConnectorBase.3 \
-	ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \
-	_gtk_string.3 gtkmm_add_signal_class.3
-
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index f21f68f937a..2d1c3b6f642 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1 +1 @@
-MD5 (Gtk---1.0.3.tar.gz) = 46bef7a097056eb230044ac5658949ae
+MD5 (gtkmm-1.2.0.tar.gz) = 0538b3ca19065b90aff91be2f4454a23
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 6f50a64b766..2e1551b32eb 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -1,11 +1,11 @@
-bin/gensig
 bin/gtkmm-config
+bin/gtkmmconvert
 include/gdk--.h
 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
@@ -21,7 +21,6 @@ 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
@@ -50,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
@@ -78,7 +76,6 @@ 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
@@ -110,7 +107,6 @@ 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
@@ -118,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
@@ -136,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
@@ -147,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
@@ -159,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
@@ -173,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
@@ -183,26 +178,26 @@ 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/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-1.2.so.0
 lib/libgdkmm.a
-lib/libgdkmm-1.0.so.1
 lib/libgdkmm.so
+lib/libgtkmm-1.2.so.0
 lib/libgtkmm.a
-lib/libgtkmm-1.0.so.7
 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 lib/Gtk--/include
-@dirrm lib/Gtk--
+@dirrm include/gdk--
 @dirrm include/gtk--/private
 @dirrm include/gtk--
-@dirrm include/gdk--/extra
-@dirrm include/gdk--
+@dirrm lib/gtkmm/include
+@dirrm lib/gtkmm/proc
+@dirrm lib/gtkmm