summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2008-08-17 06:45:48 +0000
committerdholland <dholland@pkgsrc.org>2008-08-17 06:45:48 +0000
commit49a673260ffd524cc1aac953ae15b4abaa49bcf5 (patch)
tree7d00c79baca2e598db906e299c8f6b78163873d4 /lang
parentd57fe9cad8a3ba4bd821e39dafdcc2e9d92de595 (diff)
downloadpkgsrc-49a673260ffd524cc1aac953ae15b4abaa49bcf5.tar.gz
Fix this to not compile in the pkgsrc dummy $HOME. (Patching lisp code,
whee.) PKGREVISION++.
Diffstat (limited to 'lang')
-rw-r--r--lang/lush/Makefile4
-rw-r--r--lang/lush/distinfo3
-rw-r--r--lang/lush/patches/patch-ac33
3 files changed, 38 insertions, 2 deletions
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 4476ca26b13..dfdbdad9da5 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -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 @@ CONFIGURE_ARGS+= --without-bfd
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 --git a/lang/lush/distinfo b/lang/lush/distinfo
index b322d254cd8..23f68fa77b3 100644
--- a/lang/lush/distinfo
+++ b/lang/lush/distinfo
@@ -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 --git a/lang/lush/patches/patch-ac b/lang/lush/patches/patch-ac
new file mode 100644
index 00000000000..64db38c363f
--- /dev/null
+++ b/lang/lush/patches/patch-ac
@@ -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>.