6 files changed, 19 insertions, 34 deletions

diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 6dbda489a1a5..857eaa4af5c1 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://people.FreeBSD.org/~marcus/:local \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.4 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.6 \
 		    	marcus/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		splash.png:local
+		${SPLASH_IMG}:local
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +23,7 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -33,11 +33,13 @@ MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
 MAN5=	default.session.5
 
+SPLASH_IMG=	gnome-splash04-12.png
+
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/splash.png \
+	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
 
 .include <bsd.port.mk>
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 0a06b2a8ed0e..56764710a045 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.4.2.tar.bz2) = fc2e6d9c71b4d1fe08ec329d7e03684e
-SIZE (gnome2/gnome-session-2.4.2.tar.bz2) = 911570
-MD5 (gnome2/splash.png) = bd73a8a1f0c97aac669045f6b9b1fe02
-SIZE (gnome2/splash.png) = 59161
+MD5 (gnome2/gnome-session-2.6.0.tar.bz2) = 42018f3e5f201a4f449de444c600ce29
+SIZE (gnome2/gnome-session-2.6.0.tar.bz2) = 836172
+MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
+SIZE (gnome2/gnome-splash04-12.png) = 75841
diff --git a/x11/gnomesession/files/patch-configure b/x11/gnomesession/files/patch-configure
deleted file mode 100644
index 61084626cb14..000000000000
--- a/x11/gnomesession/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed May  8 14:27:04 2002
-+++ configure	Wed May  8 14:27:23 2002
-@@ -7232,6 +7232,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
deleted file mode 100644
index 9bd6c9a2cf68..000000000000
--- a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/gnomesession/pkg-descr b/x11/gnomesession/pkg-descr
index e0a6dd0276ff..50986ef910b2 100644
--- a/x11/gnomesession/pkg-descr
+++ b/x11/gnomesession/pkg-descr
@@ -1,2 +1,2 @@
-Session component for the GNOME 2.0 desktop.  This package contains the 
-commands needed to start GNOME 2.0.
+This provides session management for the GNOME 2 desktop, and
+provides the tools used to start the desktop.
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index d4fc0ded7788..355893a4e9d8 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -26,6 +26,7 @@ share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-session-2.0.mo
@@ -38,6 +39,7 @@ share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
@@ -50,10 +52,12 @@ share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mr/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
 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-session-2.0.mo