6 files changed, 46 insertions, 6 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index be437e19d879..1aae16ce0bc8 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.6
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 9452638e89b7..157cde1df0e2 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.6.1.tar.bz2) = 63aa021d420ce14877f6a1dd3f0eeb16
-SIZE (gnome2/gnome-desktop-2.6.1.tar.bz2) = 1074516
+MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a
+SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 1fae1b2ec85e..f2699e459a3b 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -18,17 +18,29 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png
 share/gnome/gnome-about/headers/header-bg-snow01.png
 share/gnome/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
+share/gnome/help/fdl/eu/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
+share/gnome/help/gnome-feedback/eu/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
+share/gnome/help/gpl/eu/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/help/lgpl/eu/lgpl.xml
 share/gnome/omf/gnome-desktop/fdl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/fdl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/gpl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/lgpl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
@@ -199,12 +211,16 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/lgpl
 @dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl/eu
 @dirrm share/gnome/help/gpl
 @dirrm share/gnome/help/gnome-feedback/C
+@dirrm share/gnome/help/gnome-feedback/eu
 @dirrm share/gnome/help/gnome-feedback
 @dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl/eu
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
 @dirrm share/gnome/gnome-about
@@ -212,6 +228,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-eu.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index be437e19d879..1aae16ce0bc8 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.6
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 9452638e89b7..157cde1df0e2 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.6.1.tar.bz2) = 63aa021d420ce14877f6a1dd3f0eeb16
-SIZE (gnome2/gnome-desktop-2.6.1.tar.bz2) = 1074516
+MD5 (gnome2/gnome-desktop-2.6.2.tar.bz2) = efe9949e7aed8ca143287ec551b6852a
+SIZE (gnome2/gnome-desktop-2.6.2.tar.bz2) = 1131159
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index 1fae1b2ec85e..f2699e459a3b 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -18,17 +18,29 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png
 share/gnome/gnome-about/headers/header-bg-snow01.png
 share/gnome/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
+share/gnome/help/fdl/eu/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
+share/gnome/help/gnome-feedback/eu/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
+share/gnome/help/gpl/eu/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/help/lgpl/eu/lgpl.xml
 share/gnome/omf/gnome-desktop/fdl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/fdl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/gpl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-desktop/lgpl-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-eu.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
@@ -199,12 +211,16 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/C
+@dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/lgpl
 @dirrm share/gnome/help/gpl/C
+@dirrm share/gnome/help/gpl/eu
 @dirrm share/gnome/help/gpl
 @dirrm share/gnome/help/gnome-feedback/C
+@dirrm share/gnome/help/gnome-feedback/eu
 @dirrm share/gnome/help/gnome-feedback
 @dirrm share/gnome/help/fdl/C
+@dirrm share/gnome/help/fdl/eu
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
 @dirrm share/gnome/gnome-about
@@ -212,6 +228,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-eu.omf 2>/dev/null || /usr/bin/true