Treat emacs22 like emacs21. Bump PKGREVISION.

5 files changed, 45 insertions, 6 deletions

diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index 354329db924..fa545b801f5 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/06/11 14:07:28 markd Exp $
 #
 
 DISTNAME=	ilisp-20021222
 PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ilisp/}
 
@@ -24,11 +24,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ilisp.emacs \
 		${PREFIX}/share/examples/emacs-ilisp
 	${INSTALL_DATA_DIR} ${SITELISP}
-	${INSTALL_DATA} ${WRKSRC}/*.el* ${SITELISP}
+	${INSTALL_DATA} ${WRKSRC}/*.el ${SITELISP}
+	${INSTALL_DATA} ${WRKSRC}/*.elc ${SITELISP}
 	${INSTALL_DATA} ${WRKSRC}/*.lisp ${SITELISP}
 	${INSTALL_DATA} ${WRKSRC}/*.scm ${SITELISP}
 	${INSTALL_DATA_DIR} ${SITELISP}/extra
-	${INSTALL_DATA} ${WRKSRC}/extra/*.el* ${SITELISP}/extra
+	${INSTALL_DATA} ${WRKSRC}/extra/*.el ${SITELISP}/extra
+	${INSTALL_DATA} ${WRKSRC}/extra/*.elc ${SITELISP}/extra
 
 .include "../../mk/emacs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/emacs-ilisp/PLIST b/devel/emacs-ilisp/PLIST
index ec612cc3ebd..15548d9c380 100644
--- a/devel/emacs-ilisp/PLIST
+++ b/devel/emacs-ilisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/04/20 01:22:33 jmc Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/06/11 14:07:28 markd Exp $
 share/doc/emacs-ilisp/INSTALLATION
 share/doc/emacs-ilisp/README
 ${EMACS_LISPPREFIX}/ilisp/allegro.lisp
@@ -29,6 +29,7 @@ ${EMACS_LISPPREFIX}/ilisp/ilfsf20.el
 ${FOR_emacs20}${EMACS_LISPPREFIX}/ilisp/ilfsf20.elc
 ${EMACS_LISPPREFIX}/ilisp/ilfsf21.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/ilisp/ilfsf21.elc
+${FOR_emacs22}${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 721e144c587..8137cf26948 100644
--- a/devel/emacs-ilisp/distinfo
+++ b/devel/emacs-ilisp/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:13 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/06/11 14:07:28 markd 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) = 98d9e9e3fca7abfe677cb18745fd33015176bb11
+SHA1 (patch-ac) = a55755003b760efe9811b2115a8aaeaf7e7a8c0c
diff --git a/devel/emacs-ilisp/patches/patch-ab b/devel/emacs-ilisp/patches/patch-ab
new file mode 100644
index 00000000000..641e9f70d0b
--- /dev/null
+++ b/devel/emacs-ilisp/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2007/06/11 14:07:28 markd Exp $
+
+--- ilcompat.el.orig	2002-10-26 01:13:49.000000000 +1300
++++ ilcompat.el
+@@ -27,6 +27,8 @@
+ 	 'fsf-20)
+ 	((string-match "^21" emacs-version)
+ 	 'fsf-21)
++	((string-match "^22" emacs-version)
++	 'fsf-22)
+ 	(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 +57,7 @@ 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"))
+       )
+ 
+ 
diff --git a/devel/emacs-ilisp/patches/patch-ac b/devel/emacs-ilisp/patches/patch-ac
new file mode 100644
index 00000000000..f7a8041a0da
--- /dev/null
+++ b/devel/emacs-ilisp/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/06/11 14:07:28 markd Exp $
+
+--- ilisp-mak.el.orig	2002-05-31 23:47:57.000000000 +1200
++++ ilisp-mak.el
+@@ -48,6 +48,8 @@
+            (byte-compile-file "illuc19.el"))
+           ((eq +ilisp-emacs-version-id+ 'xemacs)
+            (byte-compile-file "ilxemacs.el"))
++          ((eq +ilisp-emacs-version-id+ 'fsf-22)
++           (byte-compile-file "ilfsf21.el"))
+           ((eq +ilisp-emacs-version-id+ 'fsf-21)
+            (byte-compile-file "ilfsf21.el"))
+           ((eq +ilisp-emacs-version-id+ 'fsf-20)