Update to 10.2.

Use EMACS_PORT_NAME and other related variables defined in bsd.emacs.mk.

2 files changed, 44 insertions, 47 deletions

diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index dd2842b8a084..4062df0cbbb8 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -13,11 +13,7 @@ PORTCLASS=	slave
 MASTERDIR=	${.CURDIR}/../../editors/apel-emacs
 
 # emacs port setup
-EMACS_NAME=	emacs
-EMACS_PORT=	emacs20
-EMACS_VER=	20.6
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
+EMACS_PORT_NAME=	emacs20
 
 # use pkg/* files in ${.CURDIR}
 PKGDIR=		${.CURDIR}/pkg
diff --git a/editors/apel-emacs20/pkg-plist b/editors/apel-emacs20/pkg-plist
index 296db5f55dac..fdddc2c7fd1c 100644
--- a/editors/apel-emacs20/pkg-plist
+++ b/editors/apel-emacs20/pkg-plist
@@ -3,53 +3,54 @@
 %%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/mule-caesar.el
-%%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/mcharset.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcharset.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/mcs-e20.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-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pccl-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-20.elc
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.el
-%%EMACS_LIBDIR%%/%%EMACS_VER%%/site-lisp/emu/pces-e20.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-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
+%%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/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-e20.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/mule-caesar.el
+%%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/static.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/static.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/emu/richtext.elc
 @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