3 files changed, 8 insertions, 33 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index dd0d8e759343..e9e4262d4141 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.10
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 5cddabf936c5..91296a8ac2b4 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.8.3.tar.bz2) = 607f8689f931336ad9a1f3f41d98a9c7
-SIZE (gnome2/gnome-desktop-2.8.3.tar.bz2) = 1142079
+MD5 (gnome2/gnome-desktop-2.10.0.tar.bz2) = 62edee01c309cb1b049ceaa801d415cc
+SIZE (gnome2/gnome-desktop-2.10.0.tar.bz2) = 1102509
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index d1cb33594f24..77b705c7d400 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -4,8 +4,9 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.3
+lib/libgnome-desktop-2.so.4
 libdata/pkgconfig/gnome-desktop-2.0.pc
+share/gnome/applications/gnome-about.desktop
 share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
 share/gnome/gnome-about/headers/header-bg-ancient01a.png
@@ -33,12 +34,10 @@ share/gnome/omf/gnome-desktop/gpl-C.omf
 share/gnome/omf/gnome-desktop/gpl-eu.omf
 share/gnome/omf/gnome-desktop/lgpl-C.omf
 share/gnome/omf/gnome-desktop/lgpl-eu.omf
-share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-applications.png
 share/gnome/pixmaps/gnome-background-image.png
 share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
@@ -61,7 +60,6 @@ share/gnome/pixmaps/gnome-debian.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-favorites.png
 share/gnome/pixmaps/gnome-file-c.png
 share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
@@ -80,19 +78,13 @@ share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
 share/gnome/pixmaps/gnome-logo-icon.png
 share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mailcheck.png
 share/gnome/pixmaps/gnome-mdi.png
 share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-modem.png
-share/gnome/pixmaps/gnome-money.png
-share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
 share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
@@ -106,7 +98,6 @@ share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
 share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
 share/gnome/pixmaps/gnome-windows.png
 share/gnome/pixmaps/gnome-word.png
@@ -114,21 +105,8 @@ share/gnome/pixmaps/gnome-workspace.png
 share/gnome/pixmaps/gnome-xterm.png
 share/gnome/pixmaps/gtkvim.png
 share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/launcher-program.png
 share/gnome/pixmaps/monitor.png
 share/gnome/pixmaps/vnterm.xpm
-share/gnome/vfolders/Accessories.directory
-share/gnome/vfolders/Applications.directory
-share/gnome/vfolders/Development.directory
-share/gnome/vfolders/Games.directory
-share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Internet.directory
-share/gnome/vfolders/Multimedia.directory
-share/gnome/vfolders/Office.directory
-share/gnome/vfolders/Other.directory
-share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/System.directory
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -200,17 +178,14 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/gpl/eu