Update APEL to 10.4.

Many small changes which enhance APEL's functionality.  Due to the
charasteristic of APEL as a portability layer of emacsen, no user visible
change, but more portability, possibly.

5 files changed, 69 insertions, 121 deletions

diff --git a/devel/apel/Makefile b/devel/apel/Makefile
index 6f252b9e3f5..a666427b747 100644
--- a/devel/apel/Makefile
+++ b/devel/apel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2002/09/14 02:44:36 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/11 09:28:47 uebayasi Exp $
 
-DISTNAME=	apel-10.3
+DISTNAME=	apel-10.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/apel/
 
@@ -8,24 +8,35 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
 COMMENT=	Portable Emacs Library
 
+#CONFLICTS+=	apel-*
+#CONFLICTS+=	xemacs-apel-*
+
 .include "../../mk/emacs.mk"
 
+MAKE_FLAGS+=	EMACS=${EMACS_FLAVOR}
+MAKE_FLAGS+=	LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+=	VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX}
+
+EMACS_VERSIONS_ACCEPTED=	emacs21 emacs20 xemacs211 xemacs215
+
 .if ${EMACS_FLAVOR} == "emacs"
 ALL_TARGET=	elc
 INSTALL_TARGET=	install
 PLIST_SRC=	${PKGDIR}/PLIST.emacs
 .else	# ${EMACS_FLAVOR} == "xemacs"
-ALL_TARGET=	package
+ALL_TARGET=
 INSTALL_TARGET=	install-package
 PLIST_SRC=	${PKGDIR}/PLIST.xemacs
-MAKEFLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
+MAKE_FLAGS+=	PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
 .endif
 
 DOCDIR=		${PREFIX}/share/doc/apel
 
+.if ${EMACS_FLAVOR} == "emacs"
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.en ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCDIR}
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/apel/PLIST b/devel/apel/PLIST
deleted file mode 100644
index ff608da3edd..00000000000
--- a/devel/apel/PLIST
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:16 zuntum Exp $
-share/doc/apel/README.en
-share/doc/apel/README.ja
-share/emacs/site-lisp/apel/alist.elc
-share/emacs/site-lisp/apel/calist.elc
-share/emacs/site-lisp/apel/path-util.elc
-share/emacs/site-lisp/apel/filename.elc
-share/emacs/site-lisp/apel/install.elc
-share/emacs/site-lisp/apel/alist.el
-share/emacs/site-lisp/apel/calist.el
-share/emacs/site-lisp/apel/path-util.el
-share/emacs/site-lisp/apel/filename.el
-share/emacs/site-lisp/apel/install.el
-@dirrm share/emacs/site-lisp/apel
-share/emacs/20.7/site-lisp/emu/static.elc
-share/emacs/20.7/site-lisp/emu/broken.elc
-share/emacs/20.7/site-lisp/emu/product.elc
-share/emacs/20.7/site-lisp/emu/apel-ver.elc
-share/emacs/20.7/site-lisp/emu/pym.elc
-share/emacs/20.7/site-lisp/emu/poe.elc
-share/emacs/20.7/site-lisp/emu/pcustom.elc
-share/emacs/20.7/site-lisp/emu/pccl-20.elc
-share/emacs/20.7/site-lisp/emu/pccl.elc
-share/emacs/20.7/site-lisp/emu/pces-20.elc
-share/emacs/20.7/site-lisp/emu/pces-e20.elc
-share/emacs/20.7/site-lisp/emu/pces.elc
-share/emacs/20.7/site-lisp/emu/poem-e20_3.elc
-share/emacs/20.7/site-lisp/emu/poem-e20.elc
-share/emacs/20.7/site-lisp/emu/poem.elc
-share/emacs/20.7/site-lisp/emu/mcs-20.elc
-share/emacs/20.7/site-lisp/emu/mcs-e20.elc
-share/emacs/20.7/site-lisp/emu/mcharset.elc
-share/emacs/20.7/site-lisp/emu/inv-19.elc
-share/emacs/20.7/site-lisp/emu/invisible.elc
-share/emacs/20.7/site-lisp/emu/emu.elc
-share/emacs/20.7/site-lisp/emu/richtext.elc
-share/emacs/20.7/site-lisp/emu/mule-caesar.elc
-share/emacs/20.7/site-lisp/emu/static.el
-share/emacs/20.7/site-lisp/emu/broken.el
-share/emacs/20.7/site-lisp/emu/product.el
-share/emacs/20.7/site-lisp/emu/apel-ver.el
-share/emacs/20.7/site-lisp/emu/pym.el
-share/emacs/20.7/site-lisp/emu/poe.el
-share/emacs/20.7/site-lisp/emu/pcustom.el
-share/emacs/20.7/site-lisp/emu/pccl-20.el
-share/emacs/20.7/site-lisp/emu/pccl.el
-share/emacs/20.7/site-lisp/emu/pces-20.el
-share/emacs/20.7/site-lisp/emu/pces-e20.el
-share/emacs/20.7/site-lisp/emu/pces.el
-share/emacs/20.7/site-lisp/emu/poem-e20_3.el
-share/emacs/20.7/site-lisp/emu/poem-e20.el
-share/emacs/20.7/site-lisp/emu/poem.el
-share/emacs/20.7/site-lisp/emu/mcs-20.el
-share/emacs/20.7/site-lisp/emu/mcs-e20.el
-share/emacs/20.7/site-lisp/emu/mcharset.el
-share/emacs/20.7/site-lisp/emu/inv-19.el
-share/emacs/20.7/site-lisp/emu/invisible.el
-share/emacs/20.7/site-lisp/emu/emu.el
-share/emacs/20.7/site-lisp/emu/richtext.el
-share/emacs/20.7/site-lisp/emu/mule-caesar.el
-@dirrm share/emacs/20.7/site-lisp/emu
-@dirrm share/doc/apel
diff --git a/devel/apel/PLIST.emacs b/devel/apel/PLIST.emacs
index 95823cb8931..eee42fa7e50 100644
--- a/devel/apel/PLIST.emacs
+++ b/devel/apel/PLIST.emacs
@@ -1,52 +1,52 @@
-@comment $NetBSD: PLIST.emacs,v 1.1 2002/09/14 02:44:36 uebayasi Exp $
+@comment $NetBSD: PLIST.emacs,v 1.2 2003/01/11 09:28:47 uebayasi Exp $
 share/doc/apel/README.en
 share/doc/apel/README.ja
-share/emacs/${EMACS_VERSION}/site-lisp/emu/apel-ver.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/apel-ver.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/broken.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/broken.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/emu.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/emu.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/inv-19.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/inv-19.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/invisible.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/invisible.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcharset.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcharset.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcs-20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcs-20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcs-e20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mcs-e20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mule-caesar.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/mule-caesar.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pccl-20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pccl-20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pccl.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pccl.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces-20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces-20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces-e20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces-e20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pces.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pcustom.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pcustom.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poe.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poe.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem-e20.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem-e20.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem-e20_3.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem-e20_3.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/poem.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/product.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/product.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pym.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/pym.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/richtext.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/richtext.elc
-share/emacs/${EMACS_VERSION}/site-lisp/emu/static.el
-share/emacs/${EMACS_VERSION}/site-lisp/emu/static.elc
+${EMACS_LISPPREFIX}/emu/apel-ver.el
+${EMACS_LISPPREFIX}/emu/apel-ver.elc
+${EMACS_LISPPREFIX}/emu/broken.el
+${EMACS_LISPPREFIX}/emu/broken.elc
+${EMACS_LISPPREFIX}/emu/emu.el
+${EMACS_LISPPREFIX}/emu/emu.elc
+${EMACS_LISPPREFIX}/emu/inv-19.el
+${EMACS_LISPPREFIX}/emu/inv-19.elc
+${EMACS_LISPPREFIX}/emu/invisible.el
+${EMACS_LISPPREFIX}/emu/invisible.elc
+${EMACS_LISPPREFIX}/emu/mcharset.el
+${EMACS_LISPPREFIX}/emu/mcharset.elc
+${EMACS_LISPPREFIX}/emu/mcs-20.el
+${EMACS_LISPPREFIX}/emu/mcs-20.elc
+${EMACS_LISPPREFIX}/emu/mcs-e20.el
+${EMACS_LISPPREFIX}/emu/mcs-e20.elc
+${EMACS_LISPPREFIX}/emu/mule-caesar.el
+${EMACS_LISPPREFIX}/emu/mule-caesar.elc
+${EMACS_LISPPREFIX}/emu/pccl-20.el
+${EMACS_LISPPREFIX}/emu/pccl-20.elc
+${EMACS_LISPPREFIX}/emu/pccl.el
+${EMACS_LISPPREFIX}/emu/pccl.elc
+${EMACS_LISPPREFIX}/emu/pces-20.el
+${EMACS_LISPPREFIX}/emu/pces-20.elc
+${EMACS_LISPPREFIX}/emu/pces-e20.el
+${EMACS_LISPPREFIX}/emu/pces-e20.elc
+${EMACS_LISPPREFIX}/emu/pces.el
+${EMACS_LISPPREFIX}/emu/pces.elc
+${EMACS_LISPPREFIX}/emu/pcustom.el
+${EMACS_LISPPREFIX}/emu/pcustom.elc
+${EMACS_LISPPREFIX}/emu/poe.el
+${EMACS_LISPPREFIX}/emu/poe.elc
+${EMACS_LISPPREFIX}/emu/poem-e20.el
+${EMACS_LISPPREFIX}/emu/poem-e20.elc
+${EMACS_LISPPREFIX}/emu/poem-e20_3.el
+${EMACS_LISPPREFIX}/emu/poem-e20_3.elc
+${EMACS_LISPPREFIX}/emu/poem.el
+${EMACS_LISPPREFIX}/emu/poem.elc
+${EMACS_LISPPREFIX}/emu/product.el
+${EMACS_LISPPREFIX}/emu/product.elc
+${EMACS_LISPPREFIX}/emu/pym.el
+${EMACS_LISPPREFIX}/emu/pym.elc
+${EMACS_LISPPREFIX}/emu/richtext.el
+${EMACS_LISPPREFIX}/emu/richtext.elc
+${EMACS_LISPPREFIX}/emu/static.el
+${EMACS_LISPPREFIX}/emu/static.elc
 ${EMACS_LISPPREFIX}/apel/alist.el
 ${EMACS_LISPPREFIX}/apel/alist.elc
 ${EMACS_LISPPREFIX}/apel/calist.el
@@ -57,6 +57,6 @@ ${EMACS_LISPPREFIX}/apel/install.el
 ${EMACS_LISPPREFIX}/apel/install.elc
 ${EMACS_LISPPREFIX}/apel/path-util.el
 ${EMACS_LISPPREFIX}/apel/path-util.elc
-@dirrm share/emacs/${EMACS_VERSION}/site-lisp/emu
+@dirrm ${EMACS_LISPPREFIX}/emu
 @dirrm ${EMACS_LISPPREFIX}/apel
 @dirrm share/doc/apel
diff --git a/devel/apel/PLIST.xemacs b/devel/apel/PLIST.xemacs
index d7eeda90150..496f69a1b55 100644
--- a/devel/apel/PLIST.xemacs
+++ b/devel/apel/PLIST.xemacs
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.xemacs,v 1.1 2002/09/14 02:44:36 uebayasi Exp $
+@comment $NetBSD: PLIST.xemacs,v 1.2 2003/01/11 09:28:47 uebayasi Exp $
 ${EMACS_LISPPREFIX}/apel/alist.el
 ${EMACS_LISPPREFIX}/apel/alist.elc
 ${EMACS_LISPPREFIX}/apel/apel-ver.el
@@ -63,7 +63,6 @@ ${EMACS_LISPPREFIX}/apel/richtext.el
 ${EMACS_LISPPREFIX}/apel/richtext.elc
 ${EMACS_LISPPREFIX}/apel/static.el
 ${EMACS_LISPPREFIX}/apel/static.elc
-share/doc/apel/README.en
-share/doc/apel/README.ja
+${EMACS_LISPPREFIX}/apel/timezone.el
+${EMACS_LISPPREFIX}/apel/timezone.elc
 @dirrm ${EMACS_LISPPREFIX}/apel
-@dirrm share/doc/apel
diff --git a/devel/apel/distinfo b/devel/apel/distinfo
index 701234aebf8..728ecbde162 100644
--- a/devel/apel/distinfo
+++ b/devel/apel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:10 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/01/11 09:28:47 uebayasi Exp $
 
-SHA1 (apel-10.3.tar.gz) = c910bfdf2a62317c35514a847e63266e8e5d1ca6
-Size (apel-10.3.tar.gz) = 115847 bytes
+SHA1 (apel-10.4.tar.gz) = 9a0f1370e720ddae2680ac3f96b872c48077b810
+Size (apel-10.4.tar.gz) = 127826 bytes
 SHA1 (patch-aa) = fcbbad6b59177b2e8532da2cc665a9271fca0830