Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

3 files changed, 9 insertions, 10 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 323915fab1ef..8f1c292a4c49 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.0.10
+PORTVERSION=	2.2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.2
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 49d280e227f2..3ebb8fa8c311 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.0.10.tar.bz2) = 5a04d472ce8c6be6a823d348362a6d0b
+MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index cbd05d5d550e..c1eb5c92f788 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,11 +1,10 @@
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
-include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h
 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.0
+lib/libgnome-desktop-2.so.3
 libdata/pkgconfig/gnome-desktop-2.0.pc
 share/gnome/gnome-about/contributors.dat
 share/gnome/gnome-about/gnome-version.xml
@@ -18,15 +17,13 @@ share/gnome/vfolders/Applications.directory
 share/gnome/vfolders/Development.directory
 share/gnome/vfolders/Games.directory
 share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Home.directory
 share/gnome/vfolders/Internet.directory
 share/gnome/vfolders/Multimedia.directory
 share/gnome/vfolders/Office.directory
 share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Root.order
 share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/Settings.order
 share/gnome/vfolders/System.directory
+share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/cdeappmenu.png
@@ -155,7 +152,6 @@ share/gnome/pixmaps/panel-folder.png
 share/gnome/pixmaps/panel-knob.png
 share/gnome/pixmaps/panel-menu-main.png
 share/gnome/pixmaps/vnterm.xpm
-share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -183,6 +179,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -195,9 +192,11 @@ share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
 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