Update namazu2 package to 2.0.14 fixing XSS security problem.

* pkgsrc changes:

	- simplify Makefile's structure.
	- utilize bsd.pkg.install.mk's framework.

* chages:

2004-12-15  Tadamasa Teranishi  <yw3t-trns at asahi-net.or.jp>

	* Namazu: Version 2.0.14 released.

2004-12-13  Tadamasa Teranishi  <yw3t-trns at asahi-net.or.jp>

	* doc/{ja, en}/tutorial.html: update.

	* NEWS: updated.

2004-12-08  Tadamasa Teranishi  <yw3t-trns at asahi-net.or.jp>

        * src/form.c: Correction for JVN#904429FE.

        * configure.in (Module): AC_INIT(namazu, 2.0.14)

        * src/form.c: Fix bug.

        * man/{mknmz, namazu}.1: update man.

16 files changed, 228 insertions, 141 deletions

diff --git a/textproc/namazu2/DEINSTALL b/textproc/namazu2/DEINSTALL
deleted file mode 100644
index 3bfdfc9fec3..00000000000
--- a/textproc/namazu2/DEINSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
-#
-
-case "$2" in
-	DEINSTALL) cat <<EOF
-
-=============================================================
-Note that namazu configuration (@CONFDIR@/*), index
-files (@DATADIR@/*) are not removed in the
-de-installation process.  You should remove those by hand,
-if you no longer need them.
-=============================================================
-
-EOF
-	;;
-esac
diff --git a/textproc/namazu2/INSTALL b/textproc/namazu2/MESSAGE
index fd63eda4842..3f62c1bc7c8 100644
--- a/textproc/namazu2/INSTALL
+++ b/textproc/namazu2/MESSAGE
@@ -1,22 +1,13 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.4 2004/05/06 13:40:21 taca Exp $
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/12/15 13:09:58 taca Exp $
 
-PKGNAME=$1
-STAGE=$2
+Here is general notes for namazu2 package by pkgsrc.
 
-case ${STAGE} in
-POST-INSTALL)
-	cat <<EOF
+1. If you customize namazu configuration, please edit "mknmzrc" file
+   in ${PKG_SYSCONFDIR} directory.
 
-=============================================================
-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.
+2. if you upgrade from namazu 1.X, you need to rebuild index files
+   since index file format was changed from namazu prior to 2.0.
 
 3. In order to processing Japanese, you need to set "LC_ALL", "LANG"
    or "LC_CTYPE" environment to "ja".  Or use --indexing-lang option
@@ -25,8 +16,8 @@ POST-INSTALL)
 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.
+5. If perl display locale related warnings, you need to set
+   "PERL_BADLANG" environment.
 
 6. Special notes for perl 5.8.1 users:  Please set environment
    PERL_HASH_SEED as 0.
@@ -50,9 +41,4 @@ POST-INSTALL)
    DocCat is a commercial product from Dehenken Limited.
    See http://www.dehenken.co.jp/products/doccat/doccat.html in detail.
 
-=============================================================
-
-EOF
-	;;
-esac
-exit 0
+===========================================================================
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
index 0bdc41faa33..18819659fb7 100644
--- a/textproc/namazu2/Makefile
+++ b/textproc/namazu2/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:18:20 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/15 13:09:58 taca Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
-DISTNAME=	namazu-2.0.13-1
-PKGNAME=	namazu-2.0.13
-PKGREVISION=	1
+DISTNAME=	namazu-2.0.14
 CATEGORIES=	japanese textproc www
-MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
-		http://www.namazu.org/stable/
+MASTER_SITES=	http://www.namazu.org/stable/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.namazu.org/index.html.en
@@ -15,46 +12,43 @@ COMMENT=	Full-text search system intended for easy use
 DEPENDS+=	p5-File-MMagic>=1.09:../../misc/p5-File-MMagic
 DEPENDS+=	p5-Text-Kakasi>=1.04:../../textproc/p5-Text-Kakasi
 DEPENDS+=	p5-nkf>=1.7:../../converters/p5-nkf
-.if !defined(WITH_CHASEN) || ${WITH_CHASEN} != NO
 DEPENDS+=	p5-Text-ChaSen>=1.0:../../textproc/p5-Text-ChaSen
-.endif
 
-WRKSRC=			${WRKDIR}/namazu-2.0.13
-CONFIGURE_ARGS+=	--localstatedir=${LOCALBASE}/libdata \
-			--libexecdir=${LOCALBASE}/libexec/cgi-bin
-.if defined(WITH_CHASEN) && ${WITH_CHASEN} == NO
-CONFIGURE_ARGS+=	-without-chasen
-.else
-CONFIGURE_ARGS+=	-with-chasen
-.endif
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
+CONFLICTS+=	namazu-[0-9]*
 
 USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	# defined
-USE_PERL5=		# defined
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+USE_PKGLOCALEDIR=	yes
+USE_PKGINSTALL=		yes
+USE_PERL5=		run
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 TEST_TARGET=		check
 
-CONFLICTS+=	namazu-[0-9]*
+CONFIGURE_ARGS+= 	--localstatedir=${DATADIR} \
+			--libexecdir=${PREFIX}/libexec/cgi-bin \
+			--sysconfdir=${PKG_SYSCONFBASE} \
+			--with-chasen
+
+DATADIR=		${PREFIX}/libdata
+EXAMPLESDIR=		${PREFIX}/share/examples/namazu
+EXAMPLES=		mknmzrc namazurc
+
+.include "../../mk/bsd.prefs.mk"
 
-post-build:
-	@for FILE in \
-		${PKGDIR}/DEINSTALL	\
-		${PKGDIR}/INSTALL;	\
-	do \
-		${SED}	-e 's|@CONFDIR@|${LOCALBASE}/etc/namazu|g' \
-			-e 's|@DATADIR@|${LOCALBASE}/libdata/namazu|g' \
-			-e 's|@EXAMPLEDIR@|${LOCALBASE}/share/namazu|g' \
-			< $${FILE} > ${WRKDIR}/`basename $${FILE}`; \
-	done
+PKG_SYSCONFSUBDIR?=	namazu
+.for f in ${EXAMPLES}
+CONF_FILES+=		${EXAMPLESDIR}/namazu/$f	${PKG_SYSCONFDIR}/$f
+.endfor
+MAKE_DIRS+=		${DATADIR}/namazu/index
+OWN_DIRS+=		${PKG_SYSCONFDIR} ${DATADIR}/namazu
 
 post-install:
-	@${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
-	@${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	${INSTALL_DATA_DIR} ${DATADIR}/namazu
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+.for f in ${EXAMPLES}
+	cd ${WRKSRC}/conf; ${INSTALL_DATA} $f-sample ${EXAMPLESDIR}/$f
+.endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/textproc/namazu2/PLIST b/textproc/namazu2/PLIST
index c23ba7f795c..80d4f58bd43 100644
--- a/textproc/namazu2/PLIST
+++ b/textproc/namazu2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:55 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/12/15 13:09:58 taca Exp $
 bin/adnmz
 bin/bnamazu
 bin/gcnmz
@@ -12,8 +12,6 @@ bin/nmzgrep
 bin/nmzmerge
 bin/rfnmz
 bin/vfnmz
-@exec ${MKDIR} %D/etc/namazu 2>/dev/null|| /usr/bin/true
-@dirrm etc/namazu
 include/namazu/codeconv.h
 include/namazu/field.h
 include/namazu/hlist.h
@@ -32,10 +30,6 @@ include/namazu/var.h
 include/namazu/wakati.h
 @dirrm include/namazu
 lib/libnmz.la
-@exec ${MKDIR} %D/libdata/namazu 2>/dev/null|| /usr/bin/true
-@exec ${MKDIR} %D/libdata/namazu/index 2>/dev/null || /usr/bin/true
-@dirrm libdata/namazu/index
-@dirrm libdata/namazu
 libexec/cgi-bin/namazu.cgi
 man/man1/mknmz.1
 man/man1/namazu.1
@@ -68,6 +62,9 @@ share/namazu/etc/THANKS
 share/namazu/etc/TODO
 share/namazu/etc/namazu.png
 @dirrm share/namazu/etc
+share/examples/namazu/mknmzrc
+share/examples/namazu/namazurc
+@dirrm share/examples/namazu
 share/namazu/filter/apachecache.pl
 share/namazu/filter/bzip2.pl
 share/namazu/filter/compress.pl
@@ -96,8 +93,6 @@ share/namazu/filter/taro56.pl
 share/namazu/filter/taro7_10.pl
 share/namazu/filter/tex.pl
 @dirrm share/namazu/filter
-share/namazu/mknmzrc.example
-share/namazu/namazurc.example
 share/namazu/pl/codeconv.pl
 share/namazu/pl/conf.pl
 share/namazu/pl/gettext.pl
diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo
index 3ccd6df7ad0..fabab8bdbdb 100644
--- a/textproc/namazu2/distinfo
+++ b/textproc/namazu2/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.5 2004/05/06 13:40:21 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/12/15 13:09:58 taca Exp $
 
-SHA1 (namazu-2.0.13-1.tar.gz) = 1ec8e20e12293fc008371afee98c3165dbe4017e
-Size (namazu-2.0.13-1.tar.gz) = 1046889 bytes
-SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
-SHA1 (patch-ab) = 0643872e5681ca99373a2059e0b520405c62a807
+SHA1 (namazu-2.0.14.tar.gz) = 6515d1a1ed5156ea569aed0b95eb5212b2c24dc3
+Size (namazu-2.0.14.tar.gz) = 1032273 bytes
+SHA1 (patch-ab) = 5052026e67ffb0a235c8a4ba996cb4438bf7b622
+SHA1 (patch-ac) = fcb47a8433f2784f2420835a11a06d8421a25c18
+SHA1 (patch-ad) = 3707beb6136f50512cf3ab4535e978aa198d112e
+SHA1 (patch-ae) = bcd438ddcf06e6356fd04955724b539426018c41
+SHA1 (patch-af) = b9c722b372935cbca017f706c7c7a6372fbfbc69
+SHA1 (patch-ag) = 6de0499048e452a3109106d06e4bd1fdfd537ca7
+SHA1 (patch-ah) = fce8c1489d09225f9c1a402efed55f33956799a7
+SHA1 (patch-ai) = 54c60dbfda316e5777d1234dc32b739f368e3f25
+SHA1 (patch-aj) = 55076b0fbf4eb7a7b67d6214a63b9bcdb02bf2a1
+SHA1 (patch-ak) = 1d2edc78e144f9d0fe127dedc8fa3262a4f0683d
diff --git a/textproc/namazu2/patches/patch-aa b/textproc/namazu2/patches/patch-aa
deleted file mode 100644
index e7f9b71103b..00000000000
--- a/textproc/namazu2/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
-
---- conf/Makefile.am.orig	Fri Feb 25 23:04:36 2000
-+++ conf/Makefile.am
-@@ -1,9 +1,12 @@
- AUTOMAKE_OPTIONS = 1.4 no-dependencies
- 
--confdir = $(sysconfdir)/$(PACKAGE)
--conf_DATA  = namazurc-sample mknmzrc-sample
-+confdir = $(pkgdatadir)
-+conf_DATA  = namazurc.example mknmzrc.example
- EXTRA_DIST = namazurc-sample
--CLEANFILES = mknmzrc-sample
-+CLEANFILES = namazurc.example mknmzrc.example
- 
--mknmzrc-sample: ../pl/conf.pl
-+namazurc.example: namazurc-sample
-+	@cp -p $? $@
-+
-+mknmzrc.example: ../pl/conf.pl
- 	perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
diff --git a/textproc/namazu2/patches/patch-ab b/textproc/namazu2/patches/patch-ab
index 2c7250fc20f..7282d758947 100644
--- a/textproc/namazu2/patches/patch-ab
+++ b/textproc/namazu2/patches/patch-ab
@@ -1,37 +1,31 @@
-$NetBSD: patch-ab,v 1.2 2004/05/06 13:40:21 taca Exp $
+$NetBSD: patch-ab,v 1.3 2004/12/15 13:09:58 taca Exp $
 
---- conf/Makefile.in.orig	2004-04-14 03:09:01.000000000 +0900
+--- conf/Makefile.in.orig	2004-12-14 23:34:52.000000000 +0900
 +++ conf/Makefile.in
-@@ -25,7 +25,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = $(datadir)
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -133,9 +133,9 @@ lispdir = @lispdir@
+@@ -133,7 +133,7 @@ lispdir = @lispdir@
  AUTOMAKE_OPTIONS = 1.4 no-dependencies
  
  confdir = $(sysconfdir)/$(PACKAGE)
 -conf_DATA = namazurc-sample mknmzrc-sample
-+conf_DATA = namazurc.example mknmzrc.example
++noinst_DATA = namazurc-sample mknmzrc-sample
  EXTRA_DIST = namazurc-sample
--CLEANFILES = mknmzrc-sample
-+CLEANFILES = namazurc.example mknmzrc.example
+ CLEANFILES = mknmzrc-sample
  subdir = conf
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
-@@ -290,7 +290,10 @@ uninstall-am: uninstall-confDATA uninsta
- 	uninstall-info-am
+@@ -143,7 +143,7 @@ CONFIG_CLEAN_FILES =
+ depcomp =
+ am__depfiles_maybe =
+ DIST_SOURCES =
+-DATA = $(conf_DATA)
++DATA = $(noinst_DATA)
  
+ DIST_COMMON = Makefile.am Makefile.in
+ all: all-am
+@@ -218,7 +218,7 @@ all-am: Makefile $(DATA)
+ installdirs:
+ 	$(mkinstalldirs) $(DESTDIR)$(confdir)
  
--mknmzrc-sample: ../pl/conf.pl
-+namazurc.example: namazurc-sample
-+	@cp -p $? $@
-+
-+mknmzrc.example: ../pl/conf.pl
- 	perl -pe 's/^/\x23 / unless /^(\x23|package|$$)/' ../pl/conf.pl > $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+-install: install-am
++install:
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
diff --git a/textproc/namazu2/patches/patch-ac b/textproc/namazu2/patches/patch-ac
new file mode 100644
index 00000000000..efdc060bda9
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+--- scripts/Makefile.in.orig	2004-12-14 23:34:55.000000000 +0900
++++ scripts/Makefile.in
+@@ -166,6 +166,7 @@ bnamazu: $(top_builddir)/config.status b
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ gtnmz: $(top_builddir)/config.status gtnmz.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++	chmod +x $@
+ mailutime: $(top_builddir)/config.status mailutime.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ nmzgrep: $(top_builddir)/config.status nmzgrep.in
diff --git a/textproc/namazu2/patches/patch-ad b/textproc/namazu2/patches/patch-ad
new file mode 100644
index 00000000000..5d2ac876989
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+--- nmz/field.c.orig	2004-03-21 00:25:09.000000000 +0900
++++ nmz/field.c
+@@ -122,7 +122,7 @@ nmz_isfield(const char *key)
+         }
+         key++;
+     }
+-    if (isalpha(*(key - 1)) && *key == ':' ) {
++    if (isalpha((unsigned char)*(key - 1)) && *key == ':' ) {
+         return 1;
+     }
+     return 0;
diff --git a/textproc/namazu2/patches/patch-ae b/textproc/namazu2/patches/patch-ae
new file mode 100644
index 00000000000..1bd49859678
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+--- nmz/idxname.c.orig	2004-03-21 00:25:10.000000000 +0900
++++ nmz/idxname.c
+@@ -153,7 +153,8 @@ nmz_complete_idxnames(void)
+     int i;
+ 
+     for (i = 0; i < indices.num; i++) {
+- 	if (*indices.names[i] == '+' && isalnum(*(indices.names[i] + 1))) {
++ 	if (*indices.names[i] == '+' &&
++	    isalnum((unsigned char)*(indices.names[i] + 1))) {
+ 	    char *tmp;
+ 	    tmp = malloc(strlen(defaultidx) 
+ 				  + 1 + strlen(indices.names[i]) + 1);
diff --git a/textproc/namazu2/patches/patch-af b/textproc/namazu2/patches/patch-af
new file mode 100644
index 00000000000..9bcdd7d250c
--- /dev/null
+++ b/textproc/namazu2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2004/12/15 13:09:58 taca Exp $
+
+--- nmz/search.c.orig	2004-04-05 00:26:48.000000000 +0900
++++ nmz/search.c
+@@ -564,7 +564,7 @@ do_regex_preprocessing(char *expr)
+         exprp = expr;
+         /* Escape meta characters */
+         while (*exprp) {
+-            if (!isalnum(*exprp) && !nmz_iseuc(*exprp)) {
++            if (!isalnum((unsigned char)*exprp) && !nmz_iseuc(*exprp)) {
+                 *bufp = '\\';
+                 bufp++;
+             }
diff --git a/textproc/namazu2/patches/patch-ag b/textproc/namazu2/patches/patch-ag
new file mode 100644
index 00000000000..62ec4b9b63c
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ag
@@ -0,0 +1,32 @@
+$NetBSD: patch-ag,v 1.3 2004/12/15 13:09:58 taca Exp $
+
+--- nmz/util.c.orig	2004-03-21 00:25:10.000000000 +0900
++++ nmz/util.c
+@@ -63,7 +63,7 @@
+  */
+ 
+ static void reverse_byte_order (void*, int, int);
+-static char decode_uri_sub(char c1, char c2);
++static int decode_uri_sub(int c1, int c2);
+ 
+ /* 
+  * Reverse byte order. It's type independent.
+@@ -85,14 +85,14 @@ reverse_byte_order (void *p, int n, int 
+     }
+ }
+ 
+-static char 
+-decode_uri_sub(char c1, char c2)
++static int
++decode_uri_sub(int c1, int c2)
+ {
+-    char c;
++    int c;
+ 
+     c =  ((c1 >= 'A' ? (toupper(c1) - 'A') + 10 : (c1 - '0'))) * 16;
+     c += ( c2 >= 'A' ? (toupper(c2) - 'A') + 10 : (c2 - '0'));
+-    return c;
++    return c & 0xff;
+ }
+ 
+ /*
diff --git a/textproc/namazu2/patches/patch-ah b/textproc/namazu2/patches/patch-ah
new file mode 100644
index 00000000000..6ca3e2832e7
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.3 2004/12/15 13:09:58 taca Exp $
+
+--- nmz/wakati.c.orig	2004-03-21 00:25:10.000000000 +0900
++++ nmz/wakati.c
+@@ -81,8 +81,7 @@ iskatakana(const char *chr)
+     uchar *c;
+     c = (uchar *)chr;
+ 
+-    if ((*c == 0xa5) &&
+-	(*(c + 1) >= 0xa0) && (*(c + 1) <= 0xff))
++    if ((*c == 0xa5) && (*(c + 1) >= 0xa0))
+     {
+ 	return 1;
+     } else if ((*c == 0xa1) && (*(c + 1) == 0xbc)) { /* choon */ 
+@@ -100,8 +99,7 @@ ishiragana(const char *chr)
+     uchar *c;
+     c = (uchar *)chr;
+ 
+-    if ((*c == 0xa4) &&
+-	(*(c + 1) >= 0xa0) && (*(c + 1) <= 0xff))
++    if ((*c == 0xa4) && (*(c + 1) >= 0xa0))
+     {
+ 	return 1;
+     } else if ((*c == 0xa1) && (*(c + 1) == 0xbc)) { /* choon */ 
diff --git a/textproc/namazu2/patches/patch-ai b/textproc/namazu2/patches/patch-ai
new file mode 100644
index 00000000000..354b5a7eb8a
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2004/12/15 13:09:58 taca Exp $
+
+--- src/form.c.orig	2004-12-08 16:35:06.000000000 +0900
++++ src/form.c
+@@ -96,7 +96,7 @@ cmp_element(const char *s1, const char *
+             }
+             s2++;
+         }
+-        if (toupper(*s1) != toupper(*s2)) {
++        if (toupper((unsigned char)*s1) != toupper((unsigned char)*s2)) {
+             break;
+         }
+     }
diff --git a/textproc/namazu2/patches/patch-aj b/textproc/namazu2/patches/patch-aj
new file mode 100644
index 00000000000..166e759e5e4
--- /dev/null
+++ b/textproc/namazu2/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+--- src/output.c.orig	2004-03-21 00:02:51.000000000 +0900
++++ src/output.c
+@@ -490,7 +490,7 @@ print_query(const char * qs, int w)
+ 	if (strncmp(qs, "whence=", strlen("whence=")) == 0) {
+ 	    foo = 1;
+ 	    printf("whence=%d", w);
+-	    for (qs += strlen("whence="); isdigit(*qs); qs++);
++	    for (qs += strlen("whence="); isdigit((unsigned char)*qs); qs++);
+ 	} else {
+ 	    /* '"' is converted to entities "&quot;" */
+ 	    putc_entitize(*qs);
diff --git a/textproc/namazu2/patches/patch-ak b/textproc/namazu2/patches/patch-ak
new file mode 100644
index 00000000000..486019ef52f
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2004/12/15 13:09:58 taca Exp $
+
+--- src/result.c.orig	2004-03-21 00:02:51.000000000 +0900
++++ src/result.c
+@@ -315,8 +315,8 @@ emphasize(char *str)
+ static int
+ is_wordboundary(char *p)
+ {
+-  if (isalpha(*p) && isalpha(*(p + 1))) return 0;
+-  if (isdigit(*p) && isdigit(*(p + 1))) return 0;
++  if (isalpha((unsigned char)*p) && isalpha((unsigned char)*(p + 1))) return 0;
++  if (isdigit((unsigned char)*p) && isdigit((unsigned char)*(p + 1))) return 0;
+   return 1;
+ }
+