diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-06-09 03:27:18 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-06-09 03:27:18 +0800 |
commit | f6d80d7521dcd719798fe32960094fb5f6ee884f (patch) | |
tree | afde825faf5db31ffa2c555bbb614374f25bdbc0 /x11 | |
parent | c3054868cc78fc2013b4838dab33654d0d2ef056 (diff) | |
download | marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar.gz marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar.bz2 marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar.lz marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar.xz marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.tar.zst marcuscom-ports-f6d80d7521dcd719798fe32960094fb5f6ee884f.zip |
Sync with FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11039 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm/Makefile | 4 | ||||
-rw-r--r-- | x11/gdm/files/patch-config_Xsession.in | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 3dd563f22..0d74abc56 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.121 2008/05/02 19:00:59 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.122 2008/06/06 21:38:54 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.22.0 -PORTREVISION= 1 +PORTREVISION= 2 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 new file mode 100644 index 000000000..869f9cd5a --- /dev/null +++ b/x11/gdm/files/patch-config_Xsession.in @@ -0,0 +1,17 @@ +--- 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 |