update to 2.2.12,

fix MASTER_SITES
changes:
* gtkmm 2.2.10 had an incorrect configure-time test, that mistakenly
  disabled some template code for gcc, used to convert from
    intermediate C++ containers to STL containers. For instance, this
      broke the gnome-vfsmm build.
* TreeView::get_path_at_pos(): Correct memory management. ("David").
* ConstructParams::ConstructParams(): improvement. (Daniel Elstner).
* TreePath::append(): Maybe fixed compilation for gcc 3.4. (Daniel Elstner)

10 files changed, 64 insertions, 72 deletions

diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 349cfa85934..f0673573302 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2004/04/02 12:33:22 adam Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/05 11:04:33 drochner Exp $
 #
 
-DISTNAME=	gtkmm-2.2.10
+DISTNAME=	gtkmm-2.2.12
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkmm/2.2/}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.gtkmm.org/
diff --git a/x11/gtkmm/PLIST b/x11/gtkmm/PLIST
index 2b66ea66aef..fd377c09835 100644
--- a/x11/gtkmm/PLIST
+++ b/x11/gtkmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/04/02 12:33:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/07/05 11:04:33 drochner Exp $
 include/gtkmm-2.0/atkmm.h
 include/gtkmm-2.0/atkmm/action.h
 include/gtkmm-2.0/atkmm/component.h
@@ -460,32 +460,32 @@ lib/libatkmm-1.0.a
 lib/libatkmm-1.0.la
 lib/libatkmm-1.0.so
 lib/libatkmm-1.0.so.6
-lib/libatkmm-1.0.so.6.9
+lib/libatkmm-1.0.so.6.11
 lib/libgdkmm-2.0.a
 lib/libgdkmm-2.0.la
 lib/libgdkmm-2.0.so
 lib/libgdkmm-2.0.so.6
-lib/libgdkmm-2.0.so.6.9
+lib/libgdkmm-2.0.so.6.11
 lib/libglibmm-2.0.a
 lib/libglibmm-2.0.la
 lib/libglibmm-2.0.so
 lib/libglibmm-2.0.so.6
-lib/libglibmm-2.0.so.6.9
+lib/libglibmm-2.0.so.6.11
 lib/libgtkmm-2.0.a
 lib/libgtkmm-2.0.la
 lib/libgtkmm-2.0.so
 lib/libgtkmm-2.0.so.6
-lib/libgtkmm-2.0.so.6.9
+lib/libgtkmm-2.0.so.6.11
 lib/libgtkmm_generate_extra_defs-2.0.a
 lib/libgtkmm_generate_extra_defs-2.0.la
 lib/libgtkmm_generate_extra_defs-2.0.so
 lib/libgtkmm_generate_extra_defs-2.0.so.6
-lib/libgtkmm_generate_extra_defs-2.0.so.6.9
+lib/libgtkmm_generate_extra_defs-2.0.so.6.11
 lib/libpangomm-1.0.a
 lib/libpangomm-1.0.la
 lib/libpangomm-1.0.so
 lib/libpangomm-1.0.so.6
-lib/libpangomm-1.0.so.6.9
+lib/libpangomm-1.0.so.6.11
 lib/pkgconfig/atkmm-1.0.pc
 lib/pkgconfig/gdkmm-2.0.pc
 lib/pkgconfig/glibmm-2.0.pc
@@ -649,11 +649,9 @@ share/doc/gtkmm-2.0/reference/html/classGlib_1_1ArrayHandle-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ArrayHandle.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Cond-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Cond.html
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1ArrayHandleIterator-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1ArrayHandleIterator.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1ListHandleIterator.html
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1SListHandleIterator-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Container__Helpers_1_1SListHandleIterator.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ConvertError-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ConvertError.html
@@ -858,15 +856,14 @@ share/doc/gtkmm-2.0/reference/html/classGlib_1_1ValueBase__String-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ValueBase__String.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ValueBase__String__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1ValueBase__inherit__graph.png
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01T_01_4_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01T_01_4_01_4-members.html
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01T_01_4_01_4__inherit__graph.png
+share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01T_01_4_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01const_01T_01_4_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01Glib_1_1ustring_01_4__inherit__graph.png
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01T_01_5_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01T_01_5_01_4-members.html
+share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01T_01_5_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01T_01_5_01_4__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01bool_01_4-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01bool_01_4.html
@@ -904,7 +901,6 @@ share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01unsigned_01long_01_4.h
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01unsigned_01long_01_4__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01unsigned_01long_01long_01_4-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01unsigned_01long_01long_01_4.html
-share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01unsigned_01long_01long_01_4__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01void_01_5_01_4-members.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01void_01_5_01_4.html
 share/doc/gtkmm-2.0/reference/html/classGlib_1_1Value_3_01void_01_5_01_4__inherit__graph.png
@@ -1006,9 +1002,7 @@ share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDown.html
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDownItem-members.html
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDownItem.html
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDownItem__inherit__graph.png
-share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList-members.html
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList.html
-share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1ComboDropDown__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1Combo__inherit__graph.png
 share/doc/gtkmm-2.0/reference/html/classGtk_1_1Container-members.html
@@ -1612,11 +1606,11 @@ share/doc/gtkmm-2.0/reference/html/inherit__graph__116.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__117.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__118.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__119.png
+share/doc/gtkmm-2.0/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__120.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__121.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__122.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__123.png
-share/doc/gtkmm-2.0/reference/html/inherit__graph__12.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__13.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__14.png
 share/doc/gtkmm-2.0/reference/html/inherit__graph__15.png
@@ -2147,8 +2141,6 @@ share/doc/gtkmm-2.0/tutorial/html/index.html
 @dirrm share/doc/gtkmm-2.0/FAQ
 @dirrm share/doc/gtkmm-2.0
 @dirrm share/devhelp/books/gtkmm-2.0
-@dirrm share/devhelp/books
-@dirrm share/devhelp
 @dirrm lib/gtkmm-2.0/proc/pm
 @dirrm lib/gtkmm-2.0/proc/m4
 @dirrm lib/gtkmm-2.0/proc
diff --git a/x11/gtkmm/distinfo b/x11/gtkmm/distinfo
index 1687c05d8db..211821f899d 100644
--- a/x11/gtkmm/distinfo
+++ b/x11/gtkmm/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2004/04/02 12:33:22 adam Exp $
+$NetBSD: distinfo,v 1.8 2004/07/05 11:04:34 drochner Exp $
 
-SHA1 (gtkmm-2.2.10.tar.gz) = bc1eecece4b5bb8a2ec63a1af9310cdb1f8ab6fe
-Size (gtkmm-2.2.10.tar.gz) = 5766861 bytes
-SHA1 (patch-aa) = 88b0535d771258f2cf5f0f9872b506c3c63c3b0f
-SHA1 (patch-ab) = c91d47d44f8d51df50ef707cd817d91f522ff2fb
-SHA1 (patch-ac) = 00ff77de5a471b31b14ce375572bbf0ee834ea3d
-SHA1 (patch-ad) = 4bc4bb3ad9e30b46c5d5031c3394c069357e5e91
-SHA1 (patch-ae) = 20e4128e4ee302f0cbb100b2d37db38d7a17a3bb
-SHA1 (patch-af) = 0f37a8cdea5cbf0a4e1bb94262bc7a77ddfee0f0
-SHA1 (patch-ag) = ca8347c7c43d01d5c5b6bae9a3ff31f89b42cd1b
+SHA1 (gtkmm-2.2.12.tar.gz) = 9bb4b3acd000df74aa83d9a192615ea925cc6bc2
+Size (gtkmm-2.2.12.tar.gz) = 5793169 bytes
+SHA1 (patch-aa) = 57b92c61b77b5c464b5a3e0f8a64a1b4da62965e
+SHA1 (patch-ab) = ffd085097b5d04ec461e34abb4c503cc9ff7221e
+SHA1 (patch-ac) = fbfbd5c20d389fdc1dc621e488c08d8f0d32c5fa
+SHA1 (patch-ad) = aeaf85db79f02a9cebb5dce3d1397dc1af342f4f
+SHA1 (patch-ae) = 59977a1721164350d15d3026e7513093ac48e171
+SHA1 (patch-af) = 4d62c67d8e98dde8e77cf86a29aec597b711fd68
+SHA1 (patch-ag) = a220fd1c73a28d8ce13c52ae4371e925de1d1669
diff --git a/x11/gtkmm/patches/patch-aa b/x11/gtkmm/patches/patch-aa
index 48e5d3f0dc9..2aa4e848e3a 100644
--- a/x11/gtkmm/patches/patch-aa
+++ b/x11/gtkmm/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2003/11/01 18:24:39 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2004/07/05 11:04:34 drochner Exp $
 
---- Makefile.in.orig	2003-09-29 15:10:58.000000000 +0200
+--- Makefile.in.orig	2004-06-03 19:49:14.000000000 +0200
 +++ Makefile.in
-@@ -166,7 +166,7 @@ sysconfdir = @sysconfdir@
+@@ -206,7 +206,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  ACLOCAL_AMFLAGS = -I scripts
- 
 -SUBDIRS = tools glib pango atk gdk gtk examples docs tests
 +SUBDIRS = tools glib pango atk gdk gtk docs tests
  DIST_SUBDIRS = $(SUBDIRS) scripts demos MSVC_Net2003
- 
  EXTRA_DIST = gtkmm.spec.in \
+ 		  build_shared/Makefile_build.am_fragment \
diff --git a/x11/gtkmm/patches/patch-ab b/x11/gtkmm/patches/patch-ab
index 9b03a2ee991..c96499359bf 100644
--- a/x11/gtkmm/patches/patch-ab
+++ b/x11/gtkmm/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2003/08/27 16:06:13 adam Exp $
+$NetBSD: patch-ab,v 1.5 2004/07/05 11:04:34 drochner Exp $
 
---- docs/FAQ/Makefile.in.orig	2003-08-23 09:49:27.000000000 +0200
+--- docs/FAQ/Makefile.in.orig	2004-06-03 19:49:17.000000000 +0200
 +++ docs/FAQ/Makefile.in
-@@ -170,7 +170,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -187,7 +187,7 @@ docbook_docs = gtkmm-faq.xml
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
- 
  gtkmm_faq_path = $(web_path_docs)FAQ
- 
+ EXTRA_DIST = README gtkmm-faq.xml html
+ faqdir = $(gtkmm_docdir)/FAQ/html
diff --git a/x11/gtkmm/patches/patch-ac b/x11/gtkmm/patches/patch-ac
index 690e87a2918..bad43d34d9f 100644
--- a/x11/gtkmm/patches/patch-ac
+++ b/x11/gtkmm/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2003/08/27 16:06:13 adam Exp $
+$NetBSD: patch-ac,v 1.5 2004/07/05 11:04:34 drochner Exp $
 
---- docs/images/Makefile.in.orig	2003-08-23 09:49:27.000000000 +0200
+--- docs/images/Makefile.in.orig	2004-06-03 19:49:17.000000000 +0200
 +++ docs/images/Makefile.in
-@@ -171,7 +171,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -191,7 +191,7 @@ EXTRA_DIST = gtkmm_logo.gif top.gif
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
  
- 
  # Post to the website.
+ imagesdir = $(gtkmm_docdir)/images
diff --git a/x11/gtkmm/patches/patch-ad b/x11/gtkmm/patches/patch-ad
index d028a621c84..d9c9cd2a38e 100644
--- a/x11/gtkmm/patches/patch-ad
+++ b/x11/gtkmm/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2003/08/27 16:06:13 adam Exp $
+$NetBSD: patch-ad,v 1.5 2004/07/05 11:04:34 drochner Exp $
 
---- docs/reference/Makefile.in.orig	2003-08-23 09:49:28.000000000 +0200
+--- docs/reference/Makefile.in.orig	2004-06-03 19:49:18.000000000 +0200
 +++ docs/reference/Makefile.in
-@@ -173,7 +173,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -191,7 +191,7 @@ devhelp_file = gtkmm-2.0.devhelp
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
- 
  web_path_reference = $(web_path_docs)reference
- 
+ EXTRA_DIST = README Doxyfile.in \
+              gtkmm_header.html_fragment gtkmm_footer.html_fragment beautify_docs.pl \
diff --git a/x11/gtkmm/patches/patch-ae b/x11/gtkmm/patches/patch-ae
index b0a1975f228..6ed3ca0dad8 100644
--- a/x11/gtkmm/patches/patch-ae
+++ b/x11/gtkmm/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.4 2003/08/27 16:06:13 adam Exp $
+$NetBSD: patch-ae,v 1.5 2004/07/05 11:04:34 drochner Exp $
 
---- docs/tutorial/Makefile.in.orig	2003-08-23 09:49:28.000000000 +0200
+--- docs/tutorial/Makefile.in.orig	2004-06-03 19:49:18.000000000 +0200
 +++ docs/tutorial/Makefile.in
-@@ -169,7 +169,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -195,7 +195,7 @@ target_alias = @target_alias@
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
- 
  gtkmm_tut_path = $(web_path_docs)tutorial
- 
+ SUBDIRS = figures
+ EXTRA_DIST = README insert_example_code.pl gtkmm-tut.xml gtkmm-tut-with-examples.xml html
diff --git a/x11/gtkmm/patches/patch-af b/x11/gtkmm/patches/patch-af
index ae61e0ae901..0ff407a3017 100644
--- a/x11/gtkmm/patches/patch-af
+++ b/x11/gtkmm/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.4 2003/08/27 16:06:13 adam Exp $
+$NetBSD: patch-af,v 1.5 2004/07/05 11:04:34 drochner Exp $
 
---- docs/tutorial/figures/Makefile.in.orig	2003-08-23 09:49:28.000000000 +0200
+--- docs/tutorial/figures/Makefile.in.orig	2004-06-03 19:49:19.000000000 +0200
 +++ docs/tutorial/figures/Makefile.in
-@@ -169,7 +169,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -190,7 +190,7 @@ target_alias = @target_alias@
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
- 
  figuresdir = $(gtkmm_docdir)/tutorial/figures
- 
+ figures_DATA = alignment.png aspectframe.png \
+ 	box_packing1.png box_packing2.png box_packing3.png \
diff --git a/x11/gtkmm/patches/patch-ag b/x11/gtkmm/patches/patch-ag
index a3e741435a9..3a5d482cceb 100644
--- a/x11/gtkmm/patches/patch-ag
+++ b/x11/gtkmm/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2003/08/27 16:07:04 adam Exp $
+$NetBSD: patch-ag,v 1.2 2004/07/05 11:04:34 drochner Exp $
 
---- docs/Makefile.in.orig	2003-08-27 17:06:39.000000000 +0200
+--- docs/Makefile.in.orig	2004-06-03 19:49:17.000000000 +0200
 +++ docs/Makefile.in
-@@ -175,7 +175,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+@@ -202,7 +202,7 @@ gtkmm_doc_DATA = index.html
+ web_path_gtkmm2 = /home/groups/g/gt/gtkmm/htdocs/gtkmm2/
  web_path_docs = $(web_path_gtkmm2)docs/
  rsync_args = -vz --rsh ssh --delete --delete-after
- 
 -gtkmm_docdir = $(datadir)/doc/gtkmm-2.0/docs
 +gtkmm_docdir = $(datadir)/doc/gtkmm-2.0
- subdir = docs
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+ all: all-recursive
+ 
+ .SUFFIXES: