3 files changed, 126 insertions, 116 deletions
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 4d4a44059432..7067e3619d1c 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	namazu
 PORTVERSION=	2.0.16
+PORTREVISION=	1
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
diff --git a/databases/namazu2/files/patch-pl::conf.pl.in b/databases/namazu2/files/patch-pl::conf.pl.in
index 6026d4c1b8e3..56950bb6a373 100644
--- a/databases/namazu2/files/patch-pl::conf.pl.in
+++ b/databases/namazu2/files/patch-pl::conf.pl.in
@@ -1,5 +1,5 @@
 --- pl/conf.pl.in.orig	Fri Nov 25 15:04:26 2005
-+++ pl/conf.pl.in	Mon Mar 13 22:16:41 2006
++++ pl/conf.pl.in	Tue May  2 00:12:10 2006
 @@ -197,19 +197,19 @@
  #
  # Network Kanji Filter nkf v1.71 or later
@@ -23,13 +23,22 @@
  
  #
  # ChaSen 2.02 or later (with noun words extraction)
-@@ -224,7 +224,8 @@
+@@ -219,13 +219,14 @@
  #
- # Default Japanese processer: KAKASI or ChaSen.
+ # MeCab
+ #
+-$MECAB = "@DO_MECAB@";
++$MECAB = "module_mecab";
+ 
+ #
+-# Default Japanese processer: KAKASI or ChaSen.
++# Default Japanese processer: KAKASI or ChaSen or MeCab.
  #
 -$WAKATI  = $@OPT_WAKATI_DEFAULT@;
+-
 +$WAKATI  = $KAKASI;
 +$WAKATI  = $CHASEN;
- 
++$WAKATI  = $MECAB;
  
  #===================================================================
+ #
diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist
index 4745c3b837ae..6ca0d792713b 100644
--- a/databases/namazu2/pkg-plist
+++ b/databases/namazu2/pkg-plist
@@ -42,118 +42,118 @@ share/locale/es/LC_MESSAGES/namazu.mo
 share/locale/fr/LC_MESSAGES/namazu.mo
 share/locale/ja/LC_MESSAGES/namazu.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/namazu.mo
-%%PORTDOCS%%share/namazu/doc/en/manual.html
-%%PORTDOCS%%share/namazu/doc/en/nmz.html
-%%PORTDOCS%%share/namazu/doc/en/tips.html
-%%PORTDOCS%%share/namazu/doc/en/tutorial.html
-%%PORTDOCS%%@dirrm share/namazu/doc/en
-%%PORTDOCS%%share/namazu/doc/ja/manual.html
-%%PORTDOCS%%share/namazu/doc/ja/nmz.html
-%%PORTDOCS%%share/namazu/doc/ja/tips.html
-%%PORTDOCS%%share/namazu/doc/ja/tutorial.html
-%%PORTDOCS%%@dirrm share/namazu/doc/ja
-%%PORTDOCS%%share/namazu/doc/namazu.css
-%%PORTDOCS%%@dirrm share/namazu/doc
-share/namazu/etc/AUTHORS
-share/namazu/etc/COPYING
-share/namazu/etc/CREDITS
-share/namazu/etc/ChangeLog
-share/namazu/etc/ChangeLog.1
-share/namazu/etc/HACKING
-share/namazu/etc/HACKING-ja
-share/namazu/etc/INSTALL
-share/namazu/etc/INSTALL-ja
-share/namazu/etc/NEWS
-share/namazu/etc/README
-share/namazu/etc/README-es
-share/namazu/etc/README-ja
-share/namazu/etc/THANKS
-share/namazu/etc/TODO
-share/namazu/etc/namazu.png
-@dirrm share/namazu/etc
-share/namazu/filter/apachecache.pl
-share/namazu/filter/bzip2.pl
-share/namazu/filter/compress.pl
-share/namazu/filter/deb.pl
-share/namazu/filter/dvi.pl
-share/namazu/filter/excel.pl
-share/namazu/filter/gnumeric.pl
-share/namazu/filter/gzip.pl
-share/namazu/filter/hdml.pl
-share/namazu/filter/hnf.pl
-share/namazu/filter/html.pl
-share/namazu/filter/koffice.pl
-share/namazu/filter/macbinary.pl
-share/namazu/filter/mailnews.pl
-share/namazu/filter/man.pl
-share/namazu/filter/mhonarc.pl
-share/namazu/filter/mp3.pl
-share/namazu/filter/msword.pl
-share/namazu/filter/ooo.pl
-share/namazu/filter/pdf.pl
-share/namazu/filter/pipermail.pl
-share/namazu/filter/postscript.pl
-share/namazu/filter/powerpoint.pl
-share/namazu/filter/rfc.pl
-share/namazu/filter/rpm.pl
-share/namazu/filter/rtf.pl
-share/namazu/filter/taro.pl
-share/namazu/filter/taro56.pl
-share/namazu/filter/taro7_10.pl
-share/namazu/filter/tex.pl
-share/namazu/filter/zip.pl
-@dirrm share/namazu/filter
-share/namazu/pl/codeconv.pl
-share/namazu/pl/conf.pl
-share/namazu/pl/document.pl
-share/namazu/pl/filter.pl
-share/namazu/pl/gettext.pl
-share/namazu/pl/gfilter.pl
-share/namazu/pl/htmlsplit.pl
-share/namazu/pl/nmzidx.pl
-share/namazu/pl/seed.pl
-share/namazu/pl/time.pl
-share/namazu/pl/usage.pl
-share/namazu/pl/util.pl
-share/namazu/pl/var.pl
-share/namazu/pl/wakati.pl
-@dirrm share/namazu/pl
-share/namazu/template/NMZ.body
-share/namazu/template/NMZ.body.es
-share/namazu/template/NMZ.body.fr
-share/namazu/template/NMZ.body.ja
-share/namazu/template/NMZ.body.pl
-share/namazu/template/NMZ.foot
-share/namazu/template/NMZ.foot.de
-share/namazu/template/NMZ.foot.es
-share/namazu/template/NMZ.foot.fr
-share/namazu/template/NMZ.foot.ja
-share/namazu/template/NMZ.foot.pl
-share/namazu/template/NMZ.head
-share/namazu/template/NMZ.head.de
-share/namazu/template/NMZ.head.es
-share/namazu/template/NMZ.head.fr
-share/namazu/template/NMZ.head.ja
-share/namazu/template/NMZ.head.pl
-share/namazu/template/NMZ.result.normal
-share/namazu/template/NMZ.result.normal.de
-share/namazu/template/NMZ.result.normal.es
-share/namazu/template/NMZ.result.normal.fr
-share/namazu/template/NMZ.result.normal.ja
-share/namazu/template/NMZ.result.normal.pl
-share/namazu/template/NMZ.result.short
-share/namazu/template/NMZ.result.short.de
-share/namazu/template/NMZ.result.short.es
-share/namazu/template/NMZ.result.short.fr
-share/namazu/template/NMZ.result.short.ja
-share/namazu/template/NMZ.result.short.pl
-share/namazu/template/NMZ.tips
-share/namazu/template/NMZ.tips.es
-share/namazu/template/NMZ.tips.fr
-share/namazu/template/NMZ.tips.ja
-share/namazu/template/NMZ.tips.pl
-@dirrm share/namazu/template
-@dirrm share/namazu
+%%PORTDOCS%%%%DATADIR%%/doc/en/manual.html
+%%PORTDOCS%%%%DATADIR%%/doc/en/nmz.html
+%%PORTDOCS%%%%DATADIR%%/doc/en/tips.html
+%%PORTDOCS%%%%DATADIR%%/doc/en/tutorial.html
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc/en
+%%PORTDOCS%%%%DATADIR%%/doc/ja/manual.html
+%%PORTDOCS%%%%DATADIR%%/doc/ja/nmz.html
+%%PORTDOCS%%%%DATADIR%%/doc/ja/tips.html
+%%PORTDOCS%%%%DATADIR%%/doc/ja/tutorial.html
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc/ja
+%%PORTDOCS%%%%DATADIR%%/doc/namazu.css
+%%PORTDOCS%%@dirrm %%DATADIR%%/doc
+%%DATADIR%%/etc/AUTHORS
+%%DATADIR%%/etc/COPYING
+%%DATADIR%%/etc/CREDITS
+%%DATADIR%%/etc/ChangeLog
+%%DATADIR%%/etc/ChangeLog.1
+%%DATADIR%%/etc/HACKING
+%%DATADIR%%/etc/HACKING-ja
+%%DATADIR%%/etc/INSTALL
+%%DATADIR%%/etc/INSTALL-ja
+%%DATADIR%%/etc/NEWS
+%%DATADIR%%/etc/README
+%%DATADIR%%/etc/README-es
+%%DATADIR%%/etc/README-ja
+%%DATADIR%%/etc/THANKS
+%%DATADIR%%/etc/TODO
+%%DATADIR%%/etc/namazu.png
+@dirrm %%DATADIR%%/etc
+%%DATADIR%%/filter/apachecache.pl
+%%DATADIR%%/filter/bzip2.pl
+%%DATADIR%%/filter/compress.pl
+%%DATADIR%%/filter/deb.pl
+%%DATADIR%%/filter/dvi.pl
+%%DATADIR%%/filter/excel.pl
+%%DATADIR%%/filter/gnumeric.pl
+%%DATADIR%%/filter/gzip.pl
+%%DATADIR%%/filter/hdml.pl
+%%DATADIR%%/filter/hnf.pl
+%%DATADIR%%/filter/html.pl
+%%DATADIR%%/filter/koffice.pl
+%%DATADIR%%/filter/macbinary.pl
+%%DATADIR%%/filter/mailnews.pl
+%%DATADIR%%/filter/man.pl
+%%DATADIR%%/filter/mhonarc.pl
+%%DATADIR%%/filter/mp3.pl
+%%DATADIR%%/filter/msword.pl
+%%DATADIR%%/filter/ooo.pl
+%%DATADIR%%/filter/pdf.pl
+%%DATADIR%%/filter/pipermail.pl
+%%DATADIR%%/filter/postscript.pl
+%%DATADIR%%/filter/powerpoint.pl
+%%DATADIR%%/filter/rfc.pl
+%%DATADIR%%/filter/rpm.pl
+%%DATADIR%%/filter/rtf.pl
+%%DATADIR%%/filter/taro.pl
+%%DATADIR%%/filter/taro56.pl
+%%DATADIR%%/filter/taro7_10.pl
+%%DATADIR%%/filter/tex.pl
+%%DATADIR%%/filter/zip.pl
+@dirrm %%DATADIR%%/filter
+%%DATADIR%%/pl/codeconv.pl
+%%DATADIR%%/pl/conf.pl
+%%DATADIR%%/pl/document.pl
+%%DATADIR%%/pl/filter.pl
+%%DATADIR%%/pl/gettext.pl
+%%DATADIR%%/pl/gfilter.pl
+%%DATADIR%%/pl/htmlsplit.pl
+%%DATADIR%%/pl/nmzidx.pl
+%%DATADIR%%/pl/seed.pl
+%%DATADIR%%/pl/time.pl
+%%DATADIR%%/pl/usage.pl
+%%DATADIR%%/pl/util.pl
+%%DATADIR%%/pl/var.pl
+%%DATADIR%%/pl/wakati.pl
+@dirrm %%DATADIR%%/pl
+%%DATADIR%%/template/NMZ.body
+%%DATADIR%%/template/NMZ.body.es
+%%DATADIR%%/template/NMZ.body.fr
+%%DATADIR%%/template/NMZ.body.ja
+%%DATADIR%%/template/NMZ.body.pl
+%%DATADIR%%/template/NMZ.foot
+%%DATADIR%%/template/NMZ.foot.de
+%%DATADIR%%/template/NMZ.foot.es
+%%DATADIR%%/template/NMZ.foot.fr
+%%DATADIR%%/template/NMZ.foot.ja
+%%DATADIR%%/template/NMZ.foot.pl
+%%DATADIR%%/template/NMZ.head
+%%DATADIR%%/template/NMZ.head.de
+%%DATADIR%%/template/NMZ.head.es
+%%DATADIR%%/template/NMZ.head.fr
+%%DATADIR%%/template/NMZ.head.ja
+%%DATADIR%%/template/NMZ.head.pl
+%%DATADIR%%/template/NMZ.result.normal
+%%DATADIR%%/template/NMZ.result.normal.de
+%%DATADIR%%/template/NMZ.result.normal.es
+%%DATADIR%%/template/NMZ.result.normal.fr
+%%DATADIR%%/template/NMZ.result.normal.ja
+%%DATADIR%%/template/NMZ.result.normal.pl
+%%DATADIR%%/template/NMZ.result.short
+%%DATADIR%%/template/NMZ.result.short.de
+%%DATADIR%%/template/NMZ.result.short.es
+%%DATADIR%%/template/NMZ.result.short.fr
+%%DATADIR%%/template/NMZ.result.short.ja
+%%DATADIR%%/template/NMZ.result.short.pl
+%%DATADIR%%/template/NMZ.tips
+%%DATADIR%%/template/NMZ.tips.es
+%%DATADIR%%/template/NMZ.tips.fr
+%%DATADIR%%/template/NMZ.tips.ja
+%%DATADIR%%/template/NMZ.tips.pl
+@dirrm %%DATADIR%%/template
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/es/LC_MESSAGES
 @dirrmtry share/locale/fr/LC_MESSAGES
 @dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES