Update to 2.2.1. Changes in this version:

* configure depends on ATK 1.2. (Murray Cumming)
* Various gtkmm/gdkmm reference-counting corrections, using
  refreturn. (Sven Grottke, Murray Cumming)
* Gtk::Menu_Helpers::Element: lifetime refcounting fix.
  (Murray Cumming)
* Glib:
  - build_path(), build_filename(): fix and performance
    improvement.
  - replace deprecated __builtin_bzero().
  (Daniel Elstner)
* Win32:
  2.2 now builds, after lots of work. And there's
  an installer. (Cedric Gustin)
* Documentation:
  - Glib::Cond documented (Rick L Vinyard Jr)
  - Review and completion of Gtk::AccelGroup -> Gtk::Bin
    (Bryan Forbes)
  - Minor internals docs fix. (Martin Schulze)

9 files changed, 101 insertions, 13 deletions

diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 79758f7f987..556cae9eb1b 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2003/03/01 21:46:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/15 20:32:38 jmmv Exp $
 #
 
-DISTNAME=	gtkmm-2.2.0
+DISTNAME=	gtkmm-2.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 
diff --git a/x11/gtkmm/PLIST b/x11/gtkmm/PLIST
index fda773820f4..aab9f690557 100644
--- a/x11/gtkmm/PLIST
+++ b/x11/gtkmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/01 14:33:09 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/15 20:32:38 jmmv Exp $
 include/gtkmm-2.0/atkmm.h
 include/gtkmm-2.0/atkmm/action.h
 include/gtkmm-2.0/atkmm/component.h
@@ -460,40 +460,41 @@ 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.0
+lib/libatkmm-1.0.so.6.1
 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.0
+lib/libgdkmm-2.0.so.6.1
 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.0
+lib/libglibmm-2.0.so.6.1
 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.0
+lib/libgtkmm-2.0.so.6.1
 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.0
+lib/libgtkmm_generate_extra_defs-2.0.so.6.1
 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.0
+lib/libpangomm-1.0.so.6.1
 lib/pkgconfig/atkmm-1.0.pc
 lib/pkgconfig/gdkmm-2.0.pc
 lib/pkgconfig/glibmm-2.0.pc
 lib/pkgconfig/gtkmm-2.0.pc
 lib/pkgconfig/pangomm-1.0.pc
+share/doc/gtkmm-2.0/FAQ/html/index.html
+share/doc/gtkmm-2.0/docs/index.html
 share/doc/gtkmm-2.0/images/gtkmm_logo.gif
 share/doc/gtkmm-2.0/images/top.gif
-share/doc/gtkmm-2.0/index.html
 share/doc/gtkmm-2.0/reference/html/accelgroup_8h.html
 share/doc/gtkmm-2.0/reference/html/accelkey_8h.html
 share/doc/gtkmm-2.0/reference/html/accellabel_8h.html
@@ -2108,6 +2109,9 @@ share/doc/gtkmm-2.0/tutorial/html/index.html
 @dirrm share/doc/gtkmm-2.0/reference/html
 @dirrm share/doc/gtkmm-2.0/reference
 @dirrm share/doc/gtkmm-2.0/images
+@dirrm share/doc/gtkmm-2.0/docs
+@dirrm share/doc/gtkmm-2.0/FAQ/html
+@dirrm share/doc/gtkmm-2.0/FAQ
 @dirrm share/doc/gtkmm-2.0
 @dirrm lib/gtkmm-2.0/proc/pm
 @dirrm lib/gtkmm-2.0/proc/m4
diff --git a/x11/gtkmm/distinfo b/x11/gtkmm/distinfo
index 69feca24db0..97a3804fc3c 100644
--- a/x11/gtkmm/distinfo
+++ b/x11/gtkmm/distinfo
@@ -1,4 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/01 14:33:06 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2003/03/15 20:32:40 jmmv Exp $
 
-SHA1 (gtkmm-2.2.0.tar.gz) = 66be1d586bf23be9221cf056a55ceabb3abc54f7
-Size (gtkmm-2.2.0.tar.gz) = 5023642 bytes
+SHA1 (gtkmm-2.2.1.tar.gz) = 585a31ab5059bcc78652ef8622ee0e9c6ba901ca
+Size (gtkmm-2.2.1.tar.gz) = 5049945 bytes
+SHA1 (patch-aa) = 7a94debc87146f99cc0a9c1a8e113390683f68be
+SHA1 (patch-ab) = c8209256e4a48b5c6d48ca3a19f7592b9a3deaac
+SHA1 (patch-ac) = 74c45eb37eba29bc843198ae07261f9302744540
+SHA1 (patch-ad) = b320d94367a90c7ca8dba3e302bd1093f17b664f
+SHA1 (patch-ae) = fbc815e5be6e2f58f4aba855c660f426985da272
+SHA1 (patch-af) = f6fbce223afda4b7b3911bbf1fb46d0333adf9fd
diff --git a/x11/gtkmm/patches/patch-aa b/x11/gtkmm/patches/patch-aa
new file mode 100644
index 00000000000..179c371bb8c
--- /dev/null
+++ b/x11/gtkmm/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/03/15 20:32:40 jmmv Exp $
+
+--- Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ Makefile.in
+@@ -153,7 +153,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = tools glib pango atk gdk gtk examples docs
++SUBDIRS = tools glib pango atk gdk gtk docs
+ DIST_SUBDIRS = $(SUBDIRS) scripts demos examples tests
+ 
+ EXTRA_DIST = gtkmm.spec.in \
diff --git a/x11/gtkmm/patches/patch-ab b/x11/gtkmm/patches/patch-ab
new file mode 100644
index 00000000000..027cc69f5e5
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/03/15 20:32:40 jmmv Exp $
+
+--- docs/FAQ/Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ docs/FAQ/Makefile.in
+@@ -158,7 +158,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+ 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
+ 
diff --git a/x11/gtkmm/patches/patch-ac b/x11/gtkmm/patches/patch-ac
new file mode 100644
index 00000000000..603209a2ded
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/03/15 20:32:40 jmmv Exp $
+
+--- docs/images/Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ docs/images/Makefile.in
+@@ -159,7 +159,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+ 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.
diff --git a/x11/gtkmm/patches/patch-ad b/x11/gtkmm/patches/patch-ad
new file mode 100644
index 00000000000..c2ca9924490
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/03/15 20:32:40 jmmv Exp $
+
+--- docs/reference/Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ docs/reference/Makefile.in
+@@ -161,7 +161,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+ 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
+ 
diff --git a/x11/gtkmm/patches/patch-ae b/x11/gtkmm/patches/patch-ae
new file mode 100644
index 00000000000..6ba264566f7
--- /dev/null
+++ b/x11/gtkmm/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/03/15 20:32:40 jmmv Exp $
+
+--- docs/tutorial/Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ docs/tutorial/Makefile.in
+@@ -157,7 +157,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+ 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
+ 
diff --git a/x11/gtkmm/patches/patch-af b/x11/gtkmm/patches/patch-af
new file mode 100644
index 00000000000..2382b6a560d
--- /dev/null
+++ b/x11/gtkmm/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/03/15 20:32:41 jmmv Exp $
+
+--- docs/tutorial/figures/Makefile.in.orig	2003-03-15 18:38:26.000000000 +0000
++++ docs/tutorial/figures/Makefile.in
+@@ -157,7 +157,7 @@ web_path_gtkmm2 = /home/groups/g/gt/gtkm
+ 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
+