Update bonobo to 0.15. Changes include bugfixes and enhancements required

by several new GNOME programs.

6 files changed, 184 insertions, 103 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3e5580d9fd0..4d40dcce561 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:20 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/07/16 19:50:12 rh Exp $
 #
 
-DISTNAME=		bonobo-0.4
+DISTNAME=		bonobo-0.15
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=/unstable/sources/bonobo/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
 DEPENDS+=		gdk-pixbuf-*:../../graphics/gdk-pixbuf
+DEPENDS+=		oaf-*:../../devel/oaf
+DEPENDS+=		gnome-print>=0.16:../../print/gnome-print
 
-USE_PKGLIBTOOL=		YES
+USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		X11BASE="${X11BASE}"
-LDFLAGS+=		"-L${LOCALBASE}/lib"
+LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/devel/bonobo/files/md5 b/devel/bonobo/files/md5
index bf57afc9dd4..0916ae28087 100644
--- a/devel/bonobo/files/md5
+++ b/devel/bonobo/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/01/02 15:15:16 rh Exp $
+$NetBSD: md5,v 1.2 2000/07/16 19:50:13 rh Exp $
 
-MD5 (bonobo-0.4.tar.gz) = 108b835663269416b100a0dfd7207c72
+MD5 (bonobo-0.15.tar.gz) = 999a6df46195596d436e3d1bdf1f066f
diff --git a/devel/bonobo/files/patch-sum b/devel/bonobo/files/patch-sum
index 8e73d2e02e3..ab895ac6987 100644
--- a/devel/bonobo/files/patch-sum
+++ b/devel/bonobo/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/05/02 18:48:37 danw Exp $
+$NetBSD: patch-sum,v 1.3 2000/07/16 19:50:13 rh Exp $
 
-MD5 (patch-ab) = d8fde37adbb970401c00589afd577c1a
+MD5 (patch-aa) = 2525a0a0958aa990f16f63c90932f01c
diff --git a/devel/bonobo/patches/patch-aa b/devel/bonobo/patches/patch-aa
new file mode 100644
index 00000000000..300cfd54ef8
--- /dev/null
+++ b/devel/bonobo/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2000/07/16 19:50:13 rh Exp $
+
+--- doc/api/Makefile.in.orig	Sat Jul 15 16:23:34 2000
++++ doc/api/Makefile.in	Sat Jul 15 16:23:52 2000
+@@ -326,8 +326,6 @@
+ 	    echo '-- Installing '$$i ; \
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
+ 	fi)
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
deleted file mode 100644
index aa7503644e7..00000000000
--- a/devel/bonobo/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/01/02 15:15:16 rh Exp $
-
---- components/application-x-gnomine/Makefile.in.orig	Mon Sep 27 23:22:05 1999
-+++ components/application-x-gnomine/Makefile.in	Sun Jan  2 15:41:43 2000
-@@ -146,7 +146,7 @@
- bonobo_application_x_mines_SOURCES =  	minefield.h				minefield.c				bonobo-application-x-mines.c
- 
- 
--bonobo_application_x_mines_LDADD =  	$(GNOME_LIBDIR)				-lbonobo				$(GNOMEGNORBA_LIBS)
-+bonobo_application_x_mines_LDADD =  	$(GNOME_LIBDIR)				../../bonobo/.libs/libbonobo.a				$(GNOMEGNORBA_LIBS)
- 
- 
- gnorbadir = $(sysconfdir)/CORBA/servers
-@@ -268,10 +268,10 @@
- 	@list='$(Games_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Gamesdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Gamesdir)/$$p; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Gamesdir)/bonobo-$$p; \
- 	  else if test -f $$p; then \
- 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(Gamesdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(Gamesdir)/$$p; \
-+	    $(INSTALL_DATA) $$p $(DESTDIR)$(Gamesdir)/bonobo-$$p; \
- 	  fi; fi; \
- 	done
- 
diff --git a/devel/bonobo/pkg/PLIST b/devel/bonobo/pkg/PLIST
index e1457d304ce..dc9bda90832 100644
--- a/devel/bonobo/pkg/PLIST
+++ b/devel/bonobo/pkg/PLIST
@@ -1,87 +1,179 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/01/02 15:15:16 rh Exp $
-bin/efstool
-bin/bonobo-image-x-png
+@comment $NetBSD: PLIST,v 1.2 2000/07/16 19:50:14 rh Exp $
 bin/bonobo-application-x-mines
-bin/bonobo-image-generic
-bin/bonobo-text-plain
 bin/bonobo-audio-ulaw
+bin/bonobo-echo
+bin/bonobo-hello
+bin/bonobo-text-plain
+bin/echo-client
+bin/efstool
+bin/gshell
 bin/paint-component-simple
+bin/sample-canvas-item
 bin/sample-container
-etc/CORBA/servers/sample.gnorba
-etc/CORBA/servers/item.gnorba
+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/image-generic.gnorba
-etc/CORBA/servers/image-x-png.gnorba
-etc/CORBA/servers/text-plain.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
+include/bonobo.h
+include/bonobo/Bonobo.h
+include/bonobo/bonobo-arg.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-container.h
+include/bonobo/bonobo-control-frame.h
+include/bonobo/bonobo-control.h
+include/bonobo/bonobo-desktop-window.h
+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-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-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.h
+include/bonobo/bonobo-property-types.h
+include/bonobo/bonobo-property.h
+include/bonobo/bonobo-selector.h
+include/bonobo/bonobo-storage.h
+include/bonobo/bonobo-stream-client.h
+include/bonobo/bonobo-stream-fs.h
+include/bonobo/bonobo-stream-memory.h
+include/bonobo/bonobo-stream.h
+include/bonobo/bonobo-ui-handler.h
+include/bonobo/bonobo-view-frame.h
+include/bonobo/bonobo-view.h
+include/bonobo/bonobo-widget.h
+include/bonobo/bonobo-wrapper.h
 include/efs.h
-include/bonobo/bonobo.h
-include/bonobo/gnome-bonobo.h
-include/bonobo/gnome-bonobo-item.h
-include/bonobo/gnome-bonobo-selector.h
-include/bonobo/gnome-bonobo-widget.h
-include/bonobo/gnome-canvas-component.h
-include/bonobo/gnome-client-site.h
-include/bonobo/gnome-component-io.h
-include/bonobo/gnome-container.h
-include/bonobo/gnome-embeddable.h
-include/bonobo/gnome-embeddable-factory.h
-include/bonobo/gnome-main.h
-include/bonobo/gnome-moniker.h
-include/bonobo/gnome-moniker-client.h
-include/bonobo/gnome-object.h
-include/bonobo/gnome-object-client.h
-include/bonobo/gnome-object-io.h
-include/bonobo/gnome-persist-file.h
-include/bonobo/gnome-persist-stream.h
-include/bonobo/gnome-persist.h
-include/bonobo/gnome-progressive.h
-include/bonobo/gnome-storage.h
-include/bonobo/gnome-stream.h
-include/bonobo/gnome-stream-client.h
-include/bonobo/gnome-stream-fs.h
-include/bonobo/gnome-stream-memory.h
-include/bonobo/gnome-ui-handler.h
-include/bonobo/gnome-view.h
-include/bonobo/gnome-view-frame.h
-include/bonobo/gnome-wrapper.h
-lib/locale/no/LC_MESSAGES/bonobo.mo
-lib/locale/fr/LC_MESSAGES/bonobo.mo
-lib/locale/es/LC_MESSAGES/bonobo.mo
+lib/bonoboConf.sh
+lib/libbonobo-print.a
+lib/libbonobo-print.la
+lib/libbonobo-print.so.0.0
+lib/libbonobo.a
+lib/libbonobo.la
+lib/libbonobo.so.2.0
+lib/libefs.a
+lib/libefs.la
+lib/libefs.so.0.0
+lib/libstorage_efs.a
+lib/libstorage_efs.la
+lib/libstorage_efs.so.0.0
+lib/libstorage_fs.a
+lib/libstorage_fs.la
+lib/libstorage_fs.so.0.0
+lib/locale/da/LC_MESSAGES/bonobo.mo
 lib/locale/de/LC_MESSAGES/bonobo.mo
+lib/locale/el/LC_MESSAGES/bonobo.mo
+lib/locale/es/LC_MESSAGES/bonobo.mo
+lib/locale/fr/LC_MESSAGES/bonobo.mo
+lib/locale/gl/LC_MESSAGES/bonobo.mo
+lib/locale/it/LC_MESSAGES/bonobo.mo
+lib/locale/ja/LC_MESSAGES/bonobo.mo
+lib/locale/nl/LC_MESSAGES/bonobo.mo
+lib/locale/no/LC_MESSAGES/bonobo.mo
 lib/locale/pl/LC_MESSAGES/bonobo.mo
+lib/locale/pt_BR/LC_MESSAGES/bonobo.mo
+lib/locale/ro/LC_MESSAGES/bonobo.mo
 lib/locale/ru/LC_MESSAGES/bonobo.mo
-lib/locale/it/LC_MESSAGES/bonobo.mo
-lib/locale/da/LC_MESSAGES/bonobo.mo
-lib/locale/el/LC_MESSAGES/bonobo.mo
 lib/locale/sv/LC_MESSAGES/bonobo.mo
+lib/locale/tr/LC_MESSAGES/bonobo.mo
+lib/locale/uk/LC_MESSAGES/bonobo.mo
 lib/locale/wa/LC_MESSAGES/bonobo.mo
-lib/libefs.a
-lib/libbonobo.so.0.0
-lib/libbonobo.a
-lib/libstorage_fs.so.0.0
-lib/libstorage_fs.a
-lib/libstorage_efs.so.0.0
-lib/libstorage_efs.a
-lib/bonoboConf.sh
+share/bonobo/html/bonobo-api.sgml
+share/bonobo/html/bonobo-decl.txt
+share/bonobo/html/bonobo-sections.txt
+share/bonobo/html/bonobo.hierarchy
+share/bonobo/html/bonobo.signals
+share/bonobo/html/bonobo.types
+share/bonobo/html/bonobo/bonobo-api-index.html
+share/bonobo/html/bonobo/bonobo-gnome-component-io.html
+share/bonobo/html/bonobo/bonobo-gnome-embeddable-client.html
+share/bonobo/html/bonobo/bonobo-gnome-main.html
+share/bonobo/html/bonobo/bonobo-gnome-storage-driver.html
+share/bonobo/html/bonobo/bonobo-gnome-storage-private.html
+share/bonobo/html/bonobo/bonobo-gnomebonoboselector.html
+share/bonobo/html/bonobo/bonobo-gnomeclientsite.html
+share/bonobo/html/bonobo/bonobo-gnomecompositemoniker.html
+share/bonobo/html/bonobo/bonobo-gnomecontainer.html
+share/bonobo/html/bonobo/bonobo-gnomeembeddable.html
+share/bonobo/html/bonobo/bonobo-gnomeembeddablefactory.html
+share/bonobo/html/bonobo/bonobo-gnomefilemoniker.html
+share/bonobo/html/bonobo/bonobo-gnomeinplaceembeddable.html
+share/bonobo/html/bonobo/bonobo-gnomeinplacesite.html
+share/bonobo/html/bonobo/bonobo-gnomeitemmoniker.html
+share/bonobo/html/bonobo/bonobo-gnomemoniker.html
+share/bonobo/html/bonobo/bonobo-gnomeobject.html
+share/bonobo/html/bonobo/bonobo-gnomeobjectclient.html
+share/bonobo/html/bonobo/bonobo-gnomepersist.html
+share/bonobo/html/bonobo/bonobo-gnomepersistfile.html
+share/bonobo/html/bonobo/bonobo-gnomepersiststream.html
+share/bonobo/html/bonobo/bonobo-gnomeprogressivedatasink.html
+share/bonobo/html/bonobo/bonobo-gnomesimpledatasource.html
+share/bonobo/html/bonobo/bonobo-gnomestorage.html
+share/bonobo/html/bonobo/bonobo-gnomestoragefs.html
+share/bonobo/html/bonobo/bonobo-gnomestoragerepo.html
+share/bonobo/html/bonobo/bonobo-gnomestream.html
+share/bonobo/html/bonobo/bonobo-gnomestreamfs.html
+share/bonobo/html/bonobo/bonobo-gnomestreammem.html
+share/bonobo/html/bonobo/bonobo-gnomestreamrepo.html
+share/bonobo/html/bonobo/bonobo-gnomeuihandler.html
+share/bonobo/html/bonobo/bonobo-gnomeview.html
+share/bonobo/html/bonobo/bonobo-gnomeviewframe.html
+share/bonobo/html/bonobo/bonobo-gnomewrapper.html
+share/bonobo/html/bonobo/book1.html
+share/idl/Bonobo.idl
+share/idl/Echo.idl
+share/idl/bonobo-advise.idl
+share/idl/bonobo-canvas.idl
+share/idl/bonobo-client-site.idl
+share/idl/bonobo-container.idl
+share/idl/bonobo-control.idl
+share/idl/bonobo-desktop.idl
+share/idl/bonobo-embeddable.idl
+share/idl/bonobo-factory.idl
+share/idl/bonobo-persist.idl
+share/idl/bonobo-print.idl
+share/idl/bonobo-progressive.idl
+share/idl/bonobo-property.idl
+share/idl/bonobo-storage.idl
+share/idl/bonobo-ui-handler.idl
+share/idl/bonobo-unknown.idl
 share/idl/bonobo.idl
-share/idl/gnome-advise.idl
-share/idl/gnome-canvas.idl
-share/idl/gnome-container.idl
-share/idl/gnome-client-site.idl
-share/idl/gnome-embeddable.idl
-share/idl/gnome-persist.idl
-share/idl/gnome-storage.idl
-share/idl/gnome-progressive.idl
-share/idl/gnome-ui-handler.idl
-share/gnome/apps/Games/bonobo-gnomine.desktop
-share/gnome/bonobo/docs/image_x_png/C/docbook.css
 share/mime-info/bonobo.keys
+share/oaf/application-x-mines.oafinfo
+share/oaf/audio-ulaw.oafinfo
+share/oaf/bonobo-calculator-control.oafinfo
+share/oaf/bonobo-clock-control.oafinfo
+share/oaf/echo.oafinfo
+share/oaf/hello.oafinfo
+share/oaf/paint-component-simple.oafinfo
+share/oaf/text-plain.oafinfo
+@exec mkdir -p %D/share/gnome/bonobo/docs/audio_ulaw/C/images
+@exec mkdir -p %D/share/gtk-doc/html/libefs
 @dirrm include/bonobo
-@dirrm share/gnome/bonobo/docs/image_x_png/C/images
-@dirrm share/gnome/bonobo/docs/image_x_png/C
-@dirrm share/gnome/bonobo/docs/image_x_png
+@dirrm share/bonobo/html/bonobo
+@dirrm share/bonobo/html
+@dirrm share/bonobo
 @dirrm share/gnome/bonobo/docs/audio_ulaw/C/images
 @dirrm share/gnome/bonobo/docs/audio_ulaw/C
 @dirrm share/gnome/bonobo/docs/audio_ulaw