Update to 2.23.1

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

5 files changed, 21 insertions, 35 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 24d857953..f8caec09f 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.143 2008/03/24 14:58:13 kwm Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.22.0
-PORTREVISION=	1
+PORTVERSION=	2.23.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.marcuscom.com/downloads/:local
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index c77a3cf49..044a4d610 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.22.0.tar.bz2) = 5f9531565c5ec08104c3518c72c79f42
-SHA256 (gnome2/gnome-session-2.22.0.tar.bz2) = ae426a2f356012aea1086dca89e0551d6970c404a56e31b814a53e24eab19939
-SIZE (gnome2/gnome-session-2.22.0.tar.bz2) = 778868
+MD5 (gnome2/gnome-session-2.23.1.tar.bz2) = a29a2cfff1866c421f9ebbdd0a5c10c7
+SHA256 (gnome2/gnome-session-2.23.1.tar.bz2) = 89a95befc0318757ab076bdaa63e18e4b91865807187d37a0cf3eee76cfa23be
+SIZE (gnome2/gnome-session-2.23.1.tar.bz2) = 728888
 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
diff --git a/x11/gnome-session/files/patch-data_Makefile.in b/x11/gnome-session/files/patch-data_Makefile.in
deleted file mode 100644
index 4c6f8716a..000000000
--- a/x11/gnome-session/files/patch-data_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.in.orig	2008-03-24 15:48:59.000000000 +0100
-+++ data/Makefile.in	2008-03-24 15:49:23.000000000 +0100
-@@ -276,7 +276,7 @@ CLEANFILES = \
- 	gnome.desktop			\
- 	session-properties.desktop
- 
--all: all-recursive
-+all: all-recursive default.session
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
diff --git a/x11/gnome-session/files/patch-disable_debug b/x11/gnome-session/files/patch-disable_debug
deleted file mode 100644
index 778d72c9e..000000000
--- a/x11/gnome-session/files/patch-disable_debug
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-session/main.c.orig	2008-01-16 16:48:55.000000000 -0600
-+++ gnome-session/main.c	2008-01-16 16:50:01.000000000 -0600
-@@ -626,8 +626,8 @@
-       major = atoi (versions [1]);
-       if ((major % 2) != 0)
- 	{
--          g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
--	  g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-+          /* g_setenv ("G_DEBUG", "fatal_criticals", FALSE);
-+	     g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); */
- 	}
-     }
-   g_strfreev (versions);
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 62b250a27..94b9be8f8 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,10 +1,17 @@
 bin/gnome-session
-bin/gnome-session-properties
-bin/gnome-session-remove
-bin/gnome-session-save
 bin/gnome-wm
+lib/gnome-session/helpers/at-spi-registryd-wrapper
+lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
+lib/gnome-session/helpers/gnome-login-sound
+lib/gnome-session/helpers/gnome-session-splash
+lib/gnome-session/helpers/gnome-settings-daemon-helper
 share/applications/session-properties.desktop
-share/gnome/default.session
+share/gnome/default-session/at-spi-registryd-wrapper.desktop
+share/gnome/default-session/gnome-keyring-daemon-wrapper.desktop
+share/gnome/default-session/gnome-login-sound.desktop
+share/gnome/default-session/gnome-session-splash.desktop
+share/gnome/default-session/gnome-settings-daemon-helper.desktop
+share/gnome/shutdown/gnome-logout-sound.sh
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
 share/icons/hicolor/24x24/apps/session-properties.png
@@ -119,7 +126,6 @@ share/pixmaps/splash/tremulant-blood-2.12.png
 share/pixmaps/splash/tremulant-brushed-metal-2.12.png
 share/xsessions/gnome.desktop
 @dirrmtry share/xsessions
-@dirrmtry share/applications
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -154,3 +160,8 @@ share/xsessions/gnome.desktop
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrm share/gnome/shutdown
+@dirrm share/gnome/default-session
+@dirrmtry share/applications
+@dirrm lib/gnome-session/helpers
+@dirrm lib/gnome-session