[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Fix default kdm/Xsession for csh/tcsh.

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1263766aa90b
branches:  trunk
changeset: 534818:1263766aa90b
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Nov 01 10:35:56 2007 +0000

description:
Fix default kdm/Xsession for csh/tcsh.
>From Jason Boyer in PR pkg/37158.

diffstat:

 x11/kdebase3/Makefile         |   3 ++-
 x11/kdebase3/distinfo         |   3 ++-
 x11/kdebase3/patches/patch-as |  13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r 36432ed70a14 -r 1263766aa90b x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Thu Nov 01 09:39:26 2007 +0000
+++ b/x11/kdebase3/Makefile     Thu Nov 01 10:35:56 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2007/10/20 10:37:19 markd Exp $
+# $NetBSD: Makefile,v 1.137 2007/11/01 10:35:56 markd Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
+PKGREVISION=   1
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
diff -r 36432ed70a14 -r 1263766aa90b x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Thu Nov 01 09:39:26 2007 +0000
+++ b/x11/kdebase3/distinfo     Thu Nov 01 10:35:56 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2007/10/20 10:37:20 markd Exp $
+$NetBSD: distinfo,v 1.101 2007/11/01 10:35:56 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -25,6 +25,7 @@
 SHA1 (patch-an) = e1620c558d300db98580109e64ee44a63571e5f7
 SHA1 (patch-aq) = 8cdc56fb3ca1646983790b6bb20b62ac04e41aa2
 SHA1 (patch-ar) = 0584037f39827a4b0e9859e39546295f2d7d8f5e
+SHA1 (patch-as) = 277a8f927c343cc0b194a77b0fbb45118f8a5287
 SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
 SHA1 (patch-bc) = fd7e784b584763b7351dbdaefda58443bd1aaadb
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff -r 36432ed70a14 -r 1263766aa90b x11/kdebase3/patches/patch-as
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-as     Thu Nov 01 10:35:56 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.6 2007/11/01 10:35:57 markd Exp $
+
+--- kdm/kfrontend/genkdmconf.c.orig    2007-11-01 01:09:12.000000000 +1300
++++ kdm/kfrontend/genkdmconf.c
+@@ -673,7 +673,7 @@ static const char def_session1[] =
+ "    xsess_tmp=";
+ static const char def_session2[] =
+ "\n"
+-"    $SHELL -c \"if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export >! $xsess_tmp\"\n"
++"    $SHELL -c \"if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; env >! $xsess_tmp\"\n"
+ "    . $xsess_tmp\n"
+ "    rm -f $xsess_tmp\n"
+ "    ;;\n"