4 files changed, 38 insertions, 58 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index b69329e50554..ea69e26c910d 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bonobo
-PORTVERSION=	0.9
+PORTVERSION=	0.13
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/bonobo
@@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR=	unstable/sources/bonobo
 MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs \
-		intl.1:${PORTSDIR}/devel/gettext \
-		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
-		xml.5:${PORTSDIR}/textproc/libxml
+		gnomeprint.9:${PORTSDIR}/print/gnomeprint \
+		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 7b021d226433..5cf6a5134da2 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1 +1 @@
-MD5 (bonobo-0.9.tar.gz) = 723878f46292e728b7d927af537f8fde
+MD5 (bonobo-0.13.tar.gz) = 85c33e3f13417ec1a3a38f62bc2ab174
diff --git a/devel/bonobo/files/patch-ab b/devel/bonobo/files/patch-ab
index e17ff40fccb3..f8ef41b72072 100644
--- a/devel/bonobo/files/patch-ab
+++ b/devel/bonobo/files/patch-ab
@@ -9,10 +9,10 @@
  confexec_DATA = bonoboConf.sh
  
  EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in
---- components/application-x-gnomine/Makefile.in.orig	Sun Mar 26 10:16:13 2000
-+++ components/application-x-gnomine/Makefile.in	Fri Apr 21 10:18:21 2000
-@@ -133,9 +133,9 @@
- l = @l@
+--- components/application-x-gnomine/Makefile.in.orig	Fri May 12 13:03:29 2000
++++ components/application-x-gnomine/Makefile.in	Wed May 17 10:29:13 2000
+@@ -138,9 +138,9 @@
+ @OAF_FALSE@OBJECT_DIRECTORY_LIBS = $(GNOMEGNORBA_LIBS)
  
  scoredir = $(localstatedir)/games
 -Gamesdir = $(datadir)/gnome/apps/Games
@@ -23,22 +23,6 @@
  
  
  #bin_PROGRAMS = gnomine bonobo-application-x-mines
-@@ -163,12 +163,14 @@
- EXTRA_DIST = flag.xpm mine.xpm face-cool.xpm face-sad.xpm 	face-smile.xpm face-win.xpm face-worried.xpm 	gnomine.desktop README AUTHORS $(gnorba_DATA)
- 
- 
--Games_DATA = gnomine.desktop
-+Games_DATA = gnomine-bonobo.desktop
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
- PROGRAMS =  $(bin_PROGRAMS)
- 
-+gnomine-bonobo.desktop: gnomine.desktop
-+	cp gnomine.desktop gnomine-bonobo.desktop
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- LIBS = @LIBS@
 --- components/audio-ulaw/Makefile.in.orig	Tue Feb 22 00:06:59 2000
 +++ components/audio-ulaw/Makefile.in	Tue Feb 22 11:15:23 2000
 @@ -139,7 +139,7 @@
@@ -50,25 +34,6 @@
  
  
  bonobo_audio_ulaw_LDADD =  	$(top_builddir)/bonobo/libbonobo.la		$(GTK_LIBS)					$(GNOME_LIBDIR)					$(GNOMEGNORBA_LIBS)				$(INTLLIBS)
---- components/image-x-png/Makefile.in.orig	Tue Feb 22 00:06:54 2000
-+++ components/image-x-png/Makefile.in	Tue Feb 22 11:16:15 2000
-@@ -132,14 +132,14 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--SUBDIRS = doc
-+SUBDIRS = # doc
- 
- bin_PROGRAMS = bonobo-image-x-png
- 
- bonobo_image_x_png_SOURCES =  	bonobo-image-x-png.c
- 
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I. 							-I$(top_srcdir)/bonobo				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)					$(GTK_CFLAGS)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-I$(srcdir) -I$(top_srcdir) 				-I. 							-I$(top_srcdir)/bonobo				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)					$(GTK_CFLAGS)
- 
- 
- bonobo_image_x_png_LDADD =  	$(top_builddir)/bonobo/libbonobo.la		$(GTK_LIBS)					$(GNOME_LIBDIR)					$(GNOMEGNORBA_LIBS)				$(INTLLIBS)					-lpng -lz
 --- 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 @@
@@ -137,17 +102,17 @@
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
  CONFIG_HEADER = config.h
---- bonobo/Makefile.in.orig	Sun Mar 26 10:16:10 2000
-+++ bonobo/Makefile.in	Fri Apr 21 10:08:50 2000
-@@ -140,7 +140,7 @@
+--- bonobo/Makefile.in.orig	Fri May 12 13:03:26 2000
++++ bonobo/Makefile.in	Wed May 17 10:32:46 2000
+@@ -139,7 +139,7 @@
  @OAF_TRUE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-oaf.c
  @OAF_FALSE@OBJECT_DIRECTORY_IMPL = bonobo-object-directory-goad.c
  
--INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DSTORAGE_LIB=\""$(libdir)"\"				-DG_LOG_DOMAIN=\"Bonobo\"				-I. 							-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DSTORAGE_LIB=\""$(libdir)"\"				-DG_LOG_DOMAIN=\"Bonobo\"				-I. 							-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)				        -I$(includedir)                                         $(GNOME_INCLUDEDIR)
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        	-DSTORAGE_LIB=\""$(libdir)"\"				-DG_LOG_DOMAIN=\"Bonobo\"				-I. 							-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)				        -I$(includedir)                                 	$(GNOME_INCLUDEDIR)					$(GDK_PIXBUF_CFLAGS)
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"        	-DSTORAGE_LIB=\""$(libdir)"\"				-DG_LOG_DOMAIN=\"Bonobo\"				-I. 							-I$(srcdir) -I$(top_srcdir) 				-I$(top_builddir)				        -I$(includedir)                                 	$(GNOME_INCLUDEDIR)					$(GDK_PIXBUF_CFLAGS)
  
  
- gnome_libs =  	$(GNOME_LIBDIR)		        $(GNOMEUI_LIBS)			$(OBJECT_DIRECTORY_LIBS) 	$(INTLLIBS)
+ gnome_libs =  	$(GNOME_LIBDIR)			$(GDK_PIXBUF_LIBS)         $(GNOMEUI_LIBS)			$(OBJECT_DIRECTORY_LIBS) 	$(INTLLIBS)
 --- gshell/Makefile.in.orig	Sun Mar 26 10:16:20 2000
 +++ gshell/Makefile.in	Fri Apr 21 10:19:33 2000
 @@ -132,7 +132,7 @@
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 220fb25db60d..a387fc85aa78 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -1,10 +1,13 @@
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
-bin/bonobo-image-x-png
+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
 bin/sample-control-container
 bin/sample-control-factory
@@ -14,14 +17,15 @@ etc/CORBA/servers/application-x-mines.gnorba
 etc/CORBA/servers/audio-ulaw.gnorba
 etc/CORBA/servers/bonobo-calculator-control.gnorba
 etc/CORBA/servers/bonobo-clock-control.gnorba
-etc/CORBA/servers/image-x-png.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/sample.gnorba
 etc/CORBA/servers/text-plain.gnorba
 etc/bonoboConf.sh
 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
@@ -37,14 +41,16 @@ 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-xml.h
 include/bonobo/bonobo-property-bag.h
 include/bonobo/bonobo-property-types.h
 include/bonobo/bonobo-property.h
@@ -60,9 +66,9 @@ include/bonobo/bonobo-view.h
 include/bonobo/bonobo-widget.h
 include/bonobo/bonobo-wrapper.h
 include/efs.h
-lib/libbonobo-xml.a
-lib/libbonobo-xml.so
-lib/libbonobo-xml.so.0
+lib/libbonobo-print.a
+lib/libbonobo-print.so
+lib/libbonobo-print.so.0
 lib/libbonobo.a
 lib/libbonobo.so
 lib/libbonobo.so.2
@@ -73,8 +79,8 @@ 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/apps/Games/gnomine-bonobo.desktop
 share/gnome/idl/Bonobo.idl
+share/gnome/idl/Echo.idl
 share/gnome/idl/bonobo-advise.idl
 share/gnome/idl/bonobo-canvas.idl
 share/gnome/idl/bonobo-client-site.idl
@@ -84,6 +90,7 @@ share/gnome/idl/bonobo-desktop.idl
 share/gnome/idl/bonobo-embeddable.idl
 share/gnome/idl/bonobo-factory.idl
 share/gnome/idl/bonobo-persist.idl
+share/gnome/idl/bonobo-print.idl
 share/gnome/idl/bonobo-progressive.idl
 share/gnome/idl/bonobo-property.idl
 share/gnome/idl/bonobo-storage.idl
@@ -91,6 +98,13 @@ share/gnome/idl/bonobo-ui-handler.idl
 share/gnome/idl/bonobo-unknown.idl
 share/gnome/idl/bonobo.idl
 share/gnome/mime-info/bonobo.keys
+share/gnome/oaf/application-x-mines.oafinfo
+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/paint-component-simple.oafinfo
+share/gnome/oaf/text-plain.oafinfo
 share/locale/da/LC_MESSAGES/bonobo.mo
 share/locale/de/LC_MESSAGES/bonobo.mo
 share/locale/el/LC_MESSAGES/bonobo.mo
@@ -99,6 +113,7 @@ share/locale/fr/LC_MESSAGES/bonobo.mo
 share/locale/gl/LC_MESSAGES/bonobo.mo
 share/locale/it/LC_MESSAGES/bonobo.mo
 share/locale/ja/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
 share/locale/pt_BR/LC_MESSAGES/bonobo.mo
@@ -108,4 +123,5 @@ 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 include/bonobo