12 files changed, 252 insertions, 252 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 2c1bad2e134c..c9eb8c4622ce 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -17,6 +17,13 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	shige@FreeBSD.org
 
+# emacs port setup
+.if (${PORTCLASS} == "master")
+EMACS_PORT_NAME=	emacs21
+.endif
+
+EMACS_MASTERDIR_PKGFILES=YES
+
 # distfile version
 APEL_VER=	10.3
 # setupel filename
@@ -24,19 +31,12 @@ APEL_SETUPEL=	apel-setupel.el
 # document install directory by install-doc target
 APELDOCDIR?=	share/doc/apel
 # apel lispdir
-APEL_LISPDIR?=			${LOCALBASE}/${EMACS_SITE_LISPDIR}
+APEL_LISPDIR?=			${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 APEL_VERSION_SPECIFIC_LISPDIR?=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
 
 # This is a master port.
 PORTCLASS?=	master
 
-# emacs port setup
-.if (${PORTCLASS} == "master")
-EMACS_PORT_NAME=	emacs
-# emacs requires *-setupel.el
-REQUIRE_SETUPEL=  YES
-.endif
-
 # target name for make build
 ALL_TARGET?=	elc
 # environments
@@ -51,8 +51,8 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 .if defined(EMACS_PORT_NAME)
 # depends on custom: emacs-19.34 or mule-19.34
 .if (${EMACS_VER} == "19.34")
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_PORT_NAME}
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
+RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/custom.el:${PORTSDIR}/editors/custom-${EMACS_NAME}
 .endif
 .if defined(EMACS_PACKAGESDIR)
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advice.el:${PORTSDIR}/editors/xemacs-packages
@@ -66,7 +66,7 @@ RUN_DEPENDS+=	${LOCALBASE}/${EMACS_LIBDIR}/xemacs-packages/lisp/xemacs-base/advi
 .endif
 
 pre-configure:
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
 	@${CP} ${FILESDIR}/${APEL_SETUPEL}.in ${WRKDIR}
 .endif
 
@@ -79,7 +79,7 @@ pre-install:
 .endif
 
 post-install:
-.if defined(REQUIRE_SETUPEL) && (${REQUIRE_SETUPEL} == "YES")
+.if defined(EMACS_NO_SUBDIRSEL) && (${EMACS_NO_SUBDIRSEL} == "YES")
 	@${MAKE} setupel-install
 .endif
 .if defined(EMACS_PACKAGESDIR) && defined(MANIFEST)
diff --git a/editors/apel/pkg-comment.emacs19 b/editors/apel/pkg-comment.emacs19
index 195399718c18..182232a8cd55 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 emacs19
diff --git a/editors/apel/pkg-comment.emacs21 b/editors/apel/pkg-comment.emacs21
index 5a611f960f0f..d887d9ad5fef 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 emacs21
diff --git a/editors/apel/pkg-descr.emacs19 b/editors/apel/pkg-descr.emacs19
index 5f029e89a2ad..ac985883ac64 100644
--- a/editors/apel/pkg-descr.emacs19
+++ b/editors/apel/pkg-descr.emacs19
@@ -26,7 +26,7 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
      - static: utility for static evaluation
 
   APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/apel/	--- apel
+	${LOCALBASE}/share/emacs/19.34/site-lisp/apel/	--- apel
 	${LOCALBASE}/share/emacs/19.34/site-lisp/emu/	--- emu
 
 
@@ -36,4 +36,4 @@ To use apel, put the following setup into your ~/.emacs:
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
---- Porting by shige <shige@FreeBSD.ORG>.
+Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.emacs20 b/editors/apel/pkg-descr.emacs20
index e9e2cbecee4c..fb4830e50559 100644
--- a/editors/apel/pkg-descr.emacs20
+++ b/editors/apel/pkg-descr.emacs20
@@ -26,9 +26,9 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
      - static: utility for static evaluation
 
   APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/emacs/20.5/site-lisp/emu/	--- emu
+	${LOCALBASE}/share/emacs/20.7/site-lisp/apel/	--- apel
+	${LOCALBASE}/share/emacs/20.7/site-lisp/emu/	--- emu
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
---- Porting by shige <shige@FreeBSD.ORG>.
+Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.emacs21 b/editors/apel/pkg-descr.emacs21
index e9e2cbecee4c..b38effa3e0c0 100644
--- a/editors/apel/pkg-descr.emacs21
+++ b/editors/apel/pkg-descr.emacs21
@@ -26,9 +26,9 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
      - static: utility for static evaluation
 
   APEL is installed the following directory tree:
-	${LOCALBASE}/share/emacs/site-lisp/apel/	--- apel
-	${LOCALBASE}/share/emacs/20.5/site-lisp/emu/	--- emu
+	${LOCALBASE}/share/emacs/21.1/site-lisp/apel/	--- apel
+	${LOCALBASE}/share/emacs/21.1/site-lisp/emu/	--- emu
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
---- Porting by shige <shige@FreeBSD.ORG>.
+Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.mule b/editors/apel/pkg-descr.mule
index edfc415d8ee7..b630703376a0 100644
--- a/editors/apel/pkg-descr.mule
+++ b/editors/apel/pkg-descr.mule
@@ -26,7 +26,7 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
      - static: utility for static evaluation
 
   APEL is installed the following directory tree:
-	${LOCALBASE}/share/mule/site-lisp/apel/		--- apel
+	${LOCALBASE}/share/mule/19.34/site-lisp/apel/	--- apel
 	${LOCALBASE}/share/mule/19.34/site-lisp/emu/	--- emu
 
 
@@ -36,4 +36,4 @@ To use apel, put the following setup into your ~/.emacs:
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
---- Porting by shige <shige@FreeBSD.ORG>.
+Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-descr.xemacs21-mule b/editors/apel/pkg-descr.xemacs21-mule
index 343929cfa6e5..db04e866cb16 100644
--- a/editors/apel/pkg-descr.xemacs21-mule
+++ b/editors/apel/pkg-descr.xemacs21-mule
@@ -1,4 +1,4 @@
-A Portable Emacs Library for xemacs21-mule.
+A Portable Emacs Library.
 
 --- Emacs Library Porting
 
@@ -30,4 +30,4 @@ APEL is programed by MORIOKA Tomohiko <tomo@m17n.org>.
 
 WWW: http://cvs.m17n.org/elisp/APEL/index.en.html
 
---- Porting by shige <shige@FreeBSD.ORG>.
+Ported by shige@FreeBSD.ORG.
diff --git a/editors/apel/pkg-plist.emacs19 b/editors/apel/pkg-plist.emacs19
index 6e36cd992f32..cd7e901adf4a 100644
--- a/editors/apel/pkg-plist.emacs19
+++ b/editors/apel/pkg-plist.emacs19
@@ -1,56 +1,56 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.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/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/mcs-ltn1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-ltn1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-raw.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-raw.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/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/poem-ltn1.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-ltn1.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/timezone.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/timezone.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-ltn1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-ltn1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-raw.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-raw.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-ltn1.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-ltn1.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/%%APEL_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/pkg-plist.emacs20 b/editors/apel/pkg-plist.emacs20
index 363ab427191b..b4d0ceb85ce0 100644
--- a/editors/apel/pkg-plist.emacs20
+++ b/editors/apel/pkg-plist.emacs20
@@ -1,61 +1,61 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.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/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/mcs-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pccl-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.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/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/poem-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/pkg-plist.emacs21 b/editors/apel/pkg-plist.emacs21
index 363ab427191b..b4d0ceb85ce0 100644
--- a/editors/apel/pkg-plist.emacs21
+++ b/editors/apel/pkg-plist.emacs21
@@ -1,61 +1,61 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.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/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/mcs-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pccl-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-e20.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/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/poem-e20.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-e20_3.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-e20_3.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja
diff --git a/editors/apel/pkg-plist.mule b/editors/apel/pkg-plist.mule
index a0d7eecf4cc5..299f2b82f7a8 100644
--- a/editors/apel/pkg-plist.mule
+++ b/editors/apel/pkg-plist.mule
@@ -1,60 +1,60 @@
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/alist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.el
-%%EMACS_LIBDIR%%/site-lisp/apel/calist.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.el
-%%EMACS_LIBDIR%%/site-lisp/apel/filename.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/install.el
-%%EMACS_LIBDIR%%/site-lisp/apel/install.elc
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.el
-%%EMACS_LIBDIR%%/site-lisp/apel/path-util.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/apel-ver.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/emu.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/emu.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/inv-19.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/inv-19.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/mcs-om.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mcs-om.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.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/pccl-om.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pccl-om.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-om.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pces-om.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/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/poem-om.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/poem-om.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/product.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/pym.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/static.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/timezone.el
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/timezone.elc
-%%EMACS_LIBDIR_WITH_VER%%/site-lisp/%%APEL_SETUPEL%%
-@dirrm %%EMACS_LIBDIR%%/site-lisp/apel
-@dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/alist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/calist.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/filename.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/install.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.el
+%%EMACS_VERSION_SITE_LISPDIR%%/apel/path-util.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/apel-ver.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/broken.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu-mule.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/emu-mule.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-19.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/invisible.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcharset.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-om.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mcs-om.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/mule-caesar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-om.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pccl-om.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-om.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pces-om.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pcustom.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poe.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-om.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/poem-om.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/product.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/pym.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/richtext.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/static.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/timezone.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/%%APEL_SETUPEL%%
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/apel
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/emu
 %%APELDOCDIR%%/ChangeLog
 %%APELDOCDIR%%/README.en
 %%APELDOCDIR%%/README.ja