o Some bugfix for namazu-2.0.6;

	- make sure to install a header file, score.h
	- correct some strcmp() condition.
o Catch up MESSAGE to namazu 2.0.6.
o Correct PLIST.

These fix namazu-2.0.6 package updating to namazu-2.0.6nb1.

6 files changed, 73 insertions, 16 deletions

diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index d5216134637..b409b36536b 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/08/14 16:19:24 taca Exp $
+# $NetBSD: Makefile,v 1.6 2001/08/21 14:01:18 taca Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
 DISTNAME=	namazu-2.0.6
+PKGNAME=	${DISTNAME}nb1
 CATEGORIES=	japanese textproc www
 MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
 		http://www.namazu.org/stable/
diff --git a/japanese/namazu2/distinfo b/japanese/namazu2/distinfo
index b872b410bc9..6a498cf1bea 100644
--- a/japanese/namazu2/distinfo
+++ b/japanese/namazu2/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/08/14 16:19:24 taca Exp $
+$NetBSD: distinfo,v 1.4 2001/08/21 14:01:18 taca Exp $
 
 SHA1 (namazu-2.0.6.tar.gz) = d2fa5b326da628af9fe279c4f26261795b463707
 Size (namazu-2.0.6.tar.gz) = 829209 bytes
 SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
 SHA1 (patch-ab) = 92e64af4b94f88ddea605d5b21064f33fff00798
+SHA1 (patch-ac) = ad28a080b2d77863cf24fbc702f013245b3b7dda
+SHA1 (patch-ad) = 95c897675de2e4a1914b6bc55e34d40c9b168505
+SHA1 (patch-ae) = 881944e91b497f87ef241201b206c2d5ce2b65fd
diff --git a/japanese/namazu2/patches/patch-ad b/japanese/namazu2/patches/patch-ad
new file mode 100644
index 00000000000..4a37a15a18f
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/08/21 14:01:19 taca Exp $
+
+--- nmz/Makefile.in.orig	Fri Aug 10 09:38:15 2001
++++ nmz/Makefile.in
+@@ -133,7 +133,7 @@
+ INCLUDES = -I$(srcdir) -I.. -I$(srcdir)/../lib -I$(srcdir)/../src 	-I$(srcdir)/../intl -I$(srcdir)/../nmz
+ 
+ 
+-pkginclude_HEADERS = codeconv.h field.h hlist.h i18n.h idxname.h 	libnamazu.h l10n-ja.h parser.h query.h re.h regex.h 	search.h util.h var.h wakati.h 
++pkginclude_HEADERS = codeconv.h field.h hlist.h i18n.h idxname.h 	libnamazu.h l10n-ja.h parser.h query.h re.h regex.h 	search.h util.h var.h wakati.h score.h
+ 
+ lib_LTLIBRARIES = libnmz.la
+ 
diff --git a/japanese/namazu2/patches/patch-ae b/japanese/namazu2/patches/patch-ae
new file mode 100644
index 00000000000..e00edefb78e
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2001/08/21 14:01:19 taca Exp $
+
+--- nmz/l10n-ja.c.orig	Thu Jun 21 15:21:32 2001
++++ nmz/l10n-ja.c
+@@ -47,13 +47,13 @@
+     const char *lang;
+ 
+     lang = nmz_get_lang_ctype();
+-    if (strcmp(lang, "japanese")) {
++    if (strcmp(lang, "japanese") == 0) {
+ 	return 1; /* TRUE */
+     } 
+-    if (strcmp(lang, "ja")) {
++    if (strcmp(lang, "ja") == 0) {
+ 	return 1; /* TRUE */
+     } 
+-    if (strncmp(lang, "ja_JP", 5)) {
++    if (strncmp(lang, "ja_JP", 5) == 0) {
+ 	return 1; /* TRUE */
+     } 
+     return 0; /* FALSE */
diff --git a/japanese/namazu2/pkg/MESSAGE b/japanese/namazu2/pkg/MESSAGE
index 556e4640a8f..c02510f51d1 100644
--- a/japanese/namazu2/pkg/MESSAGE
+++ b/japanese/namazu2/pkg/MESSAGE
@@ -1,13 +1,18 @@
-$NetBSD: MESSAGE,v 1.3 2001/02/18 15:31:31 taca Exp $
+$NetBSD: MESSAGE,v 1.4 2001/08/21 14:01:19 taca Exp $
 
 *WARNING*:
 
-1. Index file format has changed since namazu 2.0.
-   If you upgrade from namazu 1.X, you need to rebuild index
-   files at least.
+1. Index file format has changed since namazu 2.0.  If you upgrade
+   from namazu 1.X, you need to rebuild index files.
 
-2. In order to processing Japanese, you need to set "LANG",
-   "LC_ALL", "LC_MESSAGES" or "LANGUAGE" environment to "ja".
-   Because of lack of locale support, you could only use
-   "LANGUAGE" environment.  This restriction is hoped to
-   remove feature NetBSD release.
+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/pkg/PLIST b/japanese/namazu2/pkg/PLIST
index 399373e9a69..dde2bf8a352 100644
--- a/japanese/namazu2/pkg/PLIST
+++ b/japanese/namazu2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/27 02:29:24 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/08/21 14:01:19 taca Exp $
 bin/bnamazu
 bin/gcnmz
 bin/kwnmz
@@ -22,6 +22,7 @@ include/namazu/parser.h
 include/namazu/query.h
 include/namazu/re.h
 include/namazu/regex.h
+include/namazu/score.h
 include/namazu/search.h
 include/namazu/util.h
 include/namazu/var.h
@@ -30,8 +31,8 @@ include/namazu/wakati.h
 lib/libnmz.a
 lib/libnmz.la
 lib/libnmz.so
-lib/libnmz.so.4
-lib/libnmz.so.4.2
+lib/libnmz.so.5
+lib/libnmz.so.5.0
 @exec /bin/mkdir %D/libdata/namazu 2>/dev/null|| /usr/bin/true
 @exec /bin/mkdir %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
 @dirrm libdata/namazu/index
@@ -55,20 +56,31 @@ share/namazu/doc/ja/tutorial.html
 @dirrm share/namazu/doc/ja
 share/namazu/doc/namazu.css
 @dirrm share/namazu/doc
+share/namazu/etc/AUTHORS
 share/namazu/etc/CREDITS
+share/namazu/etc/COPYING
+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
-share/namazu/etc/namazu.spec
-share/namazu/etc/namazu.spec.in
 @dirrm share/namazu/etc
 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/gfilter.pl
 share/namazu/filter/gzip.pl
+share/namazu/filter/hdml.pl
 share/namazu/filter/hnf.pl
 share/namazu/filter/html.pl
 share/namazu/filter/mailnews.pl
@@ -76,8 +88,10 @@ share/namazu/filter/man.pl
 share/namazu/filter/mhonarc.pl
 share/namazu/filter/msword.pl
 share/namazu/filter/pdf.pl
+share/namazu/filter/postscript.pl
 share/namazu/filter/powerpoint.pl
 share/namazu/filter/rfc.pl
+share/namazu/filter/rpm.pl
 share/namazu/filter/taro.pl
 share/namazu/filter/tex.pl
 @dirrm share/namazu/filter