Update to GNOME 2.2.

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

4 files changed, 19 insertions, 6 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 25f637facffc..b18a2db68a72 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.0.9
+PORTVERSION=	2.2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.0
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.2
 DISTNAME=	gnome-session-${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
@@ -28,8 +28,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 save-session.1 \
-	session-properties.1
+MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
+	gnome-session-save.1
 MAN5=	default.session.5
 
 post-patch:
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index d62947fd6993..7a3e911c6bc1 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.0.9.tar.bz2) = 55659ab1dbcc521ded652aadc309287d
+MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3
diff --git a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
new file mode 100644
index 000000000000..9bd6c9a2cf68
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in
@@ -0,0 +1,11 @@
+--- gnome-session/gnome-session.schemas.in.in.orig	Mon Oct 14 17:18:15 2002
++++ gnome-session/gnome-session.schemas.in.in	Mon Oct 14 17:17:44 2002
+@@ -50,7 +50,7 @@
+          <applyto>/apps/gnome-session/options/splash_image</applyto>
+          <owner>gnome</owner>
+          <type>string</type>
+-         <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default>
++         <default>@datadir@/pixmaps/splash/gnome-splash.png</default>
+          <locale name="C">
+             <short>Splash Screen Image</short>
+             <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long>
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index a7aa07265800..6f959c8d2217 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -40,6 +40,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
@@ -52,6 +53,7 @@ share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo