diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 7ba6a8c9247d..a09b4ef16609 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,58 +1,58 @@
 # Created by: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 # $FreeBSD$
 
 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}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	SEMI, Library of MIME feature for GNU Emacs for emacs
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR} \
 		nkf:japanese/nkf
 RUN_DEPENDS=	flim${EMACS_PKGNAMESUFFIX}>0:editors/flim@${EMACS_FLAVOR}
 
 USES=		emacs makeinfo
 
 NO_ARCH=	yes
 
 FLIM_TRUNK=	1.14
 SEMI_VER=	${SEMI_TRUNK}.6
 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
 
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.texi mime-ui-ja.texi; do \
 		${CAT} $${i} | nkf -e > $${i}.jis ; \
 		${MAKEINFO} --no-split --no-validate $${i}.jis ; \
 	done)
 
 post-install:
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-en.info mime-ui-ja.info; do \
 		${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${PREFIX}/info ; \
 	done)
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} ; \
 	for i in ChangeLog NEWS README.* TODO VERSION ; do \
 		${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/ ; \
 	done)
 
 .include <bsd.port.mk>
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,48 +1,46 @@
-%%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
 %%PORTDOCS%%%%DOCSDIR%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/VERSION