- Update to 2.15.91

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

4 files changed, 46 insertions, 42 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 63eefcbfd..44abffce9 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.89 2006/07/21 20:47:02 mezz Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.90 2006/07/24 21:44:32 marcus Exp $
 #
 
 PORTNAME=	gnome-session
-PORTVERSION=	2.15.90
+PORTVERSION=	2.15.91
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -23,7 +23,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Session component for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus \
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 RUN_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 
 USE_GETTEXT=	yes
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index a366ac66f..041d1b12a 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,6 +1,6 @@
-MD5 (gnome2/gnome-session-2.15.90.tar.bz2) = 0f2a6d75c8ec82e54ac1531fb2297a27
-SHA256 (gnome2/gnome-session-2.15.90.tar.bz2) = 95dea02e17c97b17fbc60635b969f1f6c8e079c7bafa950f1d2cfd04d5a6d572
-SIZE (gnome2/gnome-session-2.15.90.tar.bz2) = 666480
+MD5 (gnome2/gnome-session-2.15.91.tar.bz2) = 61739d816df371a079730fb6db4bd4a5
+SHA256 (gnome2/gnome-session-2.15.91.tar.bz2) = 64564cb1abe84028c0296dfd977a5c16bd3ec8a5600b1175b6ce8a98cd4e2592
+SIZE (gnome2/gnome-session-2.15.91.tar.bz2) = 674242
 MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa
 SHA256 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = c7008fc8f43cf07e3d84cbf0bd9b2846fa31aaf37d4f97993b185b4155f8ee27
 SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000
diff --git a/x11/gnome-session/files/patch-dbus b/x11/gnome-session/files/patch-dbus
index edd18bfec..e79821666 100644
--- a/x11/gnome-session/files/patch-dbus
+++ b/x11/gnome-session/files/patch-dbus
@@ -1,39 +1,3 @@
---- gnome-session/main.c.orig	Tue Mar 21 12:37:40 2006
-+++ gnome-session/main.c	Sun Apr 23 23:05:38 2006
-@@ -43,6 +43,7 @@
- #include "command.h"
- #include "splash-widget.h"
- #include "util.h"
-+#include "gsm-dbus.h"
- #include "gsm-sound.h"
- #include "gsm-gsd.h"
- #include "gsm-keyring.h"
-@@ -334,6 +335,7 @@ main (int argc, char *argv[])
-   char *display_str;
-   char **versions;
-   GConfClient *gconf_client;
-+  gboolean dbus_daemon_owner;
-   
-   if (getenv ("GSM_VERBOSE_DEBUG"))
-     gsm_set_verbose (TRUE);
-@@ -415,6 +417,7 @@ main (int argc, char *argv[])
-   fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
-   gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
- 
-+  dbus_daemon_owner = gsm_dbus_daemon_start ();
- 
-   /* Make sure children see the right value for DISPLAY.  This is
-      useful if --display was specified on the command line.  */
-@@ -495,6 +498,9 @@ main (int argc, char *argv[])
-   gsm_sound_logout ();
- 
-   gsm_keyring_daemon_stop ();
-+
-+  if (dbus_daemon_owner)
-+    gsm_dbus_daemon_stop ();
- 
-   g_object_unref (gconf_client);
-   gsm_shutdown_gconfd ();
 --- gnome-session/gsm-dbus.h.orig	Sun Apr 23 23:01:47 2006
 +++ gnome-session/gsm-dbus.h	Sun Apr 23 23:00:53 2006
 @@ -0,0 +1,27 @@
@@ -427,3 +391,39 @@
 +   */
 +  g_setenv ("DBUS_SESSION_BUS_ADDRESS", address_str, TRUE);
 +}
+--- gnome-session/main.c.orig	Wed Jul 26 08:46:36 2006
++++ gnome-session/main.c	Mon Aug  7 21:17:49 2006
+@@ -43,6 +43,7 @@
+ #include "command.h"
+ #include "splash-widget.h"
+ #include "util.h"
++#include "gsm-dbus.h"
+ #include "gsm-sound.h"
+ #include "gsm-gsd.h"
+ #include "gsm-keyring.h"
+@@ -329,6 +330,7 @@
+   Session *the_session;
+   gboolean splashing;
+   gboolean a_t_support;
++  gboolean dbus_daemon_owner;
+   GError *err;
+   int status;
+   char *display_str;
+@@ -419,6 +421,7 @@
+   fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER"));
+   gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png");
+ 
++  dbus_daemon_owner = gsm_dbus_daemon_start ();
+ 
+   /* Make sure children see the right value for DISPLAY.  This is
+      useful if --display was specified on the command line.  */
+@@ -502,6 +505,9 @@
+   gsm_sound_logout ();
+ 
+   gsm_keyring_daemon_stop ();
++
++  if (dbus_daemon_owner)
++    gsm_dbus_daemon_stop ();
+ 
+   g_object_unref (gconf_client);
+   gsm_shutdown_gconfd ();
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index b27223b75..237e47066 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -64,6 +64,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mg/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
@@ -103,6 +104,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES