Update to 0.18

4 files changed, 16 insertions, 60 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index f529717c6325..73cc0633acc5 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	0.16
+PORTVERSION=	0.18
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/bonobo
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 6228b5396291..7c4e8de9758a 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.16.tar.gz) = 4f62468afb973d7e09934e2f249139b2
+MD5 (bonobo-0.18.tar.gz) = 09fcbb75c38da4b39ba4c90e0ddd55ab
diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab
index 12ea1cae091a..6d97c1099170 100644
--- a/devel/bonobo/files/patch-ab
+++ b/devel/bonobo/files/patch-ab
@@ -1,14 +1,10 @@
---- Makefile.in.orig	Tue Feb 22 00:06:41 2000
-+++ Makefile.in	Tue Feb 22 11:13:20 2000
-@@ -134,7 +134,7 @@
- 
- SUBDIRS = po intl idl libefs bonobo storage-modules components samples gshell tools tests
+--- Makefile.in.orig	Sat Aug 12 21:17:01 2000
++++ Makefile.in	Mon Aug 14 10:44:14 2000
+@@ -149,3 +149,3 @@
  
 -confexecdir = $(libdir)
 +confexecdir = $(sysconfdir)
- confexec_DATA = bonoboConf.sh
- 
- EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in
+ confexec_DATA = bonoboConf.sh bonoboxConf.sh bonobox_printConf.sh
 --- po/Makefile.in.in.orig	Mon Feb 21 23:37:16 2000
 +++ po/Makefile.in.in	Tue Feb 22 11:18:13 2000
 @@ -18,8 +18,8 @@
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 89278e11662e..aecef28750bc 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -12,17 +12,10 @@ 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
 etc/bonoboConf.sh
+etc/bonoboxConf.sh
+etc/bonobox_printConf.sh
 include/bonobo.h
 include/bonobo/Bonobo.h
 include/bonobo/bonobo-arg.h
@@ -38,8 +31,8 @@ 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.h
+include/bonobo/bonobo-moniker-util.h
 include/bonobo/bonobo-object-client.h
 include/bonobo/bonobo-object-directory.h
 include/bonobo/bonobo-object-io.h
@@ -75,54 +68,20 @@ lib/libbonobo-print.so.0
 lib/libbonobo.a
 lib/libbonobo.so
 lib/libbonobo.so.2
+lib/libbonobox.a
+lib/libbonobox.so
+lib/libbonobox.so.0
 lib/libefs.a
 lib/libefs.so
 lib/libefs.so.0
 lib/libstorage_efs.so
 lib/libstorage_fs.so
-share/gnome/bonobo/html/bonobo-api.html
 share/gnome/bonobo/html/bonobo-api.sgml
 share/gnome/bonobo/html/bonobo-decl.txt
 share/gnome/bonobo/html/bonobo-sections.txt
 share/gnome/bonobo/html/bonobo.hierarchy
 share/gnome/bonobo/html/bonobo.signals
 share/gnome/bonobo/html/bonobo.types
-share/gnome/bonobo/html/bonobo/bonobo-api-index.html
-share/gnome/bonobo/html/bonobo/bonobo-gnome-component-io.html
-share/gnome/bonobo/html/bonobo/bonobo-gnome-embeddable-client.html
-share/gnome/bonobo/html/bonobo/bonobo-gnome-main.html
-share/gnome/bonobo/html/bonobo/bonobo-gnome-storage-driver.html
-share/gnome/bonobo/html/bonobo/bonobo-gnome-storage-private.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomebonoboselector.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeclientsite.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomecompositemoniker.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomecontainer.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeembeddable.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeembeddablefactory.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomefilemoniker.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeinplaceembeddable.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeinplacesite.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeitemmoniker.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomemoniker.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeobject.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeobjectclient.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomepersist.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomepersistfile.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomepersiststream.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeprogressivedatasink.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomesimpledatasource.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestorage.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestoragefs.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestoragerepo.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestream.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestreamfs.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestreammem.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomestreamrepo.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeuihandler.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeview.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomeviewframe.html
-share/gnome/bonobo/html/bonobo/bonobo-gnomewrapper.html
-share/gnome/bonobo/html/bonobo/book1.html
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/Echo.idl
 share/gnome/idl/bonobo-advise.idl
@@ -132,7 +91,7 @@ share/gnome/idl/bonobo-container.idl
 share/gnome/idl/bonobo-control.idl
 share/gnome/idl/bonobo-desktop.idl
 share/gnome/idl/bonobo-embeddable.idl
-share/gnome/idl/bonobo-factory.idl
+share/gnome/idl/bonobo-moniker.idl
 share/gnome/idl/bonobo-persist.idl
 share/gnome/idl/bonobo-print.idl
 share/gnome/idl/bonobo-progressive.idl
@@ -150,7 +109,7 @@ share/gnome/oaf/bonobo-clock-control.oafinfo
 share/gnome/oaf/echo.oafinfo
 share/gnome/oaf/hello.oafinfo
 share/gnome/oaf/paint-component-simple.oafinfo
-share/gnome/oaf/text-plain.oafinfo
+share/gnome/oaf/std-moniker.oafinfo
 share/locale/da/LC_MESSAGES/bonobo.mo
 share/locale/de/LC_MESSAGES/bonobo.mo
 share/locale/el/LC_MESSAGES/bonobo.mo
@@ -158,6 +117,7 @@ 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