Update namazu2 package to 2.0.10.

o Move content of MESSAGE int INSTALL and add note for external
  supporting programs.
o Cope with update wv and xlhtml package.  (Fix has sent to
  namazu-users-ja mailing list.)
o Official change from NEWS file are bellow:

Overview of Changes in Namazu 2.0.10 - Dec 27, 2001

* Fix another cross-site scripting vulnerability.
* Fix possibility of buffer overflow.

9 files changed, 206 insertions, 40 deletions

diff --git a/japanese/namazu2/INSTALL b/japanese/namazu2/INSTALL
index 2e22e491665..6036ac1f130 100644
--- a/japanese/namazu2/INSTALL
+++ b/japanese/namazu2/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2001/10/31 23:29:26 zuntum Exp $
+# $NetBSD: INSTALL,v 1.2 2001/12/28 10:32:49 taca Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -12,10 +12,46 @@ POST-INSTALL)
 	cat <<EOF
 
 =============================================================
-If you customize namazu configuration, copy
-@EXAMPLEDIR@/share/namazu/namazurc.default and
-@EXAMPLEDIR@/mknmzrc.default to @CONFDIR@,
-and edit them.
+1. If you customize namazu configuration, copy
+   @EXAMPLEDIR@/share/namazu/namazurc.default and
+   @EXAMPLEDIR@/mknmzrc.default to @CONFDIR@,
+   and edit them.
+
+2. Since index file format is differnet from namazu 1.X, you need to
+   rebuild index files if you upgrade from namazu 1.X.
+
+3. In order to processing Japanese, you need to set "LC_ALL", "LANG"
+   or "LC_CTYPE" environment to "ja".  Or use --indexing-lang option
+   of mknmz.
+
+4. In order to display Japanese message, you need to set "LANGUAGE",
+   "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja".
+
+5. Because of lack of locale support, you need to set "PERL_BADLANG"
+   for perl to stop the warning on NetBSD 1.5.X and before.
+   On NetBSD current (1.6 or later), you don't need to set
+   "PERL_BADLANG" but "LC_LANG" environment.
+
+6. If you want to make index of bellow file type, please install
+   appropriate package.
+
+	Adobe PDF			xpdf
+	Adobe PostScript		ghostscript
+	JustSystem Ichitaro		DocCat
+	Microsoft Excel			xlHtml or DocCat
+	Microsoft PowerPoint		xlHtml or DocCat
+	Microsoft Word			wv or DocCat
+	Redhat RPM			rpm
+	TeX source			detex
+	TeX dvi				dvi2tty 
+
+   For handling non-English language, you might need lv and/or nkf
+   package, too.
+
+   DocCat is a commercial product from Dehenken Limited and it dosen't
+   provided as NetBSD package (yet?).
+   See http://www.dehenken.co.jp/english/doccat.html in detail.
+
 =============================================================
 
 EOF
diff --git a/japanese/namazu2/MESSAGE b/japanese/namazu2/MESSAGE
deleted file mode 100644
index c882bfcfbfd..00000000000
--- a/japanese/namazu2/MESSAGE
+++ /dev/null
@@ -1,21 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2001/11/27 14:46:22 taca Exp $
-
-*WARNING*:
-
-1. Since index file format is differnet from namazu 1.X, you need to
-   rebuild index files if you upgrade from namazu 1.X.
-
-2. In order to processing Japanese, you need to set "LC_ALL", "LANG"
-   or "LC_CTYPE" environment to "ja".  Or use --indexing-lang option
-   of mknmz.
-
-3. In order to display Japanese message, you need to set "LANGUAGE",
-   "LC_ALL", "LC_MESSAGES" or "LANG" environment to "ja".
-
-4. Because of lack of locale support, you need to set "PERL_BADLANG"
-   for perl to stop the warning on NetBSD 1.5.X and before.
-   On NetBSD current (1.6 or later), you don't need to set
-   "PERL_BADLANG" but "LC_LANG" environment.
-
-===========================================================================
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index c0c7679ac81..f1e44f17154 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/11/30 13:34:15 taca Exp $
+# $NetBSD: Makefile,v 1.11 2001/12/28 10:32:50 taca Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
-DISTNAME=	namazu-2.0.9
+DISTNAME=	namazu-2.0.10
 CATEGORIES=	japanese textproc www
 MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
 		http://www.namazu.org/stable/
@@ -51,5 +51,8 @@ post-install:
 	@${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
 	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
+test:
+	@cd ${WRKSRC}; make check
+
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo
index 3eab61694da..5581d7974ff 100644
--- a/japanese/namazu2/distinfo
+++ b/japanese/namazu2/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.7 2001/11/30 13:34:15 taca Exp $
+$NetBSD: distinfo,v 1.8 2001/12/28 10:32:50 taca Exp $
 
-SHA1 (namazu-2.0.9.tar.gz) = 8d4dd69178acc123a1c8575f6a13b88a26b33eb7
-Size (namazu-2.0.9.tar.gz) = 831578 bytes
+SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8
+Size (namazu-2.0.10.tar.gz) = 833838 bytes
 SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
-SHA1 (patch-ab) = 92e64af4b94f88ddea605d5b21064f33fff00798
+SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f
 SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737
 SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701
 SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4
 SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef
-SHA1 (patch-al) = 6f7317274461c254843f0a53b9f34c1bf54147ad
+SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7
+SHA1 (patch-am) = 9759805f7440a1183f58539eda43c55fc0cc26fa
+SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20
+SHA1 (patch-ao) = f3ff4fc586b019b8b1e2932704203245761e8d3c
diff --git a/japanese/namazu2/patches/patch-ab b/japanese/namazu2/patches/patch-ab
index 6a31bccb872..263c40e30c7 100644
--- a/japanese/namazu2/patches/patch-ab
+++ b/japanese/namazu2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/01/27 02:29:25 taca Exp $
+$NetBSD: patch-ab,v 1.2 2001/12/28 10:32:50 taca Exp $
 
---- conf/Makefile.in.orig	Mon Oct 23 14:58:41 2000
+--- conf/Makefile.in.orig	Thu Dec 27 14:06:04 2001
 +++ conf/Makefile.in
-@@ -111,10 +111,10 @@
+@@ -117,10 +117,10 @@
  
  AUTOMAKE_OPTIONS = 1.4 no-dependencies
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/01/27 02:29:25 taca Exp $
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
-@@ -238,7 +238,10 @@
+@@ -244,7 +244,10 @@
  maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
  
diff --git a/japanese/namazu2/patches/patch-al b/japanese/namazu2/patches/patch-al
index 8ac0c8c6b76..9db6d7aff09 100644
--- a/japanese/namazu2/patches/patch-al
+++ b/japanese/namazu2/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2001/09/24 03:56:02 taca Exp $
+$NetBSD: patch-al,v 1.2 2001/12/28 10:32:50 taca Exp $
 
---- scripts/mknmz.in.orig	Wed Aug 22 15:16:20 2001
+--- scripts/mknmz.in.orig	Sun Nov 25 18:28:58 2001
 +++ scripts/mknmz.in
-@@ -179,6 +179,8 @@
+@@ -176,6 +176,8 @@
      my $processed_num = 0;
      my $file_size = util::filesize($cfile);
  
diff --git a/japanese/namazu2/patches/patch-am b/japanese/namazu2/patches/patch-am
new file mode 100644
index 00000000000..d397e88a97c
--- /dev/null
+++ b/japanese/namazu2/patches/patch-am
@@ -0,0 +1,38 @@
+$NetBSD: patch-am,v 1.1 2001/12/28 10:32:50 taca Exp $
+
+--- filter/excel.pl.orig	Fri Dec 15 14:37:41 2000
++++ filter/excel.pl
+@@ -26,6 +26,7 @@
+ 
+ package excel;
+ use strict;
++use File::Basename;
+ use File::Copy;
+ require 'util.pl';
+ require 'gfilter.pl';
+@@ -33,13 +34,15 @@
+ 
+ my $xlconvpath  = undef;
+ my $utfconvpath = undef;
++my $convname = undef;
+ 
+ sub mediatype() {
+     return ('application/excel');
+ }
+ 
+ sub status() {
+-    $xlconvpath = util::checkcmd('xlHtml');
++    $xlconvpath = util::checkcmd('xlhtml') or util::checkcmd('xlHtml');
++    $convname = basename($xlconvpath);
+ #    return 'no' unless defined $xlconvpath;
+     if (defined $xlconvpath) {
+ 	if (!util::islang("ja")) {
+@@ -83,7 +86,7 @@
+       = @_;
+     my $err = undef;
+ 
+-    if (util::checkcmd('xlHtml')) {
++    if ($convname =~ /xlhtml/i) {
+     $err = filter_xl($orig_cfile, $cont, $weighted_str, $headings, $fields);
+     } else {
+     $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
diff --git a/japanese/namazu2/patches/patch-an b/japanese/namazu2/patches/patch-an
new file mode 100644
index 00000000000..37e1e1f5aef
--- /dev/null
+++ b/japanese/namazu2/patches/patch-an
@@ -0,0 +1,69 @@
+$NetBSD: patch-an,v 1.1 2001/12/28 10:32:50 taca Exp $
+
+--- filter/msword.pl.orig	Fri Jul 13 10:14:26 2001
++++ filter/msword.pl
+@@ -25,6 +25,7 @@
+ 
+ package msword;
+ use strict;
++use File::Basename;
+ use File::Copy;
+ require 'util.pl';
+ require 'gfilter.pl';
+@@ -33,6 +34,7 @@
+ my $wordconvpath  = undef;
+ my $utfconvpath   = undef;
+ my $wvversionpath = undef;
++my $wordconvname = undef;
+ 
+ sub mediatype() {
+     return ('application/msword');
+@@ -80,7 +82,10 @@
+       = @_;
+     my $err = undef;
+  
+-    if (util::checkcmd('wvHtml')) {
++    if (not defined $wordconvname) {
++	$wordconvname = basename($wordconvpath);
++    }
++    if ($wordconvname =~ /wvhtml/i) {
+     $err = filter_wv($orig_cfile, $cont, $weighted_str, $headings, $fields);
+     } else { 
+     $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);
+@@ -95,7 +100,7 @@
+ 
+     my $tmpfile  = util::tmpnam('NMZ.word');
+     my $tmpfile2 = util::tmpnam('NMZ.word2');
+-
++    my ($ofile, $tpath, $options, $version);
+ 
+     if (util::islang("ja")) {
+     }
+@@ -107,8 +112,17 @@
+ 	print $fh $$cont;
+     }
+ 
++    $version = `$wordconvpath --version 2>/dev/null`;
++    chomp $version;
++    if ($version ne "" and $version !~ /usage/i and $version ge "0.7") {
++	($ofile, $tpath) = fileparse($tmpfile2);
++	$options = "--targetdir=$tpath";
++    } else {
++	$ofile = $tmpfile2;
++    }
++
+     if (!util::islang("ja")) {
+-	system("$wordconvpath $tmpfile $tmpfile2");
++	system("$wordconvpath $options $tmpfile $ofile");
+     } else {
+ 	my $version = "unknown";
+ 	my $supported = undef;
+@@ -125,7 +139,7 @@
+ 	    }
+ 	}
+ 	return _("Unsupported format: ") .  $version unless $supported;
+-	system("$wordconvpath $tmpfile $tmpfile2");
++	system("$wordconvpath $options $tmpfile $ofile");
+         system("$utfconvpath -Iu8 -Oej $tmpfile2 > $tmpfile");
+ 	unlink($tmpfile2);
+ 	rename($tmpfile, $tmpfile2);
diff --git a/japanese/namazu2/patches/patch-ao b/japanese/namazu2/patches/patch-ao
new file mode 100644
index 00000000000..4295dc35646
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ao
@@ -0,0 +1,38 @@
+$NetBSD: patch-ao,v 1.1 2001/12/28 10:32:50 taca Exp $
+
+--- filter/powerpoint.pl.orig	Tue Dec 26 13:59:01 2000
++++ filter/powerpoint.pl
+@@ -25,6 +25,7 @@
+ 
+ package powerpoint;
+ use strict;
++use File::Basename;
+ use File::Copy;
+ require 'util.pl';
+ require 'gfilter.pl';
+@@ -32,13 +33,15 @@
+ 
+ my $pptconvpath  = undef;
+ my $utfconvpath = undef;
++my $pptconvname = undef;
+ 
+ sub mediatype() {
+     return ('application/powerpoint');
+ }
+ 
+ sub status() {
+-	$pptconvpath = util::checkcmd('pptHtml');
++	$pptconvpath = util::checkcmd('ppthtml') or util::checkcmd('pptHtml');
++	$pptconvname = basename($pptconvpath);
+ #	return 'no' unless defined $pptconvpath
+ 	if (defined $pptconvpath) {
+ 		if (!util::islang("ja")) {
+@@ -82,7 +85,7 @@
+       = @_;
+     my $err = undef;
+ 
+-    if (util::checkcmd('pptHtml')) {
++    if ($pptconvname =~ /ppthtml/i) {
+     $err = filter_ppt($orig_cfile, $cont, $weighted_str, $headings, $fields);
+     } else {
+     $err = filter_doccat($orig_cfile, $cont, $weighted_str, $headings, $fields);