Update to 2.2.2.

16 files changed, 64 insertions, 92 deletions

diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index e5106cb85266..3b28a2c3c97b 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtk--2/distinfo b/x11-toolkits/gtk--2/distinfo
index 6c20b3991869..9993bacdefdc 100644
--- a/x11-toolkits/gtk--2/distinfo
+++ b/x11-toolkits/gtk--2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtkmm-2.2.1.tar.gz) = 00397429ea5f180d73d80ba41ccbf65d
+MD5 (gnome2/gtkmm-2.2.2.tar.gz) = 40058a4dac4b71d2e5ed4b0b3595a542
diff --git a/x11-toolkits/gtk--2/files/patch-examples_markup_parser.cc b/x11-toolkits/gtk--2/files/patch-examples_markup_parser.cc
deleted file mode 100644
index 25bab4bd093f..000000000000
--- a/x11-toolkits/gtk--2/files/patch-examples_markup_parser.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- examples/markup/parser.cc.orig	Sat Mar 15 17:28:24 2003
-+++ examples/markup/parser.cc	Sat Mar 15 17:31:58 2003
-@@ -19,7 +19,6 @@
- #include <iomanip>
- #include <iostream>
- 
--
- namespace
- {
- 
-@@ -115,7 +114,7 @@
- void DumpParser::indent()
- {
-   if(parse_depth_ > 0)
--    std::cout << std::setw(4 * parse_depth_) << std::right << ' ';
-+    std::cout << std::setw(4 * parse_depth_) << std::ios::right << ' ';
- }
- 
- } // anonymous namespace
diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist
index a957bee6cd9e..89682f0a7b13 100644
--- a/x11-toolkits/gtk--2/pkg-plist
+++ b/x11-toolkits/gtk--2/pkg-plist
@@ -910,6 +910,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1unconst.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring__Iterator-members.html
@@ -1456,6 +1457,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1manage.html
 share/doc/gtkmm-2.0/docs/reference/html/class_8h.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild__inherit__graph.png
@@ -1591,6 +1593,8 @@ share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__114.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__115.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__116.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__117.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__118.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__119.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__14.png
@@ -1971,6 +1975,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/checkbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_ideal.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_simple.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/combo.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/devcpp_project_options.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_colorselectiondialog.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fileselection.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fontselectiondialog.png
@@ -1995,6 +2000,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/range_widgets.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/scrolledwindow.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/spinbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/table.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/textview.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/toolbar.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_draganddrop.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_editablecells.png
@@ -2013,6 +2019,9 @@ share/doc/gtkmm-2.0/docs/tutorial/html/apbs05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apbs06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apc.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apd.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ape.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch02.html
@@ -2048,6 +2057,7 @@ share/doc/gtkmm-2.0/docs/tutorial/html/ch08s05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch08s06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09s02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ch09s03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch11.html
@@ -2165,6 +2175,9 @@ share/doc/gtkmm-2.0/examples/book/helloworld/main.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.h
 share/doc/gtkmm-2.0/examples/book/helloworld2/main.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.h
+share/doc/gtkmm-2.0/examples/book/idle/main.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.h
 share/doc/gtkmm-2.0/examples/book/label/main.cc
@@ -2246,7 +2259,6 @@ share/doc/gtkmm-2.0/examples/exception/exceptiontest.cc
 share/doc/gtkmm-2.0/examples/filesel/filesel.cc
 share/doc/gtkmm-2.0/examples/fixed/fixed.cc
 share/doc/gtkmm-2.0/examples/gdk/radar.cc
-share/doc/gtkmm-2.0/examples/idle/idle.cc
 share/doc/gtkmm-2.0/examples/markup/parser.cc
 share/doc/gtkmm-2.0/examples/rulers/rulers.cc
 share/doc/gtkmm-2.0/examples/statusbar/statusbar.cc
@@ -2266,7 +2278,6 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/statusbar
 @dirrm share/doc/gtkmm-2.0/examples/rulers
 @dirrm share/doc/gtkmm-2.0/examples/markup
-@dirrm share/doc/gtkmm-2.0/examples/idle
 @dirrm share/doc/gtkmm-2.0/examples/gdk
 @dirrm share/doc/gtkmm-2.0/examples/fixed
 @dirrm share/doc/gtkmm-2.0/examples/filesel
@@ -2295,6 +2306,7 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/book/menus/main_menu
 @dirrm share/doc/gtkmm-2.0/examples/book/menus
 @dirrm share/doc/gtkmm-2.0/examples/book/label
+@dirrm share/doc/gtkmm-2.0/examples/book/idle
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld2
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld
 @dirrm share/doc/gtkmm-2.0/examples/book/frame
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index e5106cb85266..3b28a2c3c97b 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkmm20/distinfo b/x11-toolkits/gtkmm20/distinfo
index 6c20b3991869..9993bacdefdc 100644
--- a/x11-toolkits/gtkmm20/distinfo
+++ b/x11-toolkits/gtkmm20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtkmm-2.2.1.tar.gz) = 00397429ea5f180d73d80ba41ccbf65d
+MD5 (gnome2/gtkmm-2.2.2.tar.gz) = 40058a4dac4b71d2e5ed4b0b3595a542
diff --git a/x11-toolkits/gtkmm20/files/patch-examples_markup_parser.cc b/x11-toolkits/gtkmm20/files/patch-examples_markup_parser.cc
deleted file mode 100644
index 25bab4bd093f..000000000000
--- a/x11-toolkits/gtkmm20/files/patch-examples_markup_parser.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- examples/markup/parser.cc.orig	Sat Mar 15 17:28:24 2003
-+++ examples/markup/parser.cc	Sat Mar 15 17:31:58 2003
-@@ -19,7 +19,6 @@
- #include <iomanip>
- #include <iostream>
- 
--
- namespace
- {
- 
-@@ -115,7 +114,7 @@
- void DumpParser::indent()
- {
-   if(parse_depth_ > 0)
--    std::cout << std::setw(4 * parse_depth_) << std::right << ' ';
-+    std::cout << std::setw(4 * parse_depth_) << std::ios::right << ' ';
- }
- 
- } // anonymous namespace
diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist
index a957bee6cd9e..89682f0a7b13 100644
--- a/x11-toolkits/gtkmm20/pkg-plist
+++ b/x11-toolkits/gtkmm20/pkg-plist
@@ -910,6 +910,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1unconst.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring__Iterator-members.html
@@ -1456,6 +1457,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1manage.html
 share/doc/gtkmm-2.0/docs/reference/html/class_8h.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild__inherit__graph.png
@@ -1591,6 +1593,8 @@ share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__114.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__115.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__116.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__117.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__118.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__119.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__14.png
@@ -1971,6 +1975,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/checkbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_ideal.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_simple.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/combo.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/devcpp_project_options.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_colorselectiondialog.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fileselection.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fontselectiondialog.png
@@ -1995,6 +2000,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/range_widgets.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/scrolledwindow.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/spinbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/table.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/textview.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/toolbar.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_draganddrop.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_editablecells.png
@@ -2013,6 +2019,9 @@ share/doc/gtkmm-2.0/docs/tutorial/html/apbs05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apbs06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apc.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apd.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ape.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch02.html
@@ -2048,6 +2057,7 @@ share/doc/gtkmm-2.0/docs/tutorial/html/ch08s05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch08s06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09s02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ch09s03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch11.html
@@ -2165,6 +2175,9 @@ share/doc/gtkmm-2.0/examples/book/helloworld/main.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.h
 share/doc/gtkmm-2.0/examples/book/helloworld2/main.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.h
+share/doc/gtkmm-2.0/examples/book/idle/main.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.h
 share/doc/gtkmm-2.0/examples/book/label/main.cc
@@ -2246,7 +2259,6 @@ share/doc/gtkmm-2.0/examples/exception/exceptiontest.cc
 share/doc/gtkmm-2.0/examples/filesel/filesel.cc
 share/doc/gtkmm-2.0/examples/fixed/fixed.cc
 share/doc/gtkmm-2.0/examples/gdk/radar.cc
-share/doc/gtkmm-2.0/examples/idle/idle.cc
 share/doc/gtkmm-2.0/examples/markup/parser.cc
 share/doc/gtkmm-2.0/examples/rulers/rulers.cc
 share/doc/gtkmm-2.0/examples/statusbar/statusbar.cc
@@ -2266,7 +2278,6 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/statusbar
 @dirrm share/doc/gtkmm-2.0/examples/rulers
 @dirrm share/doc/gtkmm-2.0/examples/markup
-@dirrm share/doc/gtkmm-2.0/examples/idle
 @dirrm share/doc/gtkmm-2.0/examples/gdk
 @dirrm share/doc/gtkmm-2.0/examples/fixed
 @dirrm share/doc/gtkmm-2.0/examples/filesel
@@ -2295,6 +2306,7 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/book/menus/main_menu
 @dirrm share/doc/gtkmm-2.0/examples/book/menus
 @dirrm share/doc/gtkmm-2.0/examples/book/label
+@dirrm share/doc/gtkmm-2.0/examples/book/idle
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld2
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld
 @dirrm share/doc/gtkmm-2.0/examples/book/frame
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index e5106cb85266..3b28a2c3c97b 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkmm24/distinfo b/x11-toolkits/gtkmm24/distinfo
index 6c20b3991869..9993bacdefdc 100644
--- a/x11-toolkits/gtkmm24/distinfo
+++ b/x11-toolkits/gtkmm24/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtkmm-2.2.1.tar.gz) = 00397429ea5f180d73d80ba41ccbf65d
+MD5 (gnome2/gtkmm-2.2.2.tar.gz) = 40058a4dac4b71d2e5ed4b0b3595a542
diff --git a/x11-toolkits/gtkmm24/files/patch-examples_markup_parser.cc b/x11-toolkits/gtkmm24/files/patch-examples_markup_parser.cc
deleted file mode 100644
index 25bab4bd093f..000000000000
--- a/x11-toolkits/gtkmm24/files/patch-examples_markup_parser.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- examples/markup/parser.cc.orig	Sat Mar 15 17:28:24 2003
-+++ examples/markup/parser.cc	Sat Mar 15 17:31:58 2003
-@@ -19,7 +19,6 @@
- #include <iomanip>
- #include <iostream>
- 
--
- namespace
- {
- 
-@@ -115,7 +114,7 @@
- void DumpParser::indent()
- {
-   if(parse_depth_ > 0)
--    std::cout << std::setw(4 * parse_depth_) << std::right << ' ';
-+    std::cout << std::setw(4 * parse_depth_) << std::ios::right << ' ';
- }
- 
- } // anonymous namespace
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index a957bee6cd9e..89682f0a7b13 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -910,6 +910,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1unconst.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring__Iterator-members.html
@@ -1456,6 +1457,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1manage.html
 share/doc/gtkmm-2.0/docs/reference/html/class_8h.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild__inherit__graph.png
@@ -1591,6 +1593,8 @@ share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__114.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__115.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__116.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__117.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__118.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__119.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__14.png
@@ -1971,6 +1975,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/checkbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_ideal.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_simple.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/combo.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/devcpp_project_options.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_colorselectiondialog.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fileselection.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fontselectiondialog.png
@@ -1995,6 +2000,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/range_widgets.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/scrolledwindow.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/spinbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/table.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/textview.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/toolbar.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_draganddrop.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_editablecells.png
@@ -2013,6 +2019,9 @@ share/doc/gtkmm-2.0/docs/tutorial/html/apbs05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apbs06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apc.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apd.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ape.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch02.html
@@ -2048,6 +2057,7 @@ share/doc/gtkmm-2.0/docs/tutorial/html/ch08s05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch08s06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09s02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ch09s03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch11.html
@@ -2165,6 +2175,9 @@ share/doc/gtkmm-2.0/examples/book/helloworld/main.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.h
 share/doc/gtkmm-2.0/examples/book/helloworld2/main.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.h
+share/doc/gtkmm-2.0/examples/book/idle/main.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.h
 share/doc/gtkmm-2.0/examples/book/label/main.cc
@@ -2246,7 +2259,6 @@ share/doc/gtkmm-2.0/examples/exception/exceptiontest.cc
 share/doc/gtkmm-2.0/examples/filesel/filesel.cc
 share/doc/gtkmm-2.0/examples/fixed/fixed.cc
 share/doc/gtkmm-2.0/examples/gdk/radar.cc
-share/doc/gtkmm-2.0/examples/idle/idle.cc
 share/doc/gtkmm-2.0/examples/markup/parser.cc
 share/doc/gtkmm-2.0/examples/rulers/rulers.cc
 share/doc/gtkmm-2.0/examples/statusbar/statusbar.cc
@@ -2266,7 +2278,6 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/statusbar
 @dirrm share/doc/gtkmm-2.0/examples/rulers
 @dirrm share/doc/gtkmm-2.0/examples/markup
-@dirrm share/doc/gtkmm-2.0/examples/idle
 @dirrm share/doc/gtkmm-2.0/examples/gdk
 @dirrm share/doc/gtkmm-2.0/examples/fixed
 @dirrm share/doc/gtkmm-2.0/examples/filesel
@@ -2295,6 +2306,7 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/book/menus/main_menu
 @dirrm share/doc/gtkmm-2.0/examples/book/menus
 @dirrm share/doc/gtkmm-2.0/examples/book/label
+@dirrm share/doc/gtkmm-2.0/examples/book/idle
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld2
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld
 @dirrm share/doc/gtkmm-2.0/examples/book/frame
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index e5106cb85266..3b28a2c3c97b 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkmm
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index 6c20b3991869..9993bacdefdc 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtkmm-2.2.1.tar.gz) = 00397429ea5f180d73d80ba41ccbf65d
+MD5 (gnome2/gtkmm-2.2.2.tar.gz) = 40058a4dac4b71d2e5ed4b0b3595a542
diff --git a/x11-toolkits/gtkmm30/files/patch-examples_markup_parser.cc b/x11-toolkits/gtkmm30/files/patch-examples_markup_parser.cc
deleted file mode 100644
index 25bab4bd093f..000000000000
--- a/x11-toolkits/gtkmm30/files/patch-examples_markup_parser.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- examples/markup/parser.cc.orig	Sat Mar 15 17:28:24 2003
-+++ examples/markup/parser.cc	Sat Mar 15 17:31:58 2003
-@@ -19,7 +19,6 @@
- #include <iomanip>
- #include <iostream>
- 
--
- namespace
- {
- 
-@@ -115,7 +114,7 @@
- void DumpParser::indent()
- {
-   if(parse_depth_ > 0)
--    std::cout << std::setw(4 * parse_depth_) << std::right << ' ';
-+    std::cout << std::setw(4 * parse_depth_) << std::ios::right << ' ';
- }
- 
- } // anonymous namespace
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index a957bee6cd9e..89682f0a7b13 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -910,6 +910,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__Pointer__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1Value__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1unconst.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring-members.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring.html
 share/doc/gtkmm-2.0/docs/reference/html/classGlib_1_1ustring__Iterator-members.html
@@ -1456,6 +1457,7 @@ share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1ConnectionNode__inherit__graph.png
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object.html
 share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1Object__inherit__graph.png
+share/doc/gtkmm-2.0/docs/reference/html/classSigC_1_1manage.html
 share/doc/gtkmm-2.0/docs/reference/html/class_8h.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild.html
 share/doc/gtkmm-2.0/docs/reference/html/class__GtkBoxChild__inherit__graph.png
@@ -1591,6 +1593,8 @@ share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__114.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__115.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__116.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__117.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__118.png
+share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__119.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.0/docs/reference/html/inherit__graph__14.png
@@ -1971,6 +1975,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/checkbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_ideal.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/clipboard_simple.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/combo.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/devcpp_project_options.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_colorselectiondialog.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fileselection.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/dialogs_fontselectiondialog.png
@@ -1995,6 +2000,7 @@ share/doc/gtkmm-2.0/docs/tutorial/figures/range_widgets.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/scrolledwindow.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/spinbutton.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/table.png
+share/doc/gtkmm-2.0/docs/tutorial/figures/textview.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/toolbar.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_draganddrop.png
 share/doc/gtkmm-2.0/docs/tutorial/figures/treeview_editablecells.png
@@ -2013,6 +2019,9 @@ share/doc/gtkmm-2.0/docs/tutorial/html/apbs05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apbs06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apc.html
 share/doc/gtkmm-2.0/docs/tutorial/html/apd.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ape.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/apes03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch01s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch02.html
@@ -2048,6 +2057,7 @@ share/doc/gtkmm-2.0/docs/tutorial/html/ch08s05.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch08s06.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch09s02.html
+share/doc/gtkmm-2.0/docs/tutorial/html/ch09s03.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch10s02.html
 share/doc/gtkmm-2.0/docs/tutorial/html/ch11.html
@@ -2165,6 +2175,9 @@ share/doc/gtkmm-2.0/examples/book/helloworld/main.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.cc
 share/doc/gtkmm-2.0/examples/book/helloworld2/helloworld.h
 share/doc/gtkmm-2.0/examples/book/helloworld2/main.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.cc
+share/doc/gtkmm-2.0/examples/book/idle/idleexample.h
+share/doc/gtkmm-2.0/examples/book/idle/main.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.cc
 share/doc/gtkmm-2.0/examples/book/label/examplewindow.h
 share/doc/gtkmm-2.0/examples/book/label/main.cc
@@ -2246,7 +2259,6 @@ share/doc/gtkmm-2.0/examples/exception/exceptiontest.cc
 share/doc/gtkmm-2.0/examples/filesel/filesel.cc
 share/doc/gtkmm-2.0/examples/fixed/fixed.cc
 share/doc/gtkmm-2.0/examples/gdk/radar.cc
-share/doc/gtkmm-2.0/examples/idle/idle.cc
 share/doc/gtkmm-2.0/examples/markup/parser.cc
 share/doc/gtkmm-2.0/examples/rulers/rulers.cc
 share/doc/gtkmm-2.0/examples/statusbar/statusbar.cc
@@ -2266,7 +2278,6 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/statusbar
 @dirrm share/doc/gtkmm-2.0/examples/rulers
 @dirrm share/doc/gtkmm-2.0/examples/markup
-@dirrm share/doc/gtkmm-2.0/examples/idle
 @dirrm share/doc/gtkmm-2.0/examples/gdk
 @dirrm share/doc/gtkmm-2.0/examples/fixed
 @dirrm share/doc/gtkmm-2.0/examples/filesel
@@ -2295,6 +2306,7 @@ share/doc/gtkmm-2.0/examples/window/wheelbarrow.cc
 @dirrm share/doc/gtkmm-2.0/examples/book/menus/main_menu
 @dirrm share/doc/gtkmm-2.0/examples/book/menus
 @dirrm share/doc/gtkmm-2.0/examples/book/label
+@dirrm share/doc/gtkmm-2.0/examples/book/idle
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld2
 @dirrm share/doc/gtkmm-2.0/examples/book/helloworld
 @dirrm share/doc/gtkmm-2.0/examples/book/frame