[pkgsrc/trunk]: pkgsrc/lang/lush Fix this to not compile in the pkgsrc dummy ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b700ab1b6ac
branches:  trunk
changeset: 545904:5b700ab1b6ac
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Aug 17 06:45:48 2008 +0000

description:
Fix this to not compile in the pkgsrc dummy $HOME. (Patching lisp code,
whee.)
PKGREVISION++.

diffstat:

 lang/lush/Makefile         |   4 +++-
 lang/lush/distinfo         |   3 ++-
 lang/lush/patches/patch-ac |  33 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r 2b119695b2ec -r 5b700ab1b6ac lang/lush/Makefile
--- a/lang/lush/Makefile        Sun Aug 17 06:14:20 2008 +0000
+++ b/lang/lush/Makefile        Sun Aug 17 06:45:48 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 18:20:48 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/17 06:45:48 dholland Exp $
 
 DISTNAME=      lush-1.1
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lush/}
 
@@ -16,6 +17,7 @@
 
 post-install:
        ${RM} ${PREFIX}/share/lush/src/*c.orig
+       ${RM} ${PREFIX}/share/lush/lsh/libc/*.lsh.orig
 
 .include "../../math/gsl/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
diff -r 2b119695b2ec -r 5b700ab1b6ac lang/lush/distinfo
--- a/lang/lush/distinfo        Sun Aug 17 06:14:20 2008 +0000
+++ b/lang/lush/distinfo        Sun Aug 17 06:45:48 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/23 22:01:00 wiz Exp $
+$NetBSD: distinfo,v 1.2 2008/08/17 06:45:48 dholland Exp $
 
 SHA1 (lush-1.1.tar.gz) = 89d83c88d968f5216c59ce0d7a249e992f6aea41
 RMD160 (lush-1.1.tar.gz) = 3e32242a8a9391e4077144bbda10a013f4791d48
 Size (lush-1.1.tar.gz) = 4385751 bytes
 SHA1 (patch-aa) = 8e8f3bcbc1afd516931b0d14fce4560ad41bc1d3
 SHA1 (patch-ab) = b5f0161cceaadd532f2d246e4da34b424a61d829
+SHA1 (patch-ac) = 1b702c7728b2d7de1b20544fc757a6e0f9f52b8e
diff -r 2b119695b2ec -r 5b700ab1b6ac lang/lush/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/lush/patches/patch-ac        Sun Aug 17 06:45:48 2008 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ac,v 1.1 2008/08/17 06:45:48 dholland Exp $
+
+--- lsh/libc/shell.lsh~        2005-03-08 15:14:44.000000000 -0500
++++ lsh/libc/shell.lsh 2008-08-17 02:40:12.000000000 -0400
+@@ -241,7 +241,18 @@
+ 
+ #? shell-home
+ ;; user home directory
+-(defvar shell-home (getenv "HOME"))
++(defvar shell-home nil)
++
++;; get-shell-home
++;; fetch user home directory
++;; (merely initializing shell-home gets the compile-time $HOME, which is wrong)
++;; If shell-home isn't set, set it from $HOME; otherwise return it.
++;; This is suboptimal because shell-home will be nil until (cd) is run,
++;; but it's better than having shell-home contain the pkgsrc dummy homedir.
++(de shell.get-shell-home ()
++  (if (not shell-home)
++      (setq shell-home (getenv "HOME"))
++    shell-home))
+ 
+ #? shell-dirstack
+ ;; directory stack manipulated by pushd and popd
+@@ -262,7 +273,7 @@
+ #? (cd [<d>])
+ ;; change current directory to <d>, or to 
+ ;; user home if <p> is not present.
+-(de cd (&optional p) (if p (chdir p) (chdir shell-home)))
++(de cd (&optional p) (if p (chdir p) (chdir (get-shell-home))))
+ 
+ #? (pushd <d>)
+ ;; Temporarily change current directory to <d>.