Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

5 files changed, 14 insertions, 26 deletions

diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 8d2d9d44575a..6ab877a337cf 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.0.3.3
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas \
-		gnome-2.0:${PORTSDIR}/x11/libgnome
+LIB_DEPENDS=	gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas \
+		gnome-2.200:${PORTSDIR}/x11/libgnome
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index ea7c39b5db44..71c72347e16b 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-2.0.3.3.tar.bz2) = 2ae0f5ea9567a6e6bca80df4156978fc
+MD5 (gnome2/libbonoboui-2.2.0.tar.bz2) = e3a5090990f0dcf88aa1e8e8cea74e4f
diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
deleted file mode 100644
index 7d93d259360a..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- bonobo/bonobo-ui-util.c.orig	Mon Sep  2 11:24:00 2002
-+++ bonobo/bonobo-ui-util.c	Sat Nov 16 16:38:54 2002
-@@ -539,11 +539,10 @@
- 					      GNOME_PARAM_GNOME_PREFIX, &prefix, NULL);
- 		}
- 
--		/* sub-optimal, but what can you do */
--		if (prefix)
--			datadir = g_strdup_printf ("%s/share", prefix);
--		else
--			datadir = g_strdup (BONOBO_DATADIR);
-+		g_object_get (G_OBJECT (gnome_program_get ()),
-+		              GNOME_PARAM_APP_DATADIR, &datadir, NULL);
-+		if (!datadir)
-+		    datadir = g_strdup (BONOBO_DATADIR);
- 
- 		cl->program = gnome_program_init (
- 			doc_id, "2.1",
diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure
index b963f8bcce5c..e33f9e6ceb4e 100644
--- a/x11-toolkits/libbonoboui/files/patch-configure
+++ b/x11-toolkits/libbonoboui/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Oct 18 07:23:27 2002
-+++ configure	Fri Nov  1 16:08:44 2002
-@@ -7235,6 +7235,7 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 11:11:58	1.1
++++ configure	2002/04/26 11:12:23
+@@ -7013,6 +7013,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index f97a23354ee4..3a29cf390d36 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -46,11 +46,13 @@ share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/bg/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/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/es/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/he/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
@@ -58,6 +60,7 @@ share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ms/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/pl/LC_MESSAGES/libbonoboui-2.0.mo