diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index f6117b752e7a..3cd4b6dfee26 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -1,47 +1,47 @@
 PORTNAME=	navi2ch
 PORTVERSION=	2.0.0.d
 PORTREVISION=	27
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	mce@FreeBSD.org
 COMMENT=	2ch.net and 2ch-like BBS navigator for Emacsen
 WWW=		https://navi2ch.sourceforge.net
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	proxy2ch:japanese/proxy2ch
 
 USES=		emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	naota
 GH_TAGNAME=	7811dba
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-icondir=${PREFIX}/${NICONDIR} \
+		--with-lispdir=${PREFIX}/${NLISPDIR}
 CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
-CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/${PORTNAME}
-PLIST_SUB=	LISPDIR=${LISPDIR}
-PORTDOCS=	${PORTDOC_FILES} contrib
 
 NO_ARCH=	yes
 
-INFO=		navi2ch
+INFO=		${PORTNAME}
+PLIST_SUB=	NICONDIR=${NICONDIR} NLISPDIR=${NLISPDIR}
+PORTDOCS=	${PORTDOC_FILES} contrib
 
 PORTDOC_FILES=	ChangeLog README TODO
 PORTDOC_LISPS=	gikope.el navi2ch-logo.el navi2ch-migemo.el
-LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
+NICONDIR=	${EMACS_LIBDIR_WITH_VER}/etc/${PORTNAME}/icons
+NLISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS X11
 X11_RUN_DEPENDS=${LOCALBASE}/share/fonts/mona/monak12.pcf.gz:japanese/font-mona
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && \
-	    ${INSTALL_DATA} ${PORTDOC_FILES} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib
-	cd ${WRKSRC}/contrib && \
-	    ${INSTALL_DATA} ${PORTDOC_LISPS} ${STAGEDIR}${DOCSDIR}/contrib
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \
+		"${PORTDOC_FILES} ${PORTDOC_LISPS:S,^,contrib/,}" \
+		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/navi2ch/pkg-plist b/japanese/navi2ch/pkg-plist
index b0f99a814186..4fae2f967ad1 100644
--- a/japanese/navi2ch/pkg-plist
+++ b/japanese/navi2ch/pkg-plist
@@ -1,73 +1,73 @@
-%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/plugged.xpm
-%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/unplugged.xpm
-%%LISPDIR%%/navi2ch/navi2ch-article.el
-%%LISPDIR%%/navi2ch/navi2ch-article.elc
-%%LISPDIR%%/navi2ch/navi2ch-articles.el
-%%LISPDIR%%/navi2ch/navi2ch-articles.elc
-%%LISPDIR%%/navi2ch/navi2ch-auto-modify.el
-%%LISPDIR%%/navi2ch/navi2ch-auto-modify.elc
-%%LISPDIR%%/navi2ch/navi2ch-be2ch.el
-%%LISPDIR%%/navi2ch/navi2ch-be2ch.elc
-%%LISPDIR%%/navi2ch/navi2ch-board-misc.el
-%%LISPDIR%%/navi2ch/navi2ch-board-misc.elc
-%%LISPDIR%%/navi2ch/navi2ch-board.el
-%%LISPDIR%%/navi2ch/navi2ch-board.elc
-%%LISPDIR%%/navi2ch/navi2ch-bookmark.el
-%%LISPDIR%%/navi2ch/navi2ch-bookmark.elc
-%%LISPDIR%%/navi2ch/navi2ch-config.el
-%%LISPDIR%%/navi2ch/navi2ch-directory.el
-%%LISPDIR%%/navi2ch/navi2ch-directory.elc
-%%LISPDIR%%/navi2ch/navi2ch-e21.el
-%%LISPDIR%%/navi2ch/navi2ch-e21.elc
-%%LISPDIR%%/navi2ch/navi2ch-face.el
-%%LISPDIR%%/navi2ch/navi2ch-face.elc
-%%LISPDIR%%/navi2ch/navi2ch-futaba.el
-%%LISPDIR%%/navi2ch/navi2ch-futaba.elc
-%%LISPDIR%%/navi2ch/navi2ch-head.el
-%%LISPDIR%%/navi2ch/navi2ch-head.elc
-%%LISPDIR%%/navi2ch/navi2ch-history.el
-%%LISPDIR%%/navi2ch/navi2ch-history.elc
-%%LISPDIR%%/navi2ch/navi2ch-http-date.el
-%%LISPDIR%%/navi2ch/navi2ch-http-date.elc
-%%LISPDIR%%/navi2ch/navi2ch-jbbs-net.el
-%%LISPDIR%%/navi2ch/navi2ch-jbbs-net.elc
-%%LISPDIR%%/navi2ch/navi2ch-jbbs-shitaraba.el
-%%LISPDIR%%/navi2ch/navi2ch-jbbs-shitaraba.elc
-%%LISPDIR%%/navi2ch/navi2ch-list.el
-%%LISPDIR%%/navi2ch/navi2ch-list.elc
-%%LISPDIR%%/navi2ch/navi2ch-localfile.el
-%%LISPDIR%%/navi2ch/navi2ch-localfile.elc
-%%LISPDIR%%/navi2ch/navi2ch-machibbs.el
-%%LISPDIR%%/navi2ch/navi2ch-machibbs.elc
-%%LISPDIR%%/navi2ch/navi2ch-megabbs.el
-%%LISPDIR%%/navi2ch/navi2ch-megabbs.elc
-%%LISPDIR%%/navi2ch/navi2ch-message.el
-%%LISPDIR%%/navi2ch/navi2ch-message.elc
-%%LISPDIR%%/navi2ch/navi2ch-mona.el
-%%LISPDIR%%/navi2ch/navi2ch-mona.elc
-%%LISPDIR%%/navi2ch/navi2ch-multibbs.el
-%%LISPDIR%%/navi2ch/navi2ch-multibbs.elc
-%%LISPDIR%%/navi2ch/navi2ch-net.el
-%%LISPDIR%%/navi2ch/navi2ch-net.elc
-%%LISPDIR%%/navi2ch/navi2ch-oyster.el
-%%LISPDIR%%/navi2ch/navi2ch-oyster.elc
-%%LISPDIR%%/navi2ch/navi2ch-popup-article.el
-%%LISPDIR%%/navi2ch/navi2ch-popup-article.elc
-%%LISPDIR%%/navi2ch/navi2ch-search.el
-%%LISPDIR%%/navi2ch/navi2ch-search.elc
-%%LISPDIR%%/navi2ch/navi2ch-splash.el
-%%LISPDIR%%/navi2ch/navi2ch-splash.elc
-%%LISPDIR%%/navi2ch/navi2ch-util.el
-%%LISPDIR%%/navi2ch/navi2ch-util.elc
-%%LISPDIR%%/navi2ch/navi2ch-vars.el
-%%LISPDIR%%/navi2ch/navi2ch-vars.elc
-%%LISPDIR%%/navi2ch/navi2ch-version.el
-%%LISPDIR%%/navi2ch/navi2ch-version.elc
-%%LISPDIR%%/navi2ch/navi2ch-xmas.el
-%%LISPDIR%%/navi2ch/navi2ch-xmas.elc
-%%LISPDIR%%/navi2ch/navi2ch.el
-%%LISPDIR%%/navi2ch/navi2ch.elc
-%%LISPDIR%%/navi2ch/navi2ch-p2.el
-%%LISPDIR%%/navi2ch/navi2ch-p2.elc
-%%LISPDIR%%/navi2ch/navi2ch-thumbnail.el
-%%LISPDIR%%/navi2ch/navi2ch-thumbnail.elc
+%%NICONDIR%%/plugged.xpm
+%%NICONDIR%%/unplugged.xpm
+%%NLISPDIR%%/navi2ch-article.el
+%%NLISPDIR%%/navi2ch-article.elc
+%%NLISPDIR%%/navi2ch-articles.el
+%%NLISPDIR%%/navi2ch-articles.elc
+%%NLISPDIR%%/navi2ch-auto-modify.el
+%%NLISPDIR%%/navi2ch-auto-modify.elc
+%%NLISPDIR%%/navi2ch-be2ch.el
+%%NLISPDIR%%/navi2ch-be2ch.elc
+%%NLISPDIR%%/navi2ch-board-misc.el
+%%NLISPDIR%%/navi2ch-board-misc.elc
+%%NLISPDIR%%/navi2ch-board.el
+%%NLISPDIR%%/navi2ch-board.elc
+%%NLISPDIR%%/navi2ch-bookmark.el
+%%NLISPDIR%%/navi2ch-bookmark.elc
+%%NLISPDIR%%/navi2ch-config.el
+%%NLISPDIR%%/navi2ch-directory.el
+%%NLISPDIR%%/navi2ch-directory.elc
+%%NLISPDIR%%/navi2ch-e21.el
+%%NLISPDIR%%/navi2ch-e21.elc
+%%NLISPDIR%%/navi2ch-face.el
+%%NLISPDIR%%/navi2ch-face.elc
+%%NLISPDIR%%/navi2ch-futaba.el
+%%NLISPDIR%%/navi2ch-futaba.elc
+%%NLISPDIR%%/navi2ch-head.el
+%%NLISPDIR%%/navi2ch-head.elc
+%%NLISPDIR%%/navi2ch-history.el
+%%NLISPDIR%%/navi2ch-history.elc
+%%NLISPDIR%%/navi2ch-http-date.el
+%%NLISPDIR%%/navi2ch-http-date.elc
+%%NLISPDIR%%/navi2ch-jbbs-net.el
+%%NLISPDIR%%/navi2ch-jbbs-net.elc
+%%NLISPDIR%%/navi2ch-jbbs-shitaraba.el
+%%NLISPDIR%%/navi2ch-jbbs-shitaraba.elc
+%%NLISPDIR%%/navi2ch-list.el
+%%NLISPDIR%%/navi2ch-list.elc
+%%NLISPDIR%%/navi2ch-localfile.el
+%%NLISPDIR%%/navi2ch-localfile.elc
+%%NLISPDIR%%/navi2ch-machibbs.el
+%%NLISPDIR%%/navi2ch-machibbs.elc
+%%NLISPDIR%%/navi2ch-megabbs.el
+%%NLISPDIR%%/navi2ch-megabbs.elc
+%%NLISPDIR%%/navi2ch-message.el
+%%NLISPDIR%%/navi2ch-message.elc
+%%NLISPDIR%%/navi2ch-mona.el
+%%NLISPDIR%%/navi2ch-mona.elc
+%%NLISPDIR%%/navi2ch-multibbs.el
+%%NLISPDIR%%/navi2ch-multibbs.elc
+%%NLISPDIR%%/navi2ch-net.el
+%%NLISPDIR%%/navi2ch-net.elc
+%%NLISPDIR%%/navi2ch-oyster.el
+%%NLISPDIR%%/navi2ch-oyster.elc
+%%NLISPDIR%%/navi2ch-popup-article.el
+%%NLISPDIR%%/navi2ch-popup-article.elc
+%%NLISPDIR%%/navi2ch-search.el
+%%NLISPDIR%%/navi2ch-search.elc
+%%NLISPDIR%%/navi2ch-splash.el
+%%NLISPDIR%%/navi2ch-splash.elc
+%%NLISPDIR%%/navi2ch-util.el
+%%NLISPDIR%%/navi2ch-util.elc
+%%NLISPDIR%%/navi2ch-vars.el
+%%NLISPDIR%%/navi2ch-vars.elc
+%%NLISPDIR%%/navi2ch-version.el
+%%NLISPDIR%%/navi2ch-version.elc
+%%NLISPDIR%%/navi2ch-xmas.el
+%%NLISPDIR%%/navi2ch-xmas.elc
+%%NLISPDIR%%/navi2ch.el
+%%NLISPDIR%%/navi2ch.elc
+%%NLISPDIR%%/navi2ch-p2.el
+%%NLISPDIR%%/navi2ch-p2.elc
+%%NLISPDIR%%/navi2ch-thumbnail.el
+%%NLISPDIR%%/navi2ch-thumbnail.elc