4 files changed, 57 insertions, 76 deletions

diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index a933b8da6341..2ea3d95b2512 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.72 2009/03/16 08:23:53 kwm Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.82 2009/09/21 19:47:13 kwm Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.20.1
+PORTVERSION=	2.22.1
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
@@ -31,17 +31,13 @@ USE_GNOME=	gnomehack glib20 ltverhack
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static --disable-documentation
 
 post-patch:
 .for d in docs examples tests
 	@${REINPLACE_CMD} -e '/^SUBDIRS = /s/${d}//' ${WRKSRC}/Makefile.in
 .endfor
 
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/docs/reference/beautify_docs.pl \
-		${PREFIX}/lib/glibmm-2.4/proc
-
 .include <bsd.port.mk>
 
 .endif
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index c24857233b1f..96ae66df32bd 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.20.1.tar.bz2) = 6d5e3cf93543754881cd80df796ca358
-SHA256 (gnome2/glibmm-2.20.1.tar.bz2) = 8436e9f775a6ee0b4dd407fb6cb708a76e90e6255fe2fffffcd5f885d865651b
-SIZE (gnome2/glibmm-2.20.1.tar.bz2) = 7608179
+MD5 (gnome2/glibmm-2.22.1.tar.bz2) = 1a96c7fde75ddbb421bc23fb4aa7adba
+SHA256 (gnome2/glibmm-2.22.1.tar.bz2) = f105ff4afdcdf7da7f310affdbe698058958f01e94ab65ac1c35e46e20ecb6c0
+SIZE (gnome2/glibmm-2.22.1.tar.bz2) = 3480822
diff --git a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl b/devel/glibmm/files/patch-docs::reference::beautify_docs.pl
deleted file mode 100644
index bbb320452629..000000000000
--- a/devel/glibmm/files/patch-docs::reference::beautify_docs.pl
+++ /dev/null
@@ -1,20 +0,0 @@
---- docs/reference/beautify_docs.pl.in.orig	Thu Feb 12 02:52:02 2004
-+++ docs/reference/beautify_docs.pl.in	Thu Feb 12 03:00:08 2004
-@@ -25,7 +25,7 @@
-   my ($file) = @_;
-   my @outbuf;
- 
--  open(FILE, '<', $file);
-+  open(FILE, "<$file");
- 
-   while(<FILE>)
-   {
-@@ -71,7 +71,7 @@
-     push(@outbuf, $_);
-   }
- 
--  open(FILE, '>', $file);
-+  open(FILE, ">$file");
- 
-   # write the whole buffer back
-   print FILE "$_" foreach(@outbuf);
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index f059558d4def..ba8a266b3414 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -20,6 +20,7 @@ include/giomm-%%API_VERSION%%/giomm/fileenumerator.h
 include/giomm-%%API_VERSION%%/giomm/fileicon.h
 include/giomm-%%API_VERSION%%/giomm/fileinfo.h
 include/giomm-%%API_VERSION%%/giomm/fileinputstream.h
+include/giomm-%%API_VERSION%%/giomm/fileiostream.h
 include/giomm-%%API_VERSION%%/giomm/filemonitor.h
 include/giomm-%%API_VERSION%%/giomm/filenamecompleter.h
 include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h
@@ -28,6 +29,7 @@ include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h
 include/giomm-%%API_VERSION%%/giomm/icon.h
 include/giomm-%%API_VERSION%%/giomm/init.h
 include/giomm-%%API_VERSION%%/giomm/inputstream.h
+include/giomm-%%API_VERSION%%/giomm/iostream.h
 include/giomm-%%API_VERSION%%/giomm/loadableicon.h
 include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
 include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h
@@ -54,6 +56,7 @@ include/giomm-%%API_VERSION%%/giomm/private/fileenumerator_p.h
 include/giomm-%%API_VERSION%%/giomm/private/fileicon_p.h
 include/giomm-%%API_VERSION%%/giomm/private/fileinfo_p.h
 include/giomm-%%API_VERSION%%/giomm/private/fileinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/fileiostream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/filemonitor_p.h
 include/giomm-%%API_VERSION%%/giomm/private/filenamecompleter_p.h
 include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h
@@ -61,6 +64,7 @@ include/giomm-%%API_VERSION%%/giomm/private/filterinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/filteroutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/icon_p.h
 include/giomm-%%API_VERSION%%/giomm/private/inputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h
 include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h
@@ -80,6 +84,7 @@ include/giomm-%%API_VERSION%%/giomm/unixoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/volume.h
 include/giomm-%%API_VERSION%%/giomm/volumemonitor.h
 include/giomm-%%API_VERSION%%/giomm/wrap_init.h
+include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
 include/glibmm-%%API_VERSION%%/glibmm.h
 include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h
 include/glibmm-%%API_VERSION%%/glibmm/checksum.h
@@ -134,6 +139,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h
 include/glibmm-%%API_VERSION%%/glibmm/property.h
 include/glibmm-%%API_VERSION%%/glibmm/propertyproxy.h
 include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
@@ -160,54 +166,53 @@ include/glibmm-%%API_VERSION%%/glibmm/utility.h
 include/glibmm-%%API_VERSION%%/glibmm/value.h
 include/glibmm-%%API_VERSION%%/glibmm/value_basictypes.h
 include/glibmm-%%API_VERSION%%/glibmm/value_custom.h
+include/glibmm-%%API_VERSION%%/glibmm/valuearray.h
 include/glibmm-%%API_VERSION%%/glibmm/wrap.h
 include/glibmm-%%API_VERSION%%/glibmm/wrap_init.h
-include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs/generate_extra_defs.h
 lib/giomm-%%API_VERSION%%/include/giommconfig.h
 lib/glibmm-%%API_VERSION%%/include/glibmmconfig.h
-lib/glibmm-%%API_VERSION%%/proc/beautify_docs.pl
-lib/glibmm-%%API_VERSION%%/proc/generate_wrap_init.pl
-lib/glibmm-%%API_VERSION%%/proc/gmmproc
-lib/glibmm-%%API_VERSION%%/proc/m4/base.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_boxedtype_static.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_generic.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_gobject.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_gtkobject.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_interface.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_copyable.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_opaque_refcounted.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/class_shared.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/compare.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_atk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_base.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gio.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_glib.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/convert_pango.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/ctor.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/doc.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/enum.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/gerror.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/list.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/member.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/method.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/property.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/signal.m4
-lib/glibmm-%%API_VERSION%%/proc/m4/vfunc.m4
-lib/glibmm-%%API_VERSION%%/proc/pm/DocsParser.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Enum.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Function.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/FunctionBase.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/GtkDefs.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Object.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Output.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Property.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/Util.pm
-lib/glibmm-%%API_VERSION%%/proc/pm/WrapParser.pm
+lib/glibmm-%%VERSION%%/proc/generate_wrap_init.pl
+lib/glibmm-%%VERSION%%/proc/gmmproc
+lib/glibmm-%%VERSION%%/proc/m4/base.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_boxedtype_static.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_generic.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_gobject.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_gtkobject.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_interface.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_opaque_copyable.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_opaque_refcounted.m4
+lib/glibmm-%%VERSION%%/proc/m4/class_shared.m4
+lib/glibmm-%%VERSION%%/proc/m4/compare.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_atk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_base.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gdk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gio.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_glib.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gtk.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_gtkmm.m4
+lib/glibmm-%%VERSION%%/proc/m4/convert_pango.m4
+lib/glibmm-%%VERSION%%/proc/m4/ctor.m4
+lib/glibmm-%%VERSION%%/proc/m4/doc.m4
+lib/glibmm-%%VERSION%%/proc/m4/enum.m4
+lib/glibmm-%%VERSION%%/proc/m4/gerror.m4
+lib/glibmm-%%VERSION%%/proc/m4/list.m4
+lib/glibmm-%%VERSION%%/proc/m4/member.m4
+lib/glibmm-%%VERSION%%/proc/m4/method.m4
+lib/glibmm-%%VERSION%%/proc/m4/property.m4
+lib/glibmm-%%VERSION%%/proc/m4/signal.m4
+lib/glibmm-%%VERSION%%/proc/m4/vfunc.m4
+lib/glibmm-%%VERSION%%/proc/pm/DocsParser.pm
+lib/glibmm-%%VERSION%%/proc/pm/Enum.pm
+lib/glibmm-%%VERSION%%/proc/pm/Function.pm
+lib/glibmm-%%VERSION%%/proc/pm/FunctionBase.pm
+lib/glibmm-%%VERSION%%/proc/pm/GtkDefs.pm
+lib/glibmm-%%VERSION%%/proc/pm/Object.pm
+lib/glibmm-%%VERSION%%/proc/pm/Output.pm
+lib/glibmm-%%VERSION%%/proc/pm/Property.pm
+lib/glibmm-%%VERSION%%/proc/pm/Util.pm
+lib/glibmm-%%VERSION%%/proc/pm/WrapParser.pm
 lib/libgiomm-%%VERSION%%.a
 lib/libgiomm-%%VERSION%%.la
 lib/libgiomm-%%VERSION%%.so
@@ -223,16 +228,16 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
 libdata/pkgconfig/giomm-%%API_VERSION%%.pc
 libdata/pkgconfig/glibmm-%%API_VERSION%%.pc
 share/aclocal/glibmm_check_perl.m4
-@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
 @dirrm lib/glibmm-%%API_VERSION%%/proc/m4
+@dirrm lib/glibmm-%%API_VERSION%%/proc/pm
 @dirrm lib/glibmm-%%API_VERSION%%/proc
 @dirrm lib/glibmm-%%API_VERSION%%/include
 @dirrm lib/glibmm-%%API_VERSION%%
 @dirrm lib/giomm-%%API_VERSION%%/include
 @dirrm lib/giomm-%%API_VERSION%%
-@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
 @dirrm include/glibmm-%%API_VERSION%%/glibmm/private
 @dirrm include/glibmm-%%API_VERSION%%/glibmm
+@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
 @dirrm include/glibmm-%%API_VERSION%%
 @dirrm include/giomm-%%API_VERSION%%/giomm/private
 @dirrm include/giomm-%%API_VERSION%%/giomm