3 files changed, 23 insertions, 41 deletions

diff --git a/japanese/navi2ch-emacs20/Makefile b/japanese/navi2ch-emacs20/Makefile
index d4151f620e29..83b9adcb7e5d 100644
--- a/japanese/navi2ch-emacs20/Makefile
+++ b/japanese/navi2ch-emacs20/Makefile
@@ -19,39 +19,30 @@ MAINTAINER=	sf@FreeBSD.org
 EMACS_PORT_NAME?=	emacs20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
+CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/navi2ch \
+		--with-emacs=${EMACS_CMD}
 
 DOCDIR=		share/doc/ja/navi2ch
-PACKAGESDIR=	lib/xemacs/site-packages
-PLIST_SUB=	LISPDIR=${LISPDIR} \
-		ETCDIR=${ETCDIR} \
-		INFODIR=${INFODIR}
-
-LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
-ETCDIR=		${EMACS_LIBDIR_WITH_VER}/etc/navi2ch
-INFODIR=	info
+PLIST_SUB=	LISPDIR=${LISPDIR}
 
 .if ${EMACS_PORT_NAME} == xemacs21-mule
-LISPDIR=	${PACKAGESDIR}/lisp
-ETCDIR=		${PACKAGESDIR}/etc/navi2ch
-INFODIR=	${PACKAGESDIR}/info
+LISPDIR=	${EMACS_SITE_LISPDIR}
 PLIST_SUB+=	FSF="@comment "
-CONFIGURE_ARGS+=--with-packagedir=${PREFIX}/${PACKAGESDIR}
 .else
+LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
 PLIST_SUB+=	FSF=""
-CONFIGURE_ARGS+=--with-lispdir=${PREFIX}/${LISPDIR}/navi2ch \
-		--with-icondir=${PREFIX}/${ETCDIR}
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/${DOCDIR}
+.if !defined(NOPORTDOCS)
 .for i in ChangeLog README TODO
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR}
 .endfor
 .endif
+	@${MKDIR} ${PREFIX}/${DOCDIR}/contrib
 .for i in gikope.el navi2ch-logo.el navi2ch-migemo.el
-	${INSTALL_DATA} ${WRKSRC}/contrib/$i ${PREFIX}/${LISPDIR}/navi2ch
+	${INSTALL_DATA} ${WRKSRC}/contrib/$i ${PREFIX}/${DOCDIR}/contrib
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/navi2ch-emacs20/files/patch-navi2ch-vars.el b/japanese/navi2ch-emacs20/files/patch-navi2ch-vars.el
deleted file mode 100644
index 35ab31882ec0..000000000000
--- a/japanese/navi2ch-emacs20/files/patch-navi2ch-vars.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- navi2ch-vars.el.orig	Fri Jul 26 22:55:11 2002
-+++ navi2ch-vars.el	Mon Jul 29 12:35:07 2002
-@@ -832,7 +832,7 @@
- (defcustom navi2ch-icon-directory
-   (cond ((fboundp 'locate-data-directory)
- 	 (locate-data-directory "navi2ch"))
--	((let ((icons (expand-file-name "navi2ch/icons/"
-+	((let ((icons (expand-file-name "navi2ch/"
- 					data-directory)))
- 	   (if (file-directory-p icons)
- 	       icons)))
diff --git a/japanese/navi2ch-emacs20/pkg-plist b/japanese/navi2ch-emacs20/pkg-plist
index b86ca1ae0623..f4d9d0befcc2 100644
--- a/japanese/navi2ch-emacs20/pkg-plist
+++ b/japanese/navi2ch-emacs20/pkg-plist
@@ -1,17 +1,21 @@
-@unexec install-info --delete %D/%%INFODIR%%/navi2ch.info %D/%%INFODIR%%/dir
-%%INFODIR%%/navi2ch.info
-@exec install-info %D/%%INFODIR%%/navi2ch.info %D/%%INFODIR%%/dir
+@unexec install-info --delete %D/info/navi2ch.info %D/info/dir
+info/navi2ch.info
+@exec install-info %D/info/navi2ch.info %D/info/dir
 %%PORTDOCS%%share/doc/ja/navi2ch/ChangeLog
 %%PORTDOCS%%share/doc/ja/navi2ch/README
 %%PORTDOCS%%share/doc/ja/navi2ch/TODO
-%%PORTDOCS%%@dirrm share/doc/ja/navi2ch
-%%ETCDIR%%/navi2ch-logo.img
-%%ETCDIR%%/navi2ch-logo.xbm
-%%ETCDIR%%/navi2ch-logo.xpm
-%%ETCDIR%%/plugged.xpm
-%%ETCDIR%%/unplugged.xpm
-@dirrm %%ETCDIR%%
-%%LISPDIR%%/navi2ch/gikope.el
+share/doc/ja/navi2ch/contrib/gikope.el
+share/doc/ja/navi2ch/contrib/navi2ch-logo.el
+share/doc/ja/navi2ch/contrib/navi2ch-migemo.el
+@dirrm share/doc/ja/navi2ch/contrib
+@dirrm share/doc/ja/navi2ch
+%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/navi2ch-logo.img
+%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/navi2ch-logo.xbm
+%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/navi2ch-logo.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/plugged.xpm
+%%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons/unplugged.xpm
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch/icons
+@dirrm %%EMACS_LIBDIR_WITH_VER%%/etc/navi2ch
 %%LISPDIR%%/navi2ch/navi2ch-article.el
 %%LISPDIR%%/navi2ch/navi2ch-article.elc
 %%LISPDIR%%/navi2ch/navi2ch-articles.el
@@ -42,12 +46,10 @@
 %%LISPDIR%%/navi2ch/navi2ch-list.elc
 %%LISPDIR%%/navi2ch/navi2ch-localfile.el
 %%LISPDIR%%/navi2ch/navi2ch-localfile.elc
-%%LISPDIR%%/navi2ch/navi2ch-logo.el
 %%LISPDIR%%/navi2ch/navi2ch-machibbs.el
 %%LISPDIR%%/navi2ch/navi2ch-machibbs.elc
 %%LISPDIR%%/navi2ch/navi2ch-message.el
 %%LISPDIR%%/navi2ch/navi2ch-message.elc
-%%LISPDIR%%/navi2ch/navi2ch-migemo.el
 %%LISPDIR%%/navi2ch/navi2ch-mona.el
 %%LISPDIR%%/navi2ch/navi2ch-mona.elc
 %%LISPDIR%%/navi2ch/navi2ch-multibbs.el