2 files changed, 3 insertions, 62 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 0da1c8e5ae3e..87989925e75c 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -48,6 +48,9 @@ MAKE_ARGS+=	PREFIX="${LOCALBASE}" \
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || (${EMACS_PORT_NAME} == "emacs22")
+PLIST=		${PKGDIR}/pkg-plist.emacs20
+.endif
 # 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_NAME}
diff --git a/editors/apel/pkg-plist.emacs21 b/editors/apel/pkg-plist.emacs21
deleted file mode 100644
index b4d0ceb85ce0..000000000000
--- a/editors/apel/pkg-plist.emacs21
+++ /dev/null
@@ -1,62 +0,0 @@
-%%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
-@dirrm %%APELDOCDIR%%