Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

3 files changed, 12 insertions, 21 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 1c434ac65945..48f0b8e7bbb9 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,16 +6,11 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.2 \
-			marcus/:local
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.4
 DISTNAME=	gnome-session-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		splash.png:local
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -27,18 +22,11 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=	gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \
 	gnome-session-save.1
 MAN5=	default.session.5
 
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/splash.png ${WRKDIR}
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/splash.png \
-		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 81c567b465b0..93da50979a59 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,2 +1 @@
-MD5 (gnome2/gnome-session-2.2.2.tar.bz2) = 7dcfea0d925ddecb7c9700ddf597b17c
-MD5 (gnome2/splash.png) = 244d7cadfb0f5e7ba624a1d4e749a312
+MD5 (gnome2/gnome-session-2.4.0.tar.bz2) = 6a7acf3429b927c69e18019f9ec6fa9f
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 75f1650b4f35..d4fc0ded7788 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-session
 bin/gnome-session-properties
+bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
@@ -16,15 +17,17 @@ share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
+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_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
 share/locale/et/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo
@@ -37,6 +40,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/hi/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
 share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
@@ -62,13 +66,13 @@ share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr@Latn/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
+share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
-@dirrm share/gnome/omf/gnome-core
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options