author: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2010-05-10 21:19:08 +0000
commit: 48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree: b627baa77f19bb1eab2fa4dee08aab1908131cd0 /devel
parent: fbdf96410f8e803568c33397323dd9d8d3af995f (diff)
download: ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz
ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip
110 files changed, 1191 insertions, 3538 deletions
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index c1e7a0529148..e71b399bece7 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Chia-liang Kao <clkao@CirX.ORG>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/ORBit2/Makefile,v 1.53 2008/09/21 06:32:52 kwm Exp $
+#   $MCom: ports/devel/ORBit2/Makefile,v 1.55 2010/04/02 17:37:25 kwm Exp $
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.14.17
+PORTVERSION=	2.14.18
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 4749ec89f565..b4e655b065bb 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/ORBit2-2.14.17.tar.bz2) = 10bfb957fa4a8935a0b4afaee7d71df7
-SHA256 (gnome2/ORBit2-2.14.17.tar.bz2) = 62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c
-SIZE (gnome2/ORBit2-2.14.17.tar.bz2) = 747503
+MD5 (gnome2/ORBit2-2.14.18.tar.bz2) = 3e80596171b1ea652707219c7144ff53
+SHA256 (gnome2/ORBit2-2.14.18.tar.bz2) = c6148edd8044255aeed9ab1d1eeb3c39edd0aa1ace5d33cf6831b80d11f1ab7c
+SIZE (gnome2/ORBit2-2.14.18.tar.bz2) = 747701
diff --git a/devel/anjuta-extras/Makefile b/devel/anjuta-extras/Makefile
index e99f9645ee5c..2223a250c84e 100644
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta-extras/Makefile,v 1.3 2009/09/22 10:27:21 kwm Exp $
+#   $MCom: ports/devel/anjuta-extras/Makefile,v 1.7 2010/04/29 15:08:31 kwm Exp $
 #
 
 PORTNAME=	anjuta-extras
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	2.30.1.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
diff --git a/devel/anjuta-extras/distinfo b/devel/anjuta-extras/distinfo
index 79a77a4979d1..70c891199e11 100644
--- a/devel/anjuta-extras/distinfo
+++ b/devel/anjuta-extras/distinfo
@@ -1,3 +1,3 @@
-MD5 (anjuta-extras-2.28.0.tar.bz2) = c67db4abb5a873fdbe8f4fed59b2a9da
-SHA256 (anjuta-extras-2.28.0.tar.bz2) = 7b7aa28ca598e17024a41fb29582e6cf2efcc1a273b00e84994f21900e288b49
-SIZE (anjuta-extras-2.28.0.tar.bz2) = 2939244
+MD5 (anjuta-extras-2.30.1.0.tar.bz2) = c76a0843896890e054b063551fa431eb
+SHA256 (anjuta-extras-2.30.1.0.tar.bz2) = 6a8f37de883d05596d7b416a10d49d737c735a7dd0767ce4b804480255cfe808
+SIZE (anjuta-extras-2.30.1.0.tar.bz2) = 2873072
diff --git a/devel/anjuta-extras/pkg-plist b/devel/anjuta-extras/pkg-plist
index 660a35dda8d4..d274e65150ba 100644
--- a/devel/anjuta-extras/pkg-plist
+++ b/devel/anjuta-extras/pkg-plist
@@ -5,23 +5,18 @@ lib/anjuta/anjuta-scratchbox.plugin
 lib/anjuta/libanjuta-class-inheritance.a
 lib/anjuta/libanjuta-class-inheritance.la
 lib/anjuta/libanjuta-class-inheritance.so
-lib/anjuta/libanjuta-class-inheritance.so.0
 lib/anjuta/libanjuta-editor.a
 lib/anjuta/libanjuta-editor.la
 lib/anjuta/libanjuta-editor.so
-lib/anjuta/libanjuta-editor.so.0
 lib/anjuta/libanjuta-profiler.a
 lib/anjuta/libanjuta-profiler.la
 lib/anjuta/libanjuta-profiler.so
-lib/anjuta/libanjuta-profiler.so.0
 lib/anjuta/libanjuta-sample.a
 lib/anjuta/libanjuta-sample.la
 lib/anjuta/libanjuta-sample.so
-lib/anjuta/libanjuta-sample.so.0
 lib/anjuta/libanjuta-scratchbox.a
 lib/anjuta/libanjuta-scratchbox.la
 lib/anjuta/libanjuta-scratchbox.so
-lib/anjuta/libanjuta-scratchbox.so.0
 lib/anjuta/profiler.plugin
 share/anjuta/glade/anjuta-editor-scintilla.ui
 share/anjuta/glade/anjuta-scratchbox-panel.png
@@ -106,3 +101,21 @@ share/pixmaps/anjuta/anjuta-sample-plugin-48.png
 share/pixmaps/anjuta/anjuta-sample-plugin.svg
 share/pixmaps/anjuta/anjuta-scratchbox-48.png
 @dirrm share/anjuta/properties
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 8d192aa7534d..beaa922dd866 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.49 2009/10/19 19:29:48 kwm Exp $
+#   $MCom: ports/devel/anjuta/Makefile,v 1.58 2010/04/28 08:11:36 kwm Exp $
 #
 
 PORTNAME=	anjuta
-PORTVERSION=	2.28.2.0
-PORTREVISION=	2
+PORTVERSION=	2.30.1.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -44,6 +43,7 @@ USE_GNOME=	gnomeprefix gnomehack vte gtksourceview2 libgda4
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-symbol-db-shm=/tmp
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	anjuta-build-basic-autotools-plugin.schemas \
 		anjuta-cvs-plugin.schemas \
@@ -102,6 +102,9 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
 PLIST_SUB+=	DEVHELP=""
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|PKG_PATH|PKG_CONFIG_PATH|g' \
 	    	${WRKSRC}/configure
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo
index 83b82e458c32..325fbb165322 100644
--- a/devel/anjuta/distinfo
+++ b/devel/anjuta/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/anjuta-2.28.2.0.tar.bz2) = 3f61d85938d1352125f05a1167183721
-SHA256 (gnome2/anjuta-2.28.2.0.tar.bz2) = 6d8216fb1fe2541e7a3080c0ffb62bc0527c296ce97a1bd25d2064a8522f664a
-SIZE (gnome2/anjuta-2.28.2.0.tar.bz2) = 7521022
+MD5 (gnome2/anjuta-2.30.1.0.tar.bz2) = 433a159761a7d56f4b767054cc90c8fc
+SHA256 (gnome2/anjuta-2.30.1.0.tar.bz2) = 3c64d80723e2a60311405e83b1b0cab94d07003a579f47cdb1f8073dcfb4e3c1
+SIZE (gnome2/anjuta-2.30.1.0.tar.bz2) = 9404450
diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in
index 27b564d7c381..b0d1cdbdcc0b 100644
--- a/devel/anjuta/files/patch-Makefile.in
+++ b/devel/anjuta/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2010-02-14 13:38:48.000000000 -0500
-+++ Makefile.in	2010-02-14 13:39:18.000000000 -0500
-@@ -482,17 +482,17 @@ uninstall-anjuta_dataDATA:
+--- Makefile.in.orig	2009-12-23 12:28:03.000000000 +0100
++++ Makefile.in	2009-12-23 12:31:34.000000000 +0100
+@@ -490,17 +490,17 @@ uninstall-anjuta_dataDATA:
  	echo " ( cd '$(DESTDIR)$(anjuta_datadir)' && rm -f" $$files ")"; \
  	cd "$(DESTDIR)$(anjuta_datadir)" && rm -f $$files
  install-anjutadocDATA: $(anjutadoc_DATA)
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c b/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
deleted file mode 100644
index d19ef6d15a0a..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_plugin.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/plugin.c.orig	2009-04-17 01:08:28.000000000 -0400
-+++ plugins/symbol-db/plugin.c	2009-04-17 01:09:11.000000000 -0400
-@@ -1510,7 +1510,7 @@ do_check_offline_files_changed (SymbolDB
- 	GHashTable *prj_elements_hash;
- 	GPtrArray *to_add_files = NULL;
- 	gint i;
--	gint real_added ;
-+	gint real_added = 0;
- 	
- 	pm = anjuta_shell_get_interface (ANJUTA_PLUGIN (sdb_plugin)->shell,
- 									 IAnjutaProjectManager, NULL);	
diff --git a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h b/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
deleted file mode 100644
index cecb81021faf..000000000000
--- a/devel/anjuta/files/patch-plugins_symbol-db_symbol-db-engine-priv.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/symbol-db/symbol-db-engine-priv.h.orig	2009-04-15 19:40:20.000000000 -0400
-+++ plugins/symbol-db/symbol-db-engine-priv.h	2009-04-15 19:40:34.000000000 -0400
-@@ -47,7 +47,7 @@
- 
- #define CTAGS_MARKER	"#_#\n"
- 
--#define SHARED_MEMORY_PREFIX		"/dev/shm"
-+#define SHARED_MEMORY_PREFIX		"/tmp"
- 
- #define THREADS_MAX_CONCURRENT			2
- #define TRIGGER_SIGNALS_DELAY			100
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index dd4922aca066..fad84d4dbec9 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -14,7 +14,6 @@ include/libanjuta-1.0/libanjuta/anjuta-enum-types.h
 include/libanjuta-1.0/libanjuta/anjuta-error.h
 include/libanjuta-1.0/libanjuta/anjuta-launcher.h
 include/libanjuta-1.0/libanjuta/anjuta-marshal.h
-include/libanjuta-1.0/libanjuta/anjuta-message-area.h
 include/libanjuta-1.0/libanjuta/anjuta-plugin-description.h
 include/libanjuta-1.0/libanjuta/anjuta-plugin-handle.h
 include/libanjuta-1.0/libanjuta/anjuta-plugin-manager.h
@@ -23,12 +22,14 @@ include/libanjuta-1.0/libanjuta/anjuta-preferences-dialog.h
 include/libanjuta-1.0/libanjuta/anjuta-preferences.h
 include/libanjuta-1.0/libanjuta/anjuta-profile-manager.h
 include/libanjuta-1.0/libanjuta/anjuta-profile.h
+include/libanjuta-1.0/libanjuta/anjuta-project.h
 include/libanjuta-1.0/libanjuta/anjuta-save-prompt.h
 include/libanjuta-1.0/libanjuta/anjuta-serializer.h
 include/libanjuta-1.0/libanjuta/anjuta-session.h
 include/libanjuta-1.0/libanjuta/anjuta-shell.h
 include/libanjuta-1.0/libanjuta/anjuta-status.h
 include/libanjuta-1.0/libanjuta/anjuta-sync-command.h
+include/libanjuta-1.0/libanjuta/anjuta-tabber.h
 include/libanjuta-1.0/libanjuta/anjuta-ui.h
 include/libanjuta-1.0/libanjuta/anjuta-utils.h
 include/libanjuta-1.0/libanjuta/anjuta-vcs-status.h
@@ -59,6 +60,7 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-language.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-line-mode.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-search.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-selection.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-tip.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-view.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor-zoom.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-editor.h
@@ -83,6 +85,8 @@ include/libanjuta-1.0/libanjuta/interfaces/ianjuta-preferences.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-print.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-backend.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project-manager.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-project.h
+include/libanjuta-1.0/libanjuta/interfaces/ianjuta-provider.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-loader.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream-savable.h
 include/libanjuta-1.0/libanjuta/interfaces/ianjuta-stream.h
@@ -102,6 +106,7 @@ lib/anjuta/anjuta-class-gen.plugin
 lib/anjuta/anjuta-cvs.plugin
 lib/anjuta/anjuta-debug-manager.plugin
 %%DEVHELP%%lib/anjuta/anjuta-devhelp.plugin
+lib/anjuta/dir-project.plugin
 lib/anjuta/anjuta-document-manager.plugin
 lib/anjuta/anjuta-file-wizard.plugin
 lib/anjuta/anjuta-gdb.plugin
@@ -125,6 +130,8 @@ lib/anjuta/file-manager.plugin
 lib/anjuta/gbf-am.plugin
 lib/anjuta/gbf-mkfile.plugin
 lib/anjuta/git.plugin
+lib/anjuta/js_debugger.plugin
+lib/anjuta/js_support_plugin.plugin
 lib/anjuta/language-manager.plugin
 lib/anjuta/libanjuta-build-basic-autotools.la
 lib/anjuta/libanjuta-build-basic-autotools.so
@@ -180,12 +187,18 @@ lib/anjuta/libanjuta-terminal.la
 lib/anjuta/libanjuta-terminal.so
 lib/anjuta/libanjuta-tools.la
 lib/anjuta/libanjuta-tools.so
+lib/anjuta/libdir-project.la
+lib/anjuta/libdir-project.so
 lib/anjuta/libfile-manager.la
 lib/anjuta/libfile-manager.so
 lib/anjuta/libgbf-am.la
 lib/anjuta/libgbf-am.so
 lib/anjuta/libgbf-mkfile.la
 lib/anjuta/libgbf-mkfile.so
+lib/anjuta/libjs_debugger.la
+lib/anjuta/libjs_debugger.so
+lib/anjuta/libjs-support-plugin.la
+lib/anjuta/libjs-support-plugin.so
 lib/anjuta/liblanguage-manager.la
 lib/anjuta/liblanguage-manager.so
 lib/anjuta/sourceview.plugin
@@ -217,6 +230,7 @@ share/anjuta/glade/anjuta-file-wizard.ui
 share/anjuta/glade/anjuta-git.ui
 share/anjuta/glade/anjuta-glade.glade
 share/anjuta/glade/anjuta-language-cpp-java.ui
+share/anjuta/glade/anjuta-language-javascript.ui
 share/anjuta/glade/anjuta-macro.ui
 share/anjuta/glade/anjuta-message-manager-plugin.ui
 share/anjuta/glade/anjuta-project-wizard.ui
@@ -262,6 +276,7 @@ share/anjuta/project/cpp/po/POTFILES.in
 share/anjuta/project/cpp/src/Makefile.am.tpl
 share/anjuta/project/cpp/src/cvsignore
 share/anjuta/project/cpp/src/main.cc
+share/anjuta/project/directory/project.anjuta
 share/anjuta/project/django-logo.png
 share/anjuta/project/django.wiz
 share/anjuta/project/gcj-logo.png
@@ -299,6 +314,16 @@ share/anjuta/project/java/po/POTFILES.in
 share/anjuta/project/java/project.anjuta
 share/anjuta/project/java/src/Makefile.am.tpl
 share/anjuta/project/java/src/main.java
+share/anjuta/project/js.wiz
+share/anjuta/project/js_minimal/Makefile.am.tpl
+share/anjuta/project/js_minimal/autogen.sh
+share/anjuta/project/js_minimal/configure.ac.tpl
+share/anjuta/project/js_minimal/project.anjuta
+share/anjuta/project/js_minimal/src/Makefile.am.tpl
+share/anjuta/project/js_minimal/src/debug.c
+share/anjuta/project/js_minimal/src/debug.h
+share/anjuta/project/js_minimal/src/main.c
+share/anjuta/project/js_minimal/src/main.js
 share/anjuta/project/library.wiz
 share/anjuta/project/library/configure.ac.tpl
 share/anjuta/project/library/po/POTFILES.in
@@ -375,7 +400,7 @@ share/anjuta/project/xlib/configure.ac.tpl
 share/anjuta/project/xlib/po/POTFILES.in
 share/anjuta/project/xlib/src/Makefile.am.tpl
 share/anjuta/project/xlib/src/main.c
-share/anjuta/tables-from-1-to-228.sql
+share/anjuta/sources.list
 share/anjuta/tables.sql
 share/anjuta/tools/find-fixmes.pl
 share/anjuta/tools/prepare-changelog.pl
@@ -391,6 +416,7 @@ share/anjuta/ui/anjuta-git.xml
 share/anjuta/ui/anjuta-glade.ui
 share/anjuta/ui/anjuta-gtodo.ui
 share/anjuta/ui/anjuta-language-support-cpp-java.xml
+share/anjuta/ui/anjuta-language-javascript.xml
 share/anjuta/ui/anjuta-loader-plugin.ui
 share/anjuta/ui/anjuta-macro.xml
 share/anjuta/ui/anjuta-message-manager.xml
@@ -402,7 +428,7 @@ share/anjuta/ui/anjuta-search.xml
 share/anjuta/ui/anjuta-symbol-db-plugin.xml
 share/anjuta/ui/anjuta-terminal-plugin.xml
 share/anjuta/ui/anjuta-tools.xml
-share/anjuta/ui/anjuta.ui
+share/anjuta/ui/anjuta.xml
 share/anjuta/ui/file-manager.xml
 share/anjuta/welcome.txt
 share/applications/anjuta.desktop
@@ -416,9 +442,11 @@ share/applications/anjuta.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ScintillaDoc.html
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/doc/libanjuta/AnjutaAsyncCommand.html
+share/doc/libanjuta/AnjutaCModule.html
+share/doc/libanjuta/AnjutaCPluginFactory.html
+share/doc/libanjuta/AnjutaCellRendererCaptionedImage.html
 share/doc/libanjuta/AnjutaCommand.html
 share/doc/libanjuta/AnjutaLauncher.html
-share/doc/libanjuta/AnjutaMessageArea.html
 share/doc/libanjuta/AnjutaPlugin.html
 share/doc/libanjuta/AnjutaPluginHandle.html
 share/doc/libanjuta/AnjutaPluginManager.html
@@ -429,10 +457,68 @@ share/doc/libanjuta/AnjutaProfileManager.html
 share/doc/libanjuta/AnjutaSavePrompt.html
 share/doc/libanjuta/AnjutaSerializer.html
 share/doc/libanjuta/AnjutaSession.html
+share/doc/libanjuta/AnjutaShell.html
 share/doc/libanjuta/AnjutaStatus.html
 share/doc/libanjuta/AnjutaSyncCommand.html
-share/doc/libanjuta/AnjutaVcsStatusTreeView.html
 share/doc/libanjuta/AnjutaUI.html
+share/doc/libanjuta/AnjutaVcsStatusTreeView.html
+share/doc/libanjuta/ESplash.html
+share/doc/libanjuta/IAnjutaBuildable.html
+share/doc/libanjuta/IAnjutaBuilder.html
+share/doc/libanjuta/IAnjutaDebugManager.html
+share/doc/libanjuta/IAnjutaDebugger.html
+share/doc/libanjuta/IAnjutaDebuggerBreakpoint.html
+share/doc/libanjuta/IAnjutaDebuggerInstruction.html
+share/doc/libanjuta/IAnjutaDebuggerMemory.html
+share/doc/libanjuta/IAnjutaDebuggerRegister.html
+share/doc/libanjuta/IAnjutaDebuggerVariable.html
+share/doc/libanjuta/IAnjutaDocument.html
+share/doc/libanjuta/IAnjutaDocumentManager.html
+share/doc/libanjuta/IAnjutaEditor.html
+share/doc/libanjuta/IAnjutaEditorAssist.html
+share/doc/libanjuta/IAnjutaEditorCell.html
+share/doc/libanjuta/IAnjutaEditorCellStyle.html
+share/doc/libanjuta/IAnjutaEditorComment.html
+share/doc/libanjuta/IAnjutaEditorConvert.html
+share/doc/libanjuta/IAnjutaEditorFactory.html
+share/doc/libanjuta/IAnjutaEditorFolds.html
+share/doc/libanjuta/IAnjutaEditorGoto.html
+share/doc/libanjuta/IAnjutaEditorHover.html
+share/doc/libanjuta/IAnjutaEditorLanguage.html
+share/doc/libanjuta/IAnjutaEditorLineMode.html
+share/doc/libanjuta/IAnjutaEditorSearch.html
+share/doc/libanjuta/IAnjutaEditorSelection.html
+share/doc/libanjuta/IAnjutaEditorView.html
+share/doc/libanjuta/IAnjutaEditorZoom.html
+share/doc/libanjuta/IAnjutaEnvironment.html
+share/doc/libanjuta/IAnjutaFile.html
+share/doc/libanjuta/IAnjutaFileLoader.html
+share/doc/libanjuta/IAnjutaFileManager.html
+share/doc/libanjuta/IAnjutaFileSavable.html
+share/doc/libanjuta/IAnjutaHelp.html
+share/doc/libanjuta/IAnjutaIndicable.html
+share/doc/libanjuta/IAnjutaIterable.html
+share/doc/libanjuta/IAnjutaIterableTree.html
+share/doc/libanjuta/IAnjutaLanguage.html
+share/doc/libanjuta/IAnjutaLanguageSupport.html
+share/doc/libanjuta/IAnjutaLoader.html
+share/doc/libanjuta/IAnjutaMacro.html
+share/doc/libanjuta/IAnjutaMarkable.html
+share/doc/libanjuta/IAnjutaMessageManager.html
+share/doc/libanjuta/IAnjutaMessageView.html
+share/doc/libanjuta/IAnjutaPluginFactory.html
+share/doc/libanjuta/IAnjutaPreferences.html
+share/doc/libanjuta/IAnjutaPrint.html
+share/doc/libanjuta/IAnjutaProjectManager.html
+share/doc/libanjuta/IAnjutaStream.html
+share/doc/libanjuta/IAnjutaStreamLoader.html
+share/doc/libanjuta/IAnjutaStreamSavable.html
+share/doc/libanjuta/IAnjutaSymbol.html
+share/doc/libanjuta/IAnjutaSymbolManager.html
+share/doc/libanjuta/IAnjutaTerminal.html
+share/doc/libanjuta/IAnjutaTodo.html
+share/doc/libanjuta/IAnjutaVcs.html
+share/doc/libanjuta/IAnjutaWizard.html
 share/doc/libanjuta/action-block.html
 share/doc/libanjuta/anjuta-architecture.html
 share/doc/libanjuta/anjuta-architecture.png
@@ -443,82 +529,20 @@ share/doc/libanjuta/home.png
 share/doc/libanjuta/index.html
 share/doc/libanjuta/index.sgml
 share/doc/libanjuta/left.png
-share/doc/libanjuta/libanjuta-AnjutaCellRendererCaptionedImage.html
-share/doc/libanjuta/libanjuta-ESplash.html
-share/doc/libanjuta/libanjuta-anjuta-c-module.html
-share/doc/libanjuta/libanjuta-anjuta-c-plugin-factory.html
+share/doc/libanjuta/libanjuta-AnjutaPluginDescription.html
+share/doc/libanjuta/libanjuta-Debugging.html
+share/doc/libanjuta/libanjuta-Program-resources.html
+share/doc/libanjuta/libanjuta-Utilities.html
 share/doc/libanjuta/libanjuta-anjuta-convert.html
-share/doc/libanjuta/libanjuta-anjuta-debug.html
 share/doc/libanjuta/libanjuta-anjuta-encodings.html
 share/doc/libanjuta/libanjuta-anjuta-enum-types.html
 share/doc/libanjuta/libanjuta-anjuta-error.html
 share/doc/libanjuta/libanjuta-anjuta-marshal.html
-share/doc/libanjuta/libanjuta-anjuta-plugin-description.html
-share/doc/libanjuta/libanjuta-anjuta-shell.html
 share/doc/libanjuta/libanjuta-anjuta-utils-priv.html
-share/doc/libanjuta/libanjuta-anjuta-utils.html
 share/doc/libanjuta/libanjuta-anjuta-version.html
 share/doc/libanjuta/libanjuta-api.html
-share/doc/libanjuta/libanjuta-ianjuta-bookmark.html
-share/doc/libanjuta/libanjuta-ianjuta-buildable.html
-share/doc/libanjuta/libanjuta-ianjuta-builder.html
-share/doc/libanjuta/libanjuta-ianjuta-debug-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-breakpoint.html
-share/doc/libanjuta/libanjuta-ianjuta-environment.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-instruction.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-memory.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-register.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger-variable.html
-share/doc/libanjuta/libanjuta-ianjuta-debugger.html
-share/doc/libanjuta/libanjuta-ianjuta-document-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-document.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-assist.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell-style.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-cell.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-comment.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-convert.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-folds.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-goto.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-hover.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-language.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-line-mode.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-search.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-selection.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-view.html
-share/doc/libanjuta/libanjuta-ianjuta-editor-zoom.html
-share/doc/libanjuta/libanjuta-ianjuta-editor.html
-share/doc/libanjuta/libanjuta-ianjuta-file-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-file-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-file-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-file.html
-share/doc/libanjuta/libanjuta-ianjuta-help.html
-share/doc/libanjuta/libanjuta-ianjuta-indicable.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable-tree.html
-share/doc/libanjuta/libanjuta-ianjuta-iterable.html
-share/doc/libanjuta/libanjuta-ianjuta-language-support.html
-share/doc/libanjuta/libanjuta-ianjuta-language.html
-share/doc/libanjuta/libanjuta-ianjuta-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-macro.html
-share/doc/libanjuta/libanjuta-ianjuta-markable.html
-share/doc/libanjuta/libanjuta-ianjuta-message-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-message-view.html
-share/doc/libanjuta/libanjuta-ianjuta-plugin-factory.html
-share/doc/libanjuta/libanjuta-ianjuta-preferences.html
-share/doc/libanjuta/libanjuta-ianjuta-print.html
-share/doc/libanjuta/libanjuta-ianjuta-project-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-loader.html
-share/doc/libanjuta/libanjuta-ianjuta-stream-savable.html
-share/doc/libanjuta/libanjuta-ianjuta-stream.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol-manager.html
-share/doc/libanjuta/libanjuta-ianjuta-symbol.html
-share/doc/libanjuta/libanjuta-ianjuta-terminal.html
-share/doc/libanjuta/libanjuta-ianjuta-todo.html
-share/doc/libanjuta/libanjuta-ianjuta-vcs.html
-share/doc/libanjuta/libanjuta-ianjuta-wizard.html
 share/doc/libanjuta/libanjuta-internal-api.html
 share/doc/libanjuta/libanjuta-libanjuta-iface-marshallers.html
-share/doc/libanjuta/libanjuta-resources.html
 share/doc/libanjuta/libanjuta.devhelp
 share/doc/libanjuta/libanjuta.devhelp2
 share/doc/libanjuta/object-hierarchy.html
@@ -777,6 +801,49 @@ share/gnome/help/anjuta-manual/eu/figures/signals.png
 share/gnome/help/anjuta-manual/eu/figures/stack.png
 share/gnome/help/anjuta-manual/eu/figures/symbol_browser.png
 share/gnome/help/anjuta-manual/eu/figures/tool-editor.png
+share/gnome/help/anjuta-manual/fr/anjuta-manual.xml
+share/gnome/help/anjuta-manual/fr/figures/add_edit_macro.png
+share/gnome/help/anjuta-manual/fr/figures/anjuta-in-action.png
+share/gnome/help/anjuta-manual/fr/figures/attach.png
+share/gnome/help/anjuta-manual/fr/figures/brk_add.png
+share/gnome/help/anjuta-manual/fr/figures/brk_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/configure_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/display_macro.png
+share/gnome/help/anjuta-manual/fr/figures/editor_guides.png
+share/gnome/help/anjuta-manual/fr/figures/editor_margins.png
+share/gnome/help/anjuta-manual/fr/figures/editor_markers.png
+share/gnome/help/anjuta-manual/fr/figures/file_menu.png
+share/gnome/help/anjuta-manual/fr/figures/insert_text.png
+share/gnome/help/anjuta-manual/fr/figures/keyword_macro.png
+share/gnome/help/anjuta-manual/fr/figures/local_variables.png
+share/gnome/help/anjuta-manual/fr/figures/menubar.png
+share/gnome/help/anjuta-manual/fr/figures/message_win.png
+share/gnome/help/anjuta-manual/fr/figures/new_file_wizard.png
+share/gnome/help/anjuta-manual/fr/figures/open_file.png
+share/gnome/help/anjuta-manual/fr/figures/open_file_multiple.png
+share/gnome/help/anjuta-manual/fr/figures/prefs_print.png
+share/gnome/help/anjuta-manual/fr/figures/print_dlg.png
+share/gnome/help/anjuta-manual/fr/figures/print_preview.png
+share/gnome/help/anjuta-manual/fr/figures/project-window.png
+share/gnome/help/anjuta-manual/fr/figures/project_group.png
+share/gnome/help/anjuta-manual/fr/figures/project_info.png
+share/gnome/help/anjuta-manual/fr/figures/project_target.png
+share/gnome/help/anjuta-manual/fr/figures/project_target_details.png
+share/gnome/help/anjuta-manual/fr/figures/registers.png
+share/gnome/help/anjuta-manual/fr/figures/save_as_file.png
+share/gnome/help/anjuta-manual/fr/figures/search_expr.png
+share/gnome/help/anjuta-manual/fr/figures/search_expr_basic.png
+share/gnome/help/anjuta-manual/fr/figures/search_file_pattern.png
+share/gnome/help/anjuta-manual/fr/figures/search_replace.png
+share/gnome/help/anjuta-manual/fr/figures/search_setting.png
+share/gnome/help/anjuta-manual/fr/figures/search_target.png
+share/gnome/help/anjuta-manual/fr/figures/search_target_action.png
+share/gnome/help/anjuta-manual/fr/figures/search_target_in.png
+share/gnome/help/anjuta-manual/fr/figures/sharedlibs.png
+share/gnome/help/anjuta-manual/fr/figures/signals.png
+share/gnome/help/anjuta-manual/fr/figures/stack.png
+share/gnome/help/anjuta-manual/fr/figures/symbol_browser.png
+share/gnome/help/anjuta-manual/fr/figures/tool-editor.png
 share/gnome/help/anjuta-manual/oc/anjuta-manual.xml
 share/gnome/help/anjuta-manual/oc/figures/add_edit_macro.png
 share/gnome/help/anjuta-manual/oc/figures/anjuta-in-action.png
@@ -1010,6 +1077,7 @@ share/locale/dz/LC_MESSAGES/anjuta.mo
 share/locale/el/LC_MESSAGES/anjuta.mo
 share/locale/en_CA/LC_MESSAGES/anjuta.mo
 share/locale/en_GB/LC_MESSAGES/anjuta.mo
+share/locale/en@shaw/LC_MESSAGES/anjuta.mo
 share/locale/es/LC_MESSAGES/anjuta.mo
 share/locale/eu/LC_MESSAGES/anjuta.mo
 share/locale/fi/LC_MESSAGES/anjuta.mo
@@ -1067,6 +1135,7 @@ share/omf/anjuta-manual/anjuta-manual-de.omf
 share/omf/anjuta-manual/anjuta-manual-el.omf
 share/omf/anjuta-manual/anjuta-manual-es.omf
 share/omf/anjuta-manual/anjuta-manual-eu.omf
+share/omf/anjuta-manual/anjuta-manual-fr.omf
 share/omf/anjuta-manual/anjuta-manual-oc.omf
 share/omf/anjuta-manual/anjuta-manual-sv.omf
 share/omf/anjuta-manual/anjuta-manual-th.omf
@@ -1122,11 +1191,20 @@ share/pixmaps/anjuta/element-event-16.png
 share/pixmaps/anjuta/element-field-16.png
 share/pixmaps/anjuta/element-interface-16.png
 share/pixmaps/anjuta/element-interface-24.png
+share/pixmaps/anjuta/element-interface-private-16.png
+share/pixmaps/anjuta/element-interface-protected-16.png
+share/pixmaps/anjuta/element-interface-public-16.png
 share/pixmaps/anjuta/element-literal-16.png
 share/pixmaps/anjuta/element-method-16.png
 share/pixmaps/anjuta/element-method-24.png
+share/pixmaps/anjuta/element-method-private-16.png
+share/pixmaps/anjuta/element-method-protected-16.png
+share/pixmaps/anjuta/element-method-public-16.png
 share/pixmaps/anjuta/element-namespace-16.png
 share/pixmaps/anjuta/element-property-16.png
+share/pixmaps/anjuta/element-property-private-16.png
+share/pixmaps/anjuta/element-property-protected-16.png
+share/pixmaps/anjuta/element-property-public-16.png
 share/pixmaps/anjuta/element-structure-16.png
 share/pixmaps/anjuta/anjuta-editor-sourceview-plugin-48.png
 share/pixmaps/anjuta/anjuta-file-manager-plugin-48.png
@@ -1209,6 +1287,7 @@ share/pixmaps/anjuta/anjuta_logo.png
 share/pixmaps/anjuta/anjuta_splash.png
 share/pixmaps/anjuta/breakpoint.png
 share/pixmaps/anjuta/class_logo.xpm
+share/pixmaps/anjuta/dir-project-plugin-48.png
 share/pixmaps/anjuta/directory-accept.png
 share/pixmaps/anjuta/directory.png
 share/pixmaps/anjuta/gbf-am-plugin-48.png
@@ -1217,6 +1296,8 @@ share/pixmaps/anjuta/gbf-install.png
 share/pixmaps/anjuta/gbf-mkfile-plugin-48.png
 share/pixmaps/anjuta/gtodo-about.png
 share/pixmaps/anjuta/gtodo-edit.png
+share/pixmaps/anjuta/js_debugger.png
+share/pixmaps/anjuta/js_support_plugin.png
 share/pixmaps/anjuta/locals.png
 share/pixmaps/anjuta/madeinanjuta.xcf
 share/pixmaps/anjuta/password.png
@@ -1244,6 +1325,8 @@ share/pixmaps/anjuta/vcs-updated.png
 @dirrm share/gnome/help/anjuta-manual/sv
 @dirrm share/gnome/help/anjuta-manual/oc/figures
 @dirrm share/gnome/help/anjuta-manual/oc
+@dirrm share/gnome/help/anjuta-manual/fr/figures
+@dirrm share/gnome/help/anjuta-manual/fr
 @dirrm share/gnome/help/anjuta-manual/eu/figures
 @dirrm share/gnome/help/anjuta-manual/eu
 @dirrm share/gnome/help/anjuta-manual/es/figures
@@ -1290,6 +1373,8 @@ share/pixmaps/anjuta/vcs-updated.png
 @dirrm share/anjuta/project/library/src
 @dirrm share/anjuta/project/library/po
 @dirrm share/anjuta/project/library
+@dirrm share/anjuta/project/js_minimal/src
+@dirrm share/anjuta/project/js_minimal
 @dirrm share/anjuta/project/java/src
 @dirrm share/anjuta/project/java/po
 @dirrm share/anjuta/project/java
@@ -1305,6 +1390,7 @@ share/pixmaps/anjuta/vcs-updated.png
 @dirrm share/anjuta/project/gnome
 @dirrm share/anjuta/project/gcj/src
 @dirrm share/anjuta/project/gcj
+@dirrm share/anjuta/project/directory
 @dirrm share/anjuta/project/cpp/src
 @dirrm share/anjuta/project/cpp/po
 @dirrm share/anjuta/project/cpp
@@ -1328,6 +1414,8 @@ share/pixmaps/anjuta/vcs-updated.png
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @dirrmtry share/applications
+@dirrmtry share/icons/gnome/scalable/mimetypes
+@dirrmtry share/icons/gnome/scalable
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -1344,6 +1432,8 @@ share/pixmaps/anjuta/vcs-updated.png
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index fb3ac54007a1..126966185f99 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bug-buddy/Makefile,v 1.78 2009/09/21 16:26:07 kwm Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $
 #
 
 PORTNAME=	bug-buddy
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,7 +23,7 @@ USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack \
+USE_GNOME=	gnomeprefix gnomehack intlhack libbonobo \
 		gnomedocutils evolutiondataserver
 GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index c321c0c3b85f..9f4e9f0e4a4b 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.28.0.tar.bz2) = ee9c586fee2e6b8ce3b787e696f37100
-SHA256 (gnome2/bug-buddy-2.28.0.tar.bz2) = 6ec0c21a09d9eb2a5f05a60261c6c70a0cd35e8887598418402fd17f83c1b294
-SIZE (gnome2/bug-buddy-2.28.0.tar.bz2) = 1186863
+MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997
+SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05
+SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 848f49b65e13..32c3dfcc8d0b 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -15,6 +15,7 @@ share/locale/af/LC_MESSAGES/bug-buddy.mo
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
 share/locale/as/LC_MESSAGES/bug-buddy.mo
+share/locale/ast/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
 share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
@@ -30,6 +31,7 @@ share/locale/da/LC_MESSAGES/bug-buddy.mo
 share/locale/de/LC_MESSAGES/bug-buddy.mo
 share/locale/dz/LC_MESSAGES/bug-buddy.mo
 share/locale/el/LC_MESSAGES/bug-buddy.mo
+share/locale/en@shaw/LC_MESSAGES/bug-buddy.mo
 share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
 share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
 share/locale/es/LC_MESSAGES/bug-buddy.mo
diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile
index 8e1e354a58ab..23bf5e4cd603 100644
--- a/devel/dbus-glib/Makefile
+++ b/devel/dbus-glib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.84
+PORTVERSION=	0.86
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-glib/
 PKGNAMESUFFIX=	-glib
diff --git a/devel/dbus-glib/distinfo b/devel/dbus-glib/distinfo
index a2aacc0dfdd9..b80bc36f7929 100644
--- a/devel/dbus-glib/distinfo
+++ b/devel/dbus-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-glib-0.84.tar.gz) = 69fbe31fb3ee778715dff44cdd5178bf
-SHA256 (dbus-glib-0.84.tar.gz) = 60ca7df1626cc7220863f22fab1ab63e0d904daf737f3b43fc26e8e77774b7a9
-SIZE (dbus-glib-0.84.tar.gz) = 679310
+MD5 (dbus-glib-0.86.tar.gz) = cd0ab148fb0c786fc88be49d19971f50
+SHA256 (dbus-glib-0.86.tar.gz) = 5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc
+SIZE (dbus-glib-0.86.tar.gz) = 694242
diff --git a/devel/dbus-glib/pkg-plist b/devel/dbus-glib/pkg-plist
index 12df955e95ba..3008d679cabc 100644
--- a/devel/dbus-glib/pkg-plist
+++ b/devel/dbus-glib/pkg-plist
@@ -15,6 +15,7 @@ libexec/dbus-bash-completion-helper
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/ch03.html
 %%DOCSDIR%%/dbus-binding-tool.html
+%%DOCSDIR%%/dbus-glib-DBus-GLib-low-level.html
 %%DOCSDIR%%/dbus-glib-DBus-GObject-related-functions.html
 %%DOCSDIR%%/dbus-glib-DBusGConnection.html
 %%DOCSDIR%%/dbus-glib-DBusGError.html
diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index db3447fc0ebb..b10aa5aec70b 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/dbus/Makefile,v 1.34 2009/11/28 06:03:52 mezz Exp $
+#   $MCom: ports/devel/dbus/Makefile,v 1.41 2010/04/04 22:03:28 marcus Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	1.2.16
+PORTVERSION?=	1.2.24
 PORTREVISION?=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 1623b43edf79..09097b134e4b 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-1.2.16.tar.gz) = c7a47b851ebe02f6726b65b78d1b730b
-SHA256 (dbus-1.2.16.tar.gz) = 968a31c16a6c4bbbdb603cbaa3d60d6d19bc8ae30c0ed55d7f8c2e254413e4c8
-SIZE (dbus-1.2.16.tar.gz) = 1576209
+MD5 (dbus-1.2.24.tar.gz) = 565346cecd9cfecf1463540c6086cc2c
+SHA256 (dbus-1.2.24.tar.gz) = f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
+SIZE (dbus-1.2.24.tar.gz) = 1673774
diff --git a/devel/dbus/files/patch-bus_dir-watch-kqueue.c b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
new file mode 100644
index 000000000000..b65d9ab84bdf
--- /dev/null
+++ b/devel/dbus/files/patch-bus_dir-watch-kqueue.c
@@ -0,0 +1,11 @@
+--- bus/dir-watch-kqueue.c.orig	2010-04-04 17:59:18.000000000 -0400
++++ bus/dir-watch-kqueue.c	2010-04-04 17:59:55.000000000 -0400
+@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *contex
+    */
+   for (i = 0; new_dirs[i]; i++)
+     {
+-      for (j = 0; i < num_fds; j++)
++      for (j = 0; j < num_fds; j++)
+         {
+           if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
+             {
diff --git a/devel/dbus/files/patch-dbus_dbus-connection.c b/devel/dbus/files/patch-dbus_dbus-connection.c
new file mode 100644
index 000000000000..b992b9e5e83f
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-connection.c
@@ -0,0 +1,67 @@
+--- dbus/dbus-connection.c.orig	2010-03-13 17:21:40.000000000 -0500
++++ dbus/dbus-connection.c	2010-03-13 17:25:28.000000000 -0500
+@@ -2280,7 +2280,7 @@ _dbus_connection_block_pending_call (DBu
+   DBusConnection *connection;
+   dbus_uint32_t client_serial;
+   DBusTimeout *timeout;
+-  int timeout_milliseconds, elapsed_milliseconds;
++  int timeout_milliseconds, elapsed_milliseconds, remain_milliseconds;
+ 
+   _dbus_assert (pending != NULL);
+ 
+@@ -2360,6 +2360,10 @@ _dbus_connection_block_pending_call (DBu
+   _dbus_get_current_time (&tv_sec, &tv_usec);
+   elapsed_milliseconds = (tv_sec - start_tv_sec) * 1000 +
+ 	  (tv_usec - start_tv_usec) / 1000;
++  if (timeout_milliseconds != -1)
++    remain_milliseconds = timeout_milliseconds - elapsed_milliseconds;
++  else
++    remain_milliseconds = -1;
+   
+   if (!_dbus_connection_get_is_connected_unlocked (connection))
+     {
+@@ -2386,7 +2390,7 @@ _dbus_connection_block_pending_call (DBu
+            */
+           _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+ 
+-          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++          _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+         }
+       else
+         {          
+@@ -2394,7 +2398,7 @@ _dbus_connection_block_pending_call (DBu
+           _dbus_connection_do_iteration_unlocked (connection,
+                                                   DBUS_ITERATION_DO_READING |
+                                                   DBUS_ITERATION_BLOCK,
+-                                                  timeout_milliseconds - elapsed_milliseconds);
++                                                  remain_milliseconds);
+         }
+ 
+       goto recheck_status;
+@@ -2403,7 +2407,7 @@ _dbus_connection_block_pending_call (DBu
+     _dbus_verbose ("dbus_connection_send_with_reply_and_block(): clock set backward\n");
+   else if (elapsed_milliseconds < timeout_milliseconds)
+     {
+-      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", timeout_milliseconds - elapsed_milliseconds);
++      _dbus_verbose ("dbus_connection_send_with_reply_and_block(): %d milliseconds remain\n", remain_milliseconds);
+       
+       if (status == DBUS_DISPATCH_NEED_MEMORY)
+         {
+@@ -2413,7 +2417,7 @@ _dbus_connection_block_pending_call (DBu
+            */
+           _dbus_verbose ("dbus_connection_send_with_reply_and_block() waiting for more memory\n");
+ 
+-          _dbus_memory_pause_based_on_timeout (timeout_milliseconds - elapsed_milliseconds);
++          _dbus_memory_pause_based_on_timeout (remain_milliseconds);
+         }
+       else
+         {          
+@@ -2421,7 +2425,7 @@ _dbus_connection_block_pending_call (DBu
+           _dbus_connection_do_iteration_unlocked (connection,
+                                                   DBUS_ITERATION_DO_READING |
+                                                   DBUS_ITERATION_BLOCK,
+-                                                  timeout_milliseconds - elapsed_milliseconds);
++                                                  remain_milliseconds);
+         }
+ 
+       goto recheck_status;
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 82edb28f70e4..372f966b1682 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/devhelp/Makefile,v 1.28 2009/10/19 20:06:46 kwm Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.32 2010/03/30 15:51:07 avl Exp $
 
 PORTNAME=	devhelp
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index e3a67f645fd4..2603e5a1a97c 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-2.28.1.tar.bz2) = b9ec14ddf74c4b9924da77b62c345cf8
-SHA256 (gnome2/devhelp-2.28.1.tar.bz2) = 09a0f048cc5b4517e92d74d6ffcd4a17f4bb2c4c236739154fb24b60958862d9
-SIZE (gnome2/devhelp-2.28.1.tar.bz2) = 473458
+MD5 (gnome2/devhelp-2.30.0.tar.bz2) = a24087cd1b4fe6722ec05f6e88104ace
+SHA256 (gnome2/devhelp-2.30.0.tar.bz2) = 4e40dac8d8e5008fd7fe4113688d3ae9031eace7f0e10857a3bbbf103d875953
+SIZE (gnome2/devhelp-2.30.0.tar.bz2) = 484771
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 7bffc1827b6a..12e1413725ea 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -35,6 +35,7 @@ share/icons/hicolor/48x48/apps/devhelp.png
 share/icons/hicolor/scalable/apps/devhelp.svg
 share/locale/am/LC_MESSAGES/devhelp.mo
 share/locale/ar/LC_MESSAGES/devhelp.mo
+share/locale/ast/LC_MESSAGES/devhelp.mo
 share/locale/az/LC_MESSAGES/devhelp.mo
 share/locale/be/LC_MESSAGES/devhelp.mo
 share/locale/be@latin/LC_MESSAGES/devhelp.mo
@@ -50,6 +51,7 @@ share/locale/dz/LC_MESSAGES/devhelp.mo
 share/locale/el/LC_MESSAGES/devhelp.mo
 share/locale/en_CA/LC_MESSAGES/devhelp.mo
 share/locale/en_GB/LC_MESSAGES/devhelp.mo
+share/locale/en@shaw/LC_MESSAGES/devhelp.mo
 share/locale/es/LC_MESSAGES/devhelp.mo
 share/locale/et/LC_MESSAGES/devhelp.mo
 share/locale/fi/LC_MESSAGES/devhelp.mo
@@ -104,9 +106,9 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/devhelp/dtd
 @dirrm share/devhelp/assistant
 @dirrm share/devhelp
-%%GEDIT%%@dirrm lib/gedit-2/plugins/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -115,16 +117,14 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -133,4 +133,5 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index a4b8bc53387d..010c80cd955b 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.109 2009/09/22 20:20:31 kwm Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.111 2010/04/01 15:59:40 kwm Exp $
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	2.28.0
-PORTREVISION?=	2
+PORTVERSION=	2.28.1
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index c7a6a52de645..d216af850702 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.28.0.tar.bz2) = ad2aeb9c7d906b274954c51a615caeac
-SHA256 (gnome2/GConf-2.28.0.tar.bz2) = d057dcfe2bfb2a80e592349c2a78d7dce12d19542aeced466c64fb701c806ac8
-SIZE (gnome2/GConf-2.28.0.tar.bz2) = 1476190
+MD5 (gnome2/GConf-2.28.1.tar.bz2) = 27663faf0af4f6a6d534de9270f6d24a
+SHA256 (gnome2/GConf-2.28.1.tar.bz2) = 53c477f9086057b0c84816a1c979e01537b862fbcacb6af4b62f8cffec4b3000
+SIZE (gnome2/GConf-2.28.1.tar.bz2) = 1476141
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 7daafae699e4..eb8bec29974a 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -36,6 +36,7 @@ share/dbus-1/services/org.gnome.GConf.service
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/as/LC_MESSAGES/GConf2.mo
+share/locale/ast/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/be/LC_MESSAGES/GConf2.mo
 share/locale/bg/LC_MESSAGES/GConf2.mo
@@ -50,6 +51,7 @@ share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
 share/locale/dz/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
+share/locale/en@shaw/LC_MESSAGES/GConf2.mo
 share/locale/en_CA/LC_MESSAGES/GConf2.mo
 share/locale/en_GB/LC_MESSAGES/GConf2.mo
 share/locale/es/LC_MESSAGES/GConf2.mo
@@ -146,11 +148,15 @@ share/sgml/gconf/gconf-1.0.dtd
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 958a701f4eda..8808b41e293c 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.41 2009/10/07 22:03:54 kwm Exp $
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.52 2010/05/04 09:44:51 kwm Exp $
 #
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.22.4
+PORTVERSION=	2.24.1
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index c53a132c2daf..3a080dc7dc69 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708
-SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
-SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207
+MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2
+SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae
new file mode 100644
index 000000000000..a6d6851b09cf
--- /dev/null
+++ b/devel/gio-fam-backend/files/patch-ae
@@ -0,0 +1,30 @@
+--- configure.orig	2010-03-03 21:31:46.000000000 -0500
++++ configure	2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ fi
+ done
+ 
+-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -25631,6 +25634,8 @@ fi
+          ;;
+     esac
+   fi
++  G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++  G_THREAD_LIBS="${PTHREAD_LIBS}"
+ 
+   if test x"$G_THREAD_CFLAGS" = x; then
+ 
diff --git a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
index 0f6a9e25ead1..44250d545fcb 100644
--- a/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
+++ b/devel/gio-fam-backend/files/patch-gio_fam_Makefile.in
@@ -1,7 +1,7 @@
---- gio/fam/Makefile.in.orig	2008-01-07 19:40:38.000000000 -0500
-+++ gio/fam/Makefile.in	2008-01-07 19:41:53.000000000 -0500
-@@ -59,9 +59,8 @@ am__installdirs = "$(DESTDIR)$(giomodule
- giomoduleLTLIBRARIES_INSTALL = $(INSTALL)
+--- gio/fam/Makefile.in.orig	2010-01-28 10:40:29.000000000 -0500
++++ gio/fam/Makefile.in	2010-01-28 10:43:26.000000000 -0500
+@@ -76,9 +76,8 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
  LTLIBRARIES = $(giomodule_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
@@ -12,7 +12,7 @@
  	$(am__DEPENDENCIES_1)
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
-@@ -321,9 +320,9 @@ libgiofam_la_CFLAGS = \
+@@ -369,9 +368,9 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -25,3 +25,12 @@
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
+@@ -776,7 +775,7 @@ check-local: test
+ 
+ install-data-hook:
+ 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
+-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
++		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+ 	fi
+ 
+ uninstall-local:
diff --git a/devel/gio-fam-backend/pkg-plist b/devel/gio-fam-backend/pkg-plist
index 7e06d5a98ee3..f3ca7da86f63 100644
--- a/devel/gio-fam-backend/pkg-plist
+++ b/devel/gio-fam-backend/pkg-plist
@@ -1,3 +1,5 @@
 lib/gio/modules/libgiofam.a
 lib/gio/modules/libgiofam.la
 lib/gio/modules/libgiofam.so
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
diff --git a/devel/gir-repository/Makefile b/devel/gir-repository/Makefile
index 42c957336882..eaa4c25945eb 100644
--- a/devel/gir-repository/Makefile
+++ b/devel/gir-repository/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gir-repository/Makefile,v 1.9 2009/11/09 09:29:14 kwm Exp $
+#   $MCom: ports/devel/gir-repository/Makefile,v 1.16 2010/03/14 01:32:00 kwm Exp $
 #
 
 MASTER_SITES=	# Empty
@@ -16,11 +16,7 @@ COMMENT=	Introspection information for various libraries
 
 NO_BUILD=	yes
 
-RUN_DEPENDS=	${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository-atk \
-		${GIRDIR}/${pango_GIR}.gir:${PORTSDIR}/${pango_CATEGORY}/gir-repository-pango \
-		${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
-		${GIRDIR}/${gtk20_GIR}.gir:${PORTSDIR}/${gtk20_CATEGORY}/gir-repository-gtk20 \
-		${GIRDIR}/${webkit_GIR}.gir:${PORTSDIR}/${webkit_CATEGORY}/gir-repository-webkit \
+RUN_DEPENDS=	${GIRDIR}/${poppler_GIR}.gir:${PORTSDIR}/${poppler_CATEGORY}/gir-repository-poppler \
 		${GIRDIR}/${libsoup_GIR}.gir:${PORTSDIR}/${libsoup_CATEGORY}/gir-repository-libsoup \
 		${GIRDIR}/${dbus_GIR}.gir:${PORTSDIR}/${dbus_CATEGORY}/gir-repository-dbus \
 		${GIRDIR}/${gconf2_GIR}.gir:${PORTSDIR}/${gconf2_CATEGORY}/gir-repository-gconf2 \
@@ -31,8 +27,6 @@ RUN_DEPENDS=	${GIRDIR}/${atk_GIR}.gir:${PORTSDIR}/${atk_CATEGORY}/gir-repository
 		${GIRDIR}/${gtksourceview2_GIR}.gir:${PORTSDIR}/${gtksourceview2_CATEGORY}/gir-repository-gtksourceview2 \
 		${GIRDIR}/${vte_GIR}.gir:${PORTSDIR}/${vte_CATEGORY}/gir-repository-vte \
 		${GIRDIR}/${avahi_GIR}.gir:${PORTSDIR}/${avahi_CATEGORY}/gir-repository-avahi \
-		${GIRDIR}/${gnomemenus_GIR}.gir:${PORTSDIR}/${gnomemenus_CATEGORY}/gir-repository-gnome-menus \
-		${GIRDIR}/${libwnck_GIR}.gir:${PORTSDIR}/${libwnck_CATEGORY}/gir-repository-libwnck \
 		${GIRDIR}/${goocanvas_GIR}.gir:${PORTSDIR}/${goocanvas_CATEGORY}/gir-repository-goocanvas
 
 do-install:	# empty
diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index 4c419ff538fe..d8457a6bbd6b 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -1,27 +1,14 @@
 PORTNAME=	gir-repository
 PORTVERSION=	0.6.5
-PORTREVISION?=	3
+PORTREVISION?=	4
 
 MAINTAINER=	gnome@FreeBSD.org
 
 GIRDIR=		${LOCALBASE}/share/gir-1.0
 
-atk_CATEGORY=	accessibility
-atk_GIR=	Atk-1.0
-
-pango_CATEGORY=	x11-toolkits
-pango_GIR=	Pango-1.0
-
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
-gtk20_CATEGORY=	x11-toolkits
-gtk20_GIR=	Gtk-2.0
-gtk20_GIR_TMPL=	gtk
-
-webkit_CATEGORY=	www
-webkit_GIR=	WebKit-1.0
-
 libsoup_CATEGORY=	devel
 libsoup_GIR=	Soup-2.4
 libsoup_GIR_TMPL=	soup
@@ -53,12 +40,6 @@ vte_GIR=	Vte-1.0
 avahi_CATEGORY=	net
 avahi_GIR=	Avahi-0.6
 
-gnomemenus_CATEGORY=	x11
-gnomemenus_GIR=	GMenu-2.0
-
-libwnck_CATEGORY=	x11-toolkits
-libwnck_GIR=	Wnck-1.0
-
 goocanvas_CATEGORY=	graphics
 goocanvas_GIR=	GooCanvas-0.10
 
@@ -92,38 +73,13 @@ _USE_GIR_ALL=	dbus atk pango pangoxft poppler gtk gconf soup babl nautilusextens
 		gstreamer gstbufferlist_h gstreamer_plugins_base gtksourceview vte \
 		goocanvas gssdp gupnp avahi unique gmenu wnck
 
-.if ${GIR_NAME} == "atk"
-USE_GNOME+=	atk
-GIR_FILES=	Atk-1.0
-.endif
-
-.if ${GIR_NAME} == "pango"
-USE_GNOME+=	pango
-GIR_FILES=	Pango-1.0 PangoFT2-1.0 PangoCairo-1.0 PangoX-1.0 PangoXft-1.0
-DEP_NAMES+=	pangoxft
-.endif
-
 .if ${GIR_NAME} == "poppler"
 LIB_DEPENDS+=	poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
-USE_GIR=	gtk20 pango
+USE_GNOME+=	gtk20
 GIR_FILES=	Poppler-0.8
 CLEAR_DEPS+=	Gdk-2.0
 .endif
 
-.if ${GIR_NAME} == "gtk20"
-USE_GNOME+=	gtk20
-USE_GIR=	atk pango
-GIR_FILES=	Gdk-2.0 Gtk-2.0 GdkPixbuf-2.0
-LIB_FILES=	Gdk Gtk
-DEP_NAMES=	gtk
-.endif
-
-.if ${GIR_NAME} == "webkit"
-LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
-USE_GIR=	gtk20 libsoup
-GIR_FILES=	WebKit-1.0 JSCore-1.0
-.endif
-
 .if ${GIR_NAME} == "libsoup"
 LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
 GIR_FILES=	Soup-2.4
@@ -143,9 +99,9 @@ GIR_FILES=	Babl-0.1
 
 .if ${GIR_NAME} == "nautilus"
 USE_GNOME+=	nautilus2
-USE_GIR=	gtk20
 GIR_FILES=	Nautilus-1.0
 DEP_NAMES=	nautilusextension
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "gnomekeyring"
@@ -155,9 +111,10 @@ GIR_FILES=	GnomeKeyring-2.0
 
 .if ${GIR_NAME} == "libnotify"
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
-USE_GIR=	gtk20
+USE_GNOME+=	gtk20
 GIR_FILES=	Notify-0.4
 DEP_NAMES=	notify
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "dbus"
@@ -168,15 +125,15 @@ LIB_FILES=	DBus
 
 .if ${GIR_NAME} == "gtksourceview2"
 USE_GNOME+=	gtksourceview2
-USE_GIR=	gtk20
 GIR_FILES=	GtkSource-2.2
 DEP_NAMES=	gtksourceview
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "vte"
 USE_GNOME+=	vte
-USE_GIR=	gtk20
 GIR_FILES=	Vte-1.0
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 .if ${GIR_NAME} == "avahi"
@@ -184,24 +141,11 @@ LIB_DEPENDS+=	avahi-gobject.0:${PORTSDIR}/net/avahi-app
 GIR_FILES=	Avahi-0.6 AvahiCore-0.6
 .endif
 
-.if ${GIR_NAME} == "gnomemenus"
-USE_GNOME+=	gnomemenus
-USE_GIR=	gtk20
-GIR_FILES=	GMenu-2.0
-DEP_NAMES=	gmenu
-.endif
-
-.if ${GIR_NAME} == "libwnck"
-USE_GNOME+=	libwnck
-USE_GIR=	gtk20
-GIR_FILES=	Wnck-1.0
-DEP_NAMES=	wnck
-.endif
-
 .if ${GIR_NAME} == "goocanvas"
 LIB_DEPENDS+=	goocanvas.3:${PORTSDIR}/graphics/goocanvas
-USE_GIR=	gtk20
+USE_GNOME+=	gtk20
 GIR_FILES=	GooCanvas-0.10
+CLEAR_DEPS+=	Gtk-2.0
 .endif
 
 . for component in ${USE_GIR:C/^([^:]+).*/\1/}
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
index ec37f1636cd1..5c559acda3b4 100644
--- a/devel/gir-repository/files/patch-gir_Makefile.in
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -1,5 +1,5 @@
---- gir/Makefile.in.orig	2010-03-24 14:45:41.000000000 +0100
-+++ gir/Makefile.in	2010-03-24 14:45:41.000000000 +0100
+--- gir/Makefile.in.orig	2009-09-09 21:31:46.000000000 +0200
++++ gir/Makefile.in	2010-04-07 15:17:19.000000000 +0200
 @@ -86,7 +86,7 @@ host_triplet = @host@
  @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir
  @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir
@@ -27,6 +27,15 @@
  @BUILD_UNIQUE_TRUE@UNIQUE_INCLUDEDIR = `pkg-config --variable=includedir unique-1.0`/unique-1.0/unique
  @BUILD_NAUTILUS_TRUE@NAUTILUS_INCLUDEDIR = `pkg-config --variable=includedir libnautilus-extension`/nautilus/libnautilus-extension
  @BUILD_WNCK_TRUE@WNCK_INCLUDEDIR = `pkg-config --variable=includedir libwnck-1.0`/libwnck-1.0/libwnck
+@@ -1083,7 +1083,7 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            --pkg freetype2 \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            --pkg pangox \
+ @BUILD_PANGOXFT_TRUE@@BUILD_PANGO_TRUE@            $(PANGO_INCLUDEDIR)/pango/pangox.h
+-@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir Pango-1.0.gir $(INTROSPECTION_SCANNER)
++@BUILD_POPPLER_TRUE@Poppler-0.8.gir: Gdk-2.0.gir $(INTROSPECTION_SCANNER)
+ @BUILD_POPPLER_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
+ @BUILD_POPPLER_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
+ @BUILD_POPPLER_TRUE@             --include=GObject-2.0 \
 @@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --output $@ \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTFFT_INCLUDEDIR)/gst/fft/*h
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index da8461a0fe8d..116d8e44e3b6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.155 2009/10/07 22:03:54 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.166 2010/05/04 09:44:51 kwm Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.22.4
+PORTVERSION=	2.24.1
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -73,6 +73,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/glib/gutils.c
 
+post-install:
+	-${PREFIX}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index c53a132c2daf..3a080dc7dc69 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.22.4.tar.bz2) = d91bcbe27556430ddecce65086355708
-SHA256 (gnome2/glib-2.22.4.tar.bz2) = 0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14
-SIZE (gnome2/glib-2.22.4.tar.bz2) = 5012207
+MD5 (gnome2/glib-2.24.1.tar.bz2) = 6a7db81c9a2cffe6a34dadb57d7ba2d2
+SHA256 (gnome2/glib-2.24.1.tar.bz2) = 014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04
+SIZE (gnome2/glib-2.24.1.tar.bz2) = 5332511
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 4699afdbedd4..a6d6851b09cf 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,28 +1,25 @@
---- configure.orig	2009-09-05 10:54:38.000000000 +0200
-+++ configure	2009-09-05 10:56:40.000000000 +0200
-@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
+--- configure.orig	2010-03-03 21:31:46.000000000 -0500
++++ configure	2010-03-03 21:47:47.000000000 -0500
+@@ -714,6 +714,9 @@ ac_includes_default="\
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
 +#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
++# include <sys/param.h>
 +#endif
-+#ifdef HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
-+#endif
- int
- main ()
- {
-@@ -31611,7 +31617,7 @@ done
- 
- 
+ #ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+@@ -23020,7 +23023,7 @@ _ACEOF
+ fi
+ done
  
 -for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
 +for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39943,6 +39949,8 @@ fi
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -25631,6 +25634,8 @@ fi
           ;;
      esac
    fi
diff --git a/devel/glib20/files/patch-gio_gunixvolume.c b/devel/glib20/files/patch-gio_gunixvolume.c
index 377a7d6b5686..b22563047d84 100644
--- a/devel/glib20/files/patch-gio_gunixvolume.c
+++ b/devel/glib20/files/patch-gio_gunixvolume.c
@@ -1,6 +1,6 @@
---- gio/gunixvolume.c.orig	2007-12-23 15:43:17.000000000 -0500
-+++ gio/gunixvolume.c	2007-12-23 15:47:08.000000000 -0500
-@@ -387,9 +387,13 @@ g_unix_volume_eject (GVolume    *volume,
+--- gio/gunixvolume.c.orig	2009-11-30 04:35:27.000000000 +0100
++++ gio/gunixvolume.c	2009-12-08 19:32:03.000000000 +0100
+@@ -465,9 +465,14 @@ g_unix_volume_eject (GVolume            
                       gpointer             user_data)
  {
    GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
@@ -8,8 +8,8 @@
 +  char *argv[] = {"cdcontrol", "-f", NULL, "eject", NULL};
 +  argv[2] = unix_volume->device_path;
 +#else
-   char *argv[] = {"eject", NULL, NULL};
--
+   char *argv[] = { "eject", NULL, NULL };
+ 
    argv[1] = unix_volume->device_path;
 +#endif
  
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 4e011916cd1a..a760ba254490 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,3 +1,4 @@
+bin/gio-querymodules
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -5,7 +6,9 @@ bin/gobject-query
 bin/gtester
 bin/gtester-report
 include/gio-unix-2.0/gio/gdesktopappinfo.h
+include/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/gio-unix-2.0/gio/gunixconnection.h
+include/gio-unix-2.0/gio/gunixfdlist.h
 include/gio-unix-2.0/gio/gunixfdmessage.h
 include/gio-unix-2.0/gio/gunixinputstream.h
 include/gio-unix-2.0/gio/gunixmounts.h
@@ -17,7 +20,11 @@ include/glib-2.0/gio/gasyncresult.h
 include/glib-2.0/gio/gbufferedinputstream.h
 include/glib-2.0/gio/gbufferedoutputstream.h
 include/glib-2.0/gio/gcancellable.h
+include/glib-2.0/gio/gcharsetconverter.h
 include/glib-2.0/gio/gcontenttype.h
+include/glib-2.0/gio/gconverter.h
+include/glib-2.0/gio/gconverterinputstream.h
+include/glib-2.0/gio/gconverteroutputstream.h
 include/glib-2.0/gio/gdatainputstream.h
 include/glib-2.0/gio/gdataoutputstream.h
 include/glib-2.0/gio/gdrive.h
@@ -76,6 +83,8 @@ include/glib-2.0/gio/gthreadedsocketservice.h
 include/glib-2.0/gio/gvfs.h
 include/glib-2.0/gio/gvolume.h
 include/glib-2.0/gio/gvolumemonitor.h
+include/glib-2.0/gio/gzlibcompressor.h
+include/glib-2.0/gio/gzlibdecompressor.h
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
@@ -84,6 +93,7 @@ include/glib-2.0/glib/gasyncqueue.h
 include/glib-2.0/glib/gatomic.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbitlock.h
 include/glib-2.0/glib/gbookmarkfile.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gchecksum.h
@@ -138,6 +148,8 @@ include/glib-2.0/glib/gtypes.h
 include/glib-2.0/glib/gunicode.h
 include/glib-2.0/glib/gurifuncs.h
 include/glib-2.0/glib/gutils.h
+include/glib-2.0/glib/gvariant.h
+include/glib-2.0/glib/gvarianttype.h
 include/glib-2.0/glib/gwin32.h
 include/glib-2.0/glibconfig.h
 include/glib-2.0/gmodule.h
@@ -190,9 +202,11 @@ share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
+share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/as/LC_MESSAGES/glib20.mo
+share/locale/ast/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -210,6 +224,7 @@ share/locale/dz/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
 share/locale/en_CA/LC_MESSAGES/glib20.mo
 share/locale/en_GB/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/eo/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/et/LC_MESSAGES/glib20.mo
@@ -243,6 +258,7 @@ share/locale/mn/LC_MESSAGES/glib20.mo
 share/locale/mr/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nb/LC_MESSAGES/glib20.mo
+share/locale/nds/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
@@ -282,6 +298,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
 @exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
 @dirrmtry lib/gio/modules
 @dirrmtry lib/gio
 @dirrm include/glib-2.0/gobject
@@ -314,6 +332,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -324,6 +344,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -332,5 +354,7 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 2ea3d95b2512..4866b4a3a0ac 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.82 2009/09/21 19:47:13 kwm Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.90 2010/05/04 12:45:00 kwm Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.22.1
+PORTVERSION=	2.24.2
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 96ae66df32bd..b114a6abd3a1 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/glibmm-2.24.2.tar.bz2) = 48861fec006c2bd8e301d8e44cd12d3c
+SHA256 (gnome2/glibmm-2.24.2.tar.bz2) = d4687c0b27f9c9f955a5306649008a1f8d8935edff916278fb7b65b44292ff7a
+SIZE (gnome2/glibmm-2.24.2.tar.bz2) = 4481414
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index ba8a266b3414..3cb8d30b0675 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -27,7 +27,10 @@ include/giomm-%%API_VERSION%%/giomm/fileoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/filterinputstream.h
 include/giomm-%%API_VERSION%%/giomm/filteroutputstream.h
 include/giomm-%%API_VERSION%%/giomm/icon.h
+include/giomm-%%API_VERSION%%/giomm/inetaddress.h
+include/giomm-%%API_VERSION%%/giomm/inetsocketaddress.h
 include/giomm-%%API_VERSION%%/giomm/init.h
+include/giomm-%%API_VERSION%%/giomm/initable.h
 include/giomm-%%API_VERSION%%/giomm/inputstream.h
 include/giomm-%%API_VERSION%%/giomm/iostream.h
 include/giomm-%%API_VERSION%%/giomm/loadableicon.h
@@ -35,6 +38,8 @@ include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
 include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/mount.h
 include/giomm-%%API_VERSION%%/giomm/mountoperation.h
+include/giomm-%%API_VERSION%%/giomm/networkaddress.h
+include/giomm-%%API_VERSION%%/giomm/networkservice.h
 include/giomm-%%API_VERSION%%/giomm/outputstream.h
 include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
 include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
@@ -63,6 +68,9 @@ include/giomm-%%API_VERSION%%/giomm/private/fileoutputstream_p.h
 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/inetaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/inetsocketaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/initable_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
@@ -70,23 +78,51 @@ include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/mount_p.h
 include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h
 include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h
 include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socket_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketclient_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketconnectable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketconnection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketlistener_p.h
+include/giomm-%%API_VERSION%%/giomm/private/socketservice_p.h
+include/giomm-%%API_VERSION%%/giomm/private/srvtarget_p.h
+include/giomm-%%API_VERSION%%/giomm/private/tcpconnection_p.h
 include/giomm-%%API_VERSION%%/giomm/private/themedicon_p.h
+include/giomm-%%API_VERSION%%/giomm/private/threadedsocketservice_p.h
+include/giomm-%%API_VERSION%%/giomm/private/unixconnection_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
 include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/resolver.h
 include/giomm-%%API_VERSION%%/giomm/seekable.h
+include/giomm-%%API_VERSION%%/giomm/socket.h
+include/giomm-%%API_VERSION%%/giomm/socketaddress.h
+include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h
+include/giomm-%%API_VERSION%%/giomm/socketclient.h
+include/giomm-%%API_VERSION%%/giomm/socketconnectable.h
+include/giomm-%%API_VERSION%%/giomm/socketconnection.h
+include/giomm-%%API_VERSION%%/giomm/socketlistener.h
+include/giomm-%%API_VERSION%%/giomm/socketservice.h
+include/giomm-%%API_VERSION%%/giomm/srvtarget.h
+include/giomm-%%API_VERSION%%/giomm/tcpconnection.h
 include/giomm-%%API_VERSION%%/giomm/themedicon.h
+include/giomm-%%API_VERSION%%/giomm/threadedsocketservice.h
+include/giomm-%%API_VERSION%%/giomm/unixconnection.h
 include/giomm-%%API_VERSION%%/giomm/unixinputstream.h
 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/balancedtree.h
 include/glibmm-%%API_VERSION%%/glibmm/checksum.h
 include/glibmm-%%API_VERSION%%/glibmm/class.h
 include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h
@@ -119,6 +155,7 @@ include/glibmm-%%API_VERSION%%/glibmm/optionentry.h
 include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h
 include/glibmm-%%API_VERSION%%/glibmm/pattern.h
 include/glibmm-%%API_VERSION%%/glibmm/priorities.h
+include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
@@ -169,6 +206,7 @@ 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-%%VERSION%%/proc/generate_wrap_init.pl
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
index ab20f1719349..67508cf1de43 100644
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-js-common/Makefile,v 1.1 2009/07/30 02:40:56 avl Exp $
+#   $MCom: ports/devel/gnome-js-common/Makefile,v 1.3 2010/01/01 03:30:52 avl Exp $
 #
 
 PORTNAME=	gnome-js-common
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -27,7 +27,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
 .if !defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|$${prefix}/doc/gnome_js_common|$${datarootdir}/doc/${PORTNAME}|' \
+	@${REINPLACE_CMD} -e 's|$${prefix}/share/doc/gnome_js_common|${DOCSDIR}|' \
 		${WRKSRC}/Makefile.in
 .else
 	@${REINPLACE_CMD} -e 's|install-gnome_js_commondocDATA ||g' ${WRKSRC}/Makefile.in
diff --git a/devel/gnome-js-common/distinfo b/devel/gnome-js-common/distinfo
index ff081cb56a13..c154f3bfea44 100644
--- a/devel/gnome-js-common/distinfo
+++ b/devel/gnome-js-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 4f1c409a0be66d0df9dcdf15e9cf70ff
-SHA256 (gnome2/gnome-js-common-0.1.1.tar.bz2) = 6cad015cda5abfd2bccd6b95714ca39c83ca69ca7e6f7326dc75763a758dc8db
-SIZE (gnome2/gnome-js-common-0.1.1.tar.bz2) = 274010
+MD5 (gnome2/gnome-js-common-0.1.2.tar.bz2) = a4147d24622ab0f1d01e9921a3bf501b
+SHA256 (gnome2/gnome-js-common-0.1.2.tar.bz2) = 1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6
+SIZE (gnome2/gnome-js-common-0.1.2.tar.bz2) = 283520
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 9b0be1a68379..3b41a8b8f81c 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.187 2009/10/10 16:04:54 marcus Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.189 2010/04/01 14:24:30 kwm Exp $
 #
 
 PORTNAME=	gnome-vfs
-PORTVERSION=	2.24.2
-PORTREVISION?=	2
+PORTVERSION=	2.24.3
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 63d1710811e0..5a89b547e6a7 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 371d13e7306eb82e3fe3748a7584c440
-SHA256 (gnome2/gnome-vfs-2.24.2.tar.bz2) = 50ecf5f37d377492e8943a3c359ffe64176d4e7f045e9980790eca999a1c6856
-SIZE (gnome2/gnome-vfs-2.24.2.tar.bz2) = 1859173
+MD5 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 646a2672c6e7e4ebff6a798b0fb7cc90
+SHA256 (gnome2/gnome-vfs-2.24.3.tar.bz2) = 3b0f342e79813bfc11d8e636db96b3ffd16c9ca48b07306410e09a3fd1065b4a
+SIZE (gnome2/gnome-vfs-2.24.3.tar.bz2) = 1830456
diff --git a/devel/gnome-vfs/pkg-deinstall.in b/devel/gnome-vfs/pkg-deinstall.in
index 0b97e9c55c64..6567e62042f2 100644
--- a/devel/gnome-vfs/pkg-deinstall.in
+++ b/devel/gnome-vfs/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-deinstall.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-install.in b/devel/gnome-vfs/pkg-install.in
index 018b36eccbf9..0fc15088ae8b 100644
--- a/devel/gnome-vfs/pkg-install.in
+++ b/devel/gnome-vfs/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.23 2009/11/28 05:58:59 mezz Exp $
+#   $MCom: ports/devel/gnome-vfs/pkg-install.in,v 1.26 2010/04/02 21:50:06 kwm Exp $
 #
 # Restore gconf keys of libgnome.
 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 31ce344648e6..d270094942f7 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -127,6 +127,7 @@ share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/dz/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -234,6 +235,8 @@ share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index 56e45f4c086d..6fa5ce4d49f5 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/devel/gnome2-hacker-tools/Makefile,v 1.47 2009/03/01 08:15:25 marcus Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	devel gnome
 PKGNAMESUFFIX=	-hacker-tools
 
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 5ee9e37f7de2..7e8b8a130d9c 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gob2
-PORTVERSION=	2.0.16
+PORTVERSION=	2.0.17
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo
index 609b1e7e05b3..70489c464fc7 100644
--- a/devel/gob2/distinfo
+++ b/devel/gob2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gob2-2.0.16.tar.gz) = cced6d709df6fad3baf8831f027d62d5
-SHA256 (gnome2/gob2-2.0.16.tar.gz) = 2c7f57d8ab7837e82290e96fcdb4dd97a2e82acb21f4508fe9be2f6f8e6a293b
-SIZE (gnome2/gob2-2.0.16.tar.gz) = 257508
+MD5 (gnome2/gob2-2.0.17.tar.gz) = 05fa7384b30ebb2921430b2615d2c2e5
+SHA256 (gnome2/gob2-2.0.17.tar.gz) = 80b4683af653809970ef237fa45427b203653edf0dd5e3dc8897433e9c29346c
+SIZE (gnome2/gob2-2.0.17.tar.gz) = 274156
diff --git a/devel/gob2/files/patch-src_out.c b/devel/gob2/files/patch-src_out.c
new file mode 100644
index 000000000000..14f6637c68e4
--- /dev/null
+++ b/devel/gob2/files/patch-src_out.c
@@ -0,0 +1,16 @@
+--- src/out.c.orig	2009-07-10 16:43:05.000000000 +0200
++++ src/out.c	2009-11-27 14:07:58.000000000 +0100
+@@ -69,6 +69,13 @@
+ 	} else
+ 		g_assert_not_reached();
+ 
++	/* 
++	 * According to clang developers #line 0 is not allowed by the C spec.
++	 * Gcc does accept it though. http://llvm.org/bugs/show_bug.cgi?id=5603
++	 */
++	if (line == 0)
++		line += 1;
++
+ 	fprintf(fp, "#line %d \"%s\"\n", line, filename);
+ }
+ 
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 3ee455c39804..56fe63a36283 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.3 2009/09/06 07:37:44 avl Exp $
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.8 2010/04/22 15:11:23 kwm Exp $
 #
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.10
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,7 +16,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
 BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
-LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi
+LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
+		cairo.2:${PORTSDIR}/graphics/cairo
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index e3eccda319b7..73ae07e84f39 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gobject-introspection-0.6.7.tar.bz2) = 41205c14cbd86632806578448e29bd30
-SHA256 (gnome2/gobject-introspection-0.6.7.tar.bz2) = c97ca4e978b0583999775640e9e9f97b64a5880ad2a6adc3ce903207b616f24a
-SIZE (gnome2/gobject-introspection-0.6.7.tar.bz2) = 579956
+MD5 (gnome2/gobject-introspection-0.6.10.tar.bz2) = cdf7af644a0407c3fd2d57ba2bb3549f
+SHA256 (gnome2/gobject-introspection-0.6.10.tar.bz2) = 36bd511a4d45967f95526f94708b3f4367e9d344aa11f3206fe6edb7fc3a8d4b
+SIZE (gnome2/gobject-introspection-0.6.10.tar.bz2) = 550501
diff --git a/devel/gobject-introspection/files/patch-20091207 b/devel/gobject-introspection/files/patch-20091207
deleted file mode 100644
index fa0b93cf3086..000000000000
--- a/devel/gobject-introspection/files/patch-20091207
+++ /dev/null
@@ -1,2632 +0,0 @@
-From 804f59f40c027cf1fb2944764adea564dff07678 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 07 Dec 2009 23:35:06 +0000
-Subject: Allow stack allocating GIBaseInfo, add stack retrieval variants
-
-We don't want to malloc each GIBaseInfo when they can be used in
-function invocation; instead, allow stack allocation.
-
-There were a lot of structure typedefs which were actually just
-exactly the same as GIBaseInfo, with the one exception of GITypeInfo.
-
-Instead, just put the single GITypeInfo boolean inside GIBaseInfo
-as a bit in a bitfield.
-
-GIBaseInfo is still opaque publicly; GIRealInfo is the new
-internal structure.
-
-Using this, add new functions to retrieve arguments and argument types
-on the stack.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=604074
----
-diff --git a/girepository/ginfo.c b/girepository/ginfo.c
-index 2aacb76..b11cc8f 100644
---- girepository/ginfo.c
-+++ girepository/ginfo.c
-@@ -28,11 +28,19 @@
- #include "gtypelib.h"
- #include "ginfo.h"
- 
--struct _GIBaseInfo 
-+typedef struct _GIRealInfo GIRealInfo;
-+
-+/**
-+ * We just use one structure for all of the info object
-+ * types; in general, we should be reading data directly
-+ * from the typelib, and not having computed data in
-+ * per-type structures.
-+ */
-+struct _GIRealInfo
- {
-   /* Keep this part in sync with GIUnresolvedInfo below */
--  gint type;
--  gint ref_count;
-+  gint32 type;
-+  gint32 ref_count;
-   GIRepository *repository;
-   GIBaseInfo *container;
- 
-@@ -40,13 +48,18 @@ struct _GIBaseInfo
- 
-   GTypelib *typelib;
-   guint32 offset;
-+  
-+  guint32 type_is_embedded : 1; /* Used by GITypeInfo */
-+  guint32 reserved : 31;
-+  
-+  gpointer reserved2[4];
- };
- 
- struct _GIUnresolvedInfo
- {
-   /* Keep this part in sync with GIBaseInfo above */
--  gint type;
--  gint ref_count;
-+  gint32 type;
-+  gint32 ref_count;
-   GIRepository *repository;
-   GIBaseInfo *container;
- 
-@@ -56,137 +69,68 @@ struct _GIUnresolvedInfo
-   const gchar *namespace;
- };
- 
--struct _GICallableInfo
--{
--  GIBaseInfo base;
--};
--
--struct _GIFunctionInfo
--{
--  GICallableInfo callable;
--};
--
--struct _GICallbackInfo
--{
--  GICallableInfo callable;
--};
--
--struct _GIRegisteredTypeInfo
--{
--  GIBaseInfo base;
--};
--
--struct _GIStructInfo
--{
--  GIRegisteredTypeInfo registered;
--};
--
--struct _GIEnumInfo
--{
--  GIRegisteredTypeInfo registered;
--};
--
--struct _GIObjectInfo
--{
--  GIRegisteredTypeInfo registered;
--};
--
--struct _GIInterfaceInfo
--{
--  GIRegisteredTypeInfo registered;
--};
--
--struct _GIConstantInfo
--{
--  GIBaseInfo base;
--};
--
--struct _GIValueInfo
--{
--  GIBaseInfo base;
--};
--
--struct _GISignalInfo
--{
--  GICallableInfo callable;
--};
--
--struct _GIVFuncInfo
--{
--  GICallableInfo callable;
--};
--
--struct _GIPropertyInfo
--{
--  GIBaseInfo base;
--};
--
--struct _GIFieldInfo
-+static void
-+g_info_init (GIRealInfo     *info,
-+             GIInfoType      type,
-+             GIRepository   *repository,
-+             GIBaseInfo     *container,
-+             GTypelib       *typelib, 
-+             guint32         offset)
- {
--  GIBaseInfo base;
--};
-+  memset (info, 0, sizeof (GIRealInfo));
- 
--struct _GIArgInfo
--{
--  GIBaseInfo base;
--};
-+  /* Invalid refcount used to flag stack-allocated infos */
-+  info->ref_count = 0xFFFF;
-+  info->type = type;
- 
--struct _GITypeInfo
--{
--  GIBaseInfo base;
--  gboolean   is_embedded;
--};
-+  info->typelib = typelib;
-+  info->offset = offset;
- 
--struct _GIUnionInfo
--{
--  GIRegisteredTypeInfo registered;
--};
-+  if (container)
-+    info->container = container;
- 
-+  g_assert (G_IS_IREPOSITORY (repository));
-+  info->repository = repository;
-+}
- 
- /* info creation */
- GIBaseInfo *
- g_info_new_full (GIInfoType     type,
--		 GIRepository  *repository,
--		 GIBaseInfo    *container,
--		 GTypelib     *typelib, 
--		 guint32        offset)
-+                 GIRepository  *repository,
-+                 GIBaseInfo    *container,
-+                 GTypelib      *typelib, 
-+                 guint32        offset)
- {
--  GIBaseInfo *info;
-+  GIRealInfo *info;
- 
-   g_return_val_if_fail (container != NULL || repository != NULL, NULL);
- 
--  if (type == GI_INFO_TYPE_TYPE)
--    info = (GIBaseInfo *)g_new0 (GITypeInfo, 1);
--  else
--    info = g_new0 (GIBaseInfo, 1);
--
-+  info = g_new (GIRealInfo, 1);
-+    
-+  g_info_init (info, type, repository, container, typelib, offset);
-   info->ref_count = 1;
--  info->type = type;
--
--  info->typelib = typelib;
--  info->offset = offset;
- 
--  if (container)
--    info->container = g_base_info_ref (container);
-+  if (container && ((GIRealInfo *) container)->ref_count != 0xFFFF)
-+    g_base_info_ref (info->container);
- 
--  info->repository = g_object_ref (repository);
-+  g_object_ref (info->repository);
- 
--  return info;
-+  return (GIBaseInfo*)info;
- }
- 
- GIBaseInfo *
- g_info_new (GIInfoType     type,
--	    GIBaseInfo    *container,
--	    GTypelib     *typelib, 
--	    guint32        offset)
-+            GIBaseInfo    *container,
-+            GTypelib      *typelib, 
-+            guint32        offset)
- {
--  return g_info_new_full (type, container->repository, container, typelib, offset);
-+  return g_info_new_full (type, ((GIRealInfo*)container)->repository, container, typelib, offset);
- }
- 
- static GIBaseInfo *
- g_info_from_entry (GIRepository *repository,
--		   GTypelib *typelib,
--		   guint16    index)
-+                   GTypelib     *typelib,
-+                   guint16       index)
- {
-   GIBaseInfo *result;
-   DirEntry *entry = g_typelib_get_dir_entry (typelib, index);
-@@ -200,31 +144,34 @@ g_info_from_entry (GIRepository *repository,
- 
-       result = g_irepository_find_by_name (repository, namespace, name);
-       if (result == NULL)
--	{
--	  GIUnresolvedInfo *unresolved;
-+        {
-+          GIUnresolvedInfo *unresolved;
- 
--	  unresolved = g_new0 (GIUnresolvedInfo, 1);
-+          unresolved = g_new0 (GIUnresolvedInfo, 1);
- 
--	  unresolved->type = GI_INFO_TYPE_UNRESOLVED;
--	  unresolved->ref_count = 1;
--	  unresolved->repository = g_object_ref (repository);
--	  unresolved->container = NULL;
--	  unresolved->name = name;
--	  unresolved->namespace = namespace;
-+          unresolved->type = GI_INFO_TYPE_UNRESOLVED;
-+          unresolved->ref_count = 1;
-+          unresolved->repository = g_object_ref (repository);
-+          unresolved->container = NULL;
-+          unresolved->name = name;
-+          unresolved->namespace = namespace;
- 
--	  return (GIBaseInfo*)unresolved;
--	}
--      return result;
-+          return (GIBaseInfo *)unresolved;
-+	    }
-+      return (GIBaseInfo *)result;
-     }
- 
--  return result;
-+  return (GIBaseInfo *)result;
- }
- 
- /* GIBaseInfo functions */
- GIBaseInfo *
- g_base_info_ref (GIBaseInfo *info)
- {
--  info->ref_count++;
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
-+
-+  g_assert (rinfo->ref_count != 0xFFFF);
-+  ((GIRealInfo*)info)->ref_count++;
- 
-   return info;
- }
-@@ -232,18 +179,20 @@ g_base_info_ref (GIBaseInfo *info)
- void
- g_base_info_unref (GIBaseInfo *info)
- {
--  g_assert (info->ref_count > 0);
--  info->ref_count--;
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
-+
-+  g_assert (rinfo->ref_count > 0 && rinfo->ref_count != 0xFFFF);
-+  rinfo->ref_count--;
- 
--  if (!info->ref_count)
-+  if (!rinfo->ref_count)
-     {
--      if (info->container)
--	g_base_info_unref (info->container);
-+      if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != 0xFFFF)
-+        g_base_info_unref (rinfo->container);
- 
--      if (info->repository)
--        g_object_unref (info->repository);
-+      if (rinfo->repository)
-+        g_object_unref (rinfo->repository);
- 
--      g_free (info);
-+      g_free (rinfo);
-     }
- }
- 
-@@ -251,14 +200,15 @@ GIInfoType
- g_base_info_get_type (GIBaseInfo *info)
- {
-   
--  return info->type;
-+  return ((GIRealInfo*)info)->type;
- }
- 
- const gchar *
- g_base_info_get_name (GIBaseInfo *info)
- {
--  g_assert (info->ref_count > 0);
--  switch (info->type)
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
-+  g_assert (rinfo->ref_count > 0);
-+  switch (rinfo->type)
-     {
-     case GI_INFO_TYPE_FUNCTION:
-     case GI_INFO_TYPE_CALLBACK:
-@@ -272,64 +222,64 @@ g_base_info_get_name (GIBaseInfo *info)
-     case GI_INFO_TYPE_ERROR_DOMAIN:
-     case GI_INFO_TYPE_UNION:
-       {
--	CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset];
-+        CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_VALUE:
-       {
--	ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset];
-+        ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_SIGNAL:
-       {
--	SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset];
-+        SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_PROPERTY:
-       {
--	PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset];
-+        PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_VFUNC:
-       {
--	VFuncBlob *blob = (VFuncBlob *)&info->typelib->data[info->offset];
-+        VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_FIELD:
-       {
--	FieldBlob *blob = (FieldBlob *)&info->typelib->data[info->offset];
-+        FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
- 	
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
- 
-     case GI_INFO_TYPE_ARG:
-       {
--	ArgBlob *blob = (ArgBlob *)&info->typelib->data[info->offset];
-+        ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
- 	
--	return g_typelib_get_string (info->typelib, blob->name);
-+        return g_typelib_get_string (rinfo->typelib, blob->name);
-       }
-       break;
-     case GI_INFO_TYPE_UNRESOLVED:
-       {
--	GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
-+        GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
- 
--	return unresolved->name;
-+        return unresolved->name;
-       }
-       break;
-     case GI_INFO_TYPE_TYPE:
-@@ -344,24 +294,26 @@ g_base_info_get_name (GIBaseInfo *info)
- const gchar *
- g_base_info_get_namespace (GIBaseInfo *info)
- {
--  Header *header = (Header *)info->typelib->data;
-+  GIRealInfo *rinfo = (GIRealInfo*) info;
-+  Header *header = (Header *)rinfo->typelib->data;
- 
--  g_assert (info->ref_count > 0);
-+  g_assert (rinfo->ref_count > 0);
- 
--  if (info->type == GI_INFO_TYPE_UNRESOLVED)
-+  if (rinfo->type == GI_INFO_TYPE_UNRESOLVED)
-     {
-       GIUnresolvedInfo *unresolved = (GIUnresolvedInfo *)info;
-       
-       return unresolved->namespace;
-     }
- 
--  return g_typelib_get_string (info->typelib, header->namespace);
-+  return g_typelib_get_string (rinfo->typelib, header->namespace);
- }
- 
- gboolean 
- g_base_info_is_deprecated (GIBaseInfo *info)
- {
--  switch (info->type)
-+  GIRealInfo *rinfo = (GIRealInfo*) info;
-+  switch (rinfo->type)
-     {
-     case GI_INFO_TYPE_FUNCTION:
-     case GI_INFO_TYPE_CALLBACK:
-@@ -374,33 +326,33 @@ g_base_info_is_deprecated (GIBaseInfo *info)
-     case GI_INFO_TYPE_CONSTANT:
-     case GI_INFO_TYPE_ERROR_DOMAIN:
-       {
--	CommonBlob *blob = (CommonBlob *)&info->typelib->data[info->offset];
-+        CommonBlob *blob = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return blob->deprecated;
-+        return blob->deprecated;
-       }
-       break;
- 
-     case GI_INFO_TYPE_VALUE:
-       {
--	ValueBlob *blob = (ValueBlob *)&info->typelib->data[info->offset];
-+        ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return blob->deprecated;
-+        return blob->deprecated;
-       }
-       break;
- 
-     case GI_INFO_TYPE_SIGNAL:
-       {
--	SignalBlob *blob = (SignalBlob *)&info->typelib->data[info->offset];
-+        SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return blob->deprecated;
-+        return blob->deprecated;
-       }
-       break;
- 
-     case GI_INFO_TYPE_PROPERTY:
-       {
--	PropertyBlob *blob = (PropertyBlob *)&info->typelib->data[info->offset];
-+        PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--	return blob->deprecated;
-+        return blob->deprecated;
-       }
-       break;
- 
-@@ -426,7 +378,7 @@ g_base_info_is_deprecated (GIBaseInfo *info)
-  */
- const gchar *
- g_base_info_get_attribute (GIBaseInfo   *info,
--			   const gchar *name)
-+                           const gchar  *name)
- {
-   GIAttributeIter iter = { 0, };
-   gchar *curname, *curvalue;
-@@ -455,15 +407,14 @@ cmp_attribute (const void *av,
- }
- 
- static AttributeBlob *
--find_first_attribute (GIBaseInfo *info)
-+find_first_attribute (GIRealInfo *rinfo)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
-+  Header *header = (Header *)rinfo->typelib->data;
-   AttributeBlob blob, *first, *res, *previous;
- 
--  blob.offset = base->offset;
-+  blob.offset = rinfo->offset;
-   
--  first = (AttributeBlob *) &base->typelib->data[header->attributes];
-+  first = (AttributeBlob *) &rinfo->typelib->data[header->attributes];
- 
-   res = bsearch (&blob, first, header->n_attributes,
-                  header->attribute_blob_size, cmp_attribute);
-@@ -472,7 +423,7 @@ find_first_attribute (GIBaseInfo *info)
-     return NULL;
- 
-   previous = res - 1;
--  while (previous >= first && previous->offset == base->offset)
-+  while (previous >= first && previous->offset == rinfo->offset)
-     {
-       res = previous;
-       previous = res - 1;
-@@ -520,23 +471,23 @@ g_base_info_iterate_attributes (GIBaseInfo       *info,
-                                  gchar           **name,
-                                  gchar           **value)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-   AttributeBlob *next, *after;
- 
--  after = (AttributeBlob *) &base->typelib->data[header->attributes +
-+  after = (AttributeBlob *) &rinfo->typelib->data[header->attributes +
-                                                   header->n_attributes * header->attribute_blob_size];
- 
-   if (iter->data != NULL)
-     next = (AttributeBlob *) iter->data;
-   else
--    next = find_first_attribute (info);
-+    next = find_first_attribute (rinfo);
- 
--  if (next == NULL || next->offset != base->offset || next >= after)
-+  if (next == NULL || next->offset != rinfo->offset || next >= after)
-     return FALSE;
- 
--  *name = (gchar*) g_typelib_get_string (base->typelib, next->name);
--  *value = (gchar*) g_typelib_get_string (base->typelib, next->value);
-+  *name = (gchar*) g_typelib_get_string (rinfo->typelib, next->name);
-+  *value = (gchar*) g_typelib_get_string (rinfo->typelib, next->value);
-   iter->data = next + 1;
- 
-   return TRUE;
-@@ -545,13 +496,13 @@ g_base_info_iterate_attributes (GIBaseInfo       *info,
- GIBaseInfo *
- g_base_info_get_container (GIBaseInfo *info)
- {
--  return info->container;
-+  return ((GIRealInfo*)info)->container;
- }
- 
- GTypelib *
- g_base_info_get_typelib (GIBaseInfo *info)
- {
--  return info->typelib;
-+  return ((GIRealInfo*)info)->typelib;
- }
- 
- /*
-@@ -571,25 +522,27 @@ gboolean
- g_base_info_equal (GIBaseInfo *info1, GIBaseInfo *info2)
- {
-   /* Compare the TypeLib pointers, which are mmapped. */
--  return info1->typelib->data + info1->offset == info2->typelib->data + info2->offset;
-+  GIRealInfo *rinfo1 = (GIRealInfo*)info1;
-+  GIRealInfo *rinfo2 = (GIRealInfo*)info2;
-+  return rinfo1->typelib->data + rinfo1->offset == rinfo2->typelib->data + rinfo2->offset;
- }
- 
- /* GIFunctionInfo functions */
- const gchar *
- g_function_info_get_symbol (GIFunctionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return g_typelib_get_string (base->typelib, blob->symbol);
-+  return g_typelib_get_string (rinfo->typelib, blob->symbol);
- }
- 
- GIFunctionInfoFlags
- g_function_info_get_flags (GIFunctionInfo *info)
- {
-   GIFunctionInfoFlags flags;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   flags = 0;
- 
-@@ -618,9 +571,9 @@ g_function_info_get_flags (GIFunctionInfo *info)
- GIPropertyInfo *
- g_function_info_get_property (GIFunctionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
--  GIInterfaceInfo *container = (GIInterfaceInfo *)base->container;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-+  GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container;
-   
-   return g_interface_info_get_property (container, blob->index);  
- }
-@@ -628,20 +581,21 @@ g_function_info_get_property (GIFunctionInfo *info)
- GIVFuncInfo *
- g_function_info_get_vfunc (GIFunctionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FunctionBlob *blob = (FunctionBlob *)&base->typelib->data[base->offset];
--  GIInterfaceInfo *container = (GIInterfaceInfo *)base->container;
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
-+  FunctionBlob *blob = (FunctionBlob *)&rinfo->typelib->data[rinfo->offset];
-+  GIInterfaceInfo *container = (GIInterfaceInfo *)rinfo->container;
-   
-   return g_interface_info_get_vfunc (container, blob->index);  
- }
- 
--
- /* GICallableInfo functions */
- static guint32
- signature_offset (GICallableInfo *info)
- {
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
-   int sigoff = -1;
--  switch (info->base.type)
-+
-+  switch (rinfo->type)
-     {
-     case GI_INFO_TYPE_FUNCTION:
-       sigoff = G_STRUCT_OFFSET (FunctionBlob, signature);
-@@ -657,23 +611,32 @@ signature_offset (GICallableInfo *info)
-       break;
-     }
-   if (sigoff >= 0)
--    return *(guint32 *)&info->base.typelib->data[info->base.offset + sigoff];
-+    return *(guint32 *)&rinfo->typelib->data[rinfo->offset + sigoff];
-   return 0;
- }
- 
- GITypeInfo *
- g_type_info_new (GIBaseInfo    *container,
--		 GTypelib     *typelib,
--		 guint32        offset)
-+            	 GTypelib      *typelib,
-+		         guint32        offset)
- {
-   SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
--  GITypeInfo *type_info;
- 
--  type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib, 
--				    (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
--  type_info->is_embedded = FALSE;
-+  return (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE, container, typelib,
-+                                    (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
-+}
- 
--  return type_info;
-+static void
-+g_type_info_init (GIBaseInfo *info,
-+                  GIBaseInfo *container,
-+                  GTypelib   *typelib,
-+                  guint32     offset)
-+{
-+  GIRealInfo *rinfo = (GIRealInfo*)container;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&typelib->data[offset];
-+  
-+  g_info_init ((GIRealInfo*)info, GI_INFO_TYPE_TYPE, rinfo->repository, container, typelib,
-+               (type->flags.reserved == 0 && type->flags.reserved2 == 0) ? offset : type->offset);
- }
- 
- /**
-@@ -689,12 +652,36 @@ g_type_info_new (GIBaseInfo    *container,
- GITypeInfo *
- g_callable_info_get_return_type (GICallableInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-   guint32 offset;
- 
-   offset = signature_offset (info);
- 
--  return g_type_info_new (base, base->typelib, offset);
-+  return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, offset);
-+}
-+
-+
-+/**
-+ * g_callable_info_load_return_type:
-+ * @info: a #GICallableInfo
-+ * @type: (out caller-allocates): Initialized with return type of @info
-+ *
-+ * Get information about a return value of callable; this
-+ * function is a variant of g_callable_info_get_return_type() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @type must not be referenced after @info is deallocated.
-+ */
-+void
-+g_callable_info_load_return_type (GICallableInfo *info,
-+                                  GITypeInfo     *type)
-+{
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  guint32 offset;
-+
-+  offset = signature_offset (info);
-+
-+  g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
- 
- /**
-@@ -708,8 +695,8 @@ g_callable_info_get_return_type (GICallableInfo *info)
- gboolean
- g_callable_info_may_return_null (GICallableInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
- 
-   return blob->may_return_null;
- }
-@@ -726,8 +713,8 @@ g_callable_info_may_return_null (GICallableInfo *info)
- GITransfer
- g_callable_info_get_caller_owns (GICallableInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SignatureBlob *blob = (SignatureBlob *)&base->typelib->data[signature_offset (info)];
-+  GIRealInfo *rinfo = (GIRealInfo*) info;
-+  SignatureBlob *blob = (SignatureBlob *)&rinfo->typelib->data[signature_offset (info)];
- 
-   if (blob->caller_owns_return_value)
-     return GI_TRANSFER_EVERYTHING;
-@@ -748,12 +735,12 @@ g_callable_info_get_caller_owns (GICallableInfo *info)
- gint 
- g_callable_info_get_n_args (GICallableInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-   gint offset;
-   SignatureBlob *blob;
- 
-   offset = signature_offset (info);
--  blob = (SignatureBlob *)&base->typelib->data[offset];
-+  blob = (SignatureBlob *)&rinfo->typelib->data[offset];
- 
-   return blob->n_arguments;
- }
-@@ -769,24 +756,51 @@ g_callable_info_get_n_args (GICallableInfo *info)
-  */
- GIArgInfo *
- g_callable_info_get_arg (GICallableInfo *info,
--			 gint           n)
-+              			 gint           n)
-+{
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  gint offset;
-+
-+  offset = signature_offset (info);
-+  
-+  return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, (GIBaseInfo*)info, rinfo->typelib, 
-+                				   offset + header->signature_blob_size + n * header->arg_blob_size);
-+}
-+
-+/**
-+ * g_callable_info_load_arg:
-+ * @info: a #GICallableInfo
-+ * @n: the argument index to fetch
-+ * @arg: (out caller-allocates): Initialize with argument number @n
-+ *
-+ * Get information about a particular argument of this callable; this
-+ * function is a variant of g_callable_info_get_arg() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @arg must not be referenced after @info is deallocated.
-+ */
-+void
-+g_callable_info_load_arg (GICallableInfo *info,
-+                          gint            n,
-+                          GIArgInfo     *arg)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-   gint offset;
- 
-   offset = signature_offset (info);
-   
--  return (GIArgInfo *) g_info_new (GI_INFO_TYPE_ARG, base, base->typelib, 
--				   offset + header->signature_blob_size + n * header->arg_blob_size);
-+  g_info_init ((GIRealInfo*)arg, GI_INFO_TYPE_ARG, rinfo->repository, (GIBaseInfo*)info, rinfo->typelib, 
-+			   offset + header->signature_blob_size + n * header->arg_blob_size);  
- }
- 
- /* GIArgInfo function */
- GIDirection
- g_arg_info_get_direction (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (blob->in && blob->out)
-     return GI_DIRECTION_INOUT;
-@@ -799,8 +813,8 @@ g_arg_info_get_direction (GIArgInfo *info)
- gboolean
- g_arg_info_is_return_value (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->return_value;
- }
-@@ -808,8 +822,8 @@ g_arg_info_is_return_value (GIArgInfo *info)
- gboolean
- g_arg_info_is_dipper (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->dipper;
- }
-@@ -817,8 +831,8 @@ g_arg_info_is_dipper (GIArgInfo *info)
- gboolean
- g_arg_info_is_optional (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->optional;
- }
-@@ -826,8 +840,8 @@ g_arg_info_is_optional (GIArgInfo *info)
- gboolean
- g_arg_info_may_be_null (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->allow_none;
- }
-@@ -835,8 +849,8 @@ g_arg_info_may_be_null (GIArgInfo *info)
- GITransfer
- g_arg_info_get_ownership_transfer (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->transfer_ownership)
-     return GI_TRANSFER_EVERYTHING;
-@@ -849,8 +863,8 @@ g_arg_info_get_ownership_transfer (GIArgInfo *info)
- GIScopeType
- g_arg_info_get_scope (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->scope;
- }
-@@ -858,8 +872,8 @@ g_arg_info_get_scope (GIArgInfo *info)
- gint
- g_arg_info_get_closure (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->closure;
- }
-@@ -867,32 +881,57 @@ g_arg_info_get_closure (GIArgInfo *info)
- gint
- g_arg_info_get_destroy (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ArgBlob *blob = (ArgBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ArgBlob *blob = (ArgBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->destroy;
- }
- 
-+/**
-+ * g_arg_info_get_type:
-+ * @info: A #GIArgInfo
-+ *
-+ * Returns: (transfer full): Information about the type of argument @info
-+ */
- GITypeInfo *
- g_arg_info_get_type (GIArgInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-  
--  return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
-+  return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type));
-+}
-+
-+/**
-+ * g_arg_info_load_type:
-+ * @info: A #GIArgInfo
-+ * @type: (out caller-allocates): Initialized with information about type of @info
-+ *
-+ * Get information about a the type of given argument @info; this
-+ * function is a variant of g_arg_info_get_type() designed for stack
-+ * allocation.
-+ *
-+ * The initialized @type must not be referenced after @info is deallocated.
-+ */
-+void
-+g_arg_info_load_type (GIArgInfo *info,
-+                      GITypeInfo *type)
-+{
-+  GIRealInfo *rinfo = (GIRealInfo*) info;
-+  g_type_info_init (type, (GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (ArgBlob, arg_type)); 
- }
- 
- /* GITypeInfo functions */
- gboolean
- g_type_info_is_pointer (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (type->flags.reserved == 0 && type->flags.reserved2 == 0)
-     return type->flags.pointer;
-   else
-     {
--      InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+      InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-       
-       return iface->pointer;
-     }
-@@ -901,16 +940,16 @@ g_type_info_is_pointer (GITypeInfo *info)
- GITypeTag
- g_type_info_get_tag (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  if (info->is_embedded)
-+  if (rinfo->type_is_embedded)
-     return GI_TYPE_TAG_INTERFACE;
-   else if (type->flags.reserved == 0 && type->flags.reserved2 == 0)
-     return type->flags.tag;
-   else
-     {
--      InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+      InterfaceTypeBlob *iface = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       return iface->tag;
-     }
-@@ -918,49 +957,58 @@ g_type_info_get_tag (GITypeInfo *info)
- 
- GITypeInfo *
- g_type_info_get_param_type (GITypeInfo *info,
--			    gint       n)
-+                            gint       n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ParamTypeBlob *param = (ParamTypeBlob *)&base->typelib->data[base->offset];
-+      ParamTypeBlob *param = (ParamTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       switch (param->tag)
--	{
--	case GI_TYPE_TAG_ARRAY: 
--	case GI_TYPE_TAG_GLIST:
--	case GI_TYPE_TAG_GSLIST:
--	case GI_TYPE_TAG_GHASH:
--	  return g_type_info_new (base, base->typelib,
--	                          base->offset + sizeof (ParamTypeBlob)
--	                          + sizeof (SimpleTypeBlob) * n);
--	  break;
--	  
--	default: ;
--	}
-+        {
-+          case GI_TYPE_TAG_ARRAY: 
-+          case GI_TYPE_TAG_GLIST:
-+          case GI_TYPE_TAG_GSLIST:
-+          case GI_TYPE_TAG_GHASH:
-+            return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib,
-+                                    rinfo->offset + sizeof (ParamTypeBlob)
-+                                    + sizeof (SimpleTypeBlob) * n);
-+            break;
-+          default:
-+            break;
-+        }
-     }
--      
-+
-   return NULL;
- }
- 
-+/**
-+ * g_type_info_get_interface:
-+ * @info: A #GITypeInfo
-+ *
-+ * For types which have #GI_TYPE_TAG_INTERFACE such as GObjects and boxed values,
-+ * this function returns full information about the referenced type.  You can then
-+ * inspect the type of the returned #GIBaseInfo to further query whether it is
-+ * a concrete GObject, a GInterface, a structure, etc. using g_base_info_get_type().
-+ */
- GIBaseInfo *
- g_type_info_get_interface (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  if (info->is_embedded)
--    return (GIBaseInfo *) g_info_new (type->offset, base, base->typelib,
--				      base->offset);
-+  if (rinfo->type_is_embedded)
-+    return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib,
-+                                      rinfo->offset);
- 
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&base->typelib->data[base->offset];
-+      InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-       
-       if (blob->tag == GI_TYPE_TAG_INTERFACE)
--	return g_info_from_entry (base->repository, base->typelib, blob->interface);
-+        return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
-     }
- 
-   return NULL;
-@@ -969,12 +1017,12 @@ g_type_info_get_interface (GITypeInfo *info)
- gint
- g_type_info_get_array_length (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+      ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       if (blob->tag == GI_TYPE_TAG_ARRAY)
- 	{
-@@ -989,12 +1037,12 @@ g_type_info_get_array_length (GITypeInfo *info)
- gint
- g_type_info_get_array_fixed_size (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+      ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       if (blob->tag == GI_TYPE_TAG_ARRAY)
- 	{
-@@ -1009,12 +1057,12 @@ g_type_info_get_array_fixed_size (GITypeInfo *info)
- gboolean
- g_type_info_is_zero_terminated (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ArrayTypeBlob *blob = (ArrayTypeBlob *)&base->typelib->data[base->offset];
-+      ArrayTypeBlob *blob = (ArrayTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       if (blob->tag == GI_TYPE_TAG_ARRAY)
- 	return blob->zero_terminated;
-@@ -1026,12 +1074,12 @@ g_type_info_is_zero_terminated (GITypeInfo *info)
- gint
- g_type_info_get_n_error_domains (GITypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset];
-+      ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       if (blob->tag == GI_TYPE_TAG_ERROR)
- 	return blob->n_domains;
-@@ -1042,19 +1090,19 @@ g_type_info_get_n_error_domains (GITypeInfo *info)
- 
- GIErrorDomainInfo *
- g_type_info_get_error_domain (GITypeInfo *info,
--			      gint       n)
-+                              gint        n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-     {
--      ErrorTypeBlob *blob = (ErrorTypeBlob *)&base->typelib->data[base->offset];
-+      ErrorTypeBlob *blob = (ErrorTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-       if (blob->tag == GI_TYPE_TAG_ERROR)
--	return (GIErrorDomainInfo *) g_info_from_entry (base->repository,
--							base->typelib,
--							blob->domains[n]);
-+        return (GIErrorDomainInfo *) g_info_from_entry (rinfo->repository,
-+                                                        rinfo->typelib,
-+                                                        blob->domains[n]);
-     }
- 
-   return NULL;
-@@ -1065,20 +1113,20 @@ g_type_info_get_error_domain (GITypeInfo *info,
- const gchar *
- g_error_domain_info_get_quark (GIErrorDomainInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return g_typelib_get_string (base->typelib, blob->get_quark);
-+  return g_typelib_get_string (rinfo->typelib, blob->get_quark);
- }
- 
- GIInterfaceInfo *
- g_error_domain_info_get_codes (GIErrorDomainInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ErrorDomainBlob *blob = (ErrorDomainBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ErrorDomainBlob *blob = (ErrorDomainBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  return (GIInterfaceInfo *) g_info_from_entry (base->repository,
--						base->typelib, blob->error_codes);
-+  return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository,
-+						rinfo->typelib, blob->error_codes);
- }
- 
- 
-@@ -1086,8 +1134,8 @@ g_error_domain_info_get_codes (GIErrorDomainInfo *info)
- glong
- g_value_info_get_value (GIValueInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ValueBlob *blob = (ValueBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ValueBlob *blob = (ValueBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return (glong)blob->value;
- }
-@@ -1098,8 +1146,8 @@ g_field_info_get_flags (GIFieldInfo *info)
- {
-   GIFieldInfoFlags flags;
- 
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   flags = 0;
- 
-@@ -1115,8 +1163,8 @@ g_field_info_get_flags (GIFieldInfo *info)
- gint
- g_field_info_get_size (GIFieldInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->bits;
- }
-@@ -1124,8 +1172,8 @@ g_field_info_get_size (GIFieldInfo *info)
- gint
- g_field_info_get_offset (GIFieldInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->struct_offset;
- }
-@@ -1133,33 +1181,33 @@ g_field_info_get_offset (GIFieldInfo *info)
- GITypeInfo *
- g_field_info_get_type (GIFieldInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
--  FieldBlob *blob = (FieldBlob *)&base->typelib->data[base->offset];
--  GITypeInfo *type_info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  FieldBlob *blob = (FieldBlob *)&rinfo->typelib->data[rinfo->offset];
-+  GIRealInfo *type_info;
- 
-   if (blob->has_embedded_type)
-     {
--      type_info = (GITypeInfo *) g_info_new (GI_INFO_TYPE_TYPE,
--                                             (GIBaseInfo*)info, base->typelib,
--                                             base->offset + header->field_blob_size);
--      type_info->is_embedded = TRUE;
-+      type_info = (GIRealInfo *) g_info_new (GI_INFO_TYPE_TYPE,
-+                                                (GIBaseInfo*)info, rinfo->typelib,
-+                                                rinfo->offset + header->field_blob_size);
-+      type_info->type_is_embedded = TRUE;
-     }
-   else
--    return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (FieldBlob, type));
-+    return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (FieldBlob, type));
- 
--  return type_info;
-+  return (GIBaseInfo*)type_info;
- }
- 
- /* GIRegisteredTypeInfo functions */
- const gchar *
- g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->gtype_name)
--    return g_typelib_get_string (base->typelib, blob->gtype_name);
-+    return g_typelib_get_string (rinfo->typelib, blob->gtype_name);
- 
-   return NULL;
- }
-@@ -1167,11 +1215,11 @@ g_registered_type_info_get_type_name (GIRegisteredTypeInfo *info)
- const gchar *
- g_registered_type_info_get_type_init (GIRegisteredTypeInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  RegisteredTypeBlob *blob = (RegisteredTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->gtype_init)
--    return g_typelib_get_string (base->typelib, blob->gtype_init);
-+    return g_typelib_get_string (rinfo->typelib, blob->gtype_init);
- 
-   return NULL;
- }
-@@ -1181,6 +1229,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
- {
-   const char *type_init;
-   GType (* get_type_func) (void);
-+  GIRealInfo *rinfo = (GIRealInfo*)info;
- 
-   type_init = g_registered_type_info_get_type_init (info);  
-   
-@@ -1190,7 +1239,7 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
-     return G_TYPE_OBJECT;
-   
-   get_type_func = NULL;
--  if (!g_typelib_symbol (((GIBaseInfo*)info)->typelib,
-+  if (!g_typelib_symbol (rinfo->typelib,
-                          type_init,
-                          (void**) &get_type_func))
-     return G_TYPE_NONE;
-@@ -1202,8 +1251,8 @@ g_registered_type_info_get_g_type (GIRegisteredTypeInfo *info)
- gint
- g_struct_info_get_n_fields (GIStructInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_fields;
- }
-@@ -1212,15 +1261,15 @@ static gint32
- g_struct_get_field_offset (GIStructInfo *info,
- 			   gint         n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
--  guint32 offset = base->offset + header->struct_blob_size;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  guint32 offset = rinfo->offset + header->struct_blob_size;
-   gint i;
-   FieldBlob *field_blob;
- 
-   for (i = 0; i < n; i++)
-     {
--      field_blob = (FieldBlob *)&base->typelib->data[offset];
-+      field_blob = (FieldBlob *)&rinfo->typelib->data[offset];
-       offset += header->field_blob_size;
-       if (field_blob->has_embedded_type)
-         offset += header->callback_blob_size;
-@@ -1231,19 +1280,19 @@ g_struct_get_field_offset (GIStructInfo *info,
- 
- GIFieldInfo *
- g_struct_info_get_field (GIStructInfo *info,
--			 gint         n)
-+                         gint          n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-  
--  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, 
--				     g_struct_get_field_offset (info, n));
-+  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, 
-+                                     g_struct_get_field_offset (info, n));
- }
- 
- gint
- g_struct_info_get_n_methods (GIStructInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_methods;
- }
-@@ -1252,35 +1301,35 @@ GIFunctionInfo *
- g_struct_info_get_method (GIStructInfo *info,
- 			  gint         n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
--  Header *header = (Header *)base->typelib->data;  
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
-+  Header *header = (Header *)rinfo->typelib->data;  
-   gint offset;
- 
--  offset = g_struct_get_field_offset (info, blob->n_fields)
--    + n * header->function_blob_size;
--  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
--					base->typelib, offset);
-+  offset = g_struct_get_field_offset (info, blob->n_fields) + n * header->function_blob_size;
-+  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, 
-+                                        rinfo->typelib, offset);
- }
- 
- static GIFunctionInfo *
- find_method (GIBaseInfo   *base,
--	     guint32       offset,
--	     gint          n_methods,
--	     const gchar  *name)
-+             guint32       offset,
-+             gint          n_methods,
-+             const gchar  *name)
- {
-   /* FIXME hash */
--  Header *header = (Header *)base->typelib->data;  
-+  GIRealInfo *rinfo = (GIRealInfo*)base;
-+  Header *header = (Header *)rinfo->typelib->data;  
-   gint i;
- 
-   for (i = 0; i < n_methods; i++)
-     {
--      FunctionBlob *fblob = (FunctionBlob *)&base->typelib->data[offset];
--      const gchar *fname = (const gchar *)&base->typelib->data[fblob->name];
-+      FunctionBlob *fblob = (FunctionBlob *)&rinfo->typelib->data[offset];
-+      const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name];
- 
-       if (strcmp (name, fname) == 0)
--	return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
--					      base->typelib, offset);  
-+        return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
-+	                        			      rinfo->typelib, offset);  
-       
-       offset += header->function_blob_size;
-     }
-@@ -1293,21 +1342,21 @@ g_struct_info_find_method (GIStructInfo *info,
- 			   const gchar  *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->struct_blob_size
-+  offset = rinfo->offset + header->struct_blob_size
-     + blob->n_fields * header->field_blob_size;
- 
--  return find_method (base, offset, blob->n_methods, name);
-+  return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
- 
- gsize
- g_struct_info_get_size (GIStructInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->size;
- }
-@@ -1315,8 +1364,8 @@ g_struct_info_get_size (GIStructInfo *info)
- gsize
- g_struct_info_get_alignment (GIStructInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->alignment;
- }
-@@ -1334,8 +1383,8 @@ g_struct_info_get_alignment (GIStructInfo *info)
- gboolean
- g_struct_info_is_gtype_struct (GIStructInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  StructBlob *blob = (StructBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  StructBlob *blob = (StructBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->is_gtype_struct;
- }
-@@ -1343,8 +1392,8 @@ g_struct_info_is_gtype_struct (GIStructInfo *info)
- gint
- g_enum_info_get_n_values (GIEnumInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_values;
- }
-@@ -1353,13 +1402,13 @@ GIValueInfo *
- g_enum_info_get_value (GIEnumInfo *info,
- 		       gint            n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-   gint offset;
- 
--  offset = base->offset + header->enum_blob_size 
-+  offset = rinfo->offset + header->enum_blob_size 
-     + n * header->value_blob_size;
--  return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, base, base->typelib, offset);
-+  return (GIValueInfo *) g_info_new (GI_INFO_TYPE_VALUE, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
- 
- /**
-@@ -1378,8 +1427,8 @@ g_enum_info_get_value (GIEnumInfo *info,
- GITypeTag
- g_enum_info_get_storage_type (GIEnumInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  EnumBlob *blob = (EnumBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  EnumBlob *blob = (EnumBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->storage_type;
- }
-@@ -1388,12 +1437,12 @@ g_enum_info_get_storage_type (GIEnumInfo *info)
- GIObjectInfo *
- g_object_info_get_parent (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->parent)
--    return (GIObjectInfo *) g_info_from_entry (base->repository,
--					       base->typelib, blob->parent);
-+    return (GIObjectInfo *) g_info_from_entry (rinfo->repository,
-+					       rinfo->typelib, blob->parent);
-   else
-     return NULL;
- }
-@@ -1401,34 +1450,34 @@ g_object_info_get_parent (GIObjectInfo *info)
- gboolean
- g_object_info_get_abstract (GIObjectInfo    *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   return blob->abstract != 0;
- }
- 
- const gchar *
- g_object_info_get_type_name (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return g_typelib_get_string (base->typelib, blob->gtype_name);
-+  return g_typelib_get_string (rinfo->typelib, blob->gtype_name);
- }
- 
- const gchar *
- g_object_info_get_type_init (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return g_typelib_get_string (base->typelib, blob->gtype_init);
-+  return g_typelib_get_string (rinfo->typelib, blob->gtype_init);
- }
- 
- gint
- g_object_info_get_n_interfaces (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_interfaces;
- }
-@@ -1437,18 +1486,18 @@ GIInterfaceInfo *
- g_object_info_get_interface (GIObjectInfo *info,
- 			     gint          n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return (GIInterfaceInfo *) g_info_from_entry (base->repository,
--						base->typelib, blob->interfaces[n]);
-+  return (GIInterfaceInfo *) g_info_from_entry (rinfo->repository,
-+						rinfo->typelib, blob->interfaces[n]);
- }
- 
- gint
- g_object_info_get_n_fields (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_fields;
- }
-@@ -1458,22 +1507,22 @@ g_object_info_get_field (GIObjectInfo *info,
- 			 gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + n * header->field_blob_size;
-   
--  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, offset);
-+  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, offset);
- }
- 
- gint
- g_object_info_get_n_properties (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_properties;  
- }
-@@ -1483,24 +1532,24 @@ g_object_info_get_property (GIObjectInfo *info,
- 			    gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + n * header->property_blob_size;
- 
--  return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, 
--					base->typelib, offset);
-+  return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);
- }
- 
- gint
- g_object_info_get_n_methods (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_methods;
- }
-@@ -1510,18 +1559,18 @@ g_object_info_get_method (GIObjectInfo *info,
- 			  gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + blob->n_properties * header->property_blob_size
-     + n * header->function_blob_size;
- 
--    return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
--					  base->typelib, offset);  
-+    return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, 
-+					  rinfo->typelib, offset);  
- }
- 
- GIFunctionInfo *
-@@ -1529,23 +1578,23 @@ g_object_info_find_method (GIObjectInfo *info,
- 			   const gchar  *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size +
-     + blob->n_properties * header->property_blob_size;
- 
--  return find_method (base, offset, blob->n_methods, name);
-+  return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
- 
- gint
- g_object_info_get_n_signals (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_signals;
- }
-@@ -1555,26 +1604,26 @@ g_object_info_get_signal (GIObjectInfo *info,
- 			  gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + blob->n_properties * header->property_blob_size
-     + blob->n_methods * header->function_blob_size 
-     + n * header->signal_blob_size;
- 
--  return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, 
--				      base->typelib, offset);  
-+  return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, 
-+				      rinfo->typelib, offset);  
- }
- 
- gint
- g_object_info_get_n_vfuncs (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_vfuncs;
- }
-@@ -1584,11 +1633,11 @@ g_object_info_get_vfunc (GIObjectInfo *info,
- 			 gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + blob->n_properties * header->property_blob_size
-@@ -1596,28 +1645,28 @@ g_object_info_get_vfunc (GIObjectInfo *info,
-     + blob->n_signals * header->signal_blob_size 
-     + n * header->vfunc_blob_size;
- 
--  return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, 
--				     base->typelib, offset);  
-+  return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, 
-+				     rinfo->typelib, offset);  
- }
- 
- static GIVFuncInfo *
--find_vfunc (GIBaseInfo   *base,
-+find_vfunc (GIRealInfo   *rinfo,
-             guint32       offset,
-             gint          n_vfuncs,
-             const gchar  *name)
- {
-   /* FIXME hash */
--  Header *header = (Header *)base->typelib->data;
-+  Header *header = (Header *)rinfo->typelib->data;
-   gint i;
- 
-   for (i = 0; i < n_vfuncs; i++)
-     {
--      VFuncBlob *fblob = (VFuncBlob *)&base->typelib->data[offset];
--      const gchar *fname = (const gchar *)&base->typelib->data[fblob->name];
-+      VFuncBlob *fblob = (VFuncBlob *)&rinfo->typelib->data[offset];
-+      const gchar *fname = (const gchar *)&rinfo->typelib->data[fblob->name];
- 
-       if (strcmp (name, fname) == 0)
--        return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base,
--                                           base->typelib, offset);
-+        return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*) rinfo,
-+                                           rinfo->typelib, offset);
- 
-       offset += header->vfunc_blob_size;
-     }
-@@ -1643,25 +1692,25 @@ g_object_info_find_vfunc (GIObjectInfo *info,
-                           const gchar  *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + blob->n_properties * header->property_blob_size
-     + blob->n_methods * header->function_blob_size
-     + blob->n_signals * header->signal_blob_size;
- 
--  return find_vfunc (base, offset, blob->n_vfuncs, name);
-+  return find_vfunc (rinfo, offset, blob->n_vfuncs, name);
- }
- 
- gint
- g_object_info_get_n_constants (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_constants;
- }
-@@ -1671,11 +1720,11 @@ g_object_info_get_constant (GIObjectInfo *info,
- 			    gint          n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->object_blob_size
-+  offset = rinfo->offset + header->object_blob_size
-     + (blob->n_interfaces + blob->n_interfaces % 2) * 2
-     + blob->n_fields * header->field_blob_size
-     + blob->n_properties * header->property_blob_size
-@@ -1684,8 +1733,8 @@ g_object_info_get_constant (GIObjectInfo *info,
-     + blob->n_vfuncs * header->vfunc_blob_size 
-     + n * header->constant_blob_size;
- 
--  return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, 
--					base->typelib, offset);  
-+  return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);  
- }
- 
- /**
-@@ -1700,12 +1749,12 @@ g_object_info_get_constant (GIObjectInfo *info,
- GIStructInfo *
- g_object_info_get_class_struct (GIObjectInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ObjectBlob *blob = (ObjectBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ObjectBlob *blob = (ObjectBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->gtype_struct)
--    return (GIStructInfo *) g_info_from_entry (base->repository,
--                                               base->typelib, blob->gtype_struct);
-+    return (GIStructInfo *) g_info_from_entry (rinfo->repository,
-+                                               rinfo->typelib, blob->gtype_struct);
-   else
-     return NULL;
- }
-@@ -1714,8 +1763,8 @@ g_object_info_get_class_struct (GIObjectInfo *info)
- gint
- g_interface_info_get_n_prerequisites (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_prerequisites;
- }
-@@ -1724,19 +1773,19 @@ GIBaseInfo *
- g_interface_info_get_prerequisite (GIInterfaceInfo *info,
- 				   gint            n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  return g_info_from_entry (base->repository,
--			    base->typelib, blob->prerequisites[n]);
-+  return g_info_from_entry (rinfo->repository,
-+			    rinfo->typelib, blob->prerequisites[n]);
- }
- 
- 
- gint
- g_interface_info_get_n_properties (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_properties;  
- }
-@@ -1746,23 +1795,23 @@ g_interface_info_get_property (GIInterfaceInfo *info,
- 			       gint            n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->interface_blob_size
-+  offset = rinfo->offset + header->interface_blob_size
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + n * header->property_blob_size;
- 
--  return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, base, 
--					base->typelib, offset);
-+  return (GIPropertyInfo *) g_info_new (GI_INFO_TYPE_PROPERTY, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);
- }
- 
- gint
- g_interface_info_get_n_methods (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_methods;
- }
-@@ -1772,17 +1821,17 @@ g_interface_info_get_method (GIInterfaceInfo *info,
- 			     gint            n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->interface_blob_size
-+  offset = rinfo->offset + header->interface_blob_size
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + blob->n_properties * header->property_blob_size 
-     + n * header->function_blob_size;
-   
--  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
--					base->typelib, offset);  
-+  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);  
- }
- 
- GIFunctionInfo *
-@@ -1790,22 +1839,22 @@ g_interface_info_find_method (GIInterfaceInfo *info,
- 			      const gchar     *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->interface_blob_size
-+  offset = rinfo->offset + header->interface_blob_size
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + blob->n_properties * header->property_blob_size;
- 
--  return find_method (base, offset, blob->n_methods, name);
-+  return find_method ((GIBaseInfo*)info, offset, blob->n_methods, name);
- }
- 
- gint
- g_interface_info_get_n_signals (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_signals;
- }
-@@ -1815,25 +1864,25 @@ g_interface_info_get_signal (GIInterfaceInfo *info,
- 			     gint            n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->interface_blob_size 
-+  offset = rinfo->offset + header->interface_blob_size 
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + blob->n_properties * header->property_blob_size 
-     + blob->n_methods * header->function_blob_size 
-     + n * header->signal_blob_size;
-   
--  return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, base, 
--				      base->typelib, offset);  
-+  return (GISignalInfo *) g_info_new (GI_INFO_TYPE_SIGNAL, (GIBaseInfo*)info, 
-+				      rinfo->typelib, offset);  
- }
- 
- gint
- g_interface_info_get_n_vfuncs (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->n_vfuncs;
- }
-@@ -1843,19 +1892,19 @@ g_interface_info_get_vfunc (GIInterfaceInfo *info,
- 			    gint            n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->interface_blob_size 
-+  offset = rinfo->offset + header->interface_blob_size 
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + blob->n_properties * header->property_blob_size 
-     + blob->n_methods * header->function_blob_size 
-     + blob->n_signals * header->signal_blob_size
-     + n * header->vfunc_blob_size;
-   
--  return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, base, 
--				     base->typelib, offset);  
-+  return (GIVFuncInfo *) g_info_new (GI_INFO_TYPE_VFUNC, (GIBaseInfo*)info, 
-+				     rinfo->typelib, offset);  
- }
- 
- /**
-@@ -1873,24 +1922,24 @@ g_interface_info_find_vfunc (GIInterfaceInfo *info,
-                              const gchar  *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->interface_blob_size
-+  offset = rinfo->offset + header->interface_blob_size
-     + (blob->n_prerequisites + blob->n_prerequisites % 2) * 2
-     + blob->n_properties * header->property_blob_size
-     + blob->n_methods * header->function_blob_size
-     + blob->n_signals * header->signal_blob_size;
- 
--  return find_vfunc (base, offset, blob->n_vfuncs, name);
-+  return find_vfunc (rinfo, offset, blob->n_vfuncs, name);
- }
- 
- gint
- g_interface_info_get_n_constants (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_constants;
- }
-@@ -1900,11 +1949,11 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
- 			       gint             n)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
-   
--  offset = base->offset + header->interface_blob_size
-+  offset = rinfo->offset + header->interface_blob_size
-     + (blob->n_prerequisites + (blob->n_prerequisites % 2)) * 2
-     + blob->n_properties * header->property_blob_size
-     + blob->n_methods * header->function_blob_size 
-@@ -1912,8 +1961,8 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
-     + blob->n_vfuncs * header->vfunc_blob_size 
-     + n * header->constant_blob_size;
- 
--  return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, 
--					base->typelib, offset);  
-+  return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);  
- }
- 
- /**
-@@ -1927,12 +1976,12 @@ g_interface_info_get_constant (GIInterfaceInfo *info,
- GIStructInfo *
- g_interface_info_get_iface_struct (GIInterfaceInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  InterfaceBlob *blob = (InterfaceBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  InterfaceBlob *blob = (InterfaceBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->gtype_struct)
--    return (GIStructInfo *) g_info_from_entry (base->repository,
--                                               base->typelib, blob->gtype_struct);
-+    return (GIStructInfo *) g_info_from_entry (rinfo->repository,
-+                                               rinfo->typelib, blob->gtype_struct);
-   else
-     return NULL;
- }
-@@ -1942,8 +1991,8 @@ GParamFlags
- g_property_info_get_flags (GIPropertyInfo *info)
- {
-   GParamFlags flags;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  PropertyBlob *blob = (PropertyBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  PropertyBlob *blob = (PropertyBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   flags = 0;
- 
-@@ -1965,9 +2014,9 @@ g_property_info_get_flags (GIPropertyInfo *info)
- GITypeInfo *
- g_property_info_get_type (GIPropertyInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
- 
--  return g_type_info_new (base, base->typelib, base->offset + G_STRUCT_OFFSET (PropertyBlob, type));
-+  return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + G_STRUCT_OFFSET (PropertyBlob, type));
- }
- 
- 
-@@ -1977,8 +2026,8 @@ g_signal_info_get_flags (GISignalInfo *info)
- {
-   GSignalFlags flags;
- 
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   flags = 0;
- 
-@@ -2009,11 +2058,11 @@ g_signal_info_get_flags (GISignalInfo *info)
- GIVFuncInfo *
- g_signal_info_get_class_closure (GISignalInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->has_class_closure)
--    return g_interface_info_get_vfunc ((GIInterfaceInfo *)base->container, blob->class_closure);
-+    return g_interface_info_get_vfunc ((GIInterfaceInfo *)rinfo->container, blob->class_closure);
- 
-   return NULL;
- }
-@@ -2021,8 +2070,8 @@ g_signal_info_get_class_closure (GISignalInfo *info)
- gboolean
- g_signal_info_true_stops_emit (GISignalInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  SignalBlob *blob = (SignalBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  SignalBlob *blob = (SignalBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->true_stops_emit;
- }
-@@ -2033,8 +2082,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info)
- {
-   GIVFuncInfoFlags flags;
- 
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   flags = 0;
- 
-@@ -2053,8 +2102,8 @@ g_vfunc_info_get_flags (GIVFuncInfo *info)
- gint
- g_vfunc_info_get_offset (GIVFuncInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->struct_offset;
- }
-@@ -2062,11 +2111,11 @@ g_vfunc_info_get_offset (GIVFuncInfo *info)
- GISignalInfo *
- g_vfunc_info_get_signal (GIVFuncInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   if (blob->class_closure)
--    return g_interface_info_get_signal ((GIInterfaceInfo *)base->container, blob->signal);
-+    return g_interface_info_get_signal ((GIInterfaceInfo *)rinfo->container, blob->signal);
-   
-   return NULL;
- }
-@@ -2085,9 +2134,9 @@ g_vfunc_info_get_signal (GIVFuncInfo *info)
- GIFunctionInfo *
- g_vfunc_info_get_invoker (GIVFuncInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  VFuncBlob *blob = (VFuncBlob *)&base->typelib->data[base->offset];
--  GIBaseInfo *container = base->container;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  VFuncBlob *blob = (VFuncBlob *)&rinfo->typelib->data[rinfo->offset];
-+  GIBaseInfo *container = rinfo->container;
-   GIInfoType parent_type;
- 
-   /* 1023 = 0x3ff is the maximum of the 10 bits for invoker index */
-@@ -2107,80 +2156,80 @@ g_vfunc_info_get_invoker (GIVFuncInfo *info)
- GITypeInfo *
- g_constant_info_get_type (GIConstantInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-   
--  return g_type_info_new (base, base->typelib, base->offset + 8);
-+  return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 8);
- }
- 
- gint
- g_constant_info_get_value (GIConstantInfo *info, 
- 			   GArgument      *value)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  ConstantBlob *blob = (ConstantBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  ConstantBlob *blob = (ConstantBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   /* FIXME non-basic types ? */
-   if (blob->type.flags.reserved == 0 && blob->type.flags.reserved2 == 0)
-     {
-       if (blob->type.flags.pointer)
--	value->v_pointer = g_memdup (&base->typelib->data[blob->offset], blob->size);
-+	value->v_pointer = g_memdup (&rinfo->typelib->data[blob->offset], blob->size);
-       else
- 	{
- 	  switch (blob->type.flags.tag)
- 	    {
- 	    case GI_TYPE_TAG_BOOLEAN:
--	      value->v_boolean = *(gboolean*)&base->typelib->data[blob->offset];
-+	      value->v_boolean = *(gboolean*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT8:
--	      value->v_int8 = *(gint8*)&base->typelib->data[blob->offset];
-+	      value->v_int8 = *(gint8*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_UINT8:
--	      value->v_uint8 = *(guint8*)&base->typelib->data[blob->offset];
-+	      value->v_uint8 = *(guint8*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT16:
--	      value->v_int16 = *(gint16*)&base->typelib->data[blob->offset];
-+	      value->v_int16 = *(gint16*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_UINT16:
--	      value->v_uint16 = *(guint16*)&base->typelib->data[blob->offset];
-+	      value->v_uint16 = *(guint16*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT32:
--	      value->v_int32 = *(gint32*)&base->typelib->data[blob->offset];
-+	      value->v_int32 = *(gint32*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_UINT32:
--	      value->v_uint32 = *(guint32*)&base->typelib->data[blob->offset];
-+	      value->v_uint32 = *(guint32*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT64:
--	      value->v_int64 = *(gint64*)&base->typelib->data[blob->offset];
-+	      value->v_int64 = *(gint64*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_UINT64:
--	      value->v_uint64 = *(guint64*)&base->typelib->data[blob->offset];
-+	      value->v_uint64 = *(guint64*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_FLOAT:
--	      value->v_float = *(gfloat*)&base->typelib->data[blob->offset];
-+	      value->v_float = *(gfloat*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_DOUBLE:
--	      value->v_double = *(gdouble*)&base->typelib->data[blob->offset];
-+	      value->v_double = *(gdouble*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_TIME_T:
--	      value->v_long = *(long*)&base->typelib->data[blob->offset];
-+	      value->v_long = *(long*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_SHORT:
--	      value->v_short = *(gshort*)&base->typelib->data[blob->offset];
-+	      value->v_short = *(gshort*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_USHORT:
--	      value->v_ushort = *(gushort*)&base->typelib->data[blob->offset];
-+	      value->v_ushort = *(gushort*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_INT:
--	      value->v_int = *(gint*)&base->typelib->data[blob->offset];
-+	      value->v_int = *(gint*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_UINT:
--	      value->v_uint = *(guint*)&base->typelib->data[blob->offset];
-+	      value->v_uint = *(guint*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_LONG:
--	      value->v_long = *(glong*)&base->typelib->data[blob->offset];
-+	      value->v_long = *(glong*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    case GI_TYPE_TAG_ULONG:
--	      value->v_ulong = *(gulong*)&base->typelib->data[blob->offset];
-+	      value->v_ulong = *(gulong*)&rinfo->typelib->data[blob->offset];
- 	      break;
- 	    }
- 	}
-@@ -2193,8 +2242,8 @@ g_constant_info_get_value (GIConstantInfo *info,
- gint
- g_union_info_get_n_fields  (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_fields;
- }
-@@ -2203,19 +2252,19 @@ GIFieldInfo *
- g_union_info_get_field (GIUnionInfo *info,
- 			gint         n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;  
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;  
-  
--  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, base, base->typelib, 
--				     base->offset + header->union_blob_size + 
-+  return (GIFieldInfo *) g_info_new (GI_INFO_TYPE_FIELD, (GIBaseInfo*)info, rinfo->typelib, 
-+				     rinfo->offset + header->union_blob_size + 
- 				     n * header->field_blob_size);
- }
- 
- gint
- g_union_info_get_n_methods (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->n_functions;
- }
-@@ -2224,23 +2273,23 @@ GIFunctionInfo *
- g_union_info_get_method (GIUnionInfo *info,
- 			 gint         n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
--  Header *header = (Header *)base->typelib->data;  
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-+  Header *header = (Header *)rinfo->typelib->data;  
-   gint offset;
- 
--  offset = base->offset + header->union_blob_size 
-+  offset = rinfo->offset + header->union_blob_size 
-     + blob->n_fields * header->field_blob_size 
-     + n * header->function_blob_size;
--  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, base, 
--					base->typelib, offset);
-+  return (GIFunctionInfo *) g_info_new (GI_INFO_TYPE_FUNCTION, (GIBaseInfo*)info, 
-+					rinfo->typelib, offset);
- }
- 
- gboolean
- g_union_info_is_discriminated (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->discriminated;
- }
-@@ -2248,8 +2297,8 @@ g_union_info_is_discriminated (GIUnionInfo *info)
- gint
- g_union_info_get_discriminator_offset (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   return blob->discriminator_offset;
- }
-@@ -2257,30 +2306,30 @@ g_union_info_get_discriminator_offset (GIUnionInfo *info)
- GITypeInfo *
- g_union_info_get_discriminator_type (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-  
--  return g_type_info_new (base, base->typelib, base->offset + 24);
-+  return g_type_info_new ((GIBaseInfo*)info, rinfo->typelib, rinfo->offset + 24);
- }
- 
- GIConstantInfo *
- g_union_info_get_discriminator (GIUnionInfo *info,
- 				gint         n)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
-   
-   if (blob->discriminated)
-     {
--      Header *header = (Header *)base->typelib->data;  
-+      Header *header = (Header *)rinfo->typelib->data;  
-       gint offset;
- 
--      offset = base->offset + header->union_blob_size 
-+      offset = rinfo->offset + header->union_blob_size 
- 	+ blob->n_fields * header->field_blob_size 
- 	+ blob->n_functions * header->function_blob_size
- 	+ n * header->constant_blob_size;
-       
--      return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, base, 
--					    base->typelib, offset);  
-+      return (GIConstantInfo *) g_info_new (GI_INFO_TYPE_CONSTANT, (GIBaseInfo*)info, 
-+					    rinfo->typelib, offset);  
-     }
- 
-   return NULL;
-@@ -2291,21 +2340,21 @@ g_union_info_find_method (GIUnionInfo *info,
-                           const gchar *name)
- {
-   gint offset;
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  Header *header = (Header *)base->typelib->data;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  Header *header = (Header *)rinfo->typelib->data;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
- 
--  offset = base->offset + header->union_blob_size
-+  offset = rinfo->offset + header->union_blob_size
-     + blob->n_fields * header->field_blob_size;
- 
--  return find_method (base, offset, blob->n_functions, name);
-+  return find_method ((GIBaseInfo*)info, offset, blob->n_functions, name);
- }
- 
- gsize
- g_union_info_get_size (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->size;
- }
-@@ -2313,8 +2362,8 @@ g_union_info_get_size (GIUnionInfo *info)
- gsize
- g_union_info_get_alignment (GIUnionInfo *info)
- {
--  GIBaseInfo *base = (GIBaseInfo *)info;
--  UnionBlob *blob = (UnionBlob *)&base->typelib->data[base->offset];
-+  GIRealInfo *rinfo = (GIRealInfo *)info;
-+  UnionBlob *blob = (UnionBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-   return blob->alignment;
- }
-diff --git a/girepository/girepository.h b/girepository/girepository.h
-index c30418a..93cf126 100644
---- girepository/girepository.h
-+++ girepository/girepository.h
-@@ -27,37 +27,55 @@
- 
- G_BEGIN_DECLS
- 
--#define G_TYPE_IREPOSITORY      (g_irepository_get_type ())
--#define G_IREPOSITORY(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_IREPOSITORY, GIRepository))
-+#define G_TYPE_IREPOSITORY              (g_irepository_get_type ())
-+#define G_IREPOSITORY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), G_TYPE_IREPOSITORY, GIRepository))
-+#define G_IREPOSITORY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_IREPOSITORY, GIRepositoryClass))
-+#define G_IS_IREPOSITORY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), G_TYPE_IREPOSITORY))
-+#define G_IS_IREPOSITORY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_IREPOSITORY))
-+#define G_IREPOSITORY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_IREPOSITORY, GIRepositoryClass))
- 
- typedef struct _GIRepository         GIRepository; 
- typedef struct _GIRepositoryClass    GIRepositoryClass; 
- typedef struct _GIRepositoryPrivate  GIRepositoryPrivate; 
--typedef struct _GIBaseInfo           GIBaseInfo;
--typedef struct _GICallableInfo       GICallableInfo;
--typedef struct _GIFunctionInfo       GIFunctionInfo;
--typedef struct _GICallbackInfo       GICallbackInfo;
--typedef struct _GIRegisteredTypeInfo GIRegisteredTypeInfo;
--typedef struct _GIStructInfo         GIStructInfo;
--typedef struct _GIUnionInfo          GIUnionInfo;
--typedef struct _GIEnumInfo           GIEnumInfo;
--typedef struct _GIObjectInfo         GIObjectInfo;
--typedef struct _GIInterfaceInfo      GIInterfaceInfo;
--typedef struct _GIConstantInfo       GIConstantInfo;
--typedef struct _GIValueInfo          GIValueInfo;
--typedef struct _GISignalInfo         GISignalInfo;
--typedef struct _GIVFuncInfo          GIVFuncInfo;
--typedef struct _GIPropertyInfo       GIPropertyInfo;
--typedef struct _GIFieldInfo          GIFieldInfo;
--typedef struct _GIArgInfo            GIArgInfo;
--typedef struct _GITypeInfo           GITypeInfo;
--typedef struct _GIErrorDomainInfo    GIErrorDomainInfo;
-+
-+typedef struct _GIBaseInfoStub       GIBaseInfo;
-+
-+struct _GIBaseInfoStub {
-+  gint32 dummy1;
-+  gint32 dummy2;
-+  gpointer dummy3;
-+  gpointer dummy4;
-+  gpointer dummy5;
-+  guint32  dummy6;
-+  guint32  dummy7;
-+  gpointer padding[4];
-+};
-+
-+typedef GIBaseInfo GICallableInfo;
-+typedef GIBaseInfo GIFunctionInfo;
-+typedef GIBaseInfo GICallbackInfo;
-+typedef GIBaseInfo GIRegisteredTypeInfo;
-+typedef GIBaseInfo GIStructInfo;
-+typedef GIBaseInfo GIUnionInfo;
-+typedef GIBaseInfo GIEnumInfo;
-+typedef GIBaseInfo GIObjectInfo;
-+typedef GIBaseInfo GIInterfaceInfo;
-+typedef GIBaseInfo GIConstantInfo;
-+typedef GIBaseInfo GIValueInfo;
-+typedef GIBaseInfo GISignalInfo;
-+typedef GIBaseInfo GIVFuncInfo;
-+typedef GIBaseInfo GIPropertyInfo;
-+typedef GIBaseInfo GIFieldInfo;
-+typedef GIBaseInfo GIArgInfo;
-+typedef GIBaseInfo GITypeInfo;
-+typedef GIBaseInfo GIErrorDomainInfo;
-+
- typedef struct _GIUnresolvedInfo     GIUnresolvedInfo;
- typedef struct _GTypelib            GTypelib;
- 
- struct _GIRepository 
- { 
--  GObject parent; 
-+  GObject parent;
- 
-   /*< private >*/
-   GIRepositoryPrivate *priv;
-@@ -282,11 +300,16 @@ typedef enum {
- } GITransfer;
- 
- GITypeInfo *           g_callable_info_get_return_type (GICallableInfo *info);
-+void                   g_callable_info_load_return_type (GICallableInfo *info,
-+                                                         GITypeInfo     *type);
- GITransfer             g_callable_info_get_caller_owns (GICallableInfo *info);
- gboolean               g_callable_info_may_return_null (GICallableInfo *info);
- gint                   g_callable_info_get_n_args      (GICallableInfo *info);
- GIArgInfo *            g_callable_info_get_arg         (GICallableInfo *info,
--							gint           n);
-+                                                        gint            n);
-+void                   g_callable_info_load_arg        (GICallableInfo *info,
-+                                                        gint            n,
-+                                                        GIArgInfo      *arg);
- 
- /* GIArgInfo */
- 
-@@ -317,6 +340,8 @@ GIScopeType            g_arg_info_get_scope              (GIArgInfo *info);
- gint                   g_arg_info_get_closure            (GIArgInfo *info);
- gint                   g_arg_info_get_destroy            (GIArgInfo *info);
- GITypeInfo *           g_arg_info_get_type               (GIArgInfo *info);
-+void                   g_arg_info_load_type              (GIArgInfo *info,
-+                                                          GITypeInfo *type);
- 
- 
- /* GITypeInfo */
---
-cgit v0.8.3.1
diff --git a/devel/gobject-introspection/files/patch-20100107 b/devel/gobject-introspection/files/patch-20100107
deleted file mode 100644
index 570d2c7c7591..000000000000
--- a/devel/gobject-introspection/files/patch-20100107
+++ /dev/null
@@ -1,66 +0,0 @@
-From e7b9f873f0152136af60753598077156e7ae1545 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 07 Jan 2010 21:12:15 +0000
-Subject: Correctly cast to a CommonBlob when looking up embedded types
-
-When looking at an embedded type (e.g. a Callback after a Field), the
-offset we put in the info structure was to the CallbackBlob itself.
-
-However the code in g_type_info_get_interface assumed that the offset
-was to a SimpleTypeBlob, which it wasn't.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=606180
----
-diff --git a/girepository/ginfo.c b/girepository/ginfo.c
-index b11cc8f..ed2fc93 100644
---- girepository/ginfo.c
-+++ girepository/ginfo.c
-@@ -997,18 +997,38 @@ GIBaseInfo *
- g_type_info_get_interface (GITypeInfo *info)
- {
-   GIRealInfo *rinfo = (GIRealInfo *)info;
--  SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
- 
-+  /* For embedded types, the given offset is a pointer to the actual blob,
-+   * after the end of the field.  In that case we know it's a "subclass" of
-+   * CommonBlob, so use that to determine the info type.
-+   */
-   if (rinfo->type_is_embedded)
--    return (GIBaseInfo *) g_info_new (type->offset, (GIBaseInfo*)info, rinfo->typelib,
--                                      rinfo->offset);
-+    {
-+      CommonBlob *common = (CommonBlob *)&rinfo->typelib->data[rinfo->offset];
-+      GIInfoType info_type;
- 
--  if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-+      switch (common->blob_type)
-+        {
-+          case BLOB_TYPE_CALLBACK:
-+            info_type = GI_INFO_TYPE_CALLBACK;
-+            break;
-+          default:
-+            g_assert_not_reached ();
-+            return NULL;
-+        }
-+      return (GIBaseInfo *) g_info_new (info_type, (GIBaseInfo*)info, rinfo->typelib,
-+                                        rinfo->offset);
-+    }
-+  else
-     {
--      InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
--      
--      if (blob->tag == GI_TYPE_TAG_INTERFACE)
--        return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
-+      SimpleTypeBlob *type = (SimpleTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-+      if (!(type->flags.reserved == 0 && type->flags.reserved2 == 0))
-+        {
-+          InterfaceTypeBlob *blob = (InterfaceTypeBlob *)&rinfo->typelib->data[rinfo->offset];
-+
-+          if (blob->tag == GI_TYPE_TAG_INTERFACE)
-+            return g_info_from_entry (rinfo->repository, rinfo->typelib, blob->interface);
-+        }
-     }
- 
-   return NULL;
---
-cgit v0.8.3.1
diff --git a/devel/gobject-introspection/files/patch-gir_Makefile.in b/devel/gobject-introspection/files/patch-gir_Makefile.in
index cf8ce2b3d94f..9e9ef5b8c9bd 100644
--- a/devel/gobject-introspection/files/patch-gir_Makefile.in
+++ b/devel/gobject-introspection/files/patch-gir_Makefile.in
@@ -1,11 +1,12 @@
---- gir/Makefile.in.orig	2009-12-18 18:25:43.000000000 +0100
-+++ gir/Makefile.in	2009-12-18 18:25:54.000000000 +0100
-@@ -359,13 +359,12 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure 
+--- gir/Makefile.in.orig	2010-03-10 17:14:45.000000000 +0000
++++ gir/Makefile.in	2010-03-10 17:17:53.000000000 +0000
+@@ -400,14 +400,13 @@ GLib_2_0_gir_SCANNERFLAGS = --noclosure 
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
              -DGETTEXT_PACKAGE=Dummy \
+             -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
  GLib_2_0_gir_ASSERTIONS = $(srcdir)/GLib-2.0.xpath
diff --git a/devel/gobject-introspection/files/patch-girepository_girnode.c b/devel/gobject-introspection/files/patch-girepository_girnode.c
deleted file mode 100644
index f566de3d6208..000000000000
--- a/devel/gobject-introspection/files/patch-girepository_girnode.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- girepository/girnode.c.orig	2009-07-09 21:20:46.000000000 +0400
-+++ girepository/girnode.c	2009-12-09 16:12:24.000000000 +0300
-@@ -2288,7 +2288,8 @@
- 	    break;
- 	  case GI_TYPE_TAG_DOUBLE:
- 	    blob->size = sizeof (gdouble);
--	    *(gdouble*)&data[blob->offset] = (gdouble) parse_float_value (constant->value);
-+	    gdouble tmp = parse_float_value (constant->value);
-+	    memcpy (&data[blob->offset], &tmp, blob->size);
- 	    break;
- 	  case GI_TYPE_TAG_UTF8:
- 	  case GI_TYPE_TAG_FILENAME:
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index 8083b30ec40f..8543297adaef 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -4,6 +4,7 @@ bin/g-ir-scanner
 include/gobject-introspection-1.0/girepository.h
 include/gobject-introspection-1.0/girffi.h
 lib/girepository-1.0/Everything-1.0.typelib
+lib/girepository-1.0/GIMarshallingTests-1.0.typelib
 lib/girepository-1.0/GIRepository-2.0.typelib
 lib/girepository-1.0/GL-1.0.typelib
 lib/girepository-1.0/GLib-2.0.typelib
@@ -85,10 +86,15 @@ lib/libgirepository-everything-1.0.a
 lib/libgirepository-everything-1.0.la
 lib/libgirepository-everything-1.0.so
 lib/libgirepository-everything-1.0.so.1
+lib/libgirepository-gimarshallingtests-1.0.a
+lib/libgirepository-gimarshallingtests-1.0.la
+lib/libgirepository-gimarshallingtests-1.0.so
+lib/libgirepository-gimarshallingtests-1.0.so.1
 libdata/pkgconfig/gobject-introspection-1.0.pc
 libdata/pkgconfig/gobject-introspection-no-export-1.0.pc
 share/aclocal/introspection.m4
 share/gir-1.0/Everything-1.0.gir
+share/gir-1.0/GIMarshallingTests-1.0.gir
 share/gir-1.0/GIRepository-2.0.gir
 share/gir-1.0/GL-1.0.gir
 share/gir-1.0/GLib-2.0.gir
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index b1627f5b7101..9efb186dacb0 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.54 2009/10/19 19:42:40 kwm Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.61 2010/04/26 12:09:46 kwm Exp $
 #
 
 PORTNAME=	gvfs
-PORTVERSION=	1.4.3
-PORTREVISION=	2
+PORTVERSION=	1.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 4fd7047efa4a..830b1de2c377 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gvfs-1.4.3.tar.bz2) = 2624e5e7d45efd6b742e90bfde24cd20
-SHA256 (gnome2/gvfs-1.4.3.tar.bz2) = 3ca9ccab2efb2699b72a1f346d3533fc727b5ea2692af6c86adfd9532d6ba15d
-SIZE (gnome2/gvfs-1.4.3.tar.bz2) = 1263024
+MD5 (gnome2/gvfs-1.6.1.tar.bz2) = dcaae9fafbb7df9df4e92f895849921a
+SHA256 (gnome2/gvfs-1.6.1.tar.bz2) = ad75b4a1e0d61ecc271af2f015d665709cebcf22e86b9bbe0cc7ce8a33b8d8d6
+SIZE (gnome2/gvfs-1.6.1.tar.bz2) = 1364399
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure
index 0b1b2a2ab9f7..cee0fc7d7a69 100644
--- a/devel/gvfs/files/patch-configure
+++ b/devel/gvfs/files/patch-configure
@@ -1,16 +1,6 @@
---- configure.orig	2009-04-24 00:15:09.000000000 -0400
-+++ configure	2009-04-24 00:16:04.000000000 -0400
-@@ -26973,6 +26973,9 @@ fi
-     *-linux*)
-       use_gphoto2=yes
-       ;;
-+    *-freebsd*)
-+      use_gphoto2=yes
-+      ;;
-     *)
-       use_gphoto2=no
-       ;;
-@@ -28018,7 +28021,7 @@ if test "${ac_cv_lib_archive_archive_ent
+--- configure.orig	2010-03-30 10:14:50.000000000 +0200
++++ configure	2010-03-30 10:16:26.000000000 +0200
+@@ -20312,7 +20312,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +9,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28094,7 +28097,7 @@ _ACEOF
+@@ -20388,7 +20388,7 @@
                  if test x$with_archive_libs != x/usr/lib; then
                          ARCHIVE_LIBS="-L$with_archive_libs -larchive"
                  else
@@ -28,3 +18,12 @@
                  fi
  	else
  		{ $as_echo "$as_me:$LINENO: checking for archive_entry_filetype in -larchive" >&5
+@@ -20397,7 +20397,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-larchive  $LIBS"
++LIBS="-larchive -lcrypto -lmd $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index 77685a582e98..1be92a4632e6 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -74,6 +74,7 @@ share/gvfs/mounts/trash.mount
 share/gvfs/remote-volume-monitors/hal.monitor
 share/locale/ar/LC_MESSAGES/gvfs.mo
 share/locale/as/LC_MESSAGES/gvfs.mo
+share/locale/ast/LC_MESSAGES/gvfs.mo
 share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn/LC_MESSAGES/gvfs.mo
@@ -84,6 +85,7 @@ share/locale/cs/LC_MESSAGES/gvfs.mo
 share/locale/da/LC_MESSAGES/gvfs.mo
 share/locale/de/LC_MESSAGES/gvfs.mo
 share/locale/el/LC_MESSAGES/gvfs.mo
+share/locale/en@shaw/LC_MESSAGES/gvfs.mo
 share/locale/en_GB/LC_MESSAGES/gvfs.mo
 share/locale/es/LC_MESSAGES/gvfs.mo
 share/locale/et/LC_MESSAGES/gvfs.mo
@@ -96,6 +98,7 @@ share/locale/gu/LC_MESSAGES/gvfs.mo
 share/locale/he/LC_MESSAGES/gvfs.mo
 share/locale/hi/LC_MESSAGES/gvfs.mo
 share/locale/hu/LC_MESSAGES/gvfs.mo
+share/locale/id/LC_MESSAGES/gvfs.mo
 share/locale/it/LC_MESSAGES/gvfs.mo
 share/locale/ja/LC_MESSAGES/gvfs.mo
 share/locale/kn/LC_MESSAGES/gvfs.mo
@@ -108,6 +111,7 @@ share/locale/mk/LC_MESSAGES/gvfs.mo
 share/locale/ml/LC_MESSAGES/gvfs.mo
 share/locale/mr/LC_MESSAGES/gvfs.mo
 share/locale/nb/LC_MESSAGES/gvfs.mo
+share/locale/nds/LC_MESSAGES/gvfs.mo
 share/locale/nl/LC_MESSAGES/gvfs.mo
 share/locale/nn/LC_MESSAGES/gvfs.mo
 share/locale/or/LC_MESSAGES/gvfs.mo
@@ -144,17 +148,23 @@ share/locale/zh_TW/LC_MESSAGES/gvfs.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index f2f8fb42d983..f086065352e6 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/json-glib/Makefile,v 1.5 2009/10/30 11:35:48 kwm Exp $
+#   $MCom: ports/devel/json-glib/Makefile,v 1.8 2010/03/20 01:19:18 marcus Exp $
 #
 
 PORTNAME=	json-glib
-PORTVERSION=	0.10.0
+PORTVERSION=	0.10.4
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
diff --git a/devel/json-glib/distinfo b/devel/json-glib/distinfo
index c027848241ce..3cea6fe6f6d9 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,3 +1,3 @@
-MD5 (json-glib-0.10.0.tar.bz2) = f000d8d41e4dc172ef5f40e2adb97bfd
-SHA256 (json-glib-0.10.0.tar.bz2) = 029b700f1ad0960bb4954944357fe8b516487860d43fbe56853dce44fc114a64
-SIZE (json-glib-0.10.0.tar.bz2) = 415877
+MD5 (json-glib-0.10.4.tar.bz2) = cb207a673438d1bc833eca6fc93f80e1
+SHA256 (json-glib-0.10.4.tar.bz2) = efd8b341d3f9e03cc35b7e2eb353b8336cf7a5560ad273b07e85f7a7a46d5ed9
+SIZE (json-glib-0.10.4.tar.bz2) = 389457
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index fa674a10f115..604680a89fd7 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libIDL/Makefile,v 1.5 2006/07/24 14:11:11 ahze Exp $
+#   $MCom: ports/devel/libIDL/Makefile,v 1.7 2010/04/02 17:27:42 kwm Exp $
 #
 
 PORTNAME=	libIDL
-PORTVERSION=	0.8.13
+PORTVERSION=	0.8.14
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index 3fded63f8ade..da1dff7937b1 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libIDL-0.8.13.tar.bz2) = b43b289a859eb38a710f70622c46e571
-SHA256 (gnome2/libIDL-0.8.13.tar.bz2) = bccc7e10dae979518ff012f8464e47ec4b3558a5456a94c8679653aa0b262b71
-SIZE (gnome2/libIDL-0.8.13.tar.bz2) = 386468
+MD5 (gnome2/libIDL-0.8.14.tar.bz2) = bb8e10a218fac793a52d404d14adedcb
+SHA256 (gnome2/libIDL-0.8.14.tar.bz2) = c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220
+SIZE (gnome2/libIDL-0.8.14.tar.bz2) = 427149
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index cb8647126e7b..3a93b3ce1570 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libbonobo/Makefile,v 1.79 2009/09/26 13:41:58 marcus Exp $
+#   $MCom: ports/devel/libbonobo/Makefile,v 1.81 2010/04/02 18:10:40 kwm Exp $
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	2.24.2
+PORTVERSION=	2.24.3
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 866b1d4cbf5b..dbbb5091b584 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libbonobo-2.24.2.tar.bz2) = 5c7c5ea9c2f78a3c1e9ff2f1e27ad751
-SHA256 (gnome2/libbonobo-2.24.2.tar.bz2) = 95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf
-SIZE (gnome2/libbonobo-2.24.2.tar.bz2) = 1435635
+MD5 (gnome2/libbonobo-2.24.3.tar.bz2) = b217cef6a187505290c66c5bf8225d38
+SHA256 (gnome2/libbonobo-2.24.3.tar.bz2) = 5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe
+SIZE (gnome2/libbonobo-2.24.3.tar.bz2) = 1354929
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index da47a7f20a8b..161fb13c9378 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -98,6 +98,7 @@ share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
 share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/as/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ast/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
@@ -113,6 +114,7 @@ share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/dz/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/eo/LC_MESSAGES/libbonobo-2.0.mo
@@ -213,11 +215,15 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 80afa4d002b8..d14ef303dead 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,19 +3,21 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgdata/Makefile,v 1.3 2009/11/22 20:17:49 kwm Exp $
+#   $MCom: ports/devel/libgdata/Makefile,v 1.9 2010/03/30 11:24:13 kwm Exp $
 #
 
 PORTNAME=	libgdata
-PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTVERSION=	0.6.4
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	GLib based implimentation of the GData protocol
 
+BUILD_DEPENDS=	${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup \
+		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/Soup-2.4.gir:${PORTSDIR}/devel/gir-repository-libsoup
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -23,13 +25,9 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool:22
-USE_GNOME=	intltool
+USE_GNOME=	gnomehack intltool ltverhack glib20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index f04c6f721466..49d1b0deb532 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgdata-0.5.1.tar.bz2) = fc9be11d2f823bb16d6e03e2a0dda85d
-SHA256 (libgdata-0.5.1.tar.bz2) = 2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0
-SIZE (libgdata-0.5.1.tar.bz2) = 956689
+MD5 (libgdata-0.6.4.tar.bz2) = 7efdef75d1b59177d119f689522d00ba
+SHA256 (libgdata-0.6.4.tar.bz2) = 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d
+SIZE (libgdata-0.6.4.tar.bz2) = 1003963
diff --git a/devel/libgdata/pkg-descr b/devel/libgdata/pkg-descr
index 748252c4cb8b..1603f5ea0f9c 100644
--- a/devel/libgdata/pkg-descr
+++ b/devel/libgdata/pkg-descr
@@ -1,8 +1,8 @@
 libgdata is a GLib-based library for accessing online service APIs using the
 GData protocol - most notably, Google's services. It provides APIs to access
-the common Google services, and has full asynchronous support. 
+the common Google services, and has full asynchronous support.
 
-A link with more information about the GData protocol is available on the 
+A link with more information about the GData protocol is available on the
 website.
 
 WWW: http://live.gnome.org/libgdata
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 93d8dd06c693..6ebbc629022c 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -2,7 +2,6 @@ include/libgdata/gdata/atom/gdata-author.h
 include/libgdata/gdata/atom/gdata-category.h
 include/libgdata/gdata/atom/gdata-generator.h
 include/libgdata/gdata/atom/gdata-link.h
-include/libgdata/gdata/exif/gdata-exif-tags.h
 include/libgdata/gdata/gd/gdata-gd-email-address.h
 include/libgdata/gdata/gd/gdata-gd-im-address.h
 include/libgdata/gdata/gd/gdata-gd-name.h
@@ -25,7 +24,6 @@ include/libgdata/gdata/gdata-service.h
 include/libgdata/gdata/gdata-types.h
 include/libgdata/gdata/gdata-upload-stream.h
 include/libgdata/gdata/gdata.h
-include/libgdata/gdata/georss/gdata-georss-where.h
 include/libgdata/gdata/media/gdata-media-category.h
 include/libgdata/gdata/media/gdata-media-content.h
 include/libgdata/gdata/media/gdata-media-credit.h
@@ -50,9 +48,11 @@ include/libgdata/gdata/services/documents/gdata-documents-spreadsheet.h
 include/libgdata/gdata/services/documents/gdata-documents-text.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-album.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-enums.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-feed.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-file.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-query.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-service.h
+include/libgdata/gdata/services/picasaweb/gdata-picasaweb-user.h
 include/libgdata/gdata/services/youtube/gdata-youtube-content.h
 include/libgdata/gdata/services/youtube/gdata-youtube-credit.h
 include/libgdata/gdata/services/youtube/gdata-youtube-enums.h
@@ -60,10 +60,11 @@ include/libgdata/gdata/services/youtube/gdata-youtube-query.h
 include/libgdata/gdata/services/youtube/gdata-youtube-service.h
 include/libgdata/gdata/services/youtube/gdata-youtube-state.h
 include/libgdata/gdata/services/youtube/gdata-youtube-video.h
+lib/girepository-1.0/GData-0.0.typelib
 lib/libgdata.a
 lib/libgdata.la
 lib/libgdata.so
-lib/libgdata.so.6
+lib/libgdata.so.7
 libdata/pkgconfig/libgdata.pc
 share/doc/gdata/GDataAccessHandler.html
 share/doc/gdata/GDataAccessRule.html
@@ -90,6 +91,7 @@ share/doc/gdata/GDataEntry.html
 share/doc/gdata/GDataFeed.html
 share/doc/gdata/GDataGDEmailAddress.html
 share/doc/gdata/GDataGDIMAddress.html
+share/doc/gdata/GDataGDName.html
 share/doc/gdata/GDataGDOrganization.html
 share/doc/gdata/GDataGDPhoneNumber.html
 share/doc/gdata/GDataGDPostalAddress.html
@@ -142,6 +144,10 @@ share/doc/gdata/ix02.html
 share/doc/gdata/ix03.html
 share/doc/gdata/ix04.html
 share/doc/gdata/ix05.html
+share/doc/gdata/ix06.html
+share/doc/gdata/ix07.html
+share/doc/gdata/ix08.html
+share/doc/gdata/ix09.html
 share/doc/gdata/left.png
 share/doc/gdata/pt01.html
 share/doc/gdata/pt02.html
@@ -152,7 +158,9 @@ share/doc/gdata/right.png
 share/doc/gdata/structure.png
 share/doc/gdata/style.css
 share/doc/gdata/up.png
+share/gir-1.0/GData-0.0.gir
 share/locale/ca/LC_MESSAGES/gdata.mo
+share/locale/cs/LC_MESSAGES/gdata.mo
 share/locale/de/LC_MESSAGES/gdata.mo
 share/locale/el/LC_MESSAGES/gdata.mo
 share/locale/en_GB/LC_MESSAGES/gdata.mo
@@ -161,13 +169,18 @@ share/locale/eu/LC_MESSAGES/gdata.mo
 share/locale/fr/LC_MESSAGES/gdata.mo
 share/locale/gl/LC_MESSAGES/gdata.mo
 share/locale/hu/LC_MESSAGES/gdata.mo
+share/locale/it/LC_MESSAGES/gdata.mo
+share/locale/ja/LC_MESSAGES/gdata.mo
 share/locale/nb/LC_MESSAGES/gdata.mo
 share/locale/pa/LC_MESSAGES/gdata.mo
 share/locale/pl/LC_MESSAGES/gdata.mo
 share/locale/pt/LC_MESSAGES/gdata.mo
 share/locale/pt_BR/LC_MESSAGES/gdata.mo
+share/locale/ru/LC_MESSAGES/gdata.mo
+share/locale/sl/LC_MESSAGES/gdata.mo
 share/locale/sv/LC_MESSAGES/gdata.mo
 share/locale/uk/LC_MESSAGES/gdata.mo
+share/locale/zh_CN/LC_MESSAGES/gdata.mo
 share/locale/zh_HK/LC_MESSAGES/gdata.mo
 share/locale/zh_TW/LC_MESSAGES/gdata.mo
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -190,9 +203,7 @@ share/locale/zh_TW/LC_MESSAGES/gdata.mo
 @dirrm include/libgdata/gdata/services/calendar
 @dirrm include/libgdata/gdata/services
 @dirrm include/libgdata/gdata/media
-@dirrm include/libgdata/gdata/georss
 @dirrm include/libgdata/gdata/gd
-@dirrm include/libgdata/gdata/exif
 @dirrm include/libgdata/gdata/atom
 @dirrm include/libgdata/gdata
 @dirrm include/libgdata
diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile
index 22e51f667a45..bef568f619a4 100644
--- a/devel/libgsf-gnome/Makefile
+++ b/devel/libgsf-gnome/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgsf-gnome/Makefile,v 1.12 2008/09/09 00:08:35 kwm Exp $
+#   $MCom: ports/devel/libgsf-gnome/Makefile,v 1.14 2010/04/10 08:51:16 kwm Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel gnome
 PKGNAMESUFFIX=	-gnome
 
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 9d62a3abac78..ea9f824e7151 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgsf/Makefile,v 1.33 2009/01/08 01:28:46 marcus Exp $
+#   $MCom: ports/devel/libgsf/Makefile,v 1.35 2010/04/10 08:51:15 kwm Exp $
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.14.17
-PORTREVISION?=	1
+PORTVERSION=	1.14.18
+PORTREVISION?=	0
 CATEGORIES?=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 298265cdfa63..d8ec46584559 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgsf-1.14.17.tar.bz2) = d7a14096085e36fb4c3f43e3f38478f8
-SHA256 (gnome2/libgsf-1.14.17.tar.bz2) = 10c6b69149e424ac5f325eb247fdf640ddd949952f21b99a890e73f9d4276876
-SIZE (gnome2/libgsf-1.14.17.tar.bz2) = 612455
+MD5 (gnome2/libgsf-1.14.18.tar.bz2) = 2c15d875b1931c40c7e7a2368f3ed948
+SHA256 (gnome2/libgsf-1.14.18.tar.bz2) = 16d29e82f7eba68f919f2588ea5328973490fe6d4a7a5f160e8af89b387c9a95
+SIZE (gnome2/libgsf-1.14.18.tar.bz2) = 611584
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index a8fab0c18134..46a940712fc4 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -93,6 +93,7 @@ share/doc/gsf/right.png
 share/doc/gsf/sources.html
 share/doc/gsf/style.css
 share/doc/gsf/up.png
+share/locale/cs/LC_MESSAGES/libgsf.mo
 share/locale/de/LC_MESSAGES/libgsf.mo
 share/locale/en_GB/LC_MESSAGES/libgsf.mo
 share/locale/es/LC_MESSAGES/libgsf.mo
@@ -101,6 +102,7 @@ share/locale/fr/LC_MESSAGES/libgsf.mo
 share/locale/nb/LC_MESSAGES/libgsf.mo
 share/locale/oc/LC_MESSAGES/libgsf.mo
 share/locale/pa/LC_MESSAGES/libgsf.mo
+share/locale/pl/LC_MESSAGES/libgsf.mo
 share/locale/pt/LC_MESSAGES/libgsf.mo
 share/locale/pt_BR/LC_MESSAGES/libgsf.mo
 share/locale/sl/LC_MESSAGES/libgsf.mo
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 00c04df42293..65bed90efe41 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.52 2009/09/21 09:27:35 kwm Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $
 #
 
 PORTNAME=	libgtop
-PORTVERSION=	2.28.0
+PORTVERSION=	2.28.1
 PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -39,7 +39,7 @@ PKGMESSAGE=	${FILESDIR}/pkg-message
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
-post-patch:
+post-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 
 post-install:
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index be335ea4e84c..f6fedf2c05e3 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgtop-2.28.0.tar.bz2) = f74fabd765452e9a6893852afa93a7c7
-SHA256 (gnome2/libgtop-2.28.0.tar.bz2) = 22a9c6241c5a65e267a995a4a60ba483dcc629a4873e746b463e6eb6466975b3
-SIZE (gnome2/libgtop-2.28.0.tar.bz2) = 793153
+MD5 (gnome2/libgtop-2.28.1.tar.bz2) = 994c299b6dba330524a67ea45776b3ab
+SHA256 (gnome2/libgtop-2.28.1.tar.bz2) = 0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6
+SIZE (gnome2/libgtop-2.28.1.tar.bz2) = 760104
diff --git a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
index 8fd7ffffffc9..f29ef64d7c64 100644
--- a/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
+++ b/devel/libgtop/files/patch-sysdeps_freebsd_procwd.c
@@ -1,5 +1,5 @@
---- sysdeps/freebsd/procwd.c.orig	2009-12-13 18:53:02.827740000 -0500
-+++ sysdeps/freebsd/procwd.c	2009-12-13 18:59:27.000000000 -0500
+--- sysdeps/freebsd/procwd.c.orig	2009-04-19 19:51:00.000000000 +0200
++++ sysdeps/freebsd/procwd.c	2010-05-07 13:17:54.000000000 +0200
 @@ -27,6 +27,9 @@
  #include <sys/sysctl.h>
  #include <sys/param.h>
@@ -19,13 +19,19 @@
  static GPtrArray *
  parse_output(const char *output, glibtop_proc_wd *buf)
  {
-@@ -101,10 +104,14 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -97,24 +100,39 @@ parse_output(const char *output, glibtop
+ char**
+ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
+ {
+-	char path[MAXPATHLEN];
++	int exe_mib[4];
++	size_t len;
  #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
  	struct kinfo_file *freep, *kif;
  	GPtrArray *dirs;
-+#ifndef HAVE_KINFO_GETFILE
- 	size_t len;
+-	size_t len;
 -	int i;
++#ifndef HAVE_KINFO_GETFILE
  	int name[4];
  #else
 +	int cnt;
@@ -35,15 +41,31 @@
  	char *output;
  #endif
  
-@@ -115,6 +122,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
- 		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+ 	memset (buf, 0, sizeof (glibtop_proc_wd));
++	len = 0;
+ 
+-	g_snprintf(path, sizeof(path), "/proc/%u/file", pid);
+-	if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+-		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++	exe_mib[0] = CTL_KERN;
++	exe_mib[1] = KERN_PROC;
++	exe_mib[2] = KERN_PROC_PATHNAME;
++	exe_mib[3] = pid;
++
++	if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) {
++		if (len > sizeof(buf->exe))
++			len = sizeof(buf->exe);
++		if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0)
++			buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
++	}
  
  #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
 +#ifndef HAVE_KINFO_GETFILE
++	len = 0;
  	name[0] = CTL_KERN;
  	name[1] = KERN_PROC;
  	name[2] = KERN_PROC_FILEDESC;
-@@ -127,10 +135,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
+@@ -127,10 +145,21 @@ glibtop_get_proc_wd_s(glibtop *server, g
  		g_free(freep);
  		return NULL;
  	}
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index bb4b9e1d1580..5c1a377e9a4c 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -98,6 +98,7 @@ libdata/pkgconfig/libgtop-2.0.pc
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
 share/locale/as/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ast/LC_MESSAGES/libgtop-2.0.mo
 share/locale/az/LC_MESSAGES/libgtop-2.0.mo
 share/locale/be/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
@@ -112,6 +113,7 @@ share/locale/da/LC_MESSAGES/libgtop-2.0.mo
 share/locale/de/LC_MESSAGES/libgtop-2.0.mo
 share/locale/dz/LC_MESSAGES/libgtop-2.0.mo
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
 share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
@@ -205,11 +207,15 @@ share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index 5e775e6678a1..6219641f4493 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/liboobs/Makefile,v 1.38 2009/11/28 05:59:00 mezz Exp $
+#   $MCom: ports/devel/liboobs/Makefile,v 1.46 2010/04/01 22:27:34 kwm Exp $
 #
 
 PORTNAME=	liboobs
-PORTVERSION=	2.22.2
+PORTVERSION=	2.30.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,10 +21,21 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends
 
 USE_BZIP2=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --with-hal
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+# disable utmpx detection on early 9.x and below.
+# We still have only utmp there
+post-patch:
+.if ${OSVERSION} < 900007
+	@${REINPLACE_CMD} -e 's|utmpx|utmp|g' \
+		${WRKSRC}/configure
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/liboobs/distinfo b/devel/liboobs/distinfo
index 7521018e6f82..9fc0f08d30b4 100644
--- a/devel/liboobs/distinfo
+++ b/devel/liboobs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/liboobs-2.22.2.tar.bz2) = 84d20702942635e3bebc0c1c35bdad43
-SHA256 (gnome2/liboobs-2.22.2.tar.bz2) = 34a972fab68255902d4c1f82ba16dfbf673f9933f78c68b4551883b63984c58b
-SIZE (gnome2/liboobs-2.22.2.tar.bz2) = 364260
+MD5 (gnome2/liboobs-2.30.0.tar.bz2) = 69ee6d329cd919c69aae3dae7302b796
+SHA256 (gnome2/liboobs-2.30.0.tar.bz2) = b0c18e038a6c1eba15c68a8e9fabfc21144c9240c17f3bd19042bae1ea04a5ce
+SIZE (gnome2/liboobs-2.30.0.tar.bz2) = 369402
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c
index 6abd8b711ddc..0a7384b90d9c 100644
--- a/devel/liboobs/files/patch-src_oobs-group.c
+++ b/devel/liboobs/files/patch-src_oobs-group.c
@@ -1,25 +1,10 @@
---- oobs/oobs-group.c.orig	Fri Sep 15 18:41:04 2006
-+++ oobs/oobs-group.c	Tue Oct 31 23:12:40 2006
-@@ -18,7 +18,12 @@
-  * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
-  */
+--- oobs/oobs-group.c.orig	2010-01-11 13:34:52.000000000 -0500
++++ oobs/oobs-group.c	2010-01-18 02:04:34.000000000 -0500
+@@ -21,6 +21,7 @@
  
-+#if defined(HAVE_CONFIG_H)
-+#include <config.h>
-+#endif
-+
+ #include <string.h>
  #include <glib-object.h>
 +#include <unistd.h>
- #include "oobs-session.h"
- #include "oobs-group.h"
- #include "oobs-user.h"
-@@ -27,7 +32,9 @@
- #include "oobs-groupsconfig-private.h"
- #include "oobs-defines.h"
- #include "utils.h"
-+#ifdef HAVE_CRYPT_H
- #include <crypt.h>
-+#endif
- 
- #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate))
+ #include <dbus/dbus.h>
  
+ #include "oobs-object-private.h"
diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c
index 2096814ee3a6..a7215c4effbb 100644
--- a/devel/liboobs/files/patch-src_oobs-user.c
+++ b/devel/liboobs/files/patch-src_oobs-user.c
@@ -1,13 +1,9 @@
---- oobs/oobs-user.c
-+++ oobs/oobs-user.c
-@@ -18,13 +18,28 @@
-  * Authors: Carlos Garnacho Parro  <carlosg@gnome.org>
+--- oobs/oobs-user.c.orig	2010-01-31 17:36:52.000000000 +0000
++++ oobs/oobs-user.c	2010-01-31 17:40:21.000000000 +0000
+@@ -19,13 +19,24 @@
+  *          Milan Bouchet-Valat <nalimilan@club.fr>.
   */
  
-+#if defined(HAVE_CONFIG_H)
-+#include <config.h>
-+#endif
-+
 +#ifdef __FreeBSD__
 +# include <sys/param.h>
 +# if __FreeBSD_version >= 900007
@@ -22,42 +18,28 @@
  #include <string.h>
 +#ifdef HAVE_CRYPT_H
  #include <crypt.h>
--#include <utmp.h>
 +#endif
 +#ifdef HAVE_UTMPX_H
-+#include <utmpx.h>
+ #include <utmpx.h>
 +#endif
  
+ #include "oobs-object-private.h"
  #include "oobs-usersconfig.h"
- #include "oobs-user.h"
-@@ -811,7 +826,8 @@
+@@ -1252,6 +1263,7 @@ oobs_user_set_locale (OobsUser *user, co
  gboolean
  oobs_user_get_active (OobsUser *user)
  {
--  struct utmp *entry;
 +#ifdef HAVE_UTMPX_H
-+  struct utmpx *entry;
+   struct utmpx *entry;
    const gchar *login;
    gboolean match = FALSE;
- 
-@@ -819,14 +835,18 @@
- 
-   login = oobs_user_get_login_name (user);
- 
--  while (!match && (entry = getutent ()) != NULL)
-+  setutxent ();
-+  while (!match && (entry = getutxent ()) != NULL)
-     {
-       match = (entry->ut_type == USER_PROCESS &&
- 	       strcmp (entry->ut_user, login) == 0);
-     }
- 
-   /* close utmp */
--  endutent ();
-+  endutxent ();
+@@ -1272,6 +1284,9 @@ oobs_user_get_active (OobsUser *user)
+   endutxent ();
  
    return match;
 +#else
 +  return FALSE;
 +#endif
  }
+ 
+ /**
diff --git a/devel/liboobs/pkg-plist b/devel/liboobs/pkg-plist
index 11e1ab182ef1..0b3354023c23 100644
--- a/devel/liboobs/pkg-plist
+++ b/devel/liboobs/pkg-plist
@@ -1,3 +1,6 @@
+include/liboobs-1.0/oobs/oobs-defines.h
+include/liboobs-1.0/oobs/oobs-enum-types.h
+include/liboobs-1.0/oobs/oobs-error.h
 include/liboobs-1.0/oobs/oobs-group.h
 include/liboobs-1.0/oobs/oobs-groupsconfig.h
 include/liboobs-1.0/oobs/oobs-hostsconfig.h
@@ -32,5 +35,50 @@ lib/liboobs-1.la
 lib/liboobs-1.so
 lib/liboobs-1.so.4
 libdata/pkgconfig/liboobs-1.pc
+%%DOCSDIR%%/OobsGroup.html
+%%DOCSDIR%%/OobsGroupsConfig.html
+%%DOCSDIR%%/OobsHostsConfig.html
+%%DOCSDIR%%/OobsIface.html
+%%DOCSDIR%%/OobsIfaceEthernet.html
+%%DOCSDIR%%/OobsIfaceIRLan.html
+%%DOCSDIR%%/OobsIfacePPP.html
+%%DOCSDIR%%/OobsIfacePlip.html
+%%DOCSDIR%%/OobsIfaceWireless.html
+%%DOCSDIR%%/OobsIfacesConfig.html
+%%DOCSDIR%%/OobsList.html
+%%DOCSDIR%%/OobsNFSConfig.html
+%%DOCSDIR%%/OobsNTPConfig.html
+%%DOCSDIR%%/OobsNTPServer.html
+%%DOCSDIR%%/OobsObject.html
+%%DOCSDIR%%/OobsSMBConfig.html
+%%DOCSDIR%%/OobsSelfConfig.html
+%%DOCSDIR%%/OobsService.html
+%%DOCSDIR%%/OobsServicesConfig.html
+%%DOCSDIR%%/OobsSession.html
+%%DOCSDIR%%/OobsShare.html
+%%DOCSDIR%%/OobsShareNFS.html
+%%DOCSDIR%%/OobsShareSMB.html
+%%DOCSDIR%%/OobsStaticHost.html
+%%DOCSDIR%%/OobsTimeConfig.html
+%%DOCSDIR%%/OobsUser.html
+%%DOCSDIR%%/OobsUsersConfig.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch03.html
+%%DOCSDIR%%/ch04.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch06.html
+%%DOCSDIR%%/ch07.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/liboobs-OobsError.html
+%%DOCSDIR%%/liboobs.devhelp
+%%DOCSDIR%%/liboobs.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+@dirrm %%DOCSDIR%%
 @dirrm include/liboobs-1.0/oobs
 @dirrm include/liboobs-1.0
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index fa5b31d4f4eb..166478ed5b02 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libsigc++20/Makefile,v 1.11 2008/03/10 15:08:22 ahze Exp $
+#   $MCom: ports/devel/libsigc++20/Makefile,v 1.14 2010/04/16 21:30:41 kwm Exp $
 #
 
 PORTNAME=	libsigc++
-PORTVERSION=	2.2.4.2
+PORTVERSION=	2.2.6
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
diff --git a/devel/libsigc++20/distinfo b/devel/libsigc++20/distinfo
index aabdf5ab5932..08cb059bd5be 100644
--- a/devel/libsigc++20/distinfo
+++ b/devel/libsigc++20/distinfo
@@ -1,3 +1,3 @@
-MD5 (libsigc++-2.2.4.2.tar.bz2) = 545edbb7b54eec4f723323d3158c0e0c
-SHA256 (libsigc++-2.2.4.2.tar.bz2) = 998e4af392090a0db15102ba0f753fc6fc636574956c8292eb615a2a7823e201
-SIZE (libsigc++-2.2.4.2.tar.bz2) = 3596750
+MD5 (libsigc++-2.2.6.tar.bz2) = d216ef85785e0d17eda9b0326cfdcf71
+SHA256 (libsigc++-2.2.6.tar.bz2) = 93bfd6fc867c99dd3cad695908b45d35b640c6cd12dace43bfa38e48e9a54caa
+SIZE (libsigc++-2.2.6.tar.bz2) = 3741979
diff --git a/devel/libsigc++20/pkg-plist b/devel/libsigc++20/pkg-plist
index 98efa486cbdc..c546bc3d23e3 100644
--- a/devel/libsigc++20/pkg-plist
+++ b/devel/libsigc++20/pkg-plist
@@ -55,369 +55,363 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01const__reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__argument_3_01reference__wrapper_3_01T__wrapped_01_4_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__const__volatile__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1bound__volatile__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1const__volatile__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1pointer__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_1_1accumulated__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar01b49059ecd092e1ea927a389afae4ab.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar16a14c152bc5ff346d9997f7152c0448.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1b790d5e11b1dad6454242a5312e335f.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar29f8b5e4157f634b1dbf70d8cd079888.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar1da4c680404aa7c8c338bb136fd6dbea.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar2a3f9cda8e57479189997c283e69f5ff.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar3adb4b941bace89a3f952c380bedda11.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7957dbdb3fb3ed3bc11f56050bf6381e.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar7d6bfb7a6739ae4708a549aeb7c1fd19.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar9961ee865f5739f77a6f717c5be690ae.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__ar821f8b15c79da4460a4c99304ac8d504.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arbe5eef28da7cedf7c98aeec3dbe6d6b8.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arcf6cb51783c363bfae7c4a91d9685109.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__are33def4d0c1a12dcbfd220489302db67.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00c513da473cf7720ea302b4c9ac3312b.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0488c44ad57d300eb0d26f65a9505ffdc.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0ad52bc79df5ba2b4d7e5b497ba915039.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0b160353f4ad061f559297e128c4d0646.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d3a462cf1a3aee09f94ea984d7d5fb39.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_0d729ce48b1328d982e0ee754652fed04.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_012ff7d4b06d3103f927940079a2066cad.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_011e4fe3321f9150dc130b7a3b2213423b.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_014f61314713a22a7e37f830f31ddcbf93.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01756aafa66a891f219b67f866edb12f89.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01852c349c390cefa04662a850d84c0a94.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_2834c669b9a4f4ae3cbd91fd9ea54658.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_3b1bb4b094860c314af671799b3adaab.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_dc4a103abb90b58689e91ed00e1a72ef.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_02af42f0cb3d98cb6a4ad4230b22bbff2.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_08a1617e39a89dfb3d657c3c5cb6673b1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil810e579b3e82014b3c1a16450bdb6023.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_093dc18e43ee4275c7bebd699f7376cb7.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil1ce68760f5323ed9c9884b19387edf66.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4_1_1accumulated.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1signal__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg511b8698fc2891db58bb2a8bf0969f659.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg519ed0b830799ecdfb1e59a58e3902913.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg52ee407c118db89bb94aca248ba922de3.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg55fd8828cf1e28d31ca1331678509a180.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01T__arg6_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5_00_01nil_00_01nil_01_4.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01T__arg5aeb6f23fed93d951563913dc5fa02580.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_5a581d99b458267d85dd19f245bddca4.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01T__arg4_00_01nil_00_41a20cc46cbca7c5e1f6e6dab34f9c0b.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01T__arg3_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01T__arg2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01T__arg1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot_3_01T__return_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__base__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1slot__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__limit__reference_3_01T__type_00_01true_01_4__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor0__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor1__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor2__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor3__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor5__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor6__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/classsigc_1_1volatile__mem__functor7__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.css
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/doxygen.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/functions.html
@@ -457,28 +451,18 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/graph_legend.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__adaptors.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__bind.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__compose.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__exception__catch.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__group__.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__hide.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__lambdas.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__mem__fun.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__ptr__fun.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__retype.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__sigcfunctors.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__signal.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/group__slot.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/hierarchy.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/index.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/inherit__graph__0.png
@@ -534,67 +518,66 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespaces.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/namespacesigc.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__base__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adaptor__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1adapts__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0834e37f8bd5c0361c59dcde65b688ff.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T0960d75154b94d71b8dc83e697de0977.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T1564029be5092b4f54029884f8072971.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T3d8983f4d98069f4e23a772a1fcb079e.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T436ea37e3d0376f65064cb6eeb85bc6f.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T4b2da9832015a0e3ce25e0dca6b9ceb1.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T5d526f12c92849dac4a70f282eec9dc2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T67d342ad48aefc8493f51afa1b5195cc.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T69acdb40ccadd9132b5b22be14f1d570.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T723f3b4044979b2b751d7da0157d7605.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T80924a7b7c3c1f42ece02e3f2d52a352.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T8abd615cc403946700f41917bb90042c.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T8b56690e14425f094432a8a8a13b1d47.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01T94aede5c6adabf04c5b17674cd9c7ea9.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01Tc3e8b36552a95d06e9663ee6fcb1abcd.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01Tf230465d8da8d21a2da815d7eb05b413.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01n2baeca3d362bb6c43851318434b37475.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01n6d14effad731c8dfead9984e87967108.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01nc5b014861e0ccdfa419ea306a45581e6.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01T__type3_00_01nbe20b8d66fa3e6b3509efbf4c9cd81a1.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00134c50922ecb7ea017d0f8b65767cdfb.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_0064507f0ddc58a58ad7459b833436ad60.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01T__type2_00_01nil_00_01nil_00d9cca3203a2622b3ac78912416801669.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni35f2e0963b773af799e2db178870d10d.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni4ca8293ad07c2413e0de8a15362ea6c4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01ni580b37e60a5affa110a1cd3ca888b446.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3-1_00_01T__functor_00_01T__type1_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0134a004909681b7eead4388b32fdece62.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ca362af0d94b232f5a2473db276d56b0.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f6384c348e419c00f69f976bc89ba7b1.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_010_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0121184f2e1ef112f5a80623ba2748e9bd.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ce9a3bb67928cefa29aa463c4d9b5cd4.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f58c302972ee5458ed4968a2b13747c4.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_011_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01bb5df1408df2b9fa8d0c3f9fd8b5b598.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_013549d4c2a0a4cb47d1b90f99e27c5783.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01be149f6619e227f0b09fe9f7b62eaa77.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_012_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_012b4a7d70c2eae98129c3bfe9249d2cc2.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01570f8588a3828464e651970c3a153fae.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f974a7f25bea785b929a410bfe465a67.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_013_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_011f09cfd3501e5b5874f7e6f5ffe265bc.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01232622e68f03ed1747801822dfd682b9.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01db93de110c78ba2a9415a432bca61e85.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_014_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0139d8e7e057a699df0870a7d2fa4a0c50.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_013e0ef356edbd311fb08442ac3997e33a.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_0178717a512657e70d8dd04681908acdd2.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_015_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_018a5b055dd53c4d5f24b1fe7455cd33f7.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01f7c0a8288746607209a9ff74ff56a81c.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01ed14d55bfd02c716f6d545125549e176.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__functor_3_016_00_01T__functor_00_01T__bound_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_00_01nil_01_4.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1bind__return__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose1__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1compose2__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1connection__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1const__reference__wrapper-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1const__reference__wrapper.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1deduce__result__type-members.html
@@ -618,60 +601,60 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1dereference__trait-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1dereference__trait.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1functor__base__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3-1_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_010_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_011_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_012_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_013_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_014_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_015_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1hide__functor_3_016_00_01T__functor_01_4__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1is__base__and__derived-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1is__base__and__derived.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1lambda__base__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1reference__wrapper-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1reference__wrapper.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4__coll__graph.png
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor_3_01void_00_01T__functor_01_4__inherit__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1retype__return__functor__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base__coll__graph.png
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1signal__base__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__const__iterator__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator.html
-%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__iterator__coll__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__list-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1slot__list.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable.html
+%%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1trackable__inherit__graph.png
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type-members.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/structsigc_1_1unwrap__lambda__type.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html/tab_b.gif
@@ -691,12 +674,12 @@ libdata/pkgconfig/sigc++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch04s03.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/ch05.html
 %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html/index.html
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial/html
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/tutorial
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference/html
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/reference
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%/images
-%%PORTDOCS%%@dirrm share/doc/libsigc++-%%API_VERSION%%
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial/html
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/tutorial
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference/html
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/reference
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%/images
+%%PORTDOCS%%@dirrm %%PORTDOCS%%share/doc/libsigc++-%%API_VERSION%%
 %%PORTDOCS%%@dirrm share/devhelp/books/libsigc++-%%API_VERSION%%
 %%PORTDOCS%%@dirrmtry share/devhelp/books
 %%PORTDOCS%%@dirrmtry share/devhelp
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index db4eba218d11..57590d1c0b3a 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libsoup/Makefile,v 1.71 2009/10/20 00:22:57 kwm Exp $
+#   $MCom: ports/devel/libsoup/Makefile,v 1.81 2010/04/27 18:17:04 kwm Exp $
 #
 
 PORTNAME=	libsoup
-PORTVERSION=	2.28.2
-PORTREVISION?=	2
+PORTVERSION=	2.30.1
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -55,6 +55,10 @@ post-patch:
 	    	s|" == "|" = "|g' \
 		${WRKSRC}/configure
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
+	    	${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
+
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index a78a9e00dcb8..558f6991712a 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libsoup-2.28.2.tar.bz2) = 31d7ad416005eed4b78f07ac01b6b9f0
-SHA256 (gnome2/libsoup-2.28.2.tar.bz2) = 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
-SIZE (gnome2/libsoup-2.28.2.tar.bz2) = 721840
+MD5 (gnome2/libsoup-2.30.1.tar.bz2) = d80fb560a72370fba347785b00a750fb
+SHA256 (gnome2/libsoup-2.30.1.tar.bz2) = 6395c6e0bbcf4e822f1c5f3dd6f844116c571ed13cdf611d5c8f1dd4fe5777ed
+SIZE (gnome2/libsoup-2.30.1.tar.bz2) = 644401
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index f0b31a693725..2c2f61bacba1 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -3,6 +3,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-basic.h
 include/libsoup-%%VERSION%%/libsoup/soup-auth-domain-digest.h
 include/libsoup-%%VERSION%%/libsoup/soup-auth-domain.h
 include/libsoup-%%VERSION%%/libsoup/soup-auth.h
+include/libsoup-%%VERSION%%/libsoup/soup-connection.h
 include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h
 include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h
 include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-text.h
diff --git a/devel/mm-common/Makefile b/devel/mm-common/Makefile
index 75c6995dc87d..485992a4b31a 100644
--- a/devel/mm-common/Makefile
+++ b/devel/mm-common/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Koop Mast<kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/mm-common/Makefile,v 1.6 2009/09/21 18:58:15 kwm Exp $
+#   $MCom: ports/devel/mm-common/Makefile,v 1.11 2010/05/03 00:54:20 avl Exp $
 #
 
 PORTNAME=	mm-common
-PORTVERSION=	0.8
+PORTVERSION=	0.9.2
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
diff --git a/devel/mm-common/distinfo b/devel/mm-common/distinfo
index 5d13a0e23209..fd7783b3314b 100644
--- a/devel/mm-common/distinfo
+++ b/devel/mm-common/distinfo
@@ -1,3 +1,3 @@
-MD5 (mm-common-0.8.tar.bz2) = 2a335530f02c35dec1deea4b3627b725
-SHA256 (mm-common-0.8.tar.bz2) = 604c9b94629a4300e399ba72b497bedf1bf3c92b33ab8e688c32f70afe38e3c8
-SIZE (mm-common-0.8.tar.bz2) = 529592
+MD5 (mm-common-0.9.2.tar.bz2) = 8cdc5620bd864d1a17e353398e8ec1ab
+SHA256 (mm-common-0.9.2.tar.bz2) = 6bcd2681c95f3250b60127a8690901c16efd4b456f8c21e0fe72a1a6a15d89fc
+SIZE (mm-common-0.9.2.tar.bz2) = 612396
diff --git a/devel/mm-common/pkg-plist b/devel/mm-common/pkg-plist
index b5ea4637b363..262bfe32ada8 100644
--- a/devel/mm-common/pkg-plist
+++ b/devel/mm-common/pkg-plist
@@ -6,46 +6,7 @@ share/aclocal/mm-module.m4
 share/aclocal/mm-pkg.m4
 share/aclocal/mm-warnings.m4
 share/doc/mm-common/README
-share/doc/mm-common/skeletonmm/.gitignore
-share/doc/mm-common/skeletonmm/AUTHORS
-share/doc/mm-common/skeletonmm/COPYING
-share/doc/mm-common/skeletonmm/ChangeLog
-share/doc/mm-common/skeletonmm/Makefile.am
-share/doc/mm-common/skeletonmm/README
-share/doc/mm-common/skeletonmm/autogen.sh
-share/doc/mm-common/skeletonmm/build/.gitignore
-share/doc/mm-common/skeletonmm/codegen/Makefile.am
-share/doc/mm-common/skeletonmm/codegen/extradefs/generate_extra_defs_skeleton.cc
-share/doc/mm-common/skeletonmm/codegen/m4/convert.m4
-share/doc/mm-common/skeletonmm/codegen/m4/convert_skeleton.m4
-share/doc/mm-common/skeletonmm/codegen/m4/filelist.am
-share/doc/mm-common/skeletonmm/configure.ac
-share/doc/mm-common/skeletonmm/doc/Makefile.am
-share/doc/mm-common/skeletonmm/doc/reference/.gitignore
-share/doc/mm-common/skeletonmm/doc/reference/Doxyfile.in
-share/doc/mm-common/skeletonmm/examples/.gitignore
-share/doc/mm-common/skeletonmm/examples/Makefile.am
-share/doc/mm-common/skeletonmm/examples/example/example.cc
-share/doc/mm-common/skeletonmm/skeleton/.gitignore
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm-uninstalled.pc.in
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm.h
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm.pc.in
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm/Makefile.am
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm/filelist.am
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private/.gitignore
-share/doc/mm-common/skeletonmm/skeleton/skeletonmm/wrap_init.h
-share/doc/mm-common/skeletonmm/skeleton/skeletonmmconfig.h.in
-share/doc/mm-common/skeletonmm/skeleton/src/Makefile.am
-share/doc/mm-common/skeletonmm/skeleton/src/filelist.am
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton.ccg
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton.defs
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton.hg
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs.xml
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton_docs_override.xml
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton_enum.defs
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton_extra.defs
-share/doc/mm-common/skeletonmm/skeleton/src/skeleton_method.defs
-share/doc/mm-common/skeletonmm/skeletonmm.doap
+share/doc/mm-common/skeletonmm.tar.gz
 share/mm-common/build/compile-binding.am
 share/mm-common/build/dist-changelog.am
 share/mm-common/build/doc-reference.am
@@ -60,18 +21,5 @@ libdata/pkgconfig/mm-common-libstdc++.pc
 @dirrm share/mm-common/doctags
 @dirrm share/mm-common/build
 @dirrm share/mm-common
-@dirrm share/doc/mm-common/skeletonmm/skeleton/src
-@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm/private
-@dirrm share/doc/mm-common/skeletonmm/skeleton/skeletonmm
-@dirrm share/doc/mm-common/skeletonmm/skeleton
-@dirrm share/doc/mm-common/skeletonmm/doc/reference
-@dirrm share/doc/mm-common/skeletonmm/doc
-@dirrm share/doc/mm-common/skeletonmm/examples/example
-@dirrm share/doc/mm-common/skeletonmm/examples
-@dirrm share/doc/mm-common/skeletonmm/build
-@dirrm share/doc/mm-common/skeletonmm/codegen/m4
-@dirrm share/doc/mm-common/skeletonmm/codegen/extradefs
-@dirrm share/doc/mm-common/skeletonmm/codegen
-@dirrm share/doc/mm-common/skeletonmm
 @dirrm share/doc/mm-common
 @dirrmtry share/aclocal
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 68fb903b89a4..33fb37a21dc8 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-dbus/Makefile,v 1.8 2007/03/01 05:52:46 marcus Exp $
+#   $MCom: ports/devel/py-dbus/Makefile,v 1.10 2010/03/14 12:28:57 kwm Exp $
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.83.0
-PORTREVISION=	1
+PORTVERSION=	0.83.1
 CATEGORIES=	devel gnome python
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
index 4745c4dee7f1..58a0d4331ce9 100644
--- a/devel/py-dbus/distinfo
+++ b/devel/py-dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-python-0.83.0.tar.gz) = 562c78876219bf458d79a041af18293d
-SHA256 (dbus-python-0.83.0.tar.gz) = 89dd1d5aa5c2ba04677d1aa2616caa50274d8c08f3d6bc164e6f7b9930776191
-SIZE (dbus-python-0.83.0.tar.gz) = 494281
+MD5 (dbus-python-0.83.1.tar.gz) = 5fdf3970aa0c00020289de7ba8f3be18
+SHA256 (dbus-python-0.83.1.tar.gz) = ce283806f1af4f2322e183a276528a880b503c74972932bd09f06bdb7fcc1b99
+SIZE (dbus-python-0.83.1.tar.gz) = 533391
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index b7c2855cac04..e7dc28283112 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.35 2009/09/23 21:44:30 kwm Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.37 2010/01/03 06:54:20 marcus Exp $
 #
 
 PORTNAME=	gobject
-PORTVERSION=	2.20.0
+PORTVERSION=	2.21.1
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,8 +18,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
-LIB_DEPENDS=	girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
diff --git a/devel/py-gobject/distinfo b/devel/py-gobject/distinfo
index 1e5e2e37b052..2c1792ed61e3 100644
--- a/devel/py-gobject/distinfo
+++ b/devel/py-gobject/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pygobject-2.20.0.tar.bz2) = 10e1fb79be3d698476a28b1e1b0c5640
-SHA256 (gnome2/pygobject-2.20.0.tar.bz2) = 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
-SIZE (gnome2/pygobject-2.20.0.tar.bz2) = 666287
+MD5 (gnome2/pygobject-2.21.1.tar.bz2) = c12eef0cd6725dc7245c3db78ef85d2d
+SHA256 (gnome2/pygobject-2.21.1.tar.bz2) = e6ae6c70966899d2040c82ae4e1590cf941ebf121a3ec61e80bf517ce8d9be0a
+SIZE (gnome2/pygobject-2.21.1.tar.bz2) = 681795
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index c6b65ccf14e2..67f431338713 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,5 +1,4 @@
 bin/pygobject-codegen-2.0
-include/pygobject/bank.h
 include/pygtk-2.0/pyglib.h
 include/pygtk-2.0/pygobject.h
 lib/libpyglib-2.0-python%%PYTHON_VER%%.la
@@ -15,32 +14,6 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/btypes.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/importer.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/module.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gdk.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/Gtk.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.la
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repo.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/repository.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/glib/__init__.pyo
@@ -179,16 +152,20 @@ share/pygobject/2.0/defs/gfileattribute.override
 share/pygobject/2.0/defs/gfileenumerator.override
 share/pygobject/2.0/defs/gfileinfo.override
 share/pygobject/2.0/defs/gfileinputstream.override
+share/pygobject/2.0/defs/gfileiostream.override
 share/pygobject/2.0/defs/gfileoutputstream.override
 share/pygobject/2.0/defs/gicon.override
 share/pygobject/2.0/defs/ginputstream.override
 share/pygobject/2.0/defs/gio-types.defs
 share/pygobject/2.0/defs/gio.defs
 share/pygobject/2.0/defs/gio.override
+share/pygobject/2.0/defs/giostream.override
 share/pygobject/2.0/defs/gmemoryinputstream.override
 share/pygobject/2.0/defs/gmemoryoutputstream.override
 share/pygobject/2.0/defs/gmount.override
 share/pygobject/2.0/defs/goutputstream.override
+share/pygobject/2.0/defs/gresolver.override
+share/pygobject/2.0/defs/gsocket.override
 share/pygobject/2.0/defs/gvolume.override
 share/pygobject/2.0/defs/gvolumemonitor.override
 share/pygobject/2.0/defs/unix-types.defs
@@ -209,9 +186,6 @@ share/pygobject/xsl/ref-html-style.xsl
 @dirrm share/doc/pygobject
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gobject
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/glib
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository/overrides
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/girepository
 @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
 @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
 @dirrmtry include/pygtk-2.0
-@dirrm include/pygobject
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index a23991624f0c..c9ffe65c8c5b 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,12 +3,14 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/seed/Makefile,v 1.8 2009/10/19 19:33:26 kwm Exp $
+#   $MCom: ports/devel/seed/Makefile,v 1.19 2010/05/08 17:04:45 marcus Exp $
+#
+# NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
+# To do that, just replace imports.searchPaths with "." and ".." elements.
 #
 
 PORTNAME=	seed
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -39,23 +41,28 @@ MAN1=		seed.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not link on sparc64: TLS not available on this platform
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
-	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
-.if defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} -e 's|examples||g' \
-		${WRKSRC}/Makefile.in
-.endif
+#	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
+#		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
+#.if defined(NOPORTEXAMPLES)
+#	@${REINPLACE_CMD} -e 's|examples||g' \
+#		${WRKSRC}/Makefile.in
+#.endif
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
 		${WRKSRC}/Makefile.in
 .endif
 
+pre-build:
+	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	    	${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
+	${CP} ${WRKSRC}/extensions/Seed.js ${WRKSRC}/extensions/Seed.js.sav
+	${CP} ${FILESDIR}/Seed.js ${WRKSRC}/extensions/Seed.js
+
+post-build:
+	${CP} ${WRKSRC}/extensions/Seed.js.sav ${WRKSRC}/extensions/Seed.js
+
 .include <bsd.port.post.mk>
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
index 3733f839437a..6bee1233b0cf 100644
--- a/devel/seed/distinfo
+++ b/devel/seed/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seed-2.28.1.tar.bz2) = ac2b3e2789528510632154ed08380790
-SHA256 (gnome2/seed-2.28.1.tar.bz2) = c5018a9e4267d7b52c690ceb088f8c4573670460d6d5bc413afcc13510d4f4f2
-SIZE (gnome2/seed-2.28.1.tar.bz2) = 839512
+MD5 (gnome2/seed-2.30.0.tar.bz2) = dd09d22c6a06b4bbef7320bb6a715c0f
+SHA256 (gnome2/seed-2.30.0.tar.bz2) = 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361
+SIZE (gnome2/seed-2.30.0.tar.bz2) = 770032
diff --git a/devel/seed/files/Seed.js b/devel/seed/files/Seed.js
new file mode 100644
index 000000000000..9edb12c87564
--- /dev/null
+++ b/devel/seed/files/Seed.js
@@ -0,0 +1,203 @@
+GLib = imports.gi.GLib;
+
+Seed.sprintf = function ()
+{
+    if (typeof arguments == "undefined") { return null; }
+    if (arguments.length < 1) { return null; }
+    if (typeof arguments[0] != "string") { return null; }
+    if (typeof RegExp == "undefined") { return null; }
+
+    var string = arguments[0];
+    var exp = new RegExp(/(%([%]|(\-)?(\+|\x20)?(0)?(\d+)?(\.(\d)?)?([bcdfosxX])))/g);
+    var matches = new Array();
+    var strings = new Array();
+    var convCount = 0;
+    var stringPosStart = 0;
+    var stringPosEnd = 0;
+    var matchPosEnd = 0;
+    var newString = '';
+    var match = null;
+
+    while (match = exp.exec(string)) {
+        if (match[9]) { convCount += 1; }
+
+        stringPosStart = matchPosEnd;
+        stringPosEnd = exp.lastIndex - match[0].length;
+        strings[strings.length] = string.substring(stringPosStart, stringPosEnd);
+
+        matchPosEnd = exp.lastIndex;
+        matches[matches.length] = {
+            match: match[0],
+            left: match[3] ? true : false,
+            sign: match[4] || '',
+            pad: match[5] || ' ',
+            min: match[6] || 0,
+            precision: match[8],
+            code: match[9] || '%',
+            negative: parseInt(arguments[convCount]) < 0 ? true : false,
+            argument: String(arguments[convCount])
+        };
+    }
+    strings[strings.length] = string.substring(matchPosEnd);
+
+    if (matches.length == 0) { return string; }
+    if ((arguments.length - 1) < convCount) { return null; }
+
+    var code = null;
+    var match = null;
+    var i = null;
+
+    for (i=0; i<matches.length; i++) {
+
+        if (matches[i].code == '%') { substitution = '%' }
+        else if (matches[i].code == 'b') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(2));
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'c') {
+            matches[i].argument = String(String.fromCharCode(parseInt(Math.abs(parseInt(matches[i].argument)))));
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'd') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'f') {
+            matches[i].argument = String(Math.abs(parseFloat(matches[i].argument)).toFixed(matches[i].precision ? matches[i].precision : 6));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'o') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(8));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 's') {
+            matches[i].argument = matches[i].argument.substring(0, matches[i].precision ? matches[i].precision : matches[i].argument.length)
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'x') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'X') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));
+            substitution = Seed.sprintf.convert(matches[i]).toUpperCase();
+        }
+        else {
+            substitution = matches[i].match;
+        }
+
+        newString += strings[i];
+        newString += substitution;
+
+    }
+    newString += strings[i];
+
+    return newString;
+
+};
+
+Seed.sprintf.convert = function(match, nosign)
+{
+    if (nosign) {
+        match.sign = '';
+    } else {
+        match.sign = match.negative ? '-' : match.sign;
+    }
+    var l = match.min - match.argument.length + 1 - match.sign.length;
+    var pad = new Array(l < 0 ? 0 : l).join(match.pad);
+    if (!match.left) {
+        if (match.pad == "0" || nosign) {
+            return match.sign + pad + match.argument;
+        } else {
+            return pad + match.sign + match.argument;
+        }
+    } else {
+        if (match.pad == "0" || nosign) {
+            return match.sign + match.argument + pad.replace(/0/g, ' ');
+        } else {
+            return match.sign + match.argument + pad;
+        }
+    }
+};
+
+
+Seed.repl = function()
+{
+	try
+	{
+		if(readline)
+		{
+			// readline is loaded
+		}
+	}
+	catch (e)
+	{
+		try
+		{
+			readline = imports.readline;
+		}
+		catch (e)
+		{
+			print(e.name + " " + e.message);
+			return true;
+		}
+	}
+
+	try
+	{
+		item = readline.readline("> ");
+		if (item == "continue")
+			return false;
+		print(eval(item));
+	}
+	catch (e)
+	{
+		print(e.name + " " + e.message);
+	}
+	return true;
+}
+
+
+Seed.glib_repl = function()
+{
+	GLib.idle_add(Seed.repl, null);
+}
+
+Seed.thread_repl = function()
+{
+	GLib.thread_create_full(function() { while(Seed.repl()){} },
+							null, 0, true);
+}
+
+Seed.printf = function () { print(Seed.sprintf.apply(this, arguments)) };
+
+if(!imports.searchPath || (imports.searchPath.length == 0))
+{
+	imports.searchPath = [ ".",
+	                       ".." ];
+
+	if(Seed.argv.length > 1)
+	{
+		__script_path__ = GLib.path_get_dirname(Seed.argv[1]);
+		
+		try
+		{
+			if(!GLib.path_is_absolute(__script_path__))
+			{
+				__script_path__ = GLib.build_filenamev([GLib.get_current_dir(),
+				                                      __script_path__]);
+			}
+		
+			__script_path__ = imports.os.realpath(__script_path__);
+		
+			if(__script_path__ && __script_path__ != "")
+				imports.searchPath.push(__script_path__);
+		}
+		catch(e)
+		{
+			print(imports.JSON.stringify(e));
+		}
+	}
+
+	imports.searchPath.push(".");
+}
diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c
index c216fa88c4a2..ffce2725415b 100644
--- a/devel/seed/files/patch-libseed_seed-importer.c
+++ b/devel/seed/files/patch-libseed_seed-importer.c
@@ -1,6 +1,6 @@
---- libseed/seed-importer.c.orig	2009-08-10 16:23:35.000000000 -0400
-+++ libseed/seed-importer.c	2009-08-22 14:36:00.000000000 -0400
-@@ -22,6 +22,8 @@
+--- libseed/seed-importer.c.orig	2009-12-31 11:42:51.000000000 +0100
++++ libseed/seed-importer.c	2010-01-02 02:12:09.000000000 +0100
+@@ -19,6 +19,8 @@
  
  #include <gio/gio.h>
  #include <string.h>
@@ -9,7 +9,7 @@
  
  #include "seed-private.h"
  
-@@ -637,8 +639,9 @@ seed_importer_handle_file (JSContextRef 
+@@ -636,8 +638,9 @@ seed_importer_handle_file (JSContextRef 
    JSValueRef js_file_dirname;
    JSObjectRef global, c_global;
    JSStringRef file_contents, file_name;
@@ -20,11 +20,11 @@
  
    file_path = g_build_filename (dir, file, NULL);
    canonical = seed_importer_canonicalize_path (file_path);
-@@ -692,15 +695,24 @@ seed_importer_handle_file (JSContextRef 
+@@ -691,15 +694,24 @@ seed_importer_handle_file (JSContextRef 
  					g_path_get_dirname (file_path), NULL);
      }
  
--  normalized_path = canonicalize_file_name (absolute_path);
+-  normalized_path = realpath (absolute_path, NULL);
 +#ifdef PATH_MAX
 +  path_max = PATH_MAX;
 +#else
diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c
index 999f1d97a905..71aa3b2242f1 100644
--- a/devel/seed/files/patch-modules_gettext_seed-gettext.c
+++ b/devel/seed/files/patch-modules_gettext_seed-gettext.c
@@ -1,6 +1,6 @@
---- modules/gettext/seed-gettext.c.orig	2009-07-26 19:23:31.000000000 -0400
-+++ modules/gettext/seed-gettext.c	2009-07-26 19:25:12.000000000 -0400
-@@ -293,12 +293,24 @@ seed_module_init(SeedEngine *local_eng)
+--- modules/gettext/seed-gettext.c.orig	2009-12-31 05:42:51.000000000 -0500
++++ modules/gettext/seed-gettext.c	2010-01-07 19:07:10.000000000 -0500
+@@ -312,12 +313,24 @@ seed_module_init(SeedEngine *local_eng)
  	DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY);
  	DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES);
  	DEFINE_ENUM_MEMBER(ns_ref, LC_ALL);
diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c
index a24fbd1e16d7..6d96d1478c92 100644
--- a/devel/seed/files/patch-modules_os_seed-os.c
+++ b/devel/seed/files/patch-modules_os_seed-os.c
@@ -1,5 +1,5 @@
---- modules/os/seed-os.c.orig	2009-10-07 01:43:54.000000000 -0400
-+++ modules/os/seed-os.c	2009-12-19 14:53:48.000000000 -0500
+--- modules/os/seed-os.c.orig	2009-12-31 05:44:49.000000000 -0500
++++ modules/os/seed-os.c	2010-01-07 19:01:05.000000000 -0500
 @@ -29,8 +29,15 @@
  
  #include <sys/stat.h>
@@ -31,7 +31,7 @@
        EXPECTED_EXCEPTION("os.realpath", "1 argument");
      }
    arg = seed_value_to_string (ctx, arguments[0], exception);
--  ret = canonicalize_file_name(arg);
+-  ret = realpath(arg, NULL);
 +#ifdef PATH_MAX
 +  path_max = PATH_MAX;
 +#else
@@ -83,7 +83,7 @@
  }
  
  SeedValue
-@@ -1112,7 +1143,9 @@ seed_module_init(SeedEngine * eng)
+@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng)
  #if defined (O_DIRECT)
    OS_DEFINE_QUICK_ENUM (O_DIRECT);
  #endif
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
index 54621017c52a..b91412a68d76 100644
--- a/devel/seed/pkg-plist
+++ b/devel/seed/pkg-plist
@@ -58,84 +58,13 @@ libdata/pkgconfig/seed.pc
 %%DATADIR%%/extensions/Seed.js
 %%DATADIR%%/extensions/xml.js
 %%DATADIR%%/lang.js
-%%PORTEXAMPLES%%%%DATADIR%%/repl.js
+%%DATADIR%%/repl.js
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
 %%PORTDOCS%%%%DOCSDIR%%/conventions.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio-server.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HACKING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accelgroup.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/actions.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async-quine.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserSettings.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserStatusbar.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserTab.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserToolbar.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserView.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/TabbedBrowser.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cairo.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator-mpfr.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cairo-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cogl-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/clutter-pad.ui
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/animated-rectangle.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/box2d.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/cairo.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/pink-stage.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/spring.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/redhand.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderEditor.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderView.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/bob.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/default.glsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-banshee.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-consolekit.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-networkmanager.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/networkManagerIfaces.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdkpixbufloader.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/env.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/pretty.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/thread.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timeout.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timer.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/twitter.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkplug.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktextview.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktreeview.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-packing.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-reddit.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ls.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-oscillator.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify-test.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/glut-teapot.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/seed-gears.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/triangle-actor.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango-fontset.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poppler.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quine.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/repl.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/soup.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-repl.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vte-test.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/sample.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/weather.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-dom.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-tree.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-xpath.js
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/mapping/enum-mapping.png
 %%PORTDOCS%%%%DOCSDIR%%/mapping/mapping.html
@@ -160,15 +89,6 @@ libdata/pkgconfig/seed.pc
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.png
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.svg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/browser
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-shader
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dbus
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/glib
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder
author	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2010-05-10 21:19:08 +0000
commit	48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
tree	b627baa77f19bb1eab2fa4dee08aab1908131cd0 /devel
parent	fbdf96410f8e803568c33397323dd9d8d3af995f (diff)
download	ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.tar.gz ports-48e62d9a379cd45a15f6ae89d564f81b3c13d16e.zip