Update to 9.19.

28 files changed, 265 insertions, 240 deletions

diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index 70b66ceea84f..c3081e90bbce 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:	apel for emacs
-# Version required:	9.18
+# Version required:	9.19
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/05/12 23:05:14 asami Exp $
+# $Id: Makefile,v 1.8 1999/05/23 15:28:30 shige Exp $
 #
 
 DISTNAME=	apel-${APEL_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/ \
+		ftp://ftp.center.osaka-u.ac.jp/mule/apel/
 
 MAINTAINER?=	shige@FreeBSD.ORG
 
 # distfile version
-APEL_VER=	9.18
+APEL_VER=	9.19
 APEL_SETUPEL=	apel-setupel.el
 APELDOCDIR=	share/doc/apel
 
@@ -25,7 +26,8 @@ PORTCLASS?=	master
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
@@ -52,14 +54,16 @@ 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} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${APEL_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+MAKE_FLAGS+=	EMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -78,7 +82,7 @@ post-install:
 .endif
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/apel-emacs/distinfo b/editors/apel-emacs/distinfo
index 3901e89725ad..5e02a8649345 100644
--- a/editors/apel-emacs/distinfo
+++ b/editors/apel-emacs/distinfo
@@ -1 +1 @@
-MD5 (apel-9.18.tar.gz) = 0c26133614f857b7f9e15ed7c88175b6
+MD5 (apel-9.19.tar.gz) = 77fe79aba069b17424a6c1b7b062b93b
diff --git a/editors/apel-emacs/files/apel-setupel.el.in b/editors/apel-emacs/files/apel-setupel.el.in
index c4465d1b6637..0207489c0b94 100644
--- a/editors/apel-emacs/files/apel-setupel.el.in
+++ b/editors/apel-emacs/files/apel-setupel.el.in
@@ -4,6 +4,6 @@
 
 (setq load-path (append '(
 	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/apel"
-	"@@PREFIX@@/@@EMACS_LIBDIR@@/@@EMACS_VER@@/site-lisp/emu"
+	"@@PREFIX@@/@@EMACS_LIBDIR_WITH_VER@@/site-lisp/emu"
  ) load-path))
 (provide 'apel-setupel)
diff --git a/editors/apel-emacs/pkg-comment b/editors/apel-emacs/pkg-comment
index 195399718c18..28ffde6807db 100644
--- a/editors/apel-emacs/pkg-comment
+++ b/editors/apel-emacs/pkg-comment
@@ -1 +1 @@
-A Portable Emacs Library for emacs
+A Portable Emacs Library for emacs.
diff --git a/editors/apel-emacs/pkg-descr b/editors/apel-emacs/pkg-descr
index 584a6a1ad4e5..d0d3add44255 100644
--- a/editors/apel-emacs/pkg-descr
+++ b/editors/apel-emacs/pkg-descr
@@ -7,22 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
      - invisible: provide features about invisible region
      - mcharset: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcharset
-     - text/richtext module
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
+     - poe: emulation module mainly for basic functions and special forms/macros
+     - poem: provide basic functions to write portable MULE programs
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
diff --git a/editors/apel-emacs/pkg-plist b/editors/apel-emacs/pkg-plist
index f06e01857e55..db015c20783e 100644
--- a/editors/apel-emacs/pkg-plist
+++ b/editors/apel-emacs/pkg-plist
@@ -10,35 +10,37 @@
 %%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/emu.el
-%%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/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/mcharset.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.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/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_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel-emacs/scripts/configure b/editors/apel-emacs/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/apel-emacs/scripts/configure
+++ b/editors/apel-emacs/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};g" \
 		-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
 		-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
+		-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
 	> ${WRKDIR}/${i}
 	fi
 done
diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 3bb1bd9947a7..7c6224193ece 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.18
+# Version required:	9.19
 # Date created:		22 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/03/01 09:37:17 shige Exp $
+# $Id: Makefile,v 1.3 1999/05/09 16:14:42 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,7 +17,8 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs20
 EMACS_VER=	20.3
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/apel-emacs20/pkg-comment b/editors/apel-emacs20/pkg-comment
index 5a611f960f0f..ddf6d9504fd4 100644
--- a/editors/apel-emacs20/pkg-comment
+++ b/editors/apel-emacs20/pkg-comment
@@ -1 +1 @@
-A Portable Emacs Library for emacs20
+A Portable Emacs Library for emacs20.
diff --git a/editors/apel-emacs20/pkg-descr b/editors/apel-emacs20/pkg-descr
index 8d696aa885d5..6cef93b45b90 100644
--- a/editors/apel-emacs20/pkg-descr
+++ b/editors/apel-emacs20/pkg-descr
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
+     - invisible: provide features about invisible region
+     - mcharset: provide MIME charset related features
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index 4043dca8c41e..96fac8019997 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.18
+# Version required:	9.19
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/03/01 09:37:20 shige Exp $
+# $Id: Makefile,v 1.3 1999/05/09 16:14:35 shige Exp $
 #
 
 MAINTAINER=	shige@FreeBSD.ORG
@@ -17,11 +17,12 @@ MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 EMACS_NAME=	mule
 EMACS_PORT=	mule
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 
 # RUN_DEPENDS port name's suffix is '-common'.
 HAVE_COMMON_PORT=	YES
-# emacs requires *-setup.el
+# emacs requires *-setupel.el
 REQUIRE_SETUPEL=	YES
 
 # use pkg/* files in ${.CURDIR}
diff --git a/editors/apel-mule/pkg-comment b/editors/apel-mule/pkg-comment
index d2aef39aa680..23aba2c81559 100644
--- a/editors/apel-mule/pkg-comment
+++ b/editors/apel-mule/pkg-comment
@@ -1 +1 @@
-A Portable Emacs Library for mule
+A Portable Emacs Library for mule.
diff --git a/editors/apel-mule/pkg-descr b/editors/apel-mule/pkg-descr
index c6f4921ef807..ebb746786646 100644
--- a/editors/apel-mule/pkg-descr
+++ b/editors/apel-mule/pkg-descr
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
+     - invisible: provide features about invisible region
+     - mcharset: provide MIME charset related features
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/mule/site-lisp/apel/		--- apel
diff --git a/editors/apel-mule/pkg-plist b/editors/apel-mule/pkg-plist
index c997ca0229a3..f315fbd441da 100644
--- a/editors/apel-mule/pkg-plist
+++ b/editors/apel-mule/pkg-plist
@@ -10,39 +10,41 @@
 %%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/emu.el
-%%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/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/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/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-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_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 70b66ceea84f..c3081e90bbce 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:	apel for emacs
-# Version required:	9.18
+# Version required:	9.19
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.7 1999/05/12 23:05:14 asami Exp $
+# $Id: Makefile,v 1.8 1999/05/23 15:28:30 shige Exp $
 #
 
 DISTNAME=	apel-${APEL_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/
+MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/apel/ \
+		ftp://ftp.center.osaka-u.ac.jp/mule/apel/
 
 MAINTAINER?=	shige@FreeBSD.ORG
 
 # distfile version
-APEL_VER=	9.18
+APEL_VER=	9.19
 APEL_SETUPEL=	apel-setupel.el
 APELDOCDIR=	share/doc/apel
 
@@ -25,7 +26,8 @@ PORTCLASS?=	master
 EMACS_NAME=	emacs
 EMACS_PORT=	emacs
 EMACS_VER=	19.34
-EMACS_LIBDIR=	share/${EMACS_NAME}
+EMACS_LIBDIR=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
 # emacs requires *-setupel.el
 REQUIRE_SETUPEL=  YES
 .endif
@@ -52,14 +54,16 @@ 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} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		TARGETS="${APEL_SETUPEL}"
 PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
+		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
 		APELDOCDIR=${APELDOCDIR} APEL_SETUPEL=${APEL_SETUPEL}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
+MAKE_FLAGS+=	EMACS=${EMACS_CMD}
 .else
 .BEGIN:
 	@${ECHO} "Error: Bad port."
-	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR."
+	@${ECHO} "You must define EMACS_NAME, EMACS_PORT, EMACS_VER, EMACS_LIBDIR, EMACS_LIBDIR_WITH_VER."
 	@${FALSE}
 .endif
 
@@ -78,7 +82,7 @@ post-install:
 .endif
 .if (${REQUIRE_SETUPEL} == "YES")
 	@${INSTALL_DATA} ${WRKDIR}/${APEL_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
+			${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/apel/distinfo b/editors/apel/distinfo
index 3901e89725ad..5e02a8649345 100644
--- a/editors/apel/distinfo
+++ b/editors/apel/distinfo
@@ -1 +1 @@
-MD5 (apel-9.18.tar.gz) = 0c26133614f857b7f9e15ed7c88175b6
+MD5 (apel-9.19.tar.gz) = 77fe79aba069b17424a6c1b7b062b93b
diff --git a/editors/apel/files/apel-setupel.el.in b/editors/apel/files/apel-setupel.el.in
index c4465d1b6637..0207489c0b94 100644
--- a/editors/apel/files/apel-setupel.el.in
+++ b/editors/apel/files/apel-setupel.el.in
@@ -4,6 +4,6 @@
 
 (setq load-path (append '(
 	"@@PREFIX@@/@@EMACS_LIBDIR@@/site-lisp/apel"
-	"@@PREFIX@@/@@EMACS_LIBDIR@@/@@EMACS_VER@@/site-lisp/emu"
+	"@@PREFIX@@/@@EMACS_LIBDIR_WITH_VER@@/site-lisp/emu"
  ) load-path))
 (provide 'apel-setupel)
diff --git a/editors/apel/pkg-comment.emacs19 b/editors/apel/pkg-comment.emacs19
index 195399718c18..28ffde6807db 100644
--- a/editors/apel/pkg-comment.emacs19
+++ b/editors/apel/pkg-comment.emacs19
@@ -1 +1 @@
-A Portable Emacs Library for emacs
+A Portable Emacs Library for emacs.
diff --git a/editors/apel/pkg-comment.emacs20 b/editors/apel/pkg-comment.emacs20
index 5a611f960f0f..ddf6d9504fd4 100644
--- a/editors/apel/pkg-comment.emacs20
+++ b/editors/apel/pkg-comment.emacs20
@@ -1 +1 @@
-A Portable Emacs Library for emacs20
+A Portable Emacs Library for emacs20.
diff --git a/editors/apel/pkg-comment.emacs21 b/editors/apel/pkg-comment.emacs21
index 5a611f960f0f..ddf6d9504fd4 100644
--- a/editors/apel/pkg-comment.emacs21
+++ b/editors/apel/pkg-comment.emacs21
@@ -1 +1 @@
-A Portable Emacs Library for emacs20
+A Portable Emacs Library for emacs20.
diff --git a/editors/apel/pkg-comment.mule b/editors/apel/pkg-comment.mule
index d2aef39aa680..23aba2c81559 100644
--- a/editors/apel/pkg-comment.mule
+++ b/editors/apel/pkg-comment.mule
@@ -1 +1 @@
-A Portable Emacs Library for mule
+A Portable Emacs Library for mule.
diff --git a/editors/apel/pkg-descr.emacs19 b/editors/apel/pkg-descr.emacs19
index 584a6a1ad4e5..d0d3add44255 100644
--- a/editors/apel/pkg-descr.emacs19
+++ b/editors/apel/pkg-descr.emacs19
@@ -7,22 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
-     - poe: emulation module mainly for basic functions and special forms/macros
-     - poem: provide basic functions to write portable MULE programs
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
      - invisible: provide features about invisible region
      - mcharset: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcharset
-     - text/richtext module
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
+     - poe: emulation module mainly for basic functions and special forms/macros
+     - poem: provide basic functions to write portable MULE programs
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
index 8d696aa885d5..6cef93b45b90 100644
--- a/editors/apel/pkg-descr.emacs20
+++ b/editors/apel/pkg-descr.emacs20
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
+     - invisible: provide features about invisible region
+     - mcharset: provide MIME charset related features
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
diff --git a/editors/apel/pkg-descr.emacs21 b/editors/apel/pkg-descr.emacs21
index 8d696aa885d5..6cef93b45b90 100644
--- a/editors/apel/pkg-descr.emacs21
+++ b/editors/apel/pkg-descr.emacs21
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
+     - invisible: provide features about invisible region
+     - mcharset: provide MIME charset related features
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/emacs/site-lisp/apel/		--- apel
diff --git a/editors/apel/pkg-descr.mule b/editors/apel/pkg-descr.mule
index c6f4921ef807..ebb746786646 100644
--- a/editors/apel/pkg-descr.mule
+++ b/editors/apel/pkg-descr.mule
@@ -7,21 +7,22 @@ APEL is programed by MORIOKA Tomohiko <morioka@jaist.ac.jp>.
   APEL stands for "A Portable Emacs Library".  It consists of
   following modules:
     apel
-     - utility to write portable CCL program
-     - utility for Association-list
-     - utility for condition tree and condition/situation-alist
-     - utility for path management or file detection
-     - utility to make file-name
-     - utility to install emacs-lisp package
-     - ROT 13-47-48 Caesar rotation utility
-     - portable custom environment
+     - alist: utility for Association-list
+     - calist: utility for condition tree and condition/situation-alist
+     - filename: utility to make file-name
+     - install: utility to install emacs-lisp package
+     - mule-caeser: ROT 13-47-48 Caesar rotation utility
+     - path-util: utility for path management or file detection
     emu
+     - broken: provide information of broken facilities of Emacs.
+     - emu: bundled in tm-7.106 compat module
+     - invisible: provide features about invisible region
+     - mcharset: provide MIME charset related features
+     - pccl: utility to write portable CCL program
+     - pcustom: provide portable custom environment
      - poe: emulation module mainly for basic functions and special forms/macros
      - poem: provide basic functions to write portable MULE programs
-     - mcs: provide MIME charset related features
-     - broken: provide information of broken facilities of Emacs.
-     - emu: bundled in tm-7.106 compat module; it required poe, poem and mcs
-     - text/richtext module
+     - static: utility for static evaluation
 
   APEL is installed the following directory tree:
 	${PREFIX}/share/mule/site-lisp/apel/		--- apel
diff --git a/editors/apel/pkg-plist.emacs19 b/editors/apel/pkg-plist.emacs19
index f06e01857e55..db015c20783e 100644
--- a/editors/apel/pkg-plist.emacs19
+++ b/editors/apel/pkg-plist.emacs19
@@ -10,35 +10,37 @@
 %%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/emu.el
-%%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/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/mcharset.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.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/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_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/pkg-plist.mule b/editors/apel/pkg-plist.mule
index c997ca0229a3..f315fbd441da 100644
--- a/editors/apel/pkg-plist.mule
+++ b/editors/apel/pkg-plist.mule
@@ -10,39 +10,41 @@
 %%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/emu.el
-%%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/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/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/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-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_SETUPEL%%
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pcustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/tinycustom.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poe.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/invisible.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcharset.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu-mule.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/broken.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
 @dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/scripts/configure b/editors/apel/scripts/configure
index a489484bfc4a..04796ae5df87 100644
--- a/editors/apel/scripts/configure
+++ b/editors/apel/scripts/configure
@@ -7,6 +7,7 @@ do
 		-e "s;@@PREFIX@@;${PREFIX};g" \
 		-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
 		-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
+		-e "s;@@EMACS_LIBDIR_WITH_VER@@;${EMACS_LIBDIR_WITH_VER};g" \
 	> ${WRKDIR}/${i}
 	fi
 done