Update to 2.6.0. Changes from the previous stable version include (the

list may be incomplete):

libbonobo 2.5.4
	+ bugs fixed
		+ application init (Gustavo)
		+ program arg translation (Anders, Hidetoshi)
	+ featurelets
		+ *Application* documentation (Gustavo)
		+ better activation debugging (Rodrigo, Michael)

libbonobo 2.5.3
	+ bugs fixed
		+ regression tests problems (Gustavo)
		+ AIX portability (Albert Chin-A-Young)
	+ featurelets
		+ improve b-a-s debug code (Michael)
		+ use syslog for run-time spew (Michael Terry)

libbonobo 2.5.2
	+ bugs fixed
		+ _active query cache fix (Michael)
		+ property bag logic bug fix (Dave Jones)
		+ backwards compat dameon fix (Michael, Crispin Flowerday)
		+ object directory fixes (Gustavo)
		+ l10n docs fix (Martin Kretzschmar)
		+ BonoboApplication fixes (Gustavo)
		+ use environ not _environ for Solaris (Michael)
	+ featurelets (Gustavo)
		+ b-a-s tracks dead clients
		+ updated tests

8 files changed, 39 insertions, 104 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index e3931474162..e326282ae60 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2004/03/10 05:02:42 reed Exp $
+# $NetBSD: Makefile,v 1.26 2004/04/01 18:18:00 jmmv Exp $
 
-DISTNAME=		libbonobo-2.4.3
+DISTNAME=		libbonobo-2.6.0
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -21,7 +21,6 @@ USE_GNU_TOOLS+=		make yacc
 PKGCONFIG_OVERRIDE=	bonobo/libbonobo-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	bonobo-activation/bonobo-activation-2.0.pc.in
 
-CONFIGURE_ARGS= 	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index 3b7a257d84d..eb98905f25b 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/14 19:46:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:18:00 jmmv Exp $
 bin/activation-client
 bin/bonobo-activation-run-query
 bin/bonobo-slay
@@ -15,6 +15,8 @@ include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
 include/libbonobo-2.0/bonobo/Bonobo.h
+include/libbonobo-2.0/bonobo/bonobo-app-client.h
+include/libbonobo-2.0/bonobo/bonobo-application.h
 include/libbonobo-2.0/bonobo/bonobo-arg.h
 include/libbonobo-2.0/bonobo/bonobo-context.h
 include/libbonobo-2.0/bonobo/bonobo-event-source.h
@@ -75,93 +77,9 @@ lib/pkgconfig/libbonobo-2.0.pc
 libexec/bonobo-activation-server
 man/man1/bonobo-activation-server.1
 sbin/bonobo-activation-sysconf
-share/doc/html/bonobo-activation/api-reference.html
-share/doc/html/bonobo-activation/architecture.html
-share/doc/html/bonobo-activation/async-activation.html
-share/doc/html/bonobo-activation/attribute-tag.html
-share/doc/html/bonobo-activation/bonobo-activation-Debugging.html
-share/doc/html/bonobo-activation/bonobo-activation-Initialization.html
-share/doc/html/bonobo-activation/bonobo-activation-Query-and-Activation.html
-share/doc/html/bonobo-activation/bonobo-activation-Registration.html
-share/doc/html/bonobo-activation/bonobo-activation-Utilities.html
-share/doc/html/bonobo-activation/bonobo-activation.devhelp
-share/doc/html/bonobo-activation/bonobo-activation.png
-share/doc/html/bonobo-activation/checklist.html
-share/doc/html/bonobo-activation/configuring.html
-share/doc/html/bonobo-activation/home.png
-share/doc/html/bonobo-activation/index.html
-share/doc/html/bonobo-activation/index.sgml
-share/doc/html/bonobo-activation/left.png
-share/doc/html/bonobo-activation/lgpl.html
-share/doc/html/bonobo-activation/migrating.html
-share/doc/html/bonobo-activation/query-langage.html
-share/doc/html/bonobo-activation/query-syntax.html
-share/doc/html/bonobo-activation/right.png
-share/doc/html/bonobo-activation/server-arch.html
-share/doc/html/bonobo-activation/server-xml-reference.html
-share/doc/html/bonobo-activation/terms.html
-share/doc/html/bonobo-activation/tutorial.html
-share/doc/html/bonobo-activation/up.png
-share/doc/html/libbonobo/debugging.html
-share/doc/html/libbonobo/factories.html
-share/doc/html/libbonobo/general.html
-share/doc/html/libbonobo/home.png
-share/doc/html/libbonobo/index.html
-share/doc/html/libbonobo/index.sgml
-share/doc/html/libbonobo/left.png
-share/doc/html/libbonobo/libbonobo-bonobo-arg.html
-share/doc/html/libbonobo/libbonobo-bonobo-config-database.html
-share/doc/html/libbonobo/libbonobo-bonobo-context.html
-share/doc/html/libbonobo/libbonobo-bonobo-event-source.html
-share/doc/html/libbonobo/libbonobo-bonobo-exception.html
-share/doc/html/libbonobo/libbonobo-bonobo-generic-factory.html
-share/doc/html/libbonobo/libbonobo-bonobo-i18n.html
-share/doc/html/libbonobo/libbonobo-bonobo-item-container.html
-share/doc/html/libbonobo/libbonobo-bonobo-item-handler.html
-share/doc/html/libbonobo/libbonobo-bonobo-listener.html
-share/doc/html/libbonobo/libbonobo-bonobo-main.html
-share/doc/html/libbonobo/libbonobo-bonobo-moniker-context.html
-share/doc/html/libbonobo/libbonobo-bonobo-moniker-extender.html
-share/doc/html/libbonobo/libbonobo-bonobo-moniker-simple.html
-share/doc/html/libbonobo/libbonobo-bonobo-moniker-util.html
-share/doc/html/libbonobo/libbonobo-bonobo-moniker.html
-share/doc/html/libbonobo/libbonobo-bonobo-object.html
-share/doc/html/libbonobo/libbonobo-bonobo-persist-client.html
-share/doc/html/libbonobo/libbonobo-bonobo-persist-file.html
-share/doc/html/libbonobo/libbonobo-bonobo-persist-stream.html
-share/doc/html/libbonobo/libbonobo-bonobo-persist.html
-share/doc/html/libbonobo/libbonobo-bonobo-property-bag-client.html
-share/doc/html/libbonobo/libbonobo-bonobo-property-bag.html
-share/doc/html/libbonobo/libbonobo-bonobo-running-context.html
-share/doc/html/libbonobo/libbonobo-bonobo-shlib-factory.html
-share/doc/html/libbonobo/libbonobo-bonobo-shutdown.html
-share/doc/html/libbonobo/libbonobo-bonobo-storage-memory.html
-share/doc/html/libbonobo/libbonobo-bonobo-storage.html
-share/doc/html/libbonobo/libbonobo-bonobo-stream-client.html
-share/doc/html/libbonobo/libbonobo-bonobo-stream-memory.html
-share/doc/html/libbonobo/libbonobo-bonobo-types.html
-share/doc/html/libbonobo/libbonobo-faq.html
-share/doc/html/libbonobo/libbonobo.devhelp
-share/doc/html/libbonobo/misc.html
-share/doc/html/libbonobo/monikers-overview.html
-share/doc/html/libbonobo/monikers.html
-share/doc/html/libbonobo/persist-file.png
-share/doc/html/libbonobo/persist-storage.png
-share/doc/html/libbonobo/persist-stream.png
-share/doc/html/libbonobo/persist.html
-share/doc/html/libbonobo/persist.png
-share/doc/html/libbonobo/properties.html
-share/doc/html/libbonobo/property-bags.html
-share/doc/html/libbonobo/refcounting.html
-share/doc/html/libbonobo/right.png
-share/doc/html/libbonobo/running-context.png
-share/doc/html/libbonobo/storage.png
-share/doc/html/libbonobo/stream.png
-share/doc/html/libbonobo/streams.html
-share/doc/html/libbonobo/unknown.png
-share/doc/html/libbonobo/up.png
 share/examples/bonobo-activation/bonobo-activation-config.xml
 share/idl/bonobo-2.0/Bonobo.idl
+share/idl/bonobo-2.0/Bonobo_Application.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
 share/idl/bonobo-2.0/Bonobo_Context.idl
@@ -205,6 +123,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libbonobo-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libbonobo-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libbonobo-2.0.mo
@@ -244,7 +163,9 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm share/idl/bonobo-2.0
 @comment in ORBit2: @dirrm share/idl
 @dirrm share/examples/bonobo-activation
+@exec ${MKDIR} %D/share/doc/html/libbonobo
 @dirrm share/doc/html/libbonobo
+@exec ${MKDIR} %D/share/doc/html/bonobo-activation
 @dirrm share/doc/html/bonobo-activation
 @comment in ORBit2: @dirrm lib/orbit-2.0
 @dirrm lib/bonobo/servers
diff --git a/devel/libbonobo/buildlink2.mk b/devel/libbonobo/buildlink2.mk
index e50a063df24..7fa65b75317 100644
--- a/devel/libbonobo/buildlink2.mk
+++ b/devel/libbonobo/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/12/15 00:42:37 xtraeme Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/04/01 18:18:00 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use libbonobo.
 #
@@ -9,7 +9,7 @@
 LIBBONOBO_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonobo
-BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.4.2
+BUILDLINK_DEPENDS.libbonobo?=	libbonobo>=2.6.0
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonobo=libbonobo
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
index 46578b80e21..5cde498b4ce 100644
--- a/devel/libbonobo/buildlink3.mk
+++ b/devel/libbonobo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:18:00 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibbonobo}
 BUILDLINK_PACKAGES+=	libbonobo
 
 .if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.4.2
+BUILDLINK_DEPENDS.libbonobo+=	libbonobo>=2.6.0
 BUILDLINK_PKGSRCDIR.libbonobo?=	../../devel/libbonobo
 
 BUILDLINK_FILES.libbonobo+=	share/idl/bonobo-2.0/*
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 6992b98e1f1..97072456fe3 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2004/02/27 02:09:34 snj Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:18:00 jmmv Exp $
 
-SHA1 (libbonobo-2.4.3.tar.bz2) = 591b97c2fe78c489fec7d26dfe9a49150ff5f881
-Size (libbonobo-2.4.3.tar.bz2) = 1381949 bytes
-SHA1 (patch-aa) = f9f94279a1819af70123eef49cf98b4b34b956e1
-SHA1 (patch-ab) = 36e17156e0dc0ce19c395abb730707b8bc0ea8da
+SHA1 (libbonobo-2.6.0.tar.bz2) = 65d3173e9b7b5d72c0d23e482b0ea54f8e1d9150
+Size (libbonobo-2.6.0.tar.bz2) = 1059444 bytes
+SHA1 (patch-aa) = 4f7b7a16f7cba64206b5dccb021972a09efe9f55
+SHA1 (patch-ab) = 320fc0a2be131a0ab6b200643fb733f80899a005
 SHA1 (patch-ac) = 256aec5eaa1d04ce9bed162c8698f6ebce6e4b0d
+SHA1 (patch-ad) = 224d9114c285a0c6ef06b7ced6aec34b8abf538f
diff --git a/devel/libbonobo/patches/patch-aa b/devel/libbonobo/patches/patch-aa
index eee0d6ed1e3..c2845a830a7 100644
--- a/devel/libbonobo/patches/patch-aa
+++ b/devel/libbonobo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/12/14 21:46:15 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/01 18:18:00 jmmv Exp $
 
---- Makefile.in.orig	2003-11-03 13:26:50.000000000 +0100
+--- Makefile.in.orig	2004-02-02 15:28:51.000000000 +0100
 +++ Makefile.in
-@@ -202,7 +202,7 @@ prefix = @prefix@
+@@ -203,7 +203,7 @@ prefix = @prefix@
  program_transform_name = @program_transform_name@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
diff --git a/devel/libbonobo/patches/patch-ab b/devel/libbonobo/patches/patch-ab
index 7fcce6a6fcd..4980fa9f59d 100644
--- a/devel/libbonobo/patches/patch-ab
+++ b/devel/libbonobo/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2003/12/14 21:46:15 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/01 18:18:00 jmmv Exp $
 
---- activation-server/object-directory-config-file.h.orig	2001-09-13 19:50:12.000000000 +0200
+--- activation-server/object-directory-config-file.h.orig	2003-12-08 21:20:24.000000000 +0000
 +++ activation-server/object-directory-config-file.h
 @@ -27,7 +27,7 @@
  
diff --git a/devel/libbonobo/patches/patch-ad b/devel/libbonobo/patches/patch-ad
new file mode 100644
index 00000000000..def73ceeffd
--- /dev/null
+++ b/devel/libbonobo/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2004/04/01 18:18:00 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=137193
+
+--- bonobo-activation/bonobo-activation-get-language-list.c	9 Jun 2003 13:17:55 -0000	1.2
++++ bonobo-activation/bonobo-activation-get-language-list.c	14 Mar 2004 21:37:13 -0000
+@@ -71,6 +71,7 @@
+   int i;
+   if (!alias_table)
+     {
++      read_aliases (BONOBO_ACTIVATION_LOCALEDIR "/locale.alias");
+       read_aliases ("/usr/share/locale/locale.alias");
+       read_aliases ("/usr/local/share/locale/locale.alias");
+       read_aliases ("/usr/lib/X11/locale/locale.alias");