3 files changed, 34 insertions, 22 deletions
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 1f48df2e0f83..274a00a9a3ed 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -3,16 +3,18 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
-		http://people.FreeBSD.org/~pav/:local
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
-		    	pav/:local
+		http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.12 \
+		    	adamw/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SPLASHES}:local
@@ -26,16 +28,16 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 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
+MAN1=		gnome-session.1 gnome-wm.1 session-properties.1 \
+		gnome-session-save.1
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASHES=	freebsd-splashes-gnome-2.10.tar
+SPLASHES=	freebsd-splashes-gnome-2.12.1.tar
 
 post-extract:
 	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
@@ -43,10 +45,10 @@ post-extract:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
 		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
-	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
-.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png
-	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \
+.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 
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \
 		${PREFIX}/share/gnome/pixmaps/splash
 .endfor
 
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 5f305e45c84f..cfcfc5533884 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff
-SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754
-MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
-SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
+MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597
+SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397
+MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa
+SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 999c30043083..17d898f1ee23 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -2,19 +2,25 @@ bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
 bin/gnome-session-save
-bin/gnome-smproxy
 bin/gnome-wm
 share/gnome/applications/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
-share/gnome/pixmaps/splash/adamw.png
-share/gnome/pixmaps/splash/banana_flex.png
-share/gnome/pixmaps/splash/franco_malatacca.jpg
-share/gnome/pixmaps/splash/franz_klammer-1.png
-share/gnome/pixmaps/splash/franz_klammer-3.png
+share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png
+share/gnome/pixmaps/splash/adamw-piggy-2.12.png
+share/gnome/pixmaps/splash/adamw-trophy-2.12.png
+share/gnome/pixmaps/splash/andreas-slogan-2.12.png
+share/gnome/pixmaps/splash/andreas-splash-2.12.png
+share/gnome/pixmaps/splash/domix-splash-2.12.png
+share/gnome/pixmaps/splash/domix-splash2-2.12.png
 share/gnome/pixmaps/splash/gnome-splash.png
+share/gnome/pixmaps/splash/mumija-2.12.png
+share/gnome/pixmaps/splash/mumija2-2.12.png
+share/gnome/pixmaps/splash/mumija3-2.12.png
 share/gnome/pixmaps/splash/original-gnome-splash.png
-share/gnome/pixmaps/splash/radek.png
+share/gnome/pixmaps/splash/tremulant-2.12.png
+share/gnome/pixmaps/splash/tremulant-blood-2.12.png
+share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@@ -45,6 +51,7 @@ 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/hy/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
@@ -82,9 +89,12 @@ 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
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/rw/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/xh/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
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
+@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true