Update bonobo to 0.18. Changes include:

	* Monikers, total re-write along with some standard
	  monikers, 'file', 'oafiid', 'item'

	* Aggregate Object finalization bug nailed

	* Switched to a single Oaf build (Gnorba is no longer
          supported) cleaning loads of cruft, object activation
	  cleaned, bonobo-selector API shrunk

	* Bonobo has been split into GUI-less and GUI versions of
          Bonobo (bonobo, bonobox libraries to assist non-gui Bonobo
	  component development

	* Property Bag Client - new more flexible helper
	  interface removing BonoboObjectClient

Bugs fixed:

	* Bonobo-Widget bug nailed

	* Evil, fatal, intermittent plug / socket unrealize bug
	  inherited from Gtk fixed

	* UI handler bugs nailed

	* Blocking problems in listners fixed

	* Spec file sorted

	* Updated docs/refcounting.txt and enforced inter object
	  ref counting policy globaly

	* Various naming daftnesses cleaned

5 files changed, 59 insertions, 75 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 4d40dcce561..5a9c26f9004 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2000/07/16 19:50:12 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/08/29 16:28:41 rh Exp $
 #
 
-DISTNAME=		bonobo-0.15
+DISTNAME=		bonobo-0.18
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=/unstable/sources/bonobo/}
 
@@ -9,8 +9,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
-DEPENDS+=		gdk-pixbuf-*:../../graphics/gdk-pixbuf
-DEPENDS+=		oaf-*:../../devel/oaf
+DEPENDS+=		gdk-pixbuf>=0.6.0:../../graphics/gdk-pixbuf
+DEPENDS+=		oaf>=0.5.0:../../devel/oaf
 DEPENDS+=		gnome-print>=0.16:../../print/gnome-print
 
 USE_LIBTOOL=		YES
diff --git a/devel/bonobo/files/md5 b/devel/bonobo/files/md5
index 0916ae28087..ed3011e530c 100644
--- a/devel/bonobo/files/md5
+++ b/devel/bonobo/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/07/16 19:50:13 rh Exp $
+$NetBSD: md5,v 1.3 2000/08/29 16:28:41 rh Exp $
 
-MD5 (bonobo-0.15.tar.gz) = 999a6df46195596d436e3d1bdf1f066f
+MD5 (bonobo-0.18.tar.gz) = 09fcbb75c38da4b39ba4c90e0ddd55ab
diff --git a/devel/bonobo/files/patch-sum b/devel/bonobo/files/patch-sum
index ab895ac6987..6efbee1fd05 100644
--- a/devel/bonobo/files/patch-sum
+++ b/devel/bonobo/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/07/16 19:50:13 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/29 16:28:41 rh Exp $
 
 MD5 (patch-aa) = 2525a0a0958aa990f16f63c90932f01c
+MD5 (patch-ab) = f41238bcaeaa1d2291c503469b5a110d
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
new file mode 100644
index 00000000000..5302900ed3a
--- /dev/null
+++ b/devel/bonobo/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2000/08/29 16:28:41 rh Exp $
+
+--- configure.orig	Tue Aug 29 17:49:52 2000
++++ configure
+@@ -4263,7 +4263,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
diff --git a/devel/bonobo/pkg/PLIST b/devel/bonobo/pkg/PLIST
index dc9bda90832..081757f7d9b 100644
--- a/devel/bonobo/pkg/PLIST
+++ b/devel/bonobo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/16 19:50:14 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/29 16:28:41 rh Exp $
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
@@ -7,21 +7,13 @@ bin/bonobo-text-plain
 bin/echo-client
 bin/efstool
 bin/gshell
+bin/libefs-config
 bin/paint-component-simple
 bin/sample-canvas-item
 bin/sample-container
 bin/sample-control-container
 bin/sample-control-factory
-bin/test-properties-client
-bin/test-properties-server
-etc/CORBA/servers/application-x-mines.gnorba
-etc/CORBA/servers/audio-ulaw.gnorba
-etc/CORBA/servers/bonobo-calculator-control.gnorba
-etc/CORBA/servers/bonobo-clock-control.gnorba
-etc/CORBA/servers/echo.gnorba
-etc/CORBA/servers/item.gnorba
-etc/CORBA/servers/paint-component-simple.gnorba
-etc/CORBA/servers/text-plain.gnorba
+bin/std-moniker
 include/bonobo.h
 include/bonobo/Bonobo.h
 include/bonobo/bonobo-arg.h
@@ -37,7 +29,7 @@ include/bonobo/bonobo-embeddable-factory.h
 include/bonobo/bonobo-embeddable.h
 include/bonobo/bonobo-generic-factory.h
 include/bonobo/bonobo-main.h
-include/bonobo/bonobo-moniker-client.h
+include/bonobo/bonobo-moniker-util.h
 include/bonobo/bonobo-moniker.h
 include/bonobo/bonobo-object-client.h
 include/bonobo/bonobo-object-directory.h
@@ -46,6 +38,7 @@ include/bonobo/bonobo-object.h
 include/bonobo/bonobo-persist-file.h
 include/bonobo/bonobo-persist-stream.h
 include/bonobo/bonobo-persist.h
+include/bonobo/bonobo-plug.h
 include/bonobo/bonobo-print-client.h
 include/bonobo/bonobo-print.h
 include/bonobo/bonobo-progressive.h
@@ -54,6 +47,8 @@ include/bonobo/bonobo-property-bag.h
 include/bonobo/bonobo-property-types.h
 include/bonobo/bonobo-property.h
 include/bonobo/bonobo-selector.h
+include/bonobo/bonobo-sizeable.h
+include/bonobo/bonobo-socket.h
 include/bonobo/bonobo-storage.h
 include/bonobo/bonobo-stream-client.h
 include/bonobo/bonobo-stream-fs.h
@@ -66,12 +61,17 @@ include/bonobo/bonobo-widget.h
 include/bonobo/bonobo-wrapper.h
 include/efs.h
 lib/bonoboConf.sh
+lib/bonoboxConf.sh
+lib/bonobox_printConf.sh
 lib/libbonobo-print.a
 lib/libbonobo-print.la
 lib/libbonobo-print.so.0.0
 lib/libbonobo.a
 lib/libbonobo.la
 lib/libbonobo.so.2.0
+lib/libbonobox.a
+lib/libbonobox.la
+lib/libbonobox.so.0.0
 lib/libefs.a
 lib/libefs.la
 lib/libefs.so.0.0
@@ -81,66 +81,12 @@ lib/libstorage_efs.so.0.0
 lib/libstorage_fs.a
 lib/libstorage_fs.la
 lib/libstorage_fs.so.0.0
-lib/locale/da/LC_MESSAGES/bonobo.mo
-lib/locale/de/LC_MESSAGES/bonobo.mo
-lib/locale/el/LC_MESSAGES/bonobo.mo
-lib/locale/es/LC_MESSAGES/bonobo.mo
-lib/locale/fr/LC_MESSAGES/bonobo.mo
-lib/locale/gl/LC_MESSAGES/bonobo.mo
-lib/locale/it/LC_MESSAGES/bonobo.mo
-lib/locale/ja/LC_MESSAGES/bonobo.mo
-lib/locale/nl/LC_MESSAGES/bonobo.mo
-lib/locale/no/LC_MESSAGES/bonobo.mo
-lib/locale/pl/LC_MESSAGES/bonobo.mo
-lib/locale/pt_BR/LC_MESSAGES/bonobo.mo
-lib/locale/ro/LC_MESSAGES/bonobo.mo
-lib/locale/ru/LC_MESSAGES/bonobo.mo
-lib/locale/sv/LC_MESSAGES/bonobo.mo
-lib/locale/tr/LC_MESSAGES/bonobo.mo
-lib/locale/uk/LC_MESSAGES/bonobo.mo
-lib/locale/wa/LC_MESSAGES/bonobo.mo
 share/bonobo/html/bonobo-api.sgml
 share/bonobo/html/bonobo-decl.txt
 share/bonobo/html/bonobo-sections.txt
 share/bonobo/html/bonobo.hierarchy
 share/bonobo/html/bonobo.signals
 share/bonobo/html/bonobo.types
-share/bonobo/html/bonobo/bonobo-api-index.html
-share/bonobo/html/bonobo/bonobo-gnome-component-io.html
-share/bonobo/html/bonobo/bonobo-gnome-embeddable-client.html
-share/bonobo/html/bonobo/bonobo-gnome-main.html
-share/bonobo/html/bonobo/bonobo-gnome-storage-driver.html
-share/bonobo/html/bonobo/bonobo-gnome-storage-private.html
-share/bonobo/html/bonobo/bonobo-gnomebonoboselector.html
-share/bonobo/html/bonobo/bonobo-gnomeclientsite.html
-share/bonobo/html/bonobo/bonobo-gnomecompositemoniker.html
-share/bonobo/html/bonobo/bonobo-gnomecontainer.html
-share/bonobo/html/bonobo/bonobo-gnomeembeddable.html
-share/bonobo/html/bonobo/bonobo-gnomeembeddablefactory.html
-share/bonobo/html/bonobo/bonobo-gnomefilemoniker.html
-share/bonobo/html/bonobo/bonobo-gnomeinplaceembeddable.html
-share/bonobo/html/bonobo/bonobo-gnomeinplacesite.html
-share/bonobo/html/bonobo/bonobo-gnomeitemmoniker.html
-share/bonobo/html/bonobo/bonobo-gnomemoniker.html
-share/bonobo/html/bonobo/bonobo-gnomeobject.html
-share/bonobo/html/bonobo/bonobo-gnomeobjectclient.html
-share/bonobo/html/bonobo/bonobo-gnomepersist.html
-share/bonobo/html/bonobo/bonobo-gnomepersistfile.html
-share/bonobo/html/bonobo/bonobo-gnomepersiststream.html
-share/bonobo/html/bonobo/bonobo-gnomeprogressivedatasink.html
-share/bonobo/html/bonobo/bonobo-gnomesimpledatasource.html
-share/bonobo/html/bonobo/bonobo-gnomestorage.html
-share/bonobo/html/bonobo/bonobo-gnomestoragefs.html
-share/bonobo/html/bonobo/bonobo-gnomestoragerepo.html
-share/bonobo/html/bonobo/bonobo-gnomestream.html
-share/bonobo/html/bonobo/bonobo-gnomestreamfs.html
-share/bonobo/html/bonobo/bonobo-gnomestreammem.html
-share/bonobo/html/bonobo/bonobo-gnomestreamrepo.html
-share/bonobo/html/bonobo/bonobo-gnomeuihandler.html
-share/bonobo/html/bonobo/bonobo-gnomeview.html
-share/bonobo/html/bonobo/bonobo-gnomeviewframe.html
-share/bonobo/html/bonobo/bonobo-gnomewrapper.html
-share/bonobo/html/bonobo/book1.html
 share/idl/Bonobo.idl
 share/idl/Echo.idl
 share/idl/bonobo-advise.idl
@@ -150,15 +96,39 @@ share/idl/bonobo-container.idl
 share/idl/bonobo-control.idl
 share/idl/bonobo-desktop.idl
 share/idl/bonobo-embeddable.idl
-share/idl/bonobo-factory.idl
+share/idl/bonobo-moniker.idl
 share/idl/bonobo-persist.idl
 share/idl/bonobo-print.idl
 share/idl/bonobo-progressive.idl
 share/idl/bonobo-property.idl
+share/idl/bonobo-sizeable.idl
 share/idl/bonobo-storage.idl
 share/idl/bonobo-ui-handler.idl
 share/idl/bonobo-unknown.idl
 share/idl/bonobo.idl
+share/locale/da/LC_MESSAGES/bonobo.mo
+share/locale/de/LC_MESSAGES/bonobo.mo
+share/locale/el/LC_MESSAGES/bonobo.mo
+share/locale/en_GB/LC_MESSAGES/bonobo.mo
+share/locale/es/LC_MESSAGES/bonobo.mo
+share/locale/fi/LC_MESSAGES/bonobo.mo
+share/locale/fr/LC_MESSAGES/bonobo.mo
+share/locale/ga/LC_MESSAGES/bonobo.mo
+share/locale/gl/LC_MESSAGES/bonobo.mo
+share/locale/hu/LC_MESSAGES/bonobo.mo
+share/locale/it/LC_MESSAGES/bonobo.mo
+share/locale/ja/LC_MESSAGES/bonobo.mo
+share/locale/nl/LC_MESSAGES/bonobo.mo
+share/locale/no/LC_MESSAGES/bonobo.mo
+share/locale/pl/LC_MESSAGES/bonobo.mo
+share/locale/pt_BR/LC_MESSAGES/bonobo.mo
+share/locale/ro/LC_MESSAGES/bonobo.mo
+share/locale/ru/LC_MESSAGES/bonobo.mo
+share/locale/sl/LC_MESSAGES/bonobo.mo
+share/locale/sv/LC_MESSAGES/bonobo.mo
+share/locale/tr/LC_MESSAGES/bonobo.mo
+share/locale/uk/LC_MESSAGES/bonobo.mo
+share/locale/wa/LC_MESSAGES/bonobo.mo
 share/mime-info/bonobo.keys
 share/oaf/application-x-mines.oafinfo
 share/oaf/audio-ulaw.oafinfo
@@ -167,7 +137,7 @@ share/oaf/bonobo-clock-control.oafinfo
 share/oaf/echo.oafinfo
 share/oaf/hello.oafinfo
 share/oaf/paint-component-simple.oafinfo
-share/oaf/text-plain.oafinfo
+share/oaf/std-moniker.oafinfo
 @exec mkdir -p %D/share/gnome/bonobo/docs/audio_ulaw/C/images
 @exec mkdir -p %D/share/gtk-doc/html/libefs
 @dirrm include/bonobo