4 files changed, 59 insertions, 47 deletions

diff --git a/japanese/navi2ch-emacs20/Makefile b/japanese/navi2ch-emacs20/Makefile
index f884d8b6d16f..adb457c998cf 100644
--- a/japanese/navi2ch-emacs20/Makefile
+++ b/japanese/navi2ch-emacs20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	011030
+PORTREVISION?=	1
 CATEGORIES=	japanese www elisp
 MASTER_SITES=	http://www.geocities.co.jp/SiliconValley-Oakland/7673/lisp/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -16,13 +17,17 @@ MAINTAINER=	sf@FreeBSD.org
 EMACS_PORT_NAME?=	emacs20
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${EMACS_LIBDIR}/site-lisp/navi2ch
+CONFIGURE_ARGS=	--with-lispdir=${PREFIX}/${LISPDIR}/navi2ch
 
 DOCDIR=		share/doc/ja/navi2ch
-.if ${EMACS_PORT_NAME} == emacs20
-PLIST_SUB=	XEMACS="@comment "
-.elif ${EMACS_PORT_NAME} == xemacs21-mule
-PLIST_SUB=	XEMACS=""
+PLIST_SUB=	LISPDIR=${LISPDIR}
+
+.if ${EMACS_PORT_NAME} == xemacs21-mule
+LISPDIR=	${EMACS_SITE_LISPDIR}
+PLIST_SUB+=	FSF="@comment " 
+.else
+LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}
+PLIST_SUB+=	FSF=""
 .endif
 
 post-install:
diff --git a/japanese/navi2ch-emacs20/pkg-message b/japanese/navi2ch-emacs20/pkg-message
index 2d7f672a892e..ca2dded84e41 100644
--- a/japanese/navi2ch-emacs20/pkg-message
+++ b/japanese/navi2ch-emacs20/pkg-message
@@ -2,12 +2,16 @@ To use navi2ch, put the following into ~/.emacs.
 
 (require 'navi2ch)
 
-To use monafonts with Xemacs, put
+To use monafonts with FSF Emacs-21 or Xemacs, put
 
-(require 'navi2ch-mona)
-(add-hook 'navi2ch-article-arrange-message-hook
-           'navi2ch-mona-arrange-message)
+(cond
+ ((and (eq window-system 'x)
+       (or (featurep 'xemacs)
+	   (and (boundp 'emacs-major-version)
+		(>= emacs-major-version 21))))
+  (require 'navi2ch-mona)
+  (add-hook 'navi2ch-article-arrange-message-hook
+	    'navi2ch-mona-arrange-message)
+  (setq navi2ch-mona-enable t)))
 
-into ~/.xemacs and set board name to be viewed with monafonts.
-
-(setq navi2ch-mona-enable-board-list '("mona" "prog"))
+into ~/.navi2ch/init.el. 
diff --git a/japanese/navi2ch-emacs20/pkg-plist b/japanese/navi2ch-emacs20/pkg-plist
index 452edbe81a7c..88fbdf8fcaaf 100644
--- a/japanese/navi2ch-emacs20/pkg-plist
+++ b/japanese/navi2ch-emacs20/pkg-plist
@@ -2,38 +2,39 @@
 %%PORTDOCS%%share/doc/ja/navi2ch/README
 %%PORTDOCS%%share/doc/ja/navi2ch/TODO
 %%PORTDOCS%%@dirrm share/doc/ja/navi2ch
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-article.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-article.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-articles.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-articles.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-board-misc.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-board-misc.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-board.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-board.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-bookmark.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-bookmark.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-face.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-face.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-head.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-head.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-history.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-history.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-list.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-list.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-message.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-message.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-mona.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-mona.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-net.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-net.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-popup-article.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-popup-article.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-search.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-search.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-util.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-util.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-vars.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch-vars.elc
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch.el
-%%EMACS_LIBDIR%%/site-lisp/navi2ch/navi2ch.elc
-@dirrm %%EMACS_LIBDIR%%/site-lisp/navi2ch
+%%LISPDIR%%/navi2ch/navi2ch-article.el
+%%LISPDIR%%/navi2ch/navi2ch-article.elc
+%%LISPDIR%%/navi2ch/navi2ch-articles.el
+%%LISPDIR%%/navi2ch/navi2ch-articles.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-face.el
+%%LISPDIR%%/navi2ch/navi2ch-face.elc
+%%LISPDIR%%/navi2ch/navi2ch-head.el
+%%LISPDIR%%/navi2ch/navi2ch-head.elc
+%%LISPDIR%%/navi2ch/navi2ch-history.el
+%%LISPDIR%%/navi2ch/navi2ch-history.elc
+%%LISPDIR%%/navi2ch/navi2ch-list.el
+%%LISPDIR%%/navi2ch/navi2ch-list.elc
+%%LISPDIR%%/navi2ch/navi2ch-message.el
+%%LISPDIR%%/navi2ch/navi2ch-message.elc
+%%LISPDIR%%/navi2ch/navi2ch-mona.el
+%%LISPDIR%%/navi2ch/navi2ch-mona.elc
+%%LISPDIR%%/navi2ch/navi2ch-net.el
+%%LISPDIR%%/navi2ch/navi2ch-net.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-util.el
+%%LISPDIR%%/navi2ch/navi2ch-util.elc
+%%LISPDIR%%/navi2ch/navi2ch-vars.el
+%%LISPDIR%%/navi2ch/navi2ch-vars.elc
+%%LISPDIR%%/navi2ch/navi2ch.el
+%%LISPDIR%%/navi2ch/navi2ch.elc
+@dirrm %%LISPDIR%%/navi2ch
+%%FSF%%@unexec rmdir %D/%%LISPDIR%% 2>/dev/null || true
diff --git a/japanese/navi2ch-xemacs21-mule/Makefile b/japanese/navi2ch-xemacs21-mule/Makefile
index 20e1ebc53a9e..eb9ee2943dc2 100644
--- a/japanese/navi2ch-xemacs21-mule/Makefile
+++ b/japanese/navi2ch-xemacs21-mule/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	0
+
 MASTERDIR=	${.CURDIR}/../navi2ch-emacs20
 
 EMACS_PORT_NAME=	xemacs21-mule