? devel/emacs-ilisp/work Index: devel/emacs-ilisp/Makefile =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/emacs-ilisp/Makefile,v retrieving revision 1.19 diff -u -u -r1.19 Makefile --- devel/emacs-ilisp/Makefile 17 Feb 2013 19:17:58 -0000 1.19 +++ devel/emacs-ilisp/Makefile 19 Jun 2013 06:18:27 -0000 @@ -10,12 +10,19 @@ 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 \ Index: devel/emacs-ilisp/PLIST =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/emacs-ilisp/PLIST,v retrieving revision 1.12 diff -u -u -r1.12 PLIST --- devel/emacs-ilisp/PLIST 9 Oct 2011 02:18:16 -0000 1.12 +++ devel/emacs-ilisp/PLIST 19 Jun 2013 06:18:27 -0000 @@ -34,6 +34,8 @@ ${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 Index: devel/emacs-ilisp/distinfo =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/emacs-ilisp/distinfo,v retrieving revision 1.7 diff -u -u -r1.7 distinfo --- devel/emacs-ilisp/distinfo 19 Aug 2009 00:45:33 -0000 1.7 +++ devel/emacs-ilisp/distinfo 19 Jun 2013 06:18:27 -0000 @@ -4,8 +4,9 @@ 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-ilisp-dia_el) = bc858efd8a6042dc51d9b5d2f003ceb29f4110a7 Index: devel/emacs-ilisp/patches/patch-ab =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/emacs-ilisp/patches/patch-ab,v retrieving revision 1.2 diff -u -u -r1.2 patch-ab --- devel/emacs-ilisp/patches/patch-ab 12 Jul 2009 21:37:23 -0000 1.2 +++ devel/emacs-ilisp/patches/patch-ab 19 Jun 2013 06:18:27 -0000 @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.2 2009/07/12 21:37:23 minskim Exp $ +$NetBSD$ ---- 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 @@ + '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")) ) Index: devel/emacs-ilisp/patches/patch-ac =================================================================== RCS file: /cvs/cvsroot/pkgsrc/devel/emacs-ilisp/patches/patch-ac,v retrieving revision 1.2 diff -u -u -r1.2 patch-ac --- devel/emacs-ilisp/patches/patch-ac 12 Jul 2009 21:37:23 -0000 1.2 +++ devel/emacs-ilisp/patches/patch-ac 19 Jun 2013 06:18:27 -0000 @@ -1,11 +1,15 @@ $NetBSD: patch-ac,v 1.2 2009/07/12 21:37:23 minskim 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) Index: devel/emacs-ilisp/patches/patch-ilisp-dia_el =================================================================== RCS file: devel/emacs-ilisp/patches/patch-ilisp-dia_el diff -N devel/emacs-ilisp/patches/patch-ilisp-dia_el --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/emacs-ilisp/patches/patch-ilisp-dia_el 19 Jun 2013 06:18:27 -0000 @@ -0,0 +1,17 @@ +$NetBSD$ + +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)))