Date: Fri, 12 Nov 2004 01:19:46 +0100 (CET) From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kde@FreeBSD.org Subject: ports/73844: [PATCH] rever gendkmconf to 5.3-RELEASE Message-ID: <200411120019.iAC0Jkiw078811@redesjm.local> Resent-Message-ID: <200411120020.iAC0KR4F051147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73844 >Category: ports >Synopsis: [PATCH] rever gendkmconf to 5.3-RELEASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Nov 12 00:20:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Jose M Rodriguez >Release: FreeBSD 5.3-STABLE i386 >Organization: Redes JM >Environment: System: FreeBSD orion.redesjm.local 5.3-STABLE FreeBSD 5.3-STABLE #0: Thu Nov 11 12:52:44 CET 2004 root@orion.redesjm.local:/usr/obj/usr/src/sys/ORION i386 >Description: KDE-3.3.1 genkdmconf generates a Xsession script that can't import csh env. Also, make /sbin/shutdown -p now the default halt commnad Maintainer CC'd >How-To-Repeat: >Fix: apply patch from /usr/ports port revision may be bumped --- patch-kdebase3 begins here --- diff -Nru /usr/ports/x11/kdebase3/files/patch-kdm-kfrontend-config.def x11/kdebase3/files/patch-kdm-kfrontend-config.def --- /usr/ports/x11/kdebase3/files/patch-kdm-kfrontend-config.def Thu Jan 1 01:00:00 1970 +++ x11/kdebase3/files/patch-kdm-kfrontend-config.def Thu Nov 11 21:13:30 2004 @@ -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 -Nru /usr/ports/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c --- /usr/ports/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c Mon Nov 8 10:42:54 2004 +++ x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c Thu Nov 11 21:10:06 2004 @@ -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" --- patch-kdebase3 ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200411120019.iAC0Jkiw078811>