update to 1.6.0.

o use packages for XEmacs.
o install contrib's(not precompiled).

5 files changed, 48 insertions, 19 deletions

diff --git a/japanese/navi2ch-emacs20/Makefile b/japanese/navi2ch-emacs20/Makefile
index e46cde2102e8..134b4f9313a3 100644
--- a/japanese/navi2ch-emacs20/Makefile
+++ b/japanese/navi2ch-emacs20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	navi2ch
-PORTVERSION=	1.5.2
+PORTVERSION=	1.6.0
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,18 +18,28 @@ MAINTAINER=	sf@FreeBSD.org
 EMACS_PORT_NAME?=	emacs20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/navi2ch \
-		--with-emacs=${EMACS_CMD}
+CONFIGURE_ARGS=	--with-emacs=${EMACS_CMD}
 
 DOCDIR=		share/doc/ja/navi2ch
-PLIST_SUB=	LISPDIR=${LISPDIR}
+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
 
 .if ${EMACS_PORT_NAME} == xemacs21-mule
-LISPDIR=	${EMACS_SITE_LISPDIR}
+LISPDIR=	${PACKAGESDIR}/lisp
+ETCDIR=		${PACKAGESDIR}/etc/navi2ch
+INFODIR=	${PACKAGESDIR}/info
 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:
@@ -39,5 +49,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR}
 .endfor
 .endif
+.for i in gikope.el navi2ch-logo.el navi2ch-migemo.el
+	${INSTALL_DATA} ${WRKSRC}/contrib/$i ${PREFIX}/${LISPDIR}/navi2ch
+.endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/navi2ch-emacs20/distinfo b/japanese/navi2ch-emacs20/distinfo
index 38016c33f7d2..865ea7312838 100644
--- a/japanese/navi2ch-emacs20/distinfo
+++ b/japanese/navi2ch-emacs20/distinfo
@@ -1 +1 @@
-MD5 (navi2ch-1.5.2.tar.gz) = bb555e17f5c60d1f8108ccb1beae6226
+MD5 (navi2ch-1.6.0.tar.gz) = 651c78b1713bc915aad33958564c5a85
diff --git a/japanese/navi2ch-emacs20/pkg-comment b/japanese/navi2ch-emacs20/pkg-comment
index b8da26e56bfa..f0cd4c71a456 100644
--- a/japanese/navi2ch-emacs20/pkg-comment
+++ b/japanese/navi2ch-emacs20/pkg-comment
@@ -1 +1 @@
-2ch.net client for Emacsen
+2ch.net and 2ch-like BBS navigator for Emacsen
diff --git a/japanese/navi2ch-emacs20/pkg-descr b/japanese/navi2ch-emacs20/pkg-descr
index 9c5febc2040c..67905ba3b677 100644
--- a/japanese/navi2ch-emacs20/pkg-descr
+++ b/japanese/navi2ch-emacs20/pkg-descr
@@ -1,3 +1,3 @@
-Navi2ch, a 2ch.net client for Emacsen.
+Navi2ch, a 2ch.net and 2ch-like BBS navigator for Emacsen.
 
 WWW: http://navi2ch.sourceforge.net
diff --git a/japanese/navi2ch-emacs20/pkg-plist b/japanese/navi2ch-emacs20/pkg-plist
index 760bdee265d6..b86ca1ae0623 100644
--- a/japanese/navi2ch-emacs20/pkg-plist
+++ b/japanese/navi2ch-emacs20/pkg-plist
@@ -1,17 +1,17 @@
-@unexec install-info --delete %D/info/navi2ch.info %D/info/dir
-info/navi2ch.info
-@exec install-info %D/info/navi2ch.info %D/info/dir
+@unexec install-info --delete %D/%%INFODIR%%/navi2ch.info %D/%%INFODIR%%/dir
+%%INFODIR%%/navi2ch.info
+@exec install-info %D/%%INFODIR%%/navi2ch.info %D/%%INFODIR%%/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
-%%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
+%%ETCDIR%%/navi2ch-logo.img
+%%ETCDIR%%/navi2ch-logo.xbm
+%%ETCDIR%%/navi2ch-logo.xpm
+%%ETCDIR%%/plugged.xpm
+%%ETCDIR%%/unplugged.xpm
+@dirrm %%ETCDIR%%
+%%LISPDIR%%/navi2ch/gikope.el
 %%LISPDIR%%/navi2ch/navi2ch-article.el
 %%LISPDIR%%/navi2ch/navi2ch-article.elc
 %%LISPDIR%%/navi2ch/navi2ch-articles.el
@@ -22,6 +22,8 @@ info/navi2ch.info
 %%LISPDIR%%/navi2ch/navi2ch-board.elc
 %%LISPDIR%%/navi2ch/navi2ch-bookmark.el
 %%LISPDIR%%/navi2ch/navi2ch-bookmark.elc
+%%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
@@ -30,12 +32,26 @@ info/navi2ch.info
 %%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-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
+%%LISPDIR%%/navi2ch/navi2ch-multibbs.elc
 %%LISPDIR%%/navi2ch/navi2ch-net.el
 %%LISPDIR%%/navi2ch/navi2ch-net.elc
 %%LISPDIR%%/navi2ch/navi2ch-popup-article.el