Update to 2.16.0:

libbonobo 2.16.0

	* API DOC fixes (Alex, Gustavo)
	* Don't check for xrdb or dladdr when we don't use them (Kjartan)
	* Updated and new translations

libbonobo 2.15.3

	* Fix ghtread configure test when building uninstalled (Brian Cameron)
	* Various bonobo-activation login fixes (Michael)
	* Various cleanups of exception handling (Gustavo)
	* Fixes for panel sometimes hanging on login (Alex)

libbonobo 2.15.2

	* Warning and build fixes. (Marcus Meissner, Kjartan)
	* Revert a change that caused segfaults during make check
	  (Kjartan)
	* New and updated translations

libbonobo 2.15.1

	* Fix Coverity reports for leaks, accessing uninitialized memory
	  and null pointer derefs (Michael, Kjartan)

libbonobo 2.15.0

	* Add new MIME api to make gnome-vfs not have a hard dependency on
	libbonobo (Alex)
	* Fix some leaks (Kjartan)
	* Win32 portability fixes (Tor)
	* po/LINGUAS porting (Przemysław Grzegorczyk)
	* Port to GOption from popt (Michael Terry)
	* Build fixes and cleanups (Michael Meeks, Kjartan)

4 files changed, 108 insertions, 115 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 4e89117825a..897aa072282 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2006/07/05 05:37:40 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2006/09/15 15:06:56 jmmv Exp $
 
-DISTNAME=		libbonobo-2.14.0
+DISTNAME=		libbonobo-2.16.0
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.14/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.16/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -20,7 +20,6 @@ PKGCONFIG_OVERRIDE=	bonobo/libbonobo-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	bonobo-activation/bonobo-activation-2.0.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		PERL_PATH=${TOOLS_PERL5:Q}
 
 PKG_SYSCONFSUBDIR=	bonobo-activation
@@ -32,6 +31,8 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \
 				{ print "@unexec $${RMDIR} %D/" $$2 \
 				  " 2>/dev/null || $${TRUE}"; next; }
 
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index 7dc2ad71cca..08d4e578248 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/09/15 15:06:57 jmmv Exp $
 bin/activation-client
 bin/bonobo-activation-run-query
 bin/bonobo-slay
@@ -9,6 +9,7 @@ include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-mime.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
@@ -62,96 +63,98 @@ lib/pkgconfig/libbonobo-2.0.pc
 libexec/bonobo-activation-server
 man/man1/bonobo-activation-server.1
 sbin/bonobo-activation-sysconf
-share/doc/bonobo-activation/api-reference.html
-share/doc/bonobo-activation/architecture.html
-share/doc/bonobo-activation/async-activation.html
-share/doc/bonobo-activation/attribute-tag.html
-share/doc/bonobo-activation/bonobo-activation-Debugging.html
-share/doc/bonobo-activation/bonobo-activation-Initialization.html
-share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html
-share/doc/bonobo-activation/bonobo-activation-Registration.html
-share/doc/bonobo-activation/bonobo-activation-Utilities.html
-share/doc/bonobo-activation/bonobo-activation.devhelp
-share/doc/bonobo-activation/bonobo-activation.png
-share/doc/bonobo-activation/checklist.html
-share/doc/bonobo-activation/configuring.html
-share/doc/bonobo-activation/home.png
-share/doc/bonobo-activation/index.html
-share/doc/bonobo-activation/index.sgml
-share/doc/bonobo-activation/left.png
-share/doc/bonobo-activation/lgpl.html
-share/doc/bonobo-activation/migrating.html
-share/doc/bonobo-activation/query-langage.html
-share/doc/bonobo-activation/query-syntax.html
-share/doc/bonobo-activation/right.png
-share/doc/bonobo-activation/server-arch.html
-share/doc/bonobo-activation/server-xml-reference.html
-share/doc/bonobo-activation/style.css
-share/doc/bonobo-activation/terms.html
-share/doc/bonobo-activation/tutorial.html
-share/doc/bonobo-activation/up.png
-share/doc/libbonobo/debugging.html
-share/doc/libbonobo/factories.html
-share/doc/libbonobo/general.html
-share/doc/libbonobo/home.png
-share/doc/libbonobo/index.html
-share/doc/libbonobo/index.sgml
-share/doc/libbonobo/left.png
-share/doc/libbonobo/libbonobo-bonobo-app-client.html
-share/doc/libbonobo/libbonobo-bonobo-application.html
-share/doc/libbonobo/libbonobo-bonobo-arg.html
-share/doc/libbonobo/libbonobo-bonobo-config-database.html
-share/doc/libbonobo/libbonobo-bonobo-context.html
-share/doc/libbonobo/libbonobo-bonobo-event-source.html
-share/doc/libbonobo/libbonobo-bonobo-exception.html
-share/doc/libbonobo/libbonobo-bonobo-generic-factory.html
-share/doc/libbonobo/libbonobo-bonobo-i18n.html
-share/doc/libbonobo/libbonobo-bonobo-item-container.html
-share/doc/libbonobo/libbonobo-bonobo-item-handler.html
-share/doc/libbonobo/libbonobo-bonobo-listener.html
-share/doc/libbonobo/libbonobo-bonobo-main.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-util.html
-share/doc/libbonobo/libbonobo-bonobo-moniker.html
-share/doc/libbonobo/libbonobo-bonobo-object.html
-share/doc/libbonobo/libbonobo-bonobo-persist-client.html
-share/doc/libbonobo/libbonobo-bonobo-persist-file.html
-share/doc/libbonobo/libbonobo-bonobo-persist-stream.html
-share/doc/libbonobo/libbonobo-bonobo-persist.html
-share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html
-share/doc/libbonobo/libbonobo-bonobo-property-bag.html
-share/doc/libbonobo/libbonobo-bonobo-running-context.html
-share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html
-share/doc/libbonobo/libbonobo-bonobo-shutdown.html
-share/doc/libbonobo/libbonobo-bonobo-storage-memory.html
-share/doc/libbonobo/libbonobo-bonobo-storage.html
-share/doc/libbonobo/libbonobo-bonobo-stream-client.html
-share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
-share/doc/libbonobo/libbonobo-bonobo-types.html
-share/doc/libbonobo/libbonobo-faq.html
-share/doc/libbonobo/libbonobo.devhelp
-share/doc/libbonobo/misc.html
-share/doc/libbonobo/monikers-overview.html
-share/doc/libbonobo/monikers.html
-share/doc/libbonobo/persist-file.png
-share/doc/libbonobo/persist-storage.png
-share/doc/libbonobo/persist-stream.png
-share/doc/libbonobo/persist.html
-share/doc/libbonobo/persist.png
-share/doc/libbonobo/properties.html
-share/doc/libbonobo/property-bags.html
-share/doc/libbonobo/refcounting.html
-share/doc/libbonobo/right.png
-share/doc/libbonobo/running-context.png
-share/doc/libbonobo/storage.png
-share/doc/libbonobo/stream.png
-share/doc/libbonobo/streams.html
-share/doc/libbonobo/style.css
-share/doc/libbonobo/unknown.png
-share/doc/libbonobo/up.png
 share/examples/bonobo-activation/bonobo-activation-config.xml
+share/gtk-doc/html/bonobo-activation/api-reference.html
+share/gtk-doc/html/bonobo-activation/architecture.html
+share/gtk-doc/html/bonobo-activation/async-activation.html
+share/gtk-doc/html/bonobo-activation/attribute-tag.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation-Debugging.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation-Initialization.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation-Query-and-Activation.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation-Registration.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation-Utilities.html
+share/gtk-doc/html/bonobo-activation/bonobo-activation.devhelp
+share/gtk-doc/html/bonobo-activation/bonobo-activation.devhelp2
+share/gtk-doc/html/bonobo-activation/bonobo-activation.png
+share/gtk-doc/html/bonobo-activation/checklist.html
+share/gtk-doc/html/bonobo-activation/configuring.html
+share/gtk-doc/html/bonobo-activation/home.png
+share/gtk-doc/html/bonobo-activation/index.html
+share/gtk-doc/html/bonobo-activation/index.sgml
+share/gtk-doc/html/bonobo-activation/left.png
+share/gtk-doc/html/bonobo-activation/lgpl.html
+share/gtk-doc/html/bonobo-activation/migrating.html
+share/gtk-doc/html/bonobo-activation/query-langage.html
+share/gtk-doc/html/bonobo-activation/query-syntax.html
+share/gtk-doc/html/bonobo-activation/right.png
+share/gtk-doc/html/bonobo-activation/server-arch.html
+share/gtk-doc/html/bonobo-activation/server-xml-reference.html
+share/gtk-doc/html/bonobo-activation/style.css
+share/gtk-doc/html/bonobo-activation/terms.html
+share/gtk-doc/html/bonobo-activation/tutorial.html
+share/gtk-doc/html/bonobo-activation/up.png
+share/gtk-doc/html/libbonobo/debugging.html
+share/gtk-doc/html/libbonobo/factories.html
+share/gtk-doc/html/libbonobo/general.html
+share/gtk-doc/html/libbonobo/home.png
+share/gtk-doc/html/libbonobo/index.html
+share/gtk-doc/html/libbonobo/index.sgml
+share/gtk-doc/html/libbonobo/left.png
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-app-client.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-application.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-arg.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-config-database.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-context.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-event-source.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-exception.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-generic-factory.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-i18n.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-container.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-item-handler.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-listener.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-main.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-context.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-simple.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker-util.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-moniker.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-object.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-client.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-file.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist-stream.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-persist.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag-client.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-property-bag.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-running-context.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-shlib-factory.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-shutdown.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage-memory.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-storage.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-client.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-stream-memory.html
+share/gtk-doc/html/libbonobo/libbonobo-bonobo-types.html
+share/gtk-doc/html/libbonobo/libbonobo-faq.html
+share/gtk-doc/html/libbonobo/libbonobo.devhelp
+share/gtk-doc/html/libbonobo/libbonobo.devhelp2
+share/gtk-doc/html/libbonobo/misc.html
+share/gtk-doc/html/libbonobo/monikers-overview.html
+share/gtk-doc/html/libbonobo/monikers.html
+share/gtk-doc/html/libbonobo/persist-file.png
+share/gtk-doc/html/libbonobo/persist-storage.png
+share/gtk-doc/html/libbonobo/persist-stream.png
+share/gtk-doc/html/libbonobo/persist.html
+share/gtk-doc/html/libbonobo/persist.png
+share/gtk-doc/html/libbonobo/properties.html
+share/gtk-doc/html/libbonobo/property-bags.html
+share/gtk-doc/html/libbonobo/refcounting.html
+share/gtk-doc/html/libbonobo/right.png
+share/gtk-doc/html/libbonobo/running-context.png
+share/gtk-doc/html/libbonobo/storage.png
+share/gtk-doc/html/libbonobo/stream.png
+share/gtk-doc/html/libbonobo/streams.html
+share/gtk-doc/html/libbonobo/style.css
+share/gtk-doc/html/libbonobo/unknown.png
+share/gtk-doc/html/libbonobo/up.png
 share/idl/bonobo-2.0/Bonobo.idl
 share/idl/bonobo-2.0/Bonobo_Application.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
@@ -182,6 +185,7 @@ 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
 share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
@@ -209,6 +213,7 @@ share/locale/id/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ka/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
@@ -222,7 +227,7 @@ share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/or/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
@@ -244,13 +249,14 @@ share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/xh/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm share/idl/bonobo-activation-2.0
 @dirrm share/idl/bonobo-2.0
 @comment in ORBit2: @dirrm share/idl
+@dirrm share/gtk-doc/html/libbonobo
+@dirrm share/gtk-doc/html/bonobo-activation
 @dirrm share/examples/bonobo-activation
-@dirrm share/doc/libbonobo
-@dirrm share/doc/bonobo-activation
 @comment in ORBit2: @dirrm lib/orbit-2.0
 @dirrm lib/bonobo/servers
 @unexec ${RMDIR} %D/lib/bonobo/monikers 2>/dev/null || ${TRUE}
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index ef9b473f815..3e46c18bb17 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.19 2006/03/30 21:06:41 jmmv Exp $
+$NetBSD: distinfo,v 1.20 2006/09/15 15:06:57 jmmv Exp $
 
-SHA1 (libbonobo-2.14.0.tar.bz2) = 2f6c7de0a7104d153ade745117c38bea3b9a1092
-RMD160 (libbonobo-2.14.0.tar.bz2) = 7364aa2db7c55b1e2f2b5063e29b2062d5b73b3d
-Size (libbonobo-2.14.0.tar.bz2) = 1386855 bytes
+SHA1 (libbonobo-2.16.0.tar.bz2) = 8cafcd9ef92f7b81e7cc1868814add3b6794af0a
+RMD160 (libbonobo-2.16.0.tar.bz2) = 4bbaf4c58e424f786732ac57ca73d1225b195b73
+Size (libbonobo-2.16.0.tar.bz2) = 1406355 bytes
 SHA1 (patch-aa) = 4f7b7a16f7cba64206b5dccb021972a09efe9f55
 SHA1 (patch-ab) = 320fc0a2be131a0ab6b200643fb733f80899a005
-SHA1 (patch-ac) = db3f99f5fa1dc6ae3d82287804780836689b6d0f
diff --git a/devel/libbonobo/patches/patch-ac b/devel/libbonobo/patches/patch-ac
deleted file mode 100644
index bac7c9213d9..00000000000
--- a/devel/libbonobo/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/09/26 19:29:16 danw Exp $
-
---- bonobo-activation/bonobo-activation-client.c.orig	Mon Sep 13 10:26:19 2004
-+++ bonobo-activation/bonobo-activation-client.c
-@@ -197,7 +197,7 @@ get_lang_list (void)
-         return result;
- }
- 
--#if defined(__APPLE__) && defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-+#if defined(__APPLE__)
- #include <crt_externs.h>
- #define environ (*_NSGetEnviron())
- #endif