Update to 2.32.0.

Splash screen support is removed.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14676 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 13 insertions, 57 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 71306855f..4b4184e71 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -2,20 +2,15 @@
 # Date created:				08 May 2002
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
-# $FreeBSD: ports/x11/gnome-session/Makefile,v 1.77 2010/05/31 02:01:36 ade Exp $
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.181 2010/04/02 17:25:12 kwm Exp $
+# $FreeBSD$
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.185 2010/07/26 16:06:42 kwm Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.30.0
-PORTREVISION=	1
+PORTVERSION=	2.32.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	GNOME \
-		http://www.marcuscom.com/downloads/:local
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASHES}:local
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2 desktop
@@ -49,19 +44,4 @@ MAN1=		gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
 		gnome-session-save.1
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASHES=	freebsd-splashes-gnome-2.18_1.tar
-
-post-extract:
-	cd ${WRKDIR} && ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/data/gnome-splash.png \
-		${PREFIX}/share/pixmaps/splash/original-gnome-splash.png
-#	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
-#		${PREFIX}/share/pixmaps/splash/gnome-splash.png
-.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png franz-splash_218.png adamw-bat-2.18.jpg adamw-conky-2.18.png adamw-cow-2.18.png adamw-mouth-2.18.png adamw-swing-2.18.png
-	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.18/${splash} \
-		${PREFIX}/share/pixmaps/splash
-.endfor
-
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 8d32bec92..0484c1707 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,3 @@
-MD5 (gnome2/gnome-session-2.30.0.tar.bz2) = d15fdd120f3c7d01e4a388a4a0e73932
-SHA256 (gnome2/gnome-session-2.30.0.tar.bz2) = efeb45319403546fa60e6cb035e4de5e87731ea672fd37635749af49d0fd4d84
-SIZE (gnome2/gnome-session-2.30.0.tar.bz2) = 827745
-MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5
-SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508
-SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720
+MD5 (gnome2/gnome-session-2.32.0.tar.bz2) = b348bd024fbce264f74a174ebcdf3947
+SHA256 (gnome2/gnome-session-2.32.0.tar.bz2) = 4b757574303062cba560cffeca654eccd4ed0dd163efe793a4a3efb6822dea25
+SIZE (gnome2/gnome-session-2.32.0.tar.bz2) = 773010
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index cff118134..bacb06aac 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -2,10 +2,6 @@ bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-save
 bin/gnome-wm
-etc/xdg/autostart/gnome-session-splash.desktop
-etc/xdg/autostart/gnome-settings-daemon-helper.desktop
-libexec/gnome-session/helpers/gnome-session-splash
-libexec/gnome-session/helpers/gnome-settings-daemon-helper
 share/applications/session-properties.desktop
 %%DATADIR%%/gsm-inhibit-dialog.ui
 %%DATADIR%%/session-properties.ui
@@ -48,6 +44,7 @@ share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/fy/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
@@ -101,6 +98,7 @@ share/locale/sr@latin/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/te/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ug/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
@@ -115,33 +113,10 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
-share/pixmaps/splash/MaMBaNgGaoX-2.12.png
-share/pixmaps/splash/adamw-bat-2.18.jpg
-share/pixmaps/splash/adamw-conky-2.18.png
-share/pixmaps/splash/adamw-cow-2.18.png
-share/pixmaps/splash/adamw-mouth-2.18.png
-share/pixmaps/splash/adamw-piggy-2.12.png
-share/pixmaps/splash/adamw-swing-2.18.png
-share/pixmaps/splash/adamw-trophy-2.12.png
-share/pixmaps/splash/andreas-slogan-2.12.png
-share/pixmaps/splash/andreas-splash-2.12.png
-share/pixmaps/splash/domix-splash-2.12.png
-share/pixmaps/splash/domix-splash2-2.12.png
-share/pixmaps/splash/franz-splash_218.png
-share/pixmaps/splash/gnome-splash.png
-share/pixmaps/splash/mumija-2.12.png
-share/pixmaps/splash/mumija2-2.12.png
-share/pixmaps/splash/mumija3-2.12.png
-share/pixmaps/splash/original-gnome-splash.png
-share/pixmaps/splash/tremulant-2.12.png
-share/pixmaps/splash/tremulant-blood-2.12.png
-share/pixmaps/splash/tremulant-brushed-metal-2.12.png
 share/xsessions/gnome.desktop
 @dirrmtry share/xsessions
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm libexec/gnome-session/helpers
-@dirrm libexec/gnome-session
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -152,6 +127,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
 @dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -184,6 +161,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/ha/LC_MESSAGES
 @dirrmtry share/locale/ha
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
 @dirrmtry share/locale/en@shaw/LC_MESSAGES