* Sync with FreeBSD ports

* Rename the Xsession.in to reflect the correct path


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

3 files changed, 41 insertions, 19 deletions

diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 0d74abc56..331257e59 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,12 +3,12 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.122 2008/06/06 21:38:54 marcus Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.123 2008/06/08 19:27:06 marcus Exp $
 #
 
 PORTNAME=	gdm
 PORTVERSION=	2.22.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/files/patch-config_Xsession.in b/x11/gdm/files/patch-config_Xsession.in
deleted file mode 100644
index 869f9cd5a..000000000
--- a/x11/gdm/files/patch-config_Xsession.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- data/Xsession.in.orig	2008-06-08 09:54:23.000000000 -0400
-+++ data/Xsession.in	2008-06-08 09:56:36.000000000 -0400
-@@ -231,6 +231,14 @@
-   fi
- fi
- 
-+# add seahorse-agent if found
-+seahorseagent="`gdmwhich seahorse-agent`"
-+if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
-+    command="$seahorseagent --execute $command"
-+elif [ -z "$seahorseagent" ] ; then
-+    echo "$0: seahorse-agent not found!"
-+fi
-+ 
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in
new file mode 100644
index 000000000..894c97d16
--- /dev/null
+++ b/x11/gdm/files/patch-data_Xsession.in
@@ -0,0 +1,39 @@
+--- data/Xsession.in.orig	2008-05-12 20:25:54.000000000 -0400
++++ data/Xsession.in	2008-06-09 01:29:59.000000000 -0400
+@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
+   fi
+ fi
+ 
++is_gnome=0
++if [ "x$command" = "xgnome-session" ]; then
++    is_gnome=1
++fi
++
++# add seahorse-agent if found
++if [ ${is_gnome} = 1 ]; then
++    seahorseagent="`gdmwhich seahorse-agent`"
++    if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
++        command="dbus-launch --exit-with-session $seahorseagent --execute $command"
++    elif [ -z "$seahorseagent" ] ; then
++        echo "$0: seahorse-agent not found!"
++    fi
++fi
++ 
+ # add ssh-agent if found
+-sshagent="`gdmwhich ssh-agent`"
+-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+-    command="$sshagent -- $command"
+-elif [ -z "$sshagent" ] ; then
+-    echo "$0: ssh-agent not found!"
++# ssh-agent functionality is handled by gnome-keyring-daemon which is launched
++# from gnome-session
++if [ ${is_gnome} != 1 ]; then
++    sshagent="`gdmwhich ssh-agent`"
++    if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
++        command="$sshagent -- $command"
++    elif [ -z "$sshagent" ] ; then
++        echo "$0: ssh-agent not found!"
++    fi
+ fi
+ 
+ echo "$0: Setup done, will execute: $command"