diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-03-30 04:58:03 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-03-30 04:58:03 +0800 |
commit | 6506b0470bf32bdfdb4f0ed975a2eb8e741b366e (patch) | |
tree | 66f372acfb5232aa07a0cc522e6de395d02b4cc6 /x11 | |
parent | c64db5ddc12ff5779a3721672bf5c3cd941985f5 (diff) | |
download | marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar.gz marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar.bz2 marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar.lz marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar.xz marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.tar.zst marcuscom-ports-6506b0470bf32bdfdb4f0ed975a2eb8e741b366e.zip |
Fix the ability to save the confgiuration.
Reported by: bland
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5988 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gdm/Makefile | 3 | ||||
-rw-r--r-- | x11/gdm/files/patch-configure | 29 |
2 files changed, 24 insertions, 8 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ea10efecf..ad10a4dbf 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.22 2006/03/13 19:31:46 mezz Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.23 2006/03/14 01:16:33 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.14.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/} diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure index 72f2005ff..ba9d46921 100644 --- a/x11/gdm/files/patch-configure +++ b/x11/gdm/files/patch-configure @@ -1,17 +1,32 @@ ---- configure.orig Sat Jun 11 03:35:18 2005 -+++ configure Sat Jun 11 03:43:21 2005 -@@ -22412,6 +22412,8 @@ +--- configure.orig Wed Mar 29 13:51:40 2006 ++++ configure Wed Mar 29 14:15:56 2006 +@@ -22965,6 +22965,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> +#include <sys/socket.h> $ac_includes_default - int - main () -@@ -30210,6 +30212,13 @@ - SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n" + #include <$ac_header> + _ACEOF +@@ -32119,12 +32121,12 @@ GDM_OLD_CONF="$sysconfdir/gdm/gdm.conf" + + + cat >>confdefs.h <<_ACEOF +-#define GDM_CUSTOM_CONF "$GDM_CUSTOM_CONF" ++#define GDM_CUSTOM_CONF "`eval echo $GDM_CUSTOM_CONF`" + _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define GDM_OLD_CONF "$GDM_OLD_CONF" ++#define GDM_OLD_CONF "`eval echo $GDM_OLD_CONF`" + _ACEOF + + +@@ -32415,6 +32417,13 @@ case "$host" in XSESSION_SHELL=/bin/ksh + SOUND_PROGRAM=/usr/bin/audioplay ;; +*freebsd*) + GDM_USER_PATH="/bin:/usr/bin" |