* Change lisp directory from EMACS_SITE_LISPDIR to EMACS_VERSION_SITE_LISPDIR.

* Remove unnecessary @rmtry from pkg-plist.
* Bump PORTREVISION because of plist change.

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

2 files changed, 42 insertions, 44 deletions

diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 7ba6a8c9247d..a09b4ef16609 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	semi
 PORTVERSION=	${SEMI_VER}
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	editors elisp
 MASTER_SITES=	http://git.chise.org/elisp/dist/semi/semi-1.14-for-flim-1.14/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
@@ -28,7 +28,7 @@ SEMI_TRUNK=	1.14
 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}${EMACS_VERSION_SITE_LISPDIR}"
 
 INFO=		mime-ui-en mime-ui-ja
diff --git a/editors/semi/pkg-plist b/editors/semi/pkg-plist
index 47d19ee55814..72005c440419 100644
--- a/editors/semi/pkg-plist
+++ b/editors/semi/pkg-plist
@@ -1,45 +1,43 @@
-%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.el
-%%EMACS_SITE_LISPDIR%%/semi/mail-mime-setup.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.el
-@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-bbdb.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-edit.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-edit.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-image.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-image.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-partial.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-partial.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-pgp.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-play.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-play.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-setup.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-setup.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-view.el
-%%EMACS_SITE_LISPDIR%%/semi/mime-view.elc
-%%EMACS_SITE_LISPDIR%%/semi/mime-w3.el
-@rmtry %%EMACS_SITE_LISPDIR%%/semi/mime-w3.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg-def.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg-def.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg-gpg.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg-parse.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg-pgp5.elc
-%%EMACS_SITE_LISPDIR%%/semi/pgg.el
-%%EMACS_SITE_LISPDIR%%/semi/pgg.elc
-%%EMACS_SITE_LISPDIR%%/semi/postpet.el
-%%EMACS_SITE_LISPDIR%%/semi/postpet.elc
-%%EMACS_SITE_LISPDIR%%/semi/semi-def.el
-%%EMACS_SITE_LISPDIR%%/semi/semi-def.elc
-%%EMACS_SITE_LISPDIR%%/semi/semi-setup.el
-%%EMACS_SITE_LISPDIR%%/semi/semi-setup.elc
-%%EMACS_SITE_LISPDIR%%/semi/signature.el
-%%EMACS_SITE_LISPDIR%%/semi/signature.elc
-%%EMACS_SITE_LISPDIR%%/semi/smime.el
-%%EMACS_SITE_LISPDIR%%/semi/smime.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mail-mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-bbdb.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-image.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-partial.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-pgp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-play.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-view.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/mime-w3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-gpg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-parse.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg-pgp5.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/pgg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/postpet.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-def.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/semi-setup.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/signature.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.el
+%%EMACS_VERSION_SITE_LISPDIR%%/semi/smime.elc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.en