Fix libbonoboui build with the new libgnome* components.

Obtained from:	GNOME CVS


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3534 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 253 insertions, 0 deletions

diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
new file mode 100644
index 000000000..49f625d84
--- /dev/null
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for:	libbonoboui
+# Date created:				04 April 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/x11-toolkits/libbonoboui/Makefile,v 1.43 2004/11/07 22:24:30 marcus Exp $
+#
+
+PORTNAME=	libbonoboui
+PORTVERSION=	2.8.0
+PORTREVISION=	1
+CATEGORIES=	x11-toolkits gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	GUI frontend to the libbonobo component of GNOME 2
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack \
+		libgnomecanvas libgnome
+USE_INC_LIBTOOL_VER=13
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
new file mode 100644
index 000000000..b59d866f2
--- /dev/null
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/libbonoboui-2.8.0.tar.bz2) = 73e0b8883d8bea6b3bbd297dbbcb1f36
+SIZE (gnome2/libbonoboui-2.8.0.tar.bz2) = 970664
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
new file mode 100644
index 000000000..fcdbe416b
--- /dev/null
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Jan 16 13:17:47 2004
++++ Makefile.in	Fri Jan 16 13:18:13 2004
+@@ -146,7 +146,7 @@
+ am__quote = @am__quote@
+ gnomelocaledir = @gnomelocaledir@
+ install_sh = @install_sh@
+-SUBDIRS = bonobo glade samples tests po doc
++SUBDIRS = bonobo glade samples po doc
+ 
+ libincludedir = $(includedir)/libbonoboui-2.0
+ libinclude_HEADERS = \
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-canvas-item.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-canvas-item.c
new file mode 100644
index 000000000..3b6f54e6b
--- /dev/null
+++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-canvas-item.c
@@ -0,0 +1,11 @@
+--- bonobo/bonobo-canvas-item.c.orig	Wed Jan 26 13:21:00 2005
++++ bonobo/bonobo-canvas-item.c	Wed Jan 26 13:22:20 2005
+@@ -20,7 +20,7 @@
+ #include <bonobo/bonobo-object.h>
+ #include <bonobo/bonobo-types.h>
+ #include <bonobo/bonobo-main.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-macros.h>
+ #include <gdk/gdkprivate.h>
+ #include <gdk/gdkx.h>
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-toolbar.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-toolbar.c
new file mode 100644
index 000000000..7ba5fdd51
--- /dev/null
+++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-toolbar.c
@@ -0,0 +1,11 @@
+--- bonobo/bonobo-ui-toolbar.c.orig	Wed Jan 26 13:22:46 2005
++++ bonobo/bonobo-ui-toolbar.c	Wed Jan 26 13:23:04 2005
+@@ -9,7 +9,7 @@
+  */
+ 
+ #include <config.h>
+-#include <libgnome/gnome-i18n.h>
++#include <glib/gi18n.h>
+ #include <libgnome/gnome-macros.h>
+ #include <bonobo/bonobo-ui-private.h>
+ #include <bonobo/bonobo-ui-toolbar.h>
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
new file mode 100644
index 000000000..f0c6cd1b9
--- /dev/null
+++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
@@ -0,0 +1,31 @@
+--- bonobo/bonobo-ui-util.c.orig	Fri May 14 06:49:07 2004
++++ bonobo/bonobo-ui-util.c	Wed Jan 26 13:24:13 2005
+@@ -400,7 +400,8 @@
+ 			g_warning ("Could not find GNOME pixmap file %s", text);
+ 		else {
+  			int w, h;
+- 			if (gtk_icon_size_lookup (icon_size, &w, &h))
++			GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (image));
++			if (gtk_icon_size_lookup_for_settings (settings, icon_size, &w, &h))
+  				pixbuf = gdk_pixbuf_new_from_file_at_size (name, w, h, NULL);
+  			else
+  				pixbuf = gdk_pixbuf_new_from_file (name, NULL);
+@@ -564,14 +565,11 @@
+ 		else
+ 			prefix = NULL;
+ 
+-		if (prefix)
++		datadir = NULL;
++		g_object_get (G_OBJECT (gnome_program_get ()),
++			GNOME_PARAM_APP_DATADIR, &datadir, NULL);
++		if (!datadir && prefix) 
+ 			datadir = g_strdup_printf ("%s/share", prefix);
+-
+- 		else {
+-			datadir = NULL;
+-			g_object_get (G_OBJECT (gnome_program_get ()),
+-				      GNOME_PARAM_APP_DATADIR, &datadir, NULL);
+-		}
+ 
+ 		if (!datadir) /* desparate fallback */
+ 			datadir = g_strdup (BONOBO_DATADIR);
diff --git a/x11-toolkits/libbonoboui/pkg-descr b/x11-toolkits/libbonoboui/pkg-descr
new file mode 100644
index 000000000..8ca4e661c
--- /dev/null
+++ b/x11-toolkits/libbonoboui/pkg-descr
@@ -0,0 +1,7 @@
+Bonobo is a set of language- and system-independant CORBA
+interfaces for creating reusable components and compound documents.
+
+libbonoboui includes a Gtk+-based implementation of the Bonobo
+interfaces.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
new file mode 100644
index 000000000..5cc25c76e
--- /dev/null
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -0,0 +1,151 @@
+include/libbonoboui-2.0/bonobo.h
+include/libbonoboui-2.0/bonobo/bonobo-canvas-component.h
+include/libbonoboui-2.0/bonobo/bonobo-canvas-item.h
+include/libbonoboui-2.0/bonobo/bonobo-control-frame.h
+include/libbonoboui-2.0/bonobo/bonobo-control.h
+include/libbonoboui-2.0/bonobo/bonobo-dock-band.h
+include/libbonoboui-2.0/bonobo/bonobo-dock-item.h
+include/libbonoboui-2.0/bonobo/bonobo-dock-layout.h
+include/libbonoboui-2.0/bonobo/bonobo-dock.h
+include/libbonoboui-2.0/bonobo/bonobo-file-selector-util.h
+include/libbonoboui-2.0/bonobo/bonobo-plug.h
+include/libbonoboui-2.0/bonobo/bonobo-property-control.h
+include/libbonoboui-2.0/bonobo/bonobo-selector-widget.h
+include/libbonoboui-2.0/bonobo/bonobo-selector.h
+include/libbonoboui-2.0/bonobo/bonobo-socket.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-component.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-config-widget.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-container.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-engine.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-main.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-node.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-sync.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-toolbar-button-item.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-toolbar-item.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-toolbar-toggle-button-item.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-toolbar.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-type-builtins.h
+include/libbonoboui-2.0/bonobo/bonobo-ui-util.h
+include/libbonoboui-2.0/bonobo/bonobo-widget.h
+include/libbonoboui-2.0/bonobo/bonobo-window.h
+include/libbonoboui-2.0/bonobo/bonobo-zoomable-frame.h
+include/libbonoboui-2.0/bonobo/bonobo-zoomable.h
+include/libbonoboui-2.0/libbonoboui.h
+lib/bonobo-2.0/samples/bonobo-sample-controls-2
+lib/libbonoboui-2.a
+lib/libbonoboui-2.so
+lib/libbonoboui-2.so.0
+lib/libglade/2.0/libbonobo.so
+libdata/bonobo/servers/Bonobo_Sample_Controls.server
+libdata/bonobo/servers/CanvDemo.server
+libdata/pkgconfig/libbonoboui-2.0.pc
+%%DOCSDIR%%/bonobo-controls.html
+%%DOCSDIR%%/bonobo-support-utilities.html
+%%DOCSDIR%%/bonobo-ui.html
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/control-frame.png
+%%DOCSDIR%%/control.png
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libbonoboui-bonobo-a11y.html
+%%DOCSDIR%%/libbonoboui-bonobo-control-frame.html
+%%DOCSDIR%%/libbonoboui-bonobo-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-file-selector-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-plug.html
+%%DOCSDIR%%/libbonoboui-bonobo-property-control.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-selector.html
+%%DOCSDIR%%/libbonoboui-bonobo-socket.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-component.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-container.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine-config.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-engine.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-node.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-preferences.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-sync.html
+%%DOCSDIR%%/libbonoboui-bonobo-ui-util.html
+%%DOCSDIR%%/libbonoboui-bonobo-widget.html
+%%DOCSDIR%%/libbonoboui-bonobo-window.html
+%%DOCSDIR%%/libbonoboui-bonobo-wrapper.html
+%%DOCSDIR%%/libbonoboui-faq.html
+%%DOCSDIR%%/libbonoboui.devhelp
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+share/gnome/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
+share/gnome/gnome-2.0/ui/Bonobo_Sample_Hello.xml
+share/locale/af/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/bn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/bs/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/cy/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/en_CA/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/et/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/eu/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/fa/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ga/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/gu/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/hr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/id/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/li/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/lt/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/mr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/nb/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ne/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/or/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pa/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pt/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ru/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sk/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/yi/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
+@dirrm lib/bonobo-2.0/samples
+@dirrm lib/bonobo-2.0
+@dirrm include/libbonoboui-2.0/bonobo
+@dirrm include/libbonoboui-2.0
+@dirrm %%DOCSDIR%%