diff options
| author | markd <markd@pkgsrc.org> | 2011-01-25 11:13:13 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2011-01-25 11:13:13 +0000 |
| commit | 4179a165834ff06354d88a1f81ce326c001fb56e (patch) | |
| tree | 7af5961d72d1359e64bbd886de148a4a2a561fc3 /x11 | |
| parent | 5fb6552ce448e94267d30b6572726bb6d227944d (diff) | |
| download | pkgsrc-4179a165834ff06354d88a1f81ce326c001fb56e.tar.gz | |
Fix login non-kde session with csh/tcsh. PR 40165
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdebase3/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-aw | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 714d26016f1..a0972f78c78 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.159 2011/01/13 13:36:19 wiz Exp $ +# $NetBSD: Makefile,v 1.160 2011/01/25 11:13:13 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index cbd61a5ff22..d0804449f9a 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.111 2011/01/18 10:25:52 markd Exp $ +$NetBSD: distinfo,v 1.112 2011/01/25 11:13:13 markd Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -30,6 +30,7 @@ SHA1 (patch-ar) = 0584037f39827a4b0e9859e39546295f2d7d8f5e SHA1 (patch-at) = 55aa213937c858984785500a56bad655196eeaec SHA1 (patch-au) = 49fcdbef0409bc657d5fc20c4f391924df72cf4b SHA1 (patch-av) = cc28cc463aff2cfefcfc49e6601253afdd00bddb +SHA1 (patch-aw) = 181a704d2855105d69eec205df97b69cf59626ea SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba SHA1 (patch-bc) = 63983ae5110a8fa85621f39848aff2113207d02c SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990 diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw new file mode 100644 index 00000000000..f8bcf557b9b --- /dev/null +++ b/x11/kdebase3/patches/patch-aw @@ -0,0 +1,15 @@ +$NetBSD: patch-aw,v 1.9 2011/01/25 11:13:13 markd Exp $ + +Fix login non-kde session with csh/tcsh + +--- kdm/kfrontend/genkdmconf.c.orig 2008-02-13 09:40:49.000000000 +0000 ++++ 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 -p >! $xsess_tmp\"\n" ++" $SHELL -c \"if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c 'export -p' >! $xsess_tmp\"\n" + " . $xsess_tmp\n" + " rm -f $xsess_tmp\n" + " ;;\n" |