patch-a{b,c,f} patch-ilisp-dia_el

PLIST
distinfo
 - Add emacs24 support.
MESSAGE
 - Added for initial test guide.

8 files changed, 67 insertions, 20 deletions

diff --git a/devel/emacs-ilisp/MESSAGE b/devel/emacs-ilisp/MESSAGE
new file mode 100644
index 00000000000..b7ec6a5bd66
--- /dev/null
+++ b/devel/emacs-ilisp/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/06/19 13:12:00 mef Exp $
+To test the function easily:
+(1) Install any one of lisp environments, for example, lang/clisp.
+(2) M-x load-library ilisp RET
+    M-x ilisp-mode RET
+    Select Dialect. One example is clisp-hs in this case.
+    Then you will see Interactive Lisp prompt.
+===========================================================================
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index e03ed23103c..764f458336c 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/02/17 19:17:58 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/19 13:12:00 mef Exp $
 #
 
 DISTNAME=	ilisp-20021222
@@ -10,12 +10,19 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ilisp/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/ilisp/
 COMMENT=	Emacs interface to embedded Lisp process
+#LICENSE=	# ILISP License, see COPYING file.
 
 MAKE_ENV+=	EMACS=${EMACS_BIN:Q}
 BUILD_TARGET=	compile
 
 SITELISP=	${EMACS_LISPPREFIX}/ilisp
 
+SUBST_CLASSES+=			string-to-int
+SUBST_STAGE.string-to-int=	post-patch
+SUBST_MESSAGE.string-to-int=	obsolete function (as of 22.1); use `string-to-number' instead
+SUBST_FILES.string-to-int+=	ilisp-acl.el
+SUBST_SED.string-to-int=	-e 's/string-to-int/string-to-number/'
+
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/emacs-ilisp
 	${INSTALL_DATA} ${WRKSRC}/INSTALLATION \
diff --git a/devel/emacs-ilisp/PLIST b/devel/emacs-ilisp/PLIST
index 9f3cd719594..ecea73e3937 100644
--- a/devel/emacs-ilisp/PLIST
+++ b/devel/emacs-ilisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2011/10/09 02:18:16 kim Exp $
+@comment $NetBSD: PLIST,v 1.13 2013/06/19 13:12:00 mef Exp $
 share/doc/emacs-ilisp/INSTALLATION
 share/doc/emacs-ilisp/README
 ${EMACS_LISPPREFIX}/ilisp/allegro.lisp
@@ -34,6 +34,8 @@ ${FOR_emacs22}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs22nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs23}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${FOR_emacs23nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
+${FOR_emacs24}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
+${FOR_emacs24nox}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.el
 ${EMACS_LISPPREFIX}/ilisp/ilisp-acl.elc
 ${EMACS_LISPPREFIX}/ilisp/ilisp-aut.el
diff --git a/devel/emacs-ilisp/distinfo b/devel/emacs-ilisp/distinfo
index a6f9f1af453..b0aedc0f4c3 100644
--- a/devel/emacs-ilisp/distinfo
+++ b/devel/emacs-ilisp/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2009/08/19 00:45:33 uwe Exp $
+$NetBSD: distinfo,v 1.8 2013/06/19 13:12:00 mef Exp $
 
 SHA1 (ilisp-20021222.tar.gz) = bb3755f9c7168dc8ce212934bedd20eb0feeadf6
 RMD160 (ilisp-20021222.tar.gz) = 8fb643c1aa388bfbadf99c23beb5c058183c585e
 Size (ilisp-20021222.tar.gz) = 261641 bytes
 SHA1 (patch-aa) = 87e96dde3d808add1b8048484d9f3342af33362c
-SHA1 (patch-ab) = 5aa463e76207dc209e0b7ab32deca23a2e852b57
-SHA1 (patch-ac) = d615de6a2252001af68aa861621cd02c668e0d75
+SHA1 (patch-ab) = f2599a9906cc94ceaac090c51ce38e7cf63dfc81
+SHA1 (patch-ac) = d3fdc4ed46844b316ef8271e2690044fd1727047
 SHA1 (patch-ad) = 98ab6ed1fc657ded13c4fc7eb287a73f3a5d364a
 SHA1 (patch-ae) = 813442ae92c708fc1ce2ad10678b4ecdc174a720
-SHA1 (patch-af) = 23dfee9dffb57799b8918c81e944557e44c28186
+SHA1 (patch-af) = 29d8189d5658336bed87ce32cd8ca15132b31ab1
+SHA1 (patch-ilisp-dia_el) = 955ce5164fb1347d09b62dd905476ff7881f4aaf
diff --git a/devel/emacs-ilisp/patches/patch-ab b/devel/emacs-ilisp/patches/patch-ab
index ad79c6239ed..291aac90126 100644
--- a/devel/emacs-ilisp/patches/patch-ab
+++ b/devel/emacs-ilisp/patches/patch-ab
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.2 2009/07/12 21:37:23 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2013/06/19 13:12:01 mef Exp $
 
---- ilcompat.el.orig	2002-10-25 05:13:49.000000000 -0700
-+++ ilcompat.el
-@@ -27,6 +27,10 @@
+Update to include new versions of Emacsen
+
+--- ilcompat.el.orig	2002-10-25 21:13:49.000000000 +0900
++++ ilcompat.el	2013-06-19 15:07:53.000000000 +0900
+@@ -27,6 +27,12 @@
  	 'fsf-20)
  	((string-match "^21" emacs-version)
  	 'fsf-21)
@@ -10,15 +12,18 @@ $NetBSD: patch-ab,v 1.2 2009/07/12 21:37:23 minskim Exp $
 +	 'fsf-22)
 +	((string-match "^23" emacs-version)
 +	 'fsf-23)
++	((string-match "^24" emacs-version)
++	 'fsf-24)
  	(t 'fsf-18))
    "The major version of (X)Emacs ILISP is running in.
  Declared as '(member fsf-19 fsf-19 fsf-20 fsf-21 lucid-19 lucid-19-new xemacs).
-@@ -55,6 +59,8 @@ Set in ilcompat.el.")
+@@ -55,6 +61,9 @@ Set in ilcompat.el.")
        ((eq +ilisp-emacs-version-id+ 'fsf-19) (load "ilfsf19"))
        ((eq +ilisp-emacs-version-id+ 'fsf-20) (load "ilfsf20"))
        ((eq +ilisp-emacs-version-id+ 'fsf-21) (load "ilfsf21"))
 +      ((eq +ilisp-emacs-version-id+ 'fsf-22) (load "ilfsf21"))
 +      ((eq +ilisp-emacs-version-id+ 'fsf-23) (load "ilfsf21"))
++      ((eq +ilisp-emacs-version-id+ 'fsf-24) (load "ilfsf21"))
        )
  
  
diff --git a/devel/emacs-ilisp/patches/patch-ac b/devel/emacs-ilisp/patches/patch-ac
index 5f96045dd0b..61f04099f89 100644
--- a/devel/emacs-ilisp/patches/patch-ac
+++ b/devel/emacs-ilisp/patches/patch-ac
@@ -1,11 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2009/07/12 21:37:23 minskim Exp $
+$NetBSD: patch-ac,v 1.3 2013/06/19 13:12:01 mef Exp $
 
---- ilisp-mak.el.orig	2002-05-31 04:47:57.000000000 -0700
-+++ ilisp-mak.el
-@@ -48,6 +48,10 @@
+Add Version specific module to byte-compile
+
+--- ilisp-mak.el.orig	2002-05-31 20:47:57.000000000 +0900
++++ ilisp-mak.el	2013-06-19 15:13:05.000000000 +0900
+@@ -48,6 +48,12 @@
             (byte-compile-file "illuc19.el"))
            ((eq +ilisp-emacs-version-id+ 'xemacs)
             (byte-compile-file "ilxemacs.el"))
++          ((eq +ilisp-emacs-version-id+ 'fsf-24)
++           (byte-compile-file "ilfsf21.el"))
 +          ((eq +ilisp-emacs-version-id+ 'fsf-23)
 +           (byte-compile-file "ilfsf21.el"))
 +          ((eq +ilisp-emacs-version-id+ 'fsf-22)
diff --git a/devel/emacs-ilisp/patches/patch-af b/devel/emacs-ilisp/patches/patch-af
index 757d108aabe..bfccc86f80a 100644
--- a/devel/emacs-ilisp/patches/patch-af
+++ b/devel/emacs-ilisp/patches/patch-af
@@ -1,15 +1,16 @@
-$NetBSD: patch-af,v 1.1 2009/08/19 00:45:34 uwe Exp $
+$NetBSD: patch-af,v 1.2 2013/06/19 13:12:01 mef Exp $
 
---- ilisp-xfr.el.orig	2002-05-24 00:41:42.000000000 +0400
-+++ ilisp-xfr.el
-@@ -45,7 +45,9 @@
+--- ilisp-xfr.el.orig	2002-05-24 05:41:42.000000000 +0900
++++ ilisp-xfr.el	2013-06-19 19:02:24.000000000 +0900
+@@ -45,7 +45,10 @@ If we have a complete sexp, send it.  Ot
  		;;       25/11/94 Marco Antoniotti
  		(when (or (eq +ilisp-emacs-version-id+ 'fsf-19)
  			  (eq +ilisp-emacs-version-id+ 'fsf-20)
 -			  (eq +ilisp-emacs-version-id+ 'fsf-21))
 +			  (eq +ilisp-emacs-version-id+ 'fsf-21)
 +			  (eq +ilisp-emacs-version-id+ 'fsf-22)
-+			  (eq +ilisp-emacs-version-id+ 'fsf-23))
++			  (eq +ilisp-emacs-version-id+ 'fsf-23)
++			  (eq +ilisp-emacs-version-id+ 'fsf-24))
  		  (setq comint-input-ring-index nil))
  		;; Nuke symbol table
  		(setq ilisp-original nil)
diff --git a/devel/emacs-ilisp/patches/patch-ilisp-dia_el b/devel/emacs-ilisp/patches/patch-ilisp-dia_el
new file mode 100644
index 00000000000..f9d5e3b30e1
--- /dev/null
+++ b/devel/emacs-ilisp/patches/patch-ilisp-dia_el
@@ -0,0 +1,18 @@
+$NetBSD: patch-ilisp-dia_el,v 1.1 2013/06/19 13:12:01 mef Exp $
+
+(With Emacs-24.3)
+In toplevel form:
+ilisp-acl.el:33:1:Error: Invalid function: (\` (progn (defvar ((\, hook)) 
+
+--- ilisp-dia.el.orig	2002-01-25 20:48:33.000000000 +0900
++++ ilisp-dia.el	2013-06-19 13:58:23.000000000 +0900
+@@ -120,8 +120,7 @@ inferior LISP.  PARENT is the name of th
+ 	(hook (read (format "%s-hook" dialect)))
+ 	(program (read (format "%s-program" dialect)))
+ 	(dialects (format "%s" dialect)))
+-    (`
+-     (progn
++    (` (progn
+        (defvar (, hook) nil (, (format "*Inferior %s hook." full-name)))
+        (defvar (, program) nil
+ 	 (, (format "*Inferior %s default program." full-name)))