update to 2.22.0

This switches to the gnome-2.32 release branch.
(recursive PKGREV bump needed due to the new atkmm dependency -- we
ride on the revbump due to png which covers everything depending on gtk2)

4 files changed, 30 insertions, 177 deletions

diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 17464c11078..04f4dd4fb0a 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2011/01/13 13:36:24 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2011/01/13 16:05:00 drochner Exp $
 
-DISTNAME=	gtkmm-2.20.3
-PKGREVISION=	5
+DISTNAME=	gtkmm-2.22.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -16,16 +15,15 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl:run pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-examples
 
 EXTRACT_USING=		bsdtar
 
-PKGCONFIG_OVERRIDE=	atk/atkmm.pc.in
 PKGCONFIG_OVERRIDE+=	gdk/gdkmm.pc.in
 PKGCONFIG_OVERRIDE+=	gtk/gtkmm.pc.in
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.20.1
 
+.include "../../devel/atkmm/buildlink3.mk"
 .include "../../devel/pangomm/buildlink3.mk"
 .include "../../devel/glibmm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtkmm/PLIST b/x11/gtkmm/PLIST
index e6972a95e0b..b237e2cf319 100644
--- a/x11/gtkmm/PLIST
+++ b/x11/gtkmm/PLIST
@@ -1,45 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2010/06/28 11:29:26 wiz Exp $
-include/atkmm-1.6/atkmm.h
-include/atkmm-1.6/atkmm/action.h
-include/atkmm-1.6/atkmm/component.h
-include/atkmm-1.6/atkmm/document.h
-include/atkmm-1.6/atkmm/editabletext.h
-include/atkmm-1.6/atkmm/hyperlink.h
-include/atkmm-1.6/atkmm/hypertext.h
-include/atkmm-1.6/atkmm/image.h
-include/atkmm-1.6/atkmm/implementor.h
-include/atkmm-1.6/atkmm/init.h
-include/atkmm-1.6/atkmm/noopobject.h
-include/atkmm-1.6/atkmm/object.h
-include/atkmm-1.6/atkmm/objectaccessible.h
-include/atkmm-1.6/atkmm/private/action_p.h
-include/atkmm-1.6/atkmm/private/component_p.h
-include/atkmm-1.6/atkmm/private/document_p.h
-include/atkmm-1.6/atkmm/private/editabletext_p.h
-include/atkmm-1.6/atkmm/private/hyperlink_p.h
-include/atkmm-1.6/atkmm/private/hypertext_p.h
-include/atkmm-1.6/atkmm/private/image_p.h
-include/atkmm-1.6/atkmm/private/implementor_p.h
-include/atkmm-1.6/atkmm/private/noopobject_p.h
-include/atkmm-1.6/atkmm/private/object_p.h
-include/atkmm-1.6/atkmm/private/objectaccessible_p.h
-include/atkmm-1.6/atkmm/private/relation_p.h
-include/atkmm-1.6/atkmm/private/relationset_p.h
-include/atkmm-1.6/atkmm/private/selection_p.h
-include/atkmm-1.6/atkmm/private/stateset_p.h
-include/atkmm-1.6/atkmm/private/streamablecontent_p.h
-include/atkmm-1.6/atkmm/private/table_p.h
-include/atkmm-1.6/atkmm/private/text_p.h
-include/atkmm-1.6/atkmm/private/value_p.h
-include/atkmm-1.6/atkmm/relation.h
-include/atkmm-1.6/atkmm/relationset.h
-include/atkmm-1.6/atkmm/selection.h
-include/atkmm-1.6/atkmm/stateset.h
-include/atkmm-1.6/atkmm/streamablecontent.h
-include/atkmm-1.6/atkmm/table.h
-include/atkmm-1.6/atkmm/text.h
-include/atkmm-1.6/atkmm/value.h
-include/atkmm-1.6/atkmm/wrap_init.h
+@comment $NetBSD: PLIST,v 1.38 2011/01/13 16:05:00 drochner Exp $
 include/gdkmm-2.4/gdkmm.h
 include/gdkmm-2.4/gdkmm/bitmap.h
 include/gdkmm-2.4/gdkmm/color.h
@@ -461,10 +420,14 @@ include/gtkmm-2.4/gtkmm/window.h
 include/gtkmm-2.4/gtkmm/wrap_init.h
 lib/gdkmm-2.4/include/gdkmmconfig.h
 lib/gtkmm-2.4/include/gtkmmconfig.h
-lib/libatkmm-1.6.la
+lib/gtkmm-2.4/proc/m4/convert.m4
+lib/gtkmm-2.4/proc/m4/convert_atk.m4
+lib/gtkmm-2.4/proc/m4/convert_gdk.m4
+lib/gtkmm-2.4/proc/m4/convert_gtk.m4
+lib/gtkmm-2.4/proc/m4/convert_gtkmm.m4
+lib/gtkmm-2.4/proc/m4/convert_pango.m4
 lib/libgdkmm-2.4.la
 lib/libgtkmm-2.4.la
-lib/pkgconfig/atkmm-1.6.pc
 lib/pkgconfig/gdkmm-2.4.pc
 lib/pkgconfig/gtkmm-2.4.pc
 share/devhelp/books/gtkmm-2.4/gtkmm-2.4.devhelp2
@@ -477,67 +440,7 @@ share/doc/gtkmm-2.4/reference/html/arrow1.png
 share/doc/gtkmm-2.4/reference/html/button2.png
 share/doc/gtkmm-2.4/reference/html/calendar1.png
 share/doc/gtkmm-2.4/reference/html/checkbutton1.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Action-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Action.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Action__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Attribute-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Attribute.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Component-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Component.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Component__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Document-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Document.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Document__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1EditableText-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1EditableText.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1EditableText__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hyperlink-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hyperlink.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hyperlink__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hypertext-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hypertext.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Hypertext__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Image-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Image.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Image__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Implementor-members.html
 share/doc/gtkmm-2.4/reference/html/classAtk_1_1Implementor.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Implementor__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1NoOpObject-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1NoOpObject.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1NoOpObject__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Object-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Object.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1ObjectAccessible-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1ObjectAccessible.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1ObjectAccessible__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Object__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Relation-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Relation.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1RelationSet-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1RelationSet.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1RelationSet__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Relation__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Selection-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Selection.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Selection__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StateSet-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StateSet.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StateSet__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StreamableContent-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StreamableContent.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1StreamableContent__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Table-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Table.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Table__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Text-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Text.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1TextAttribute-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1TextAttribute.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Text__coll__graph.png
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Value-members.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Value.html
-share/doc/gtkmm-2.4/reference/html/classAtk_1_1Value__coll__graph.png
 share/doc/gtkmm-2.4/reference/html/classGdk_1_1Bitmap-members.html
 share/doc/gtkmm-2.4/reference/html/classGdk_1_1Bitmap.html
 share/doc/gtkmm-2.4/reference/html/classGdk_1_1Bitmap__coll__graph.png
@@ -1395,7 +1298,6 @@ share/doc/gtkmm-2.4/reference/html/group__TreeView.html
 share/doc/gtkmm-2.4/reference/html/group__TreeView.png
 share/doc/gtkmm-2.4/reference/html/group__Widgets.html
 share/doc/gtkmm-2.4/reference/html/group__Widgets.png
-share/doc/gtkmm-2.4/reference/html/group__atkmmEnums.html
 share/doc/gtkmm-2.4/reference/html/group__gdkmmEnums.html
 share/doc/gtkmm-2.4/reference/html/group__gtkmmEnums.html
 share/doc/gtkmm-2.4/reference/html/gtk-about.png
@@ -1561,9 +1463,6 @@ share/doc/gtkmm-2.4/reference/html/inherit__graph__47.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__48.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__49.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__5.png
-share/doc/gtkmm-2.4/reference/html/inherit__graph__50.png
-share/doc/gtkmm-2.4/reference/html/inherit__graph__51.png
-share/doc/gtkmm-2.4/reference/html/inherit__graph__52.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__6.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__7.png
 share/doc/gtkmm-2.4/reference/html/inherit__graph__8.png
@@ -1574,7 +1473,6 @@ share/doc/gtkmm-2.4/reference/html/linkbutton1.png
 share/doc/gtkmm-2.4/reference/html/menubar1.png
 share/doc/gtkmm-2.4/reference/html/messagedialog1.png
 share/doc/gtkmm-2.4/reference/html/modules.html
-share/doc/gtkmm-2.4/reference/html/namespaceAtk.html
 share/doc/gtkmm-2.4/reference/html/namespaceGdk.html
 share/doc/gtkmm-2.4/reference/html/namespaceGdk_1_1Cairo.html
 share/doc/gtkmm-2.4/reference/html/namespaceGtk.html
@@ -1640,7 +1538,6 @@ share/doc/gtkmm-2.4/reference/html/namespacemembers_func.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x63.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x66.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x67.html
-share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x69.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x6c.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x6d.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x6f.html
@@ -1650,28 +1547,25 @@ share/doc/gtkmm-2.4/reference/html/namespacemembers_func_0x75.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_type.html
 share/doc/gtkmm-2.4/reference/html/namespacemembers_vars.html
 share/doc/gtkmm-2.4/reference/html/namespaces.html
+share/doc/gtkmm-2.4/reference/html/namespacesigc.html
 share/doc/gtkmm-2.4/reference/html/notebook1.png
 share/doc/gtkmm-2.4/reference/html/pages.html
 share/doc/gtkmm-2.4/reference/html/progressbar1.png
 share/doc/gtkmm-2.4/reference/html/radiobutton1.png
 share/doc/gtkmm-2.4/reference/html/recentchooserdialog1.png
-share/doc/gtkmm-2.4/reference/html/since_1_3.html
-share/doc/gtkmm-2.4/reference/html/since_1_4.html
-share/doc/gtkmm-2.4/reference/html/since_1_9.html
-share/doc/gtkmm-2.4/reference/html/since_2_10.html
-share/doc/gtkmm-2.4/reference/html/since_2_12.html
-share/doc/gtkmm-2.4/reference/html/since_2_14.html
-share/doc/gtkmm-2.4/reference/html/since_2_16.html
-share/doc/gtkmm-2.4/reference/html/since_2_18.html
-share/doc/gtkmm-2.4/reference/html/since_2_2.html
-share/doc/gtkmm-2.4/reference/html/since_2_20.html
-share/doc/gtkmm-2.4/reference/html/since_2_4.html
-share/doc/gtkmm-2.4/reference/html/since_2_6.html
-share/doc/gtkmm-2.4/reference/html/since_2_8.html
+share/doc/gtkmm-2.4/reference/html/since__2__10.html
+share/doc/gtkmm-2.4/reference/html/since__2__12.html
+share/doc/gtkmm-2.4/reference/html/since__2__14.html
+share/doc/gtkmm-2.4/reference/html/since__2__16.html
+share/doc/gtkmm-2.4/reference/html/since__2__18.html
+share/doc/gtkmm-2.4/reference/html/since__2__2.html
+share/doc/gtkmm-2.4/reference/html/since__2__20.html
+share/doc/gtkmm-2.4/reference/html/since__2__22.html
+share/doc/gtkmm-2.4/reference/html/since__2__4.html
+share/doc/gtkmm-2.4/reference/html/since__2__6.html
+share/doc/gtkmm-2.4/reference/html/since__2__8.html
 share/doc/gtkmm-2.4/reference/html/spinbutton1.png
 share/doc/gtkmm-2.4/reference/html/statusbar1.png
-share/doc/gtkmm-2.4/reference/html/structAtk_1_1AttributeTraits-members.html
-share/doc/gtkmm-2.4/reference/html/structAtk_1_1AttributeTraits.html
 share/doc/gtkmm-2.4/reference/html/structGtk_1_1Box__Helpers_1_1EndElem-members.html
 share/doc/gtkmm-2.4/reference/html/structGtk_1_1Box__Helpers_1_1EndElem.html
 share/doc/gtkmm-2.4/reference/html/structGtk_1_1Box__Helpers_1_1EndElem__coll__graph.png
@@ -1693,43 +1587,3 @@ share/doc/gtkmm-2.4/reference/html/toggletoolbutton1.png
 share/doc/gtkmm-2.4/reference/html/vscale1.png
 share/doc/gtkmm-2.4/reference/html/vscrollbar1.png
 share/doc/gtkmm-2.4/reference/html/vseparator1.png
-share/gtkmm-2.4/demo/alphatest.png
-share/gtkmm-2.4/demo/apple-red.png
-share/gtkmm-2.4/demo/background.jpg
-share/gtkmm-2.4/demo/demo-common.cc
-share/gtkmm-2.4/demo/demo-common.h
-share/gtkmm-2.4/demo/demos.h
-share/gtkmm-2.4/demo/demowindow.cc
-share/gtkmm-2.4/demo/demowindow.h
-share/gtkmm-2.4/demo/example_appwindow.cc
-share/gtkmm-2.4/demo/example_buttonbox.cc
-share/gtkmm-2.4/demo/example_change_display.cc
-share/gtkmm-2.4/demo/example_colorsel.cc
-share/gtkmm-2.4/demo/example_dialog.cc
-share/gtkmm-2.4/demo/example_drawingarea.cc
-share/gtkmm-2.4/demo/example_iconview.cc
-share/gtkmm-2.4/demo/example_images.cc
-share/gtkmm-2.4/demo/example_menus.cc
-share/gtkmm-2.4/demo/example_panes.cc
-share/gtkmm-2.4/demo/example_pixbufs.cc
-share/gtkmm-2.4/demo/example_sizegroup.cc
-share/gtkmm-2.4/demo/example_stockbrowser.cc
-share/gtkmm-2.4/demo/example_textview.cc
-share/gtkmm-2.4/demo/example_treeview_editable_cells.cc
-share/gtkmm-2.4/demo/example_treeview_liststore.cc
-share/gtkmm-2.4/demo/example_treeview_treestore.cc
-share/gtkmm-2.4/demo/example_uimanager.cc
-share/gtkmm-2.4/demo/floppybuddy.gif
-share/gtkmm-2.4/demo/gnome-applets.png
-share/gtkmm-2.4/demo/gnome-calendar.png
-share/gtkmm-2.4/demo/gnome-foot.png
-share/gtkmm-2.4/demo/gnome-fs-directory.png
-share/gtkmm-2.4/demo/gnome-fs-regular.png
-share/gtkmm-2.4/demo/gnome-gimp.png
-share/gtkmm-2.4/demo/gnome-gmush.png
-share/gtkmm-2.4/demo/gnome-gsame.png
-share/gtkmm-2.4/demo/gnu-keys.png
-share/gtkmm-2.4/demo/gtk-logo-rgb.gif
-share/gtkmm-2.4/demo/main.cc
-share/gtkmm-2.4/demo/textwidget.cc
-share/gtkmm-2.4/demo/textwidget.h
diff --git a/x11/gtkmm/buildlink3.mk b/x11/gtkmm/buildlink3.mk
index 2d17eb83e07..103369b676d 100644
--- a/x11/gtkmm/buildlink3.mk
+++ b/x11/gtkmm/buildlink3.mk
@@ -1,14 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.24 2011/01/13 13:36:24 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2011/01/13 16:05:00 drochner Exp $
 
 BUILDLINK_TREE+=	gtkmm
 
 .if !defined(GTKMM_BUILDLINK3_MK)
 GTKMM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.20.3
+BUILDLINK_API_DEPENDS.gtkmm+=	gtkmm>=2.22.0
 BUILDLINK_ABI_DEPENDS.gtkmm+=	gtkmm>=2.20.3nb5
 BUILDLINK_PKGSRCDIR.gtkmm?=	../../x11/gtkmm
 
+.include "../../devel/atkmm/buildlink3.mk"
 .include "../../devel/pangomm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # GTKMM_BUILDLINK3_MK
diff --git a/x11/gtkmm/distinfo b/x11/gtkmm/distinfo
index 1a88918770a..4eb4b4e5a61 100644
--- a/x11/gtkmm/distinfo
+++ b/x11/gtkmm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.39 2010/06/02 16:45:41 adam Exp $
+$NetBSD: distinfo,v 1.40 2011/01/13 16:05:00 drochner Exp $
 
-SHA1 (gtkmm-2.20.3.tar.bz2) = ad53f52f18cc3021b7fd6cd06f965471039d5333
-RMD160 (gtkmm-2.20.3.tar.bz2) = b0f26cb06443e642e43435cec9ff66a5972fc8d7
-Size (gtkmm-2.20.3.tar.bz2) = 12554334 bytes
+SHA1 (gtkmm-2.22.0.tar.bz2) = 4a43945ecf20d0db7679daf95d504c2e97fb0a72
+RMD160 (gtkmm-2.22.0.tar.bz2) = 5eacf79b3c2acd09ba36a3e8643da90282cec579
+Size (gtkmm-2.22.0.tar.bz2) = 11496369 bytes