Update to 1.0.9.

3 files changed, 81 insertions, 170 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 8599dbcb00bc..0c80bb1d852f 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	1.0.8
+PORTVERSION=	1.0.9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bonobo
@@ -34,4 +34,10 @@ pre-patch:
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
+post-install:
+	@if [ -L ${PREFIX}/include/bonobo ]; then \
+		${RM} -f ${PREFIX}/include/bonobo; \
+	fi
+	@${LN} -sf ${PREFIX}/include/gnome-1.0/bonobo ${PREFIX}/include/bonobo
+
 .include <bsd.port.mk>
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 6429ae3d5e82..f427cb581a08 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-1.0.8.tar.gz) = a21755814671e25d86988c098ebb68f3
+MD5 (bonobo-1.0.9.tar.gz) = ee5c8becdec041a911c5159e4ebf1e91
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 253518b21130..2f0d81315af6 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -19,76 +19,77 @@ bin/sample-control-container
 etc/bonoboConf.sh
 etc/bonoboxConf.sh
 etc/bonobox_printConf.sh
+include/bonobo
 include/bonobo.h
-include/bonobo/Bonobo.h
-include/bonobo/bonobo-arg.h
-include/bonobo/bonobo-async.h
-include/bonobo/bonobo-canvas-component.h
-include/bonobo/bonobo-canvas-item.h
-include/bonobo/bonobo-client-site.h
-include/bonobo/bonobo-context.h
-include/bonobo/bonobo-control-frame.h
-include/bonobo/bonobo-control.h
-include/bonobo/bonobo-desktop-window.h
-include/bonobo/bonobo-embeddable.h
-include/bonobo/bonobo-event-source.h
-include/bonobo/bonobo-exception.h
-include/bonobo/bonobo-generic-factory.h
-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
-include/bonobo/bonobo-object-directory.h
-include/bonobo/bonobo-object-io.h
-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
-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.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
-include/bonobo/bonobo-stream-client.h
-include/bonobo/bonobo-stream-memory.h
-include/bonobo/bonobo-stream.h
-include/bonobo/bonobo-transient.h
-include/bonobo/bonobo-ui-component.h
-include/bonobo/bonobo-ui-config-widget.h
-include/bonobo/bonobo-ui-container.h
-include/bonobo/bonobo-ui-engine.h
-include/bonobo/bonobo-ui-node.h
-include/bonobo/bonobo-ui-sync.h
-include/bonobo/bonobo-ui-toolbar-button-item.h
-include/bonobo/bonobo-ui-toolbar-icon.h
-include/bonobo/bonobo-ui-toolbar-item.h
-include/bonobo/bonobo-ui-toolbar-toggle-button-item.h
-include/bonobo/bonobo-ui-util.h
-include/bonobo/bonobo-view-frame.h
-include/bonobo/bonobo-view.h
-include/bonobo/bonobo-widget.h
-include/bonobo/bonobo-win.h
-include/bonobo/bonobo-wrapper.h
-include/bonobo/bonobo-xobject.h
-include/bonobo/bonobo-zoomable-frame.h
-include/bonobo/bonobo-zoomable.h
 include/efs.h
 include/efs_error.h
+include/gnome-1.0/bonobo/Bonobo.h
+include/gnome-1.0/bonobo/bonobo-arg.h
+include/gnome-1.0/bonobo/bonobo-async.h
+include/gnome-1.0/bonobo/bonobo-canvas-component.h
+include/gnome-1.0/bonobo/bonobo-canvas-item.h
+include/gnome-1.0/bonobo/bonobo-client-site.h
+include/gnome-1.0/bonobo/bonobo-context.h
+include/gnome-1.0/bonobo/bonobo-control-frame.h
+include/gnome-1.0/bonobo/bonobo-control.h
+include/gnome-1.0/bonobo/bonobo-desktop-window.h
+include/gnome-1.0/bonobo/bonobo-embeddable.h
+include/gnome-1.0/bonobo/bonobo-event-source.h
+include/gnome-1.0/bonobo/bonobo-exception.h
+include/gnome-1.0/bonobo/bonobo-generic-factory.h
+include/gnome-1.0/bonobo/bonobo-item-container.h
+include/gnome-1.0/bonobo/bonobo-item-handler.h
+include/gnome-1.0/bonobo/bonobo-listener.h
+include/gnome-1.0/bonobo/bonobo-main.h
+include/gnome-1.0/bonobo/bonobo-moniker-extender.h
+include/gnome-1.0/bonobo/bonobo-moniker-simple.h
+include/gnome-1.0/bonobo/bonobo-moniker-util.h
+include/gnome-1.0/bonobo/bonobo-moniker.h
+include/gnome-1.0/bonobo/bonobo-object-client.h
+include/gnome-1.0/bonobo/bonobo-object-directory.h
+include/gnome-1.0/bonobo/bonobo-object-io.h
+include/gnome-1.0/bonobo/bonobo-object.h
+include/gnome-1.0/bonobo/bonobo-persist-file.h
+include/gnome-1.0/bonobo/bonobo-persist-stream.h
+include/gnome-1.0/bonobo/bonobo-persist.h
+include/gnome-1.0/bonobo/bonobo-plug.h
+include/gnome-1.0/bonobo/bonobo-print-client.h
+include/gnome-1.0/bonobo/bonobo-print.h
+include/gnome-1.0/bonobo/bonobo-progressive.h
+include/gnome-1.0/bonobo/bonobo-property-bag-client.h
+include/gnome-1.0/bonobo/bonobo-property-bag-xml.h
+include/gnome-1.0/bonobo/bonobo-property-bag.h
+include/gnome-1.0/bonobo/bonobo-property-control.h
+include/gnome-1.0/bonobo/bonobo-property.h
+include/gnome-1.0/bonobo/bonobo-selector-widget.h
+include/gnome-1.0/bonobo/bonobo-selector.h
+include/gnome-1.0/bonobo/bonobo-shlib-factory.h
+include/gnome-1.0/bonobo/bonobo-socket.h
+include/gnome-1.0/bonobo/bonobo-storage-plugin.h
+include/gnome-1.0/bonobo/bonobo-storage.h
+include/gnome-1.0/bonobo/bonobo-stream-client.h
+include/gnome-1.0/bonobo/bonobo-stream-memory.h
+include/gnome-1.0/bonobo/bonobo-stream.h
+include/gnome-1.0/bonobo/bonobo-transient.h
+include/gnome-1.0/bonobo/bonobo-ui-component.h
+include/gnome-1.0/bonobo/bonobo-ui-config-widget.h
+include/gnome-1.0/bonobo/bonobo-ui-container.h
+include/gnome-1.0/bonobo/bonobo-ui-engine.h
+include/gnome-1.0/bonobo/bonobo-ui-node.h
+include/gnome-1.0/bonobo/bonobo-ui-sync.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-button-item.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-icon.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-item.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-toggle-button-item.h
+include/gnome-1.0/bonobo/bonobo-ui-util.h
+include/gnome-1.0/bonobo/bonobo-view-frame.h
+include/gnome-1.0/bonobo/bonobo-view.h
+include/gnome-1.0/bonobo/bonobo-widget.h
+include/gnome-1.0/bonobo/bonobo-win.h
+include/gnome-1.0/bonobo/bonobo-wrapper.h
+include/gnome-1.0/bonobo/bonobo-xobject.h
+include/gnome-1.0/bonobo/bonobo-zoomable-frame.h
+include/gnome-1.0/bonobo/bonobo-zoomable.h
 lib/bonobo/monikers/libmoniker_std.a
 lib/bonobo/monikers/libmoniker_std.so
 lib/bonobo/monikers/libmoniker_std.so.0
@@ -109,110 +110,13 @@ lib/libefs.a
 lib/libefs.so
 lib/libefs.so.1
 libdata/pkgconfig/libefs.pc
-share/gnome/bonobo/html/bonobo-api.html
+share/gnome/bonobo/docs/audio_ulaw/C/index.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-arg.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-async.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-extender.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-simple.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.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-engine.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-node.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-sync.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-xobject.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-controls.html
-share/gnome/bonobo/html/bonobo/bonobo-core.html
-share/gnome/bonobo/html/bonobo/bonobo-documents-widgets.html
-share/gnome/bonobo/html/bonobo/bonobo-documents.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-ugly.html
-share/gnome/bonobo/html/bonobo/bonobo-ui.html
-share/gnome/bonobo/html/bonobo/bonobo-useful-widgets.html
-share/gnome/bonobo/html/bonobo/bonobo-view.html
-share/gnome/bonobo/html/bonobo/book1.html
-share/gnome/bonobo/html/bonobo/misc-ugly.html
-share/gnome/bonobo/html/bonobo/x10104.html
-share/gnome/bonobo/html/bonobo/x10146.html
-share/gnome/bonobo/html/bonobo/x10147.html
-share/gnome/bonobo/html/bonobo/x10189.html
-share/gnome/bonobo/html/bonobo/x10996.html
-share/gnome/bonobo/html/bonobo/x11010.html
-share/gnome/bonobo/html/bonobo/x11207.html
-share/gnome/bonobo/html/bonobo/x11335.html
-share/gnome/bonobo/html/bonobo/x11349.html
-share/gnome/bonobo/html/bonobo/x11351.html
-share/gnome/bonobo/html/bonobo/x11391.html
-share/gnome/bonobo/html/bonobo/x11418.html
-share/gnome/bonobo/html/bonobo/x11419.html
-share/gnome/bonobo/html/bonobo/x11421.html
-share/gnome/bonobo/html/bonobo/x11462.html
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/Bonobo_Advise.idl
 share/gnome/idl/Bonobo_Canvas.idl
@@ -275,8 +179,8 @@ 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/locale/zh_CN.GB2312/LC_MESSAGES/bonobo.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/bonobo.mo
+share/locale/zh_CN/LC_MESSAGES/bonobo.mo
+share/locale/zh_TW/LC_MESSAGES/bonobo.mo
 @dirrm share/gnome/ui
 @dirrm share/gnome/libefs/html/libefs
 @dirrm share/gnome/libefs/html
@@ -291,4 +195,5 @@ share/locale/zh_TW.Big5/LC_MESSAGES/bonobo.mo
 @dirrm lib/bonobo/plugin
 @dirrm lib/bonobo/monikers
 @dirrm lib/bonobo
-@dirrm include/bonobo
+@dirrm include/gnome-1.0/bonobo
+@dirrm include/gnome-1.0