diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-12 02:45:40 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-11-12 02:45:40 +0000 |
| commit | 1ec5e3c20fe760a04e2ebafe9cefa4f0c5086604 (patch) | |
| tree | 0a39f10340e4ee59440797cb2d7b524bba378912 /x11/kdebase4-workspace/files | |
| parent | 3dc8987c71856964d9babddcffe9c71b4c9516b4 (diff) | |
| download | ports-1ec5e3c20fe760a04e2ebafe9cefa4f0c5086604.tar.gz ports-1ec5e3c20fe760a04e2ebafe9cefa4f0c5086604.zip | |
Notes
Diffstat (limited to 'x11/kdebase4-workspace/files')
| -rw-r--r-- | x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def | 11 | ||||
| -rw-r--r-- | x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c | 14 |
2 files changed, 17 insertions, 8 deletions
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def new file mode 100644 index 000000000000..3776abd3beae --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def @@ -0,0 +1,11 @@ +--- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004 ++++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004 +@@ -10,7 +10,7 @@ + # define HALT_CMD "/usr/sbin/shutdown -h now" + # define REBOOT_CMD "/usr/sbin/shutdown -r now" + #elif defined(BSD) +-# define HALT_CMD "/sbin/shutdown -h now" ++# define HALT_CMD "/sbin/shutdown -p now" + # define REBOOT_CMD "/sbin/shutdown -r now" + #elif defined(__SVR4) + # define HALT_CMD "/usr/sbin/halt" diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c index e3027efaa8d5..c845a8cbf236 100644 --- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c @@ -1,5 +1,5 @@ ---- kdm/kfrontend/genkdmconf.c.orig Thu Aug 5 20:57:04 2004 -+++ kdm/kfrontend/genkdmconf.c Wed Sep 15 18:18:11 2004 +--- kdm/kfrontend/genkdmconf.c.orig Sun Oct 3 09:11:07 2004 ++++ kdm/kfrontend/genkdmconf.c Thu Nov 11 20:47:01 2004 @@ -578,7 +578,7 @@ "# by Xsetup usually.\n" "# This is not required if you use PAM with the pam_console module.\n" @@ -20,14 +20,12 @@ "\n" #ifdef _AIX "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -667,9 +667,7 @@ static const char def_session[] = - " */csh|*/tcsh)\n" +@@ -668,7 +668,7 @@ " # [t]cshrc is always sourced automatically.\n" " # Note that sourcing csh.login after .cshrc is non-standard.\n" --" set -a\n" + " set -a\n" -" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n" --" set +a\n" -+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n" ++" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n" + " set +a\n" " ;;\n" " *) # Plain sh, ksh, and anything we don't know.\n" - " [ -f /etc/profile ] && . /etc/profile\n" |