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

3 files changed, 19 insertions, 26 deletions

diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index d75f3f70b62f..8f26ad958d92 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	2.2.1
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics 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
@@ -21,6 +21,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_GNOMENG=	yes
 USE_GNOME=	gnomehack libglade2 libartlgpl2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 9ed901d768ba..49e6d07fec03 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-2.2.1.tar.bz2) = 4023de1258dfdfe0d7b26db05b528edd
+MD5 (gnome2/libgnomecanvas-2.4.0.tar.bz2) = c212a7cac06b7f9e68ed2de38df6e54d
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 8af32e2d5fd6..a20514a4aaa6 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -15,10 +15,12 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
 lib/libglade/2.0/libcanvas.so
 lib/libgnomecanvas-2.a
 lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.200
+lib/libgnomecanvas-2.so.400
 libdata/pkgconfig/libgnomecanvas-2.0.pc
 share/doc/libgnomecanvas/c35.html
 share/doc/libgnomecanvas/c4.html
+share/doc/libgnomecanvas/index.html
+share/doc/libgnomecanvas/index.sgml
 share/doc/libgnomecanvas/gnomecanvas.html
 share/doc/libgnomecanvas/gnomecanvasbpath.html
 share/doc/libgnomecanvas/gnomecanvasclipgroup.html
@@ -34,40 +36,26 @@ share/doc/libgnomecanvas/gnomecanvasrichtext.html
 share/doc/libgnomecanvas/gnomecanvasshape.html
 share/doc/libgnomecanvas/gnomecanvastext.html
 share/doc/libgnomecanvas/gnomecanvaswidget.html
-share/doc/libgnomecanvas/index.html
-share/doc/libgnomecanvas/index.sgml
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html
+share/doc/libgnomecanvas/home.png
+share/doc/libgnomecanvas/left.png
 share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
 share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspathdef.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasre.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrect.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
-share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html
+share/doc/libgnomecanvas/right.png
+share/doc/libgnomecanvas/up.png
 share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -77,15 +65,18 @@ share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -96,6 +87,7 @@ share/locale/ro/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo