3 files changed, 38 insertions, 14 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 10e4f37e1873..d16b5de35886 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	0.37
+PORTVERSION=	1.0.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	unstable/sources/bonobo
+MASTER_SITE_SUBDIR=	stable/sources/bonobo
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnomeprint.13:${PORTSDIR}/print/gnomeprint \
-		oaf.0:${PORTSDIR}/devel/oaf
+LIB_DEPENDS=	gnomeprint.16:${PORTSDIR}/print/gnomeprint
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMECTRL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libefs/configure
@@ -33,4 +32,9 @@ pre-patch:
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
+# XXX: hack - will be fixed in next release - say hi to
+#      GNOME release engineering :)
+post-patch:
+	@find ${WRKSRC} -name '*.idl' | xargs touch
+
 .include <bsd.port.mk>
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 27f0975945f5..962a390ba86e 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.37.tar.gz) = 9055c40397c74c9a6bc0edfcd5a1610f
+MD5 (bonobo-1.0.3.tar.gz) = 9dd2ed10a4614fc9c11559ad5c152b72
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 3c791a08810c..106e61f8e37d 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -26,7 +26,6 @@ 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-component-io.h
 include/bonobo/bonobo-context.h
 include/bonobo/bonobo-control-frame.h
 include/bonobo/bonobo-control.h
@@ -114,8 +113,8 @@ 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-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
@@ -132,7 +131,8 @@ 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-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
@@ -150,8 +150,6 @@ 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
@@ -163,7 +161,9 @@ 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
@@ -175,10 +175,13 @@ 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
@@ -186,10 +189,27 @@ 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/x11340.html
-share/gnome/bonobo/html/bonobo/x11347.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
@@ -211,7 +231,6 @@ share/gnome/idl/Bonobo_Storage.idl
 share/gnome/idl/Bonobo_UI.idl
 share/gnome/idl/Bonobo_Unknown.idl
 share/gnome/idl/Bonobo_Zoomable.idl
-share/gnome/mime-info/bonobo.keys
 share/gnome/oaf/Bonobo_Moniker_gzip.oaf
 share/gnome/oaf/Bonobo_Moniker_http.oaf
 share/gnome/oaf/Bonobo_Moniker_std.oaf
@@ -240,6 +259,7 @@ share/locale/hu/LC_MESSAGES/bonobo.mo
 share/locale/it/LC_MESSAGES/bonobo.mo
 share/locale/ja/LC_MESSAGES/bonobo.mo
 share/locale/ko/LC_MESSAGES/bonobo.mo
+share/locale/lt/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