Update to 0.15, now with OAF support (gnorba is going away)

4 files changed, 65 insertions, 5 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 9f489060fb96..b9b9b461ce22 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	0.13
+PORTVERSION=	0.15
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/bonobo
@@ -15,7 +15,8 @@ MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
+		oaf.0:${PORTSDIR}/devel/oaf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 5cf6a5134da2..4910dba550de 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.13.tar.gz) = 85c33e3f13417ec1a3a38f62bc2ab174
+MD5 (bonobo-0.15.tar.gz) = 999a6df46195596d436e3d1bdf1f066f
diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab
index f8ef41b72072..9044d9b253ac 100644
--- a/devel/bonobo/files/patch-ab
+++ b/devel/bonobo/files/patch-ab
@@ -34,6 +34,17 @@
  
  
  bonobo_audio_ulaw_LDADD =  	$(top_builddir)/bonobo/libbonobo.la		$(GTK_LIBS)					$(GNOME_LIBDIR)					$(GNOMEGNORBA_LIBS)				$(INTLLIBS)
+--- components/audio-ulaw/doc/C/Makefile.in.orig	Wed May 31 15:57:26 2000
++++ components/audio-ulaw/doc/C/Makefile.in	Thu Jun  1 14:58:56 2000
+@@ -141,7 +141,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-audio_ulaw_helpdir = $(datadir)/gnome/bonobo/docs/audio_ulaw/C
++audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C
+ 
+ # 
+ # Module configuration information
 --- components/text-plain/Makefile.in.orig	Tue Feb 22 00:06:58 2000
 +++ components/text-plain/Makefile.in	Tue Feb 22 11:16:45 2000
 @@ -137,7 +137,7 @@
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index a387fc85aa78..29e1c747a8ce 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -18,7 +18,6 @@ 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/hello.gnorba
 etc/CORBA/servers/item.gnorba
 etc/CORBA/servers/paint-component-simple.gnorba
 etc/CORBA/servers/text-plain.gnorba
@@ -79,6 +78,48 @@ lib/libstorage_efs.so
 lib/libstorage_fs.so
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+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
@@ -103,6 +144,7 @@ share/gnome/oaf/audio-ulaw.oafinfo
 share/gnome/oaf/bonobo-calculator-control.oafinfo
 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/locale/da/LC_MESSAGES/bonobo.mo
@@ -123,5 +165,11 @@ 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
-@dirrm share/gnome/oaf
+@dirrm share/gnome/bonobo/html/bonobo
+@dirrm share/gnome/bonobo/html
+@dirrm share/gnome/bonobo/docs/audio_ulaw/C/images
+@dirrm share/gnome/bonobo/docs/audio_ulaw/C
+@dirrm share/gnome/bonobo/docs/audio_ulaw
+@dirrm share/gnome/bonobo/docs
+@dirrm share/gnome/bonobo
 @dirrm include/bonobo