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

10 files changed, 137 insertions, 82 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 42b8c0b10844..b65209bd9313 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	2.2.1
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	eog-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,11 +19,16 @@ COMMENT=	The Eye Of Gnome image viewer
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui libgnomeprintui \
-	   	librsvg2
+USE_GNOME=	gnomeprefix gnomehack gnomehier eel2 libgnomeprintui librsvg2
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+	
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if defined(WITH_EXIF) || exists(${LOCALBASE}/lib/libexif.so.8)
+LIB_DEPENDS+=	exif.8:${PORTSDIR}/graphics/libexif
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 8c032b7a1ffa..edbb82d0720b 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eog-2.2.1.tar.bz2) = 6251a7d4a6484187e9236a3f20b6d719
+MD5 (gnome2/eog-2.4.0.tar.bz2) = daebc6c3dbce24e72141437568a2618d
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index be4fc01eaba7..e24c07bd172e 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,38 +1,90 @@
 bin/eog
 etc/gconf/gconf.xml.defaults/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/eog/full_screen/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/eog/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/eog/window/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/eog/full_screen/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/view/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/eog/window/%gconf.xml
 etc/gconf/schemas/eog.schemas
 libdata/bonobo/servers/GNOME_EOG.server
+libdata/bonobo/servers/GNOME_EOG_Collection.server
+libexec/eog-collection-view
 libexec/eog-image-viewer
 share/gnome/applications/eog.desktop
 share/gnome/eog/glade/eog.glade
+share/gnome/eog/gpi-dialog.glade
+share/gnome/gnome-2.0/ui/eog-collection-view-ui.xml
 share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml
 share/gnome/gnome-2.0/ui/eog-image-view-ui.xml
 share/gnome/gnome-2.0/ui/eog-shell-ui.xml
 share/gnome/help/eog/C/eog.xml
 share/gnome/help/eog/C/figures/eog_start_window.png
 share/gnome/help/eog/C/legal.xml
+share/gnome/help/eog/de/eog.xml
+share/gnome/help/eog/de/figures/eog_start_window.png
+share/gnome/help/eog/de/legal.xml
+share/gnome/help/eog/es/eog.xml
+share/gnome/help/eog/es/figures/eog_start_window.png
+share/gnome/help/eog/es/legal.xml
+share/gnome/help/eog/fr/eog.xml
+share/gnome/help/eog/fr/figures/eog_start_window.png
+share/gnome/help/eog/fr/legal.xml
+share/gnome/help/eog/it/eog.xml
+share/gnome/help/eog/it/figures/eog_start_window.png
+share/gnome/help/eog/it/legal.xml
+share/gnome/help/eog/ja/eog.xml
+share/gnome/help/eog/ja/figures/eog_start_window.png
+share/gnome/help/eog/ja/legal.xml
+share/gnome/help/eog/ko/eog.xml
+share/gnome/help/eog/ko/figures/eog_start_window.png
+share/gnome/help/eog/ko/legal.xml
+share/gnome/help/eog/sv/eog.xml
+share/gnome/help/eog/sv/figures/eog_start_window.png
+share/gnome/help/eog/sv/legal.xml
+share/gnome/help/eog/zh_CN/eog.xml
+share/gnome/help/eog/zh_CN/figures/eog_start_window.png
+share/gnome/help/eog/zh_CN/legal.xml
+share/gnome/help/eog/zh_TW/eog.xml
+share/gnome/help/eog/zh_TW/figures/eog_start_window.png
+share/gnome/help/eog/zh_TW/legal.xml
 share/gnome/idl/Eog.idl
 share/gnome/omf/eog/eog-C.omf
-@exec scrollkeeper-install %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/eog/eog-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/eog/down-right.png
 share/gnome/pixmaps/eog/orient-horizontal.png
 share/gnome/pixmaps/eog/orient-vertical.png
 share/gnome/pixmaps/eog/right-down.png
+share/gnome/pixmaps/eog/stock-rotate-90-16.png
+share/gnome/pixmaps/eog/stock-rotate-270-16.png
+share/gnome/pixmaps/eog/stock-rotate-180-16.png
 share/gnome/pixmaps/gnome-eog.png
 share/locale/am/LC_MESSAGES/eog.mo
 share/locale/ar/LC_MESSAGES/eog.mo
 share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
 share/locale/bg/LC_MESSAGES/eog.mo
+share/locale/bn/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
+share/locale/cy/LC_MESSAGES/eog.mo
 share/locale/da/LC_MESSAGES/eog.mo
 share/locale/de/LC_MESSAGES/eog.mo
 share/locale/el/LC_MESSAGES/eog.mo
@@ -44,8 +96,10 @@ share/locale/fr/LC_MESSAGES/eog.mo
 share/locale/ga/LC_MESSAGES/eog.mo
 share/locale/gl/LC_MESSAGES/eog.mo
 share/locale/he/LC_MESSAGES/eog.mo
+share/locale/hi/LC_MESSAGES/eog.mo
 share/locale/hu/LC_MESSAGES/eog.mo
 share/locale/id/LC_MESSAGES/eog.mo
+share/locale/is/LC_MESSAGES/eog.mo
 share/locale/it/LC_MESSAGES/eog.mo
 share/locale/ja/LC_MESSAGES/eog.mo
 share/locale/kn/LC_MESSAGES/eog.mo
@@ -53,6 +107,7 @@ share/locale/ko/LC_MESSAGES/eog.mo
 share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/lv/LC_MESSAGES/eog.mo
 share/locale/mk/LC_MESSAGES/eog.mo
+share/locale/ml/LC_MESSAGES/eog.mo
 share/locale/mn/LC_MESSAGES/eog.mo
 share/locale/ms/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
@@ -66,8 +121,11 @@ share/locale/ru/LC_MESSAGES/eog.mo
 share/locale/sk/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sq/LC_MESSAGES/eog.mo
+share/locale/sr/LC_MESSAGES/eog.mo
+share/locale/sr@Latn/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/ta/LC_MESSAGES/eog.mo
+share/locale/th/LC_MESSAGES/eog.mo
 share/locale/tr/LC_MESSAGES/eog.mo
 share/locale/uk/LC_MESSAGES/eog.mo
 share/locale/vi/LC_MESSAGES/eog.mo
@@ -75,7 +133,40 @@ share/locale/wa/LC_MESSAGES/eog.mo
 share/locale/zh_CN/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 @dirrm share/gnome/omf/eog
+@dirrm share/gnome/help/eog/zh_TW/figures
+@dirrm share/gnome/help/eog/zh_TW
+@dirrm share/gnome/help/eog/zh_CN/figures
+@dirrm share/gnome/help/eog/zh_CN
+@dirrm share/gnome/help/eog/sv/figures
+@dirrm share/gnome/help/eog/sv
+@dirrm share/gnome/help/eog/ko/figures
+@dirrm share/gnome/help/eog/ko
+@dirrm share/gnome/help/eog/ja/figures
+@dirrm share/gnome/help/eog/ja
+@dirrm share/gnome/help/eog/it/figures
+@dirrm share/gnome/help/eog/it
+@dirrm share/gnome/help/eog/fr/figures
+@dirrm share/gnome/help/eog/fr
+@dirrm share/gnome/help/eog/es/figures
+@dirrm share/gnome/help/eog/es
+@dirrm share/gnome/help/eog/de/figures
+@dirrm share/gnome/help/eog/de
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
-@unexec scrollkeeper-uninstall %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/window
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog/view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/eog
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/window
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog/view
+@dirrm etc/gconf/gconf.xml.defaults/apps/eog
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
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
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index d3ba995acfbc..6e4dbb12d526 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.2.5
-PORTREVISION=	2
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	librsvg-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,7 +18,8 @@ COMMENT=	Library for parsing and rendering SVG vector-graphic files
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		popt.0:${PORTSDIR}/devel/popt
+		popt.0:${PORTSDIR}/devel/popt \
+		gsf-1.9:${PORTSDIR}/devel/libgsf
 RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2
 
 USE_BZIP2=	yes
@@ -28,9 +28,9 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack gtk20 libartlgpl2 libxml2 libgsf
+USE_GNOME=	gnomehack gtk20 libartlgpl2 libxml2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-svgz \
 		--disable-gtk-doc
 PLIST_SUB=	GTK_VERSION="2.2.0"
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 3a3e9c8b579d..4796a4a1f2a1 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/librsvg-2.2.5.tar.bz2) = db71094f14f460142b356c5ce6b9f835
+MD5 (gnome2/librsvg-2.4.0.tar.bz2) = 1a073864e5f6e9793cf23e38dc723803
diff --git a/graphics/librsvg2/files/patch-rsvg.c b/graphics/librsvg2/files/patch-rsvg.c
deleted file mode 100644
index 54b3861e208f..000000000000
--- a/graphics/librsvg2/files/patch-rsvg.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- rsvg.c.orig	Thu Jul 31 02:03:34 2003
-+++ rsvg.c	Thu Jul 31 02:26:35 2003
-@@ -332,13 +332,14 @@
- {
- 	RsvgSaxHandlerGstops *z = (RsvgSaxHandlerGstops *)self;
- 	RsvgHandle *ctx = z->ctx;
-+	RsvgSaxHandler *prev = &z->parent->super;
- 	
- 	if (!strcmp((char *)name, z->parent_tag))
- 		{
- 			if (ctx->handler != NULL)
- 				{
- 					ctx->handler->free (ctx->handler);
--					ctx->handler = &z->parent->super;
-+					ctx->handler = prev;
- 				}
- 		}
- }
-@@ -679,13 +680,14 @@
- {
- 	RsvgSaxHandlerStyle *z = (RsvgSaxHandlerStyle *)self;
- 	RsvgHandle *ctx = z->ctx;
-+	RsvgSaxHandler *prev = &z->parent->super;
- 	
- 	if (!strcmp ((char *)name, "style"))
- 		{
- 			if (ctx->handler != NULL)
- 				{
- 					ctx->handler->free (ctx->handler);
--					ctx->handler = &z->parent->super;
-+					ctx->handler = prev;
- 				}
- 		}
- }
diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist
index 21f66f6f4d6d..f9c5935081bb 100644
--- a/graphics/librsvg2/pkg-plist
+++ b/graphics/librsvg2/pkg-plist
@@ -6,17 +6,17 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so
 lib/librsvg-2.a
 lib/librsvg-2.so
-lib/librsvg-2.so.4
+lib/librsvg-2.so.6
 libdata/pkgconfig/librsvg-2.0.pc
 %%GIMP:%%libexec/gimp/1.3/plug-ins/svg
 share/doc/librsvg/html/home.png
-share/doc/librsvg/html/i909.html
+share/doc/librsvg/html/i1013.html
 share/doc/librsvg/html/index.html
 share/doc/librsvg/html/index.sgml
 share/doc/librsvg/html/left.png
 share/doc/librsvg/html/r22.html
-share/doc/librsvg/html/r320.html
-share/doc/librsvg/html/r354.html
+share/doc/librsvg/html/r376.html
+share/doc/librsvg/html/r413.html
 share/doc/librsvg/html/right.png
 share/doc/librsvg/html/rsvg-convenience-functions.html
 share/doc/librsvg/html/rsvg-core-api.html