Make ilisp work with newer clisp (devel/clisp).

- sys::debug-* functions now take an argument (since 2.45)
- fix prompt regexp to match reality

4 files changed, 53 insertions, 3 deletions

diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index eeff523236d..8c9a38a2673 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2008/10/11 09:31:55 uebayasi Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/11 19:25:53 uwe Exp $
 #
 
 DISTNAME=	ilisp-20021222
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ilisp/}
 
diff --git a/devel/emacs-ilisp/distinfo b/devel/emacs-ilisp/distinfo
index 8137cf26948..d66086f63f0 100644
--- a/devel/emacs-ilisp/distinfo
+++ b/devel/emacs-ilisp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/06/11 14:07:28 markd Exp $
+$NetBSD: distinfo,v 1.5 2008/10/11 19:25:53 uwe Exp $
 
 SHA1 (ilisp-20021222.tar.gz) = bb3755f9c7168dc8ce212934bedd20eb0feeadf6
 RMD160 (ilisp-20021222.tar.gz) = 8fb643c1aa388bfbadf99c23beb5c058183c585e
@@ -6,3 +6,5 @@ Size (ilisp-20021222.tar.gz) = 261641 bytes
 SHA1 (patch-aa) = 87e96dde3d808add1b8048484d9f3342af33362c
 SHA1 (patch-ab) = 98d9e9e3fca7abfe677cb18745fd33015176bb11
 SHA1 (patch-ac) = a55755003b760efe9811b2115a8aaeaf7e7a8c0c
+SHA1 (patch-ad) = 98ab6ed1fc657ded13c4fc7eb287a73f3a5d364a
+SHA1 (patch-ae) = 813442ae92c708fc1ce2ad10678b4ecdc174a720
diff --git a/devel/emacs-ilisp/patches/patch-ad b/devel/emacs-ilisp/patches/patch-ad
new file mode 100644
index 00000000000..4b56d24b15e
--- /dev/null
+++ b/devel/emacs-ilisp/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/10/11 19:25:53 uwe Exp $
+
+--- cl-chs-init.lisp.orig	2002-03-26 12:41:04.000000000 +0300
++++ cl-chs-init.lisp
+@@ -65,7 +65,7 @@
+ 
+   (when (boundp 'system::*source-file-types*)
+     (pushnew (pathname ".lisp") system::*source-file-types* :test #'equalp))
+-  (sys::debug-unwind))
++  (sys::debug-unwind nil))
+ 
+ 
+ ;;; end of file -- cl-chs-init.lsp --
diff --git a/devel/emacs-ilisp/patches/patch-ae b/devel/emacs-ilisp/patches/patch-ae
new file mode 100644
index 00000000000..fd63b7c0246
--- /dev/null
+++ b/devel/emacs-ilisp/patches/patch-ae
@@ -0,0 +1,35 @@
+$NetBSD: patch-ae,v 1.1 2008/10/11 19:25:53 uwe Exp $
+
+--- ilisp-chs.el.orig	2002-08-20 15:36:41.000000000 +0400
++++ ilisp-chs.el
+@@ -85,7 +85,7 @@
+    ilisp-error-regexp
+    "\\(ILISP:[^\"]*\\)\\|\\(\\*\\*[^\n]*\\)"
+ 
+-   ilisp-reset "(sys::debug-unwind)"
++   ilisp-reset "(sys::debug-quit nil)"
+    ilisp-block-command "(progn %s)"
+    ilisp-find-source-command nil
+    ilisp-callers-command nil
+@@ -96,9 +96,9 @@
+    ;; proper extension.  See file 'ilisp-cl.el'.
+    ;; ilisp-binary-extension "fas"
+ 
+-   comint-prompt-regexp "^\\([0-9]+\\. Break \\[[0-9]+\\]> \\|[^>]*> \\)"
+-   comint-interrupt-regexp "\\(\\*\\*\\* - [A-Za-z]*: User break\\)"
+-   comint-fix-error "(sys::debug-unwind)"
++   comint-prompt-regexp "^\\(Break [0-9]+ \\[[0-9]+\\]> \\|[^>]*> \\)"
++   comint-interrupt-regexp "\\(\\*\\*\\* - [-A-Za-z]*: User break\\)"
++   comint-fix-error "(sys::debug-unwind nil)"
+    comint-continue "continue"
+    comint-prompt-status
+    (function
+@@ -108,7 +108,7 @@
+   ;; ILD Support. NIL values mean that more work is needed or that the
+   ;; particular command is not available
+ 
+-  (setq ild-abort-string "(sys::debug-unwind)"
++  (setq ild-abort-string "(sys::debug-unwind nil)"
+ 	ild-continue-string "continue"
+ 	ild-next-string "up"
+ 	ild-next-string-arg nil