5 files changed, 35 insertions, 20 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ab5ff700a301..094f576055b2 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.1
 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.6 \
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.8 \
 		    	marcus/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -24,19 +24,20 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--with-halt-command=/sbin/shutdown \
 		--with-reboot-command=/sbin/shutdown
 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
+MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
+		session-properties.1 gnome-session-save.1
+MAN5=		default.session.5
+GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash04-12.png
+SPLASH_IMG=	gnome-splash28.png
 
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 47fa01285ba3..8f05e97ece4c 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.6.2.tar.bz2) = 0c80fbb64123cef7f2d7a9b69b0b965e
-SIZE (gnome2/gnome-session-2.6.2.tar.bz2) = 873420
-MD5 (gnome2/gnome-splash04-12.png) = a26cafb0ccffd5e173d7255e683faafd
-SIZE (gnome2/gnome-splash04-12.png) = 75841
+MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98
+SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921
+MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
+SIZE (gnome2/gnome-splash28.png) = 121715
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 60c14531bce0..2b05e8c0027e 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig	Wed May  8 14:36:22 2002
-+++ gnome-session/Makefile.in	Wed May  8 14:36:34 2002
-@@ -129,7 +129,7 @@
+--- gnome-session/Makefile.in.orig	Mon May 31 14:34:48 2004
++++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
+@@ -153,7 +153,7 @@
  
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(DISABLE_DEPRECATED_CFLAGS)				$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						-DGNOMELOCALEDIR=\""$(prefix)/share/locale\""		-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DDEFAULTDIR="\"$(defaultdir)\""
+ INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
  
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
new file mode 100644
index 000000000000..7e56843ac733
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_manager.c
@@ -0,0 +1,14 @@
+--- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
++++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
+@@ -1042,9 +1042,10 @@
+ 
+       if (interact_ping_replied)
+ 	{
++	  IceConn ice_conn;
+ 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
+ 	  print_client (client);
+-	  IceConn ice_conn = SmsGetIceConnection (client->connection);
++	  ice_conn = SmsGetIceConnection (client->connection);
+ 	  interact_ping_replied = FALSE;
+ 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
+ 	}
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index ae71556f4a43..6107618a5527 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -4,9 +4,6 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-session.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-session.schemas > /dev/null || /usr/bin/true
 share/gnome/control-center-2.0/capplets/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
@@ -16,9 +13,9 @@ 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/bg/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/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
@@ -55,6 +52,8 @@ 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/nb/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ne/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
@@ -72,6 +71,7 @@ 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/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/vi/LC_MESSAGES/gnome-session-2.0.mo