3 files changed, 92 insertions, 11 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index fe92b2a301b9..7547711883c9 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	0.30
+PORTVERSION=	0.31
 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 793069de3ab4..b69ce4c2494c 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.30.tar.gz) = 640d6b3285044ee7e9a1462dfe13a874
+MD5 (bonobo-0.31.tar.gz) = 83e7103031c9f7db4a9727e50c1088dd
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 0f83ee4ed86f..2e32c11f3fd6 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -1,21 +1,21 @@
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
-bin/bonobo-hello
 bin/bonobo-moniker-gunzip
 bin/bonobo-moniker-http
+bin/bonobo-sample-canvas-item
+bin/bonobo-sample-controls
+bin/bonobo-sample-hello
+bin/bonobo-sample-paint
 bin/bonobo-selector
 bin/bonobo-text-plain
 bin/echo-client
 bin/efstool
 bin/gshell
 bin/libefs-config
-bin/paint-component-simple
-bin/sample-canvas-item
+bin/moniker-test
 bin/sample-container
 bin/sample-control-container
-bin/sample-control-factory
-bin/std-moniker
 etc/bonoboConf.sh
 etc/bonoboxConf.sh
 etc/bonobox_printConf.sh
@@ -39,6 +39,8 @@ include/bonobo/bonobo-item-container.h
 include/bonobo/bonobo-item-handler.h
 include/bonobo/bonobo-listener.h
 include/bonobo/bonobo-main.h
+include/bonobo/bonobo-moniker-extender.h
+include/bonobo/bonobo-moniker-simple.h
 include/bonobo/bonobo-moniker-util.h
 include/bonobo/bonobo-moniker.h
 include/bonobo/bonobo-object-client.h
@@ -56,11 +58,10 @@ include/bonobo/bonobo-property-bag-client.h
 include/bonobo/bonobo-property-bag-xml.h
 include/bonobo/bonobo-property-bag.h
 include/bonobo/bonobo-property-control.h
-include/bonobo/bonobo-property-listener.h
-include/bonobo/bonobo-property-types.h
 include/bonobo/bonobo-property.h
 include/bonobo/bonobo-selector-widget.h
 include/bonobo/bonobo-selector.h
+include/bonobo/bonobo-shlib-factory.h
 include/bonobo/bonobo-socket.h
 include/bonobo/bonobo-storage-plugin.h
 include/bonobo/bonobo-storage.h
@@ -86,6 +87,9 @@ include/bonobo/bonobo-zoomable-frame.h
 include/bonobo/bonobo-zoomable.h
 include/efs.h
 include/efs_error.h
+lib/bonobo/monikers/libmoniker_std.a
+lib/bonobo/monikers/libmoniker_std.so
+lib/bonobo/monikers/libmoniker_std.so.0
 lib/bonobo/plugin/libstorage_efs.so
 lib/bonobo/plugin/libstorage_fs.so
 lib/libbonobo-print.a
@@ -100,12 +104,89 @@ lib/libbonobox.so.2
 lib/libefs.a
 lib/libefs.so
 lib/libefs.so.1
+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-bonobo-activation-context.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-arg.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-component.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-item.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-client-site.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-component-io.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-context.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-control-frame.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-control.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-desktop-window.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-embeddable.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-event-source.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-exception.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-generic-factory.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-container.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-handler.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-listener.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-main.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-async.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-util.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-client.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-directory.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-io.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-object.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-file.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-stream.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-plug.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-print-client.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-print.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-progressive.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-client.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-xml.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-control.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-listener.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-types.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-property.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-selector.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-socket.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage-plugin.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-client.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-memory.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-transient.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-component.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-container.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-node.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-button-item.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-icon.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-item.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-toggle-button-item.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-util.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-xml.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-view-frame.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-view.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-widget.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-win.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-wrapper.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-zoomable-frame.html
+share/gnome/bonobo/html/bonobo/bonobo-bonobo-zoomable.html
+share/gnome/bonobo/html/bonobo/bonobo-core.html
+share/gnome/bonobo/html/bonobo/bonobo-documents-widgets.html
+share/gnome/bonobo/html/bonobo/bonobo-moniker-handlers.html
+share/gnome/bonobo/html/bonobo/bonobo-notification.html
+share/gnome/bonobo/html/bonobo/bonobo-object-activation.html
+share/gnome/bonobo/html/bonobo/bonobo-print.html
+share/gnome/bonobo/html/bonobo/bonobo-properties.html
+share/gnome/bonobo/html/bonobo/bonobo-storage.html
+share/gnome/bonobo/html/bonobo/bonobo-support-utilities.html
+share/gnome/bonobo/html/bonobo/bonobo-ui.html
+share/gnome/bonobo/html/bonobo/book1.html
+share/gnome/bonobo/html/bonobo/x11347.html
+share/gnome/bonobo/html/bonobo/x4510.html
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/Echo.idl
 share/gnome/idl/bonobo-advise.idl
@@ -131,9 +212,8 @@ share/gnome/oaf/Bonobo_Moniker_gzip.oafinfo
 share/gnome/oaf/Bonobo_Moniker_http.oafinfo
 share/gnome/oaf/Bonobo_Moniker_std.oafinfo
 share/gnome/oaf/Bonobo_Sample_Audio.oafinfo
-share/gnome/oaf/Bonobo_Sample_Calculator.oafinfo
 share/gnome/oaf/Bonobo_Sample_CanvasItem.oafinfo
-share/gnome/oaf/Bonobo_Sample_Clock.oafinfo
+share/gnome/oaf/Bonobo_Sample_Controls.oafinfo
 share/gnome/oaf/Bonobo_Sample_Echo.oafinfo
 share/gnome/oaf/Bonobo_Sample_Hello.oafinfo
 share/gnome/oaf/Bonobo_Sample_Mines.oafinfo
@@ -179,5 +259,6 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/bonobo.mo
 @dirrm share/gnome/bonobo/docs
 @dirrm share/gnome/bonobo
 @dirrm lib/bonobo/plugin
+@dirrm lib/bonobo/monikers
 @dirrm lib/bonobo
 @dirrm include/bonobo