Update to 9.18.

22 files changed, 209 insertions, 138 deletions

diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index f8c891c073ff..112662ff1d26 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -1,29 +1,32 @@
 # New ports collection makefile for:	apel for emacs
-# Version required:	9.13
+# Version required:	9.16
 # Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/03/01 09:37:13 shige Exp $
+# $Id: Makefile,v 1.5 1999/03/02 08:01:45 shige Exp $
 #
 
 DISTNAME=	apel-${APEL_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/apel/
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/
 
 MAINTAINER?=	shige@FreeBSD.ORG
 
 # distfile version
-APEL_VER=	9.13
+APEL_VER=	9.18
 APEL_SETUPEL=	apel-setup.el
+APELDOCDIR=	share/doc/apel
 
 # This is a master port.
 PORTCLASS?=	master
 
+# emacs port setup
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
+# emacs requires *-setup.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -49,7 +52,8 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
+PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		APELDOCDIR=${APELDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .else
 .BEGIN:
@@ -61,8 +65,17 @@ MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${REQUIRE_SETUPEL} == "YES")
 pre-configure:
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
+.endif
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/${APELDOCDIR}
+	@(cd ${WRKSRC} ; \
+	for i in ChangeLog README.* ; do \
+		${INSTALL_DATA} $${i} ${PREFIX}/${APELDOCDIR}/ ; \
+	done)
+.endif
+.if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR}/site-lisp
 .endif
diff --git a/editors/apel-emacs/distinfo b/editors/apel-emacs/distinfo
index 2869af5b1375..3901e89725ad 100644
--- a/editors/apel-emacs/distinfo
+++ b/editors/apel-emacs/distinfo
@@ -1 +1 @@
-MD5 (apel-9.13.tar.gz) = f95c89b37ce5ef7d2eac09f057cc7402
+MD5 (apel-9.18.tar.gz) = 0c26133614f857b7f9e15ed7c88175b6
diff --git a/editors/apel-emacs/files/patch-ac b/editors/apel-emacs/files/patch-ac
deleted file mode 100644
index 418c50a0f462..000000000000
--- a/editors/apel-emacs/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- poem-ltn1.el.orig	Tue Mar  2 17:10:01 1999
-+++ poem-ltn1.el	Tue Mar  2 17:10:14 1999
-@@ -163,9 +163,9 @@
-   (let ((emx-binary-mode t))
-     (find-file-noselect filename nowarn rawfile)))
- 
--(defalias find-file-noselect-as-raw-text 'find-file-noselect)
-+(defalias 'find-file-noselect-as-raw-text 'find-file-noselect)
- 
--(defalias find-file-noselect-as-raw-text-CRLF 'find-file-noselect)
-+(defalias 'find-file-noselect-as-raw-text-CRLF 'find-file-noselect)
- 
- (defun save-buffer-as-binary (&optional args)
-   "Like `save-buffer', q.v., but don't encode."
diff --git a/editors/apel-emacs/pkg-descr b/editors/apel-emacs/pkg-descr
index a23c6580aa57..21ba14d12537 100644
--- a/editors/apel-emacs/pkg-descr
+++ b/editors/apel-emacs/pkg-descr
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/19.34/site-lisp/emu/	--- emu
 
 
diff --git a/editors/apel-emacs/pkg-plist b/editors/apel-emacs/pkg-plist
index 943f6057194e..49ab7d0d18a6 100644
--- a/editors/apel-emacs/pkg-plist
+++ b/editors/apel-emacs/pkg-plist
@@ -14,24 +14,34 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
 %%EMACS_LIBDIR%%/site-lisp/apel-setup.el
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index e9decccd013a..3bb1bd9947a7 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	apel for emacs20
-# Version required:	9.x
+# Version required:	9.18
 # Date created:		22 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/02 13:26:51 kuriyama Exp $
+# $Id: Makefile,v 1.2 1999/03/01 09:37:17 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -19,7 +19,7 @@ EMACS_PORT=	emacs20
 EMACS_VER=	20.3
 EMACS_LIBDIR=	share/${EMACS_NAME}
 
-# pkg/* files are used in ${.CURDIR}
+# use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/apel-emacs20/pkg-descr b/editors/apel-emacs20/pkg-descr
index 5f9468375313..8d696aa885d5 100644
--- a/editors/apel-emacs20/pkg-descr
+++ b/editors/apel-emacs20/pkg-descr
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel-emacs20/pkg-plist b/editors/apel-emacs20/pkg-plist
index d84a6952e6e7..abe4af4cf82b 100644
--- a/editors/apel-emacs20/pkg-plist
+++ b/editors/apel-emacs20/pkg-plist
@@ -10,24 +10,14 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el
@@ -38,7 +28,25 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index fedcd27ab0df..4043dca8c41e 100644
--- a/editors/apel-mule/Makefile
+++ b/editors/apel-mule/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	apel for mule
-# Version required:	9.x
+# Version required:	9.18
 # Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/02 13:26:50 kuriyama Exp $
+# $Id: Makefile,v 1.2 1999/03/01 09:37:20 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -19,10 +19,12 @@ EMACS_PORT=	mule
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
 
+# RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
+# emacs requires *-setup.el
 REQUIRE_SETUPEL=	YES
 
-# pkg/* files are used in ${.CURDIR}
+# use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
 
 .include <${MASTERDIR}/Makefile>
diff --git a/editors/apel-mule/pkg-descr b/editors/apel-mule/pkg-descr
index 18337370d45c..e303492814ce 100644
--- a/editors/apel-mule/pkg-descr
+++ b/editors/apel-mule/pkg-descr
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/mule/site-lisp/apel/		--- APEL
+	${PREFIX}/share/mule/site-lisp/apel/		--- apel
 	${PREFIX}/share/mule/19.34/site-lisp/emu/	--- emu
 
 
diff --git a/editors/apel-mule/pkg-plist b/editors/apel-mule/pkg-plist
index 5f6e08245f00..83c64e892008 100644
--- a/editors/apel-mule/pkg-plist
+++ b/editors/apel-mule/pkg-plist
@@ -12,30 +12,40 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
 %%EMACS_LIBDIR%%/site-lisp/apel-setup.el
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index f8c891c073ff..112662ff1d26 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,29 +1,32 @@
 # New ports collection makefile for:	apel for emacs
-# Version required:	9.13
+# Version required:	9.16
 # Date created:		23 September 1998
-# Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1999/03/01 09:37:13 shige Exp $
+# $Id: Makefile,v 1.5 1999/03/02 08:01:45 shige Exp $
 #
 
 DISTNAME=	apel-${APEL_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/GNU/elisp/apel/
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/
 
 MAINTAINER?=	shige@FreeBSD.ORG
 
 # distfile version
-APEL_VER=	9.13
+APEL_VER=	9.18
 APEL_SETUPEL=	apel-setup.el
+APELDOCDIR=	share/doc/apel
 
 # This is a master port.
 PORTCLASS?=	master
 
+# emacs port setup
 .if (${PORTCLASS} == "master")
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
 EMACS_LIBDIR=	share/${EMACS_NAME}
+# emacs requires *-setup.el
 REQUIRE_SETUPEL=  YES
 .endif
 
@@ -49,7 +52,8 @@ RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common
 RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
 .endif
 SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER}
+PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		APELDOCDIR=${APELDOCDIR}
 MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .else
 .BEGIN:
@@ -61,8 +65,17 @@ MAKE_FLAGS=	EMACS=${EMACS_CMD}
 .if (${REQUIRE_SETUPEL} == "YES")
 pre-configure:
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
+.endif
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/${APELDOCDIR}
+	@(cd ${WRKSRC} ; \
+	for i in ChangeLog README.* ; do \
+		${INSTALL_DATA} $${i} ${PREFIX}/${APELDOCDIR}/ ; \
+	done)
+.endif
+.if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
 			${PREFIX}/${EMACS_LIBDIR}/site-lisp
 .endif
diff --git a/editors/apel/distinfo b/editors/apel/distinfo
index 2869af5b1375..3901e89725ad 100644
--- a/editors/apel/distinfo
+++ b/editors/apel/distinfo
@@ -1 +1 @@
-MD5 (apel-9.13.tar.gz) = f95c89b37ce5ef7d2eac09f057cc7402
+MD5 (apel-9.18.tar.gz) = 0c26133614f857b7f9e15ed7c88175b6
diff --git a/editors/apel/files/patch-ac b/editors/apel/files/patch-ac
deleted file mode 100644
index 418c50a0f462..000000000000
--- a/editors/apel/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- poem-ltn1.el.orig	Tue Mar  2 17:10:01 1999
-+++ poem-ltn1.el	Tue Mar  2 17:10:14 1999
-@@ -163,9 +163,9 @@
-   (let ((emx-binary-mode t))
-     (find-file-noselect filename nowarn rawfile)))
- 
--(defalias find-file-noselect-as-raw-text 'find-file-noselect)
-+(defalias 'find-file-noselect-as-raw-text 'find-file-noselect)
- 
--(defalias find-file-noselect-as-raw-text-CRLF 'find-file-noselect)
-+(defalias 'find-file-noselect-as-raw-text-CRLF 'find-file-noselect)
- 
- (defun save-buffer-as-binary (&optional args)
-   "Like `save-buffer', q.v., but don't encode."
diff --git a/editors/apel/pkg-descr.emacs19 b/editors/apel/pkg-descr.emacs19
index a23c6580aa57..21ba14d12537 100644
--- a/editors/apel/pkg-descr.emacs19
+++ b/editors/apel/pkg-descr.emacs19
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/19.34/site-lisp/emu/	--- emu
 
 
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
index 5f9468375313..8d696aa885d5 100644
--- a/editors/apel/pkg-descr.emacs20
+++ b/editors/apel/pkg-descr.emacs20
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel/pkg-descr.emacs21 b/editors/apel/pkg-descr.emacs21
index 5f9468375313..8d696aa885d5 100644
--- a/editors/apel/pkg-descr.emacs21
+++ b/editors/apel/pkg-descr.emacs21
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/emacs/site-lisp/apel/		--- APEL
+	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
 	${PREFIX}/share/emacs/20.3/site-lisp/emu/	--- emu
 
 --- Porting by shige <shige@FreeBSD.ORG>.
diff --git a/editors/apel/pkg-descr.mule b/editors/apel/pkg-descr.mule
index 18337370d45c..e303492814ce 100644
--- a/editors/apel/pkg-descr.mule
+++ b/editors/apel/pkg-descr.mule
@@ -6,7 +6,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
 
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
-    APEL
+    apel
      - utility to write portable CCL program
      - utility for Association-list
      - utility for condition tree and condition/situation-alist
@@ -14,6 +14,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - utility to make file-name
      - utility to install emacs-lisp package
      - ROT 13-47-48 Caesar rotation utility
+     - portable custom environment
     emu
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
@@ -23,7 +24,7 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
      - text/richtext module
 
   APEL is installed the following directory tree:
-	${PREFIX}/share/mule/site-lisp/apel/		--- APEL
+	${PREFIX}/share/mule/site-lisp/apel/		--- apel
 	${PREFIX}/share/mule/19.34/site-lisp/emu/	--- emu
 
 
diff --git a/editors/apel/pkg-plist.emacs19 b/editors/apel/pkg-plist.emacs19
index 943f6057194e..49ab7d0d18a6 100644
--- a/editors/apel/pkg-plist.emacs19
+++ b/editors/apel/pkg-plist.emacs19
@@ -14,24 +14,34 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-ltn1.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-ltn1.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
 %%EMACS_LIBDIR%%/site-lisp/apel-setup.el
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/pkg-plist.emacs20 b/editors/apel/pkg-plist.emacs20
index d84a6952e6e7..abe4af4cf82b 100644
--- a/editors/apel/pkg-plist.emacs20
+++ b/editors/apel/pkg-plist.emacs20
@@ -10,24 +10,14 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el
@@ -38,7 +28,25 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/pkg-plist.emacs21 b/editors/apel/pkg-plist.emacs21
index d84a6952e6e7..abe4af4cf82b 100644
--- a/editors/apel/pkg-plist.emacs21
+++ b/editors/apel/pkg-plist.emacs21
@@ -10,24 +10,14 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/mule-caesar.elc
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el
@@ -38,7 +28,25 @@
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-e20_3.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%
diff --git a/editors/apel/pkg-plist.mule b/editors/apel/pkg-plist.mule
index 5f6e08245f00..83c64e892008 100644
--- a/editors/apel/pkg-plist.mule
+++ b/editors/apel/pkg-plist.mule
@@ -12,30 +12,40 @@
 %%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/tinycustom.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poe.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/invisible.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-om.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/emu-mule.elc
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.el
 %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/static.elc
 %%EMACS_LIBDIR%%/site-lisp/apel-setup.el
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
 @dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+%%APELDOCDIR%%/ChangeLog
+%%APELDOCDIR%%/README.en
+%%APELDOCDIR%%/README.ja
+@dirrm %%APELDOCDIR%%