Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

4 files changed, 13 insertions, 9 deletions

diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 20eb2d7f170..e3ece0690fc 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	2.2.4
+PORTVERSION=	2.4.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 124f41e5ddc..1d6f2f98d6c 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-2.2.4.tar.bz2) = bbf8715be93ac8e6dbc70a16a6353d0a
+MD5 (gnome2/libbonoboui-2.4.0.tar.bz2) = 176e1a094ecbfaf765c9996fc3eccf3c
diff --git a/x11-toolkits/libbonoboui/files/patch-Makefile.in b/x11-toolkits/libbonoboui/files/patch-Makefile.in
index 3512fa0d365..156a4f58718 100644
--- a/x11-toolkits/libbonoboui/files/patch-Makefile.in
+++ b/x11-toolkits/libbonoboui/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Jul 29 21:56:19 2003
-+++ Makefile.in	Tue Jul 29 21:56:48 2003
-@@ -133,7 +133,7 @@
- cxxflags_set = @cxxflags_set@
- gnomelocaledir = @gnomelocaledir@
- install_sh = @install_sh@
+--- Makefile.in.orig	Sat Jun 14 04:47:53 2003
++++ Makefile.in	Sat Jun 14 04:48:13 2003
+@@ -192,7 +192,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = bonobo glade samples tests po doc
 +SUBDIRS = bonobo glade samples po doc
  
diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index a3acc2d6800..3bc4954d1eb 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -37,6 +37,7 @@ 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
 share/doc/libbonoboui/bonobo-controls.html
 share/doc/libbonoboui/bonobo-support-utilities.html
@@ -72,6 +73,7 @@ share/doc/libbonoboui/libbonoboui-faq.html
 share/doc/libbonoboui/libbonoboui.devhelp
 share/doc/libbonoboui/right.png
 share/doc/libbonoboui/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/am/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
@@ -92,10 +94,12 @@ 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/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/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