? 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 05:08:02 -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 05:08:02 -0000 @@ -24,6 +24,9 @@ ${EMACS_LISPPREFIX}/ilisp/ild.el ${EMACS_LISPPREFIX}/ilisp/ild.elc ${EMACS_LISPPREFIX}/ilisp/ilfsf18.el +${FOR_emacs22}${EMACS_LISPPREFIX}/ilisp/ilfsf18.elc +${FOR_emacs23}${EMACS_LISPPREFIX}/ilisp/ilfsf18.elc +${FOR_emacs24}${EMACS_LISPPREFIX}/ilisp/ilfsf18.elc ${EMACS_LISPPREFIX}/ilisp/ilfsf19.el ${EMACS_LISPPREFIX}/ilisp/ilfsf20.el ${FOR_emacs20}${EMACS_LISPPREFIX}/ilisp/ilfsf20.elc 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 05:08:02 -0000 @@ -9,3 +9,5 @@ SHA1 (patch-ad) = 98ab6ed1fc657ded13c4fc7eb287a73f3a5d364a SHA1 (patch-ae) = 813442ae92c708fc1ce2ad10678b4ecdc174a720 SHA1 (patch-af) = 23dfee9dffb57799b8918c81e944557e44c28186 +SHA1 (patch-ilfsf18_el) = 97e5f415b2d1e0a1405ff83973d6c0bee517b734 +SHA1 (patch-ilisp-dia_el) = bc858efd8a6042dc51d9b5d2f003ceb29f4110a7 Index: devel/emacs-ilisp/patches/patch-ilfsf18_el =================================================================== RCS file: devel/emacs-ilisp/patches/patch-ilfsf18_el diff -N devel/emacs-ilisp/patches/patch-ilfsf18_el --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ devel/emacs-ilisp/patches/patch-ilfsf18_el 19 Jun 2013 05:08:02 -0000 @@ -0,0 +1,21 @@ +$NetBSD$ +To avoid the error with recent Emacsen, + Loading /usr/pkgsrc/devel/emacs-ilisp/work/ilisp-20021222/ilfsf18.el (source)... + Symbol's value as variable is void: comint-version + *** [compile] Error code 255 + (This patch works fine at least emacs-20.7) + +--- ilfsf18.el~ 2001-05-13 07:10:53.000000000 +0900 ++++ ilfsf18.el 2013-06-19 13:26:24.000000000 +0900 +@@ -14,9 +14,8 @@ + ;;;============================================================================ + ;;; Prologue + +-(if (string-match "2\.03" comint-version) +- (fset 'comint-mem 'member)) +- ++(if (not (featurep 'comint-mem)) ++ (fset 'comint-mem 'member) ) + + ;;;============================================================================ + ;;; Functions 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 05:08:02 -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)))