Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

6 files changed, 37 insertions, 74 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 37f82afac725..1f48df2e0f83 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.10.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.8 \
-		    	marcus/:local
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://people.FreeBSD.org/~pav/:local
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
+		    	pav/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASH_IMG}:local
+		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -25,11 +24,9 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GMAKE=	yes
 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"
 
@@ -38,13 +35,19 @@ MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash28.png
+SPLASHES=	freebsd-splashes-gnome-2.10.tar
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
+	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
+	${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 \
 		${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} \
+		${PREFIX}/share/gnome/pixmaps/splash
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 8f05e97ece4c..5f305e45c84f 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-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
+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
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 2b05e8c0027e..ed0b6ac56866 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	Mon May 31 14:34:48 2004
-+++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
-@@ -153,7 +153,7 @@
- 
+--- gnome-session/Makefile.in.orig	Tue Nov 30 14:07:39 2004
++++ gnome-session/Makefile.in	Tue Nov 30 14:07:51 2004
+@@ -209,7 +209,7 @@
+ target_alias = @target_alias@
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- 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)\""
- 
+ INCLUDES = \
+ 	$(GNOME_SESSION_CFLAGS)				\
diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c
deleted file mode 100644
index f82aefdc7d2e..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_logout.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gnome-session/logout.c.orig	Sun May  9 15:45:34 2004
-+++ gnome-session/logout.c	Sun May  9 15:48:29 2004
-@@ -37,12 +37,20 @@
- 
- static gchar *halt_command[] =
- {
-+#ifdef __FreeBSD__
-+  HALT_COMMAND, "-p", "now", NULL
-+#else
-   HALT_COMMAND, NULL
-+#endif
- };
- 
- static gchar *reboot_command[] =
- {
-+#ifdef __FreeBSD__
-+  REBOOT_COMMAND, "-r", "now", NULL
-+#else
-   REBOOT_COMMAND, NULL
-+#endif
- };
- 
- /* What action to take upon shutdown */
-@@ -401,8 +409,12 @@
-    */
-   s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL);
-   t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
-+#ifndef __FreeBSD__
-   if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
-       access (halt_command[0], X_OK) == 0)
-+#else
-+  if (access (halt_command[0], X_OK) == 0)
-+#endif
-     {
-       GtkWidget *title, *spacer;
-       GtkWidget *action_vbox, *hbox;
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
deleted file mode 100644
index 7e56843ac733..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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 6107618a5527..999c30043083 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -4,10 +4,17 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-share/gnome/control-center-2.0/capplets/session-properties.desktop
+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/gnome-splash.png
+share/gnome/pixmaps/splash/original-gnome-splash.png
+share/gnome/pixmaps/splash/radek.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
@@ -57,6 +64,7 @@ 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
+share/locale/nso/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
@@ -76,5 +84,7 @@ 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/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