* Change lisp directory from EMACS_SITE_LISPDIR to EMACS_VERSION_SITE_LISPDIR.

* Bump PORTREVISION because of plist change.

PR:		228719
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>

2 files changed, 59 insertions, 58 deletions

diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 4b9243a019b9..68f4e8aac32d 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apel
 PORTVERSION=	${APEL_VER}
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/apel/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
@@ -20,7 +20,8 @@ NO_ARCH=	yes
 APEL_VER=	10.8
 ALL_TARGET=	elc
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}" \
-		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}"
+		LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" \
+		VERSION_SPECIFIC_LISPDIR="${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/editors/apel/pkg-plist b/editors/apel/pkg-plist
index ef30f7292adf..69f1bdb50a02 100644
--- a/editors/apel/pkg-plist
+++ b/editors/apel/pkg-plist
@@ -1,59 +1,59 @@
-%%EMACS_SITE_LISPDIR%%/apel/alist.el
-%%EMACS_SITE_LISPDIR%%/apel/alist.elc
-%%EMACS_SITE_LISPDIR%%/apel/calist.el
-%%EMACS_SITE_LISPDIR%%/apel/calist.elc
-%%EMACS_SITE_LISPDIR%%/apel/filename.el
-%%EMACS_SITE_LISPDIR%%/apel/filename.elc
-%%EMACS_SITE_LISPDIR%%/apel/install.el
-%%EMACS_SITE_LISPDIR%%/apel/install.elc
-%%EMACS_SITE_LISPDIR%%/apel/path-util.el
-%%EMACS_SITE_LISPDIR%%/apel/path-util.elc
-%%EMACS_SITE_LISPDIR%%/emu/apel-ver.el
-%%EMACS_SITE_LISPDIR%%/emu/apel-ver.elc
-%%EMACS_SITE_LISPDIR%%/emu/broken.el
-%%EMACS_SITE_LISPDIR%%/emu/broken.elc
-%%EMACS_SITE_LISPDIR%%/emu/emu.el
-%%EMACS_SITE_LISPDIR%%/emu/emu.elc
-%%EMACS_SITE_LISPDIR%%/emu/inv-23.el
-%%EMACS_SITE_LISPDIR%%/emu/inv-23.elc
-%%EMACS_SITE_LISPDIR%%/emu/invisible.el
-%%EMACS_SITE_LISPDIR%%/emu/invisible.elc
-%%EMACS_SITE_LISPDIR%%/emu/mcharset.el
-%%EMACS_SITE_LISPDIR%%/emu/mcharset.elc
-%%EMACS_SITE_LISPDIR%%/emu/mcs-20.el
-%%EMACS_SITE_LISPDIR%%/emu/mcs-20.elc
-%%EMACS_SITE_LISPDIR%%/emu/mcs-e20.el
-%%EMACS_SITE_LISPDIR%%/emu/mcs-e20.elc
-%%EMACS_SITE_LISPDIR%%/emu/mule-caesar.el
-%%EMACS_SITE_LISPDIR%%/emu/mule-caesar.elc
-%%EMACS_SITE_LISPDIR%%/emu/pccl.el
-%%EMACS_SITE_LISPDIR%%/emu/pccl.elc
-%%EMACS_SITE_LISPDIR%%/emu/pccl-20.el
-%%EMACS_SITE_LISPDIR%%/emu/pccl-20.elc
-%%EMACS_SITE_LISPDIR%%/emu/pces.el
-%%EMACS_SITE_LISPDIR%%/emu/pces.elc
-%%EMACS_SITE_LISPDIR%%/emu/pces-20.el
-%%EMACS_SITE_LISPDIR%%/emu/pces-20.elc
-%%EMACS_SITE_LISPDIR%%/emu/pces-e20.el
-%%EMACS_SITE_LISPDIR%%/emu/pces-e20.elc
-%%EMACS_SITE_LISPDIR%%/emu/pcustom.el
-%%EMACS_SITE_LISPDIR%%/emu/pcustom.elc
-%%EMACS_SITE_LISPDIR%%/emu/poe.el
-%%EMACS_SITE_LISPDIR%%/emu/poe.elc
-%%EMACS_SITE_LISPDIR%%/emu/poem.el
-%%EMACS_SITE_LISPDIR%%/emu/poem.elc
-%%EMACS_SITE_LISPDIR%%/emu/poem-e20.el
-%%EMACS_SITE_LISPDIR%%/emu/poem-e20.elc
-%%EMACS_SITE_LISPDIR%%/emu/poem-e20_3.el
-%%EMACS_SITE_LISPDIR%%/emu/poem-e20_3.elc
-%%EMACS_SITE_LISPDIR%%/emu/product.el
-%%EMACS_SITE_LISPDIR%%/emu/product.elc
-%%EMACS_SITE_LISPDIR%%/emu/pym.el
-%%EMACS_SITE_LISPDIR%%/emu/pym.elc
-%%EMACS_SITE_LISPDIR%%/emu/richtext.el
-%%EMACS_SITE_LISPDIR%%/emu/richtext.elc
-%%EMACS_SITE_LISPDIR%%/emu/static.el
-%%EMACS_SITE_LISPDIR%%/emu/static.elc
+%%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-23.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emu/inv-23.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
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.en
 %%PORTDOCS%%%%DOCSDIR%%/README.ja