Reimport of package namazu from japanese/namazu2 into textproc/namazu2.

This is part of the japanese category retirement.
Pathnames to japanese/ adjusted.

16 files changed, 773 insertions, 0 deletions

diff --git a/textproc/namazu2/DEINSTALL b/textproc/namazu2/DEINSTALL
new file mode 100644
index 00000000000..3bfdfc9fec3
--- /dev/null
+++ b/textproc/namazu2/DEINSTALL
@@ -0,0 +1,18 @@
+#!/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/DESCR b/textproc/namazu2/DESCR
new file mode 100644
index 00000000000..01989bd08be
--- /dev/null
+++ b/textproc/namazu2/DESCR
@@ -0,0 +1,5 @@
+Namazu is a full-text search system intended for easy use. Not only it works
+as a CGI program for a small or medium scale Web search engine, but also works
+as a personal use search system for your pile of email. 
+
+(The Japanese word `Namazu' means `catfish' in English) 
diff --git a/textproc/namazu2/INSTALL b/textproc/namazu2/INSTALL
new file mode 100644
index 00000000000..226dca0bb25
--- /dev/null
+++ b/textproc/namazu2/INSTALL
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	cat <<EOF
+
+=============================================================
+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
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile
new file mode 100644
index 00000000000..67d7b901d18
--- /dev/null
+++ b/textproc/namazu2/Makefile
@@ -0,0 +1,59 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+# FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
+
+DISTNAME=	namazu-2.0.10
+PKGREVISION=	2
+CATEGORIES=	japanese textproc www
+MASTER_SITES=	ftp://ftp.namazu.org/namazu/stable/ \
+		http://www.namazu.org/stable/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.namazu.org/index.html.en
+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
+
+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
+
+USE_BUILDLINK_ONLY=	# defined
+USE_PERL5=		# defined
+GNU_CONFIGURE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
+
+CONFLICTS+=	namazu-[0-9]*
+
+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
+
+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/textproc/namazu2/PLIST b/textproc/namazu2/PLIST
new file mode 100644
index 00000000000..a53cb630cc1
--- /dev/null
+++ b/textproc/namazu2/PLIST
@@ -0,0 +1,139 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+bin/adnmz
+bin/bnamazu
+bin/gcnmz
+bin/kwnmz
+bin/lnnmz
+bin/mailutime
+bin/mknmz
+bin/namazu
+bin/nmz-config
+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
+include/namazu/i18n.h
+include/namazu/idxname.h
+include/namazu/l10n-ja.h
+include/namazu/libnamazu.h
+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
+include/namazu/wakati.h
+@dirrm include/namazu
+lib/libnmz.a
+lib/libnmz.la
+lib/libnmz.so
+lib/libnmz.so.5
+lib/libnmz.so.5.0
+@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
+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
+share/namazu/doc/en/manual.html
+share/namazu/doc/en/nmz.html
+share/namazu/doc/en/tips.html
+share/namazu/doc/en/tutorial.html
+@dirrm share/namazu/doc/en
+share/namazu/doc/ja/manual.html
+share/namazu/doc/ja/nmz.html
+share/namazu/doc/ja/tips.html
+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
+@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/gzip.pl
+share/namazu/filter/hdml.pl
+share/namazu/filter/hnf.pl
+share/namazu/filter/html.pl
+share/namazu/filter/mailnews.pl
+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
+share/namazu/mknmzrc.example
+share/namazu/namazurc.example
+share/namazu/pl/codeconv.pl
+share/namazu/pl/conf.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/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.foot
+share/namazu/template/NMZ.foot.es
+share/namazu/template/NMZ.foot.fr
+share/namazu/template/NMZ.foot.ja
+share/namazu/template/NMZ.head
+share/namazu/template/NMZ.head.es
+share/namazu/template/NMZ.head.fr
+share/namazu/template/NMZ.head.ja
+share/namazu/template/NMZ.result.normal
+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.short
+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.tips
+share/namazu/template/NMZ.tips.es
+share/namazu/template/NMZ.tips.fr
+share/namazu/template/NMZ.tips.ja
+@dirrm share/namazu/template
+@dirrm share/namazu
diff --git a/textproc/namazu2/distinfo b/textproc/namazu2/distinfo
new file mode 100644
index 00000000000..a31e16ffef9
--- /dev/null
+++ b/textproc/namazu2/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+
+SHA1 (namazu-2.0.10.tar.gz) = 43a7f32ff0d86b4e65dfa9fa6c1ad90a0636a8a8
+Size (namazu-2.0.10.tar.gz) = 833838 bytes
+SHA1 (patch-aa) = 336a7f68842d4a9ca29ce085ccded45fe0b1392f
+SHA1 (patch-ab) = c5baa6b5555c4fee0215980ca8df3880fa93390f
+SHA1 (patch-af) = a5a4c913980e163813f06749445c980eb4644737
+SHA1 (patch-ag) = 626af603170bca527cedc4d27e07e1c07259a701
+SHA1 (patch-ah) = e38d7efb8e1e8a6e80e96fe84f9c180ec8a7fbb4
+SHA1 (patch-ai) = 49d685ddd93207f984813e05a21da60fe1862bef
+SHA1 (patch-al) = f05436ec713ae1bcb01dd7b1a9a7a598018e9dd7
+SHA1 (patch-am) = abce3739aa99e9ee19bf4b56f961c33cc33004be
+SHA1 (patch-an) = fa073b9baef46cd31348d048816f8592a8b35f20
+SHA1 (patch-ao) = 16070a6b7f9b50e2e14d3256d6bab44c9ea52aca
diff --git a/textproc/namazu2/patches/patch-aa b/textproc/namazu2/patches/patch-aa
new file mode 100644
index 00000000000..e7f9b71103b
--- /dev/null
+++ b/textproc/namazu2/patches/patch-aa
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 00000000000..3b0456e5225
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+
+--- conf/Makefile.in.orig	Thu Dec 27 14:06:04 2001
++++ conf/Makefile.in
+@@ -117,10 +117,10 @@
+ 
+ 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
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+@@ -244,7 +244,10 @@
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+-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.
diff --git a/textproc/namazu2/patches/patch-af b/textproc/namazu2/patches/patch-af
new file mode 100644
index 00000000000..ce6dd07f3e9
--- /dev/null
+++ b/textproc/namazu2/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:01:41 seb Exp $
+
+--- lib/getopt.c.orig	Mon Oct 11 13:25:11 1999
++++ lib/getopt.c
+@@ -71,10 +71,11 @@
+ 
+ #ifdef VMS
+ #include <unixlib.h>
++#endif
++
+ #if HAVE_STRING_H - 0
+ #include <string.h>
+ #endif
+-#endif
+ 
+ #if defined (WIN32) && !defined (__CYGWIN32__)
+ /* It's not Unix, really.  See?  Capital letters.  */
+@@ -695,7 +696,7 @@
+ 		optarg = nameend + 1;
+ 	      else
+ 		{
+-		  if (opterr)
++		  if (opterr) {
+ 		   if (argv[optind - 1][1] == '-')
+ 		    /* --option */
+ 		    fprintf (stderr,
+@@ -706,6 +707,7 @@
+ 		    fprintf (stderr,
+ 		     _("%s: option `%c%s' doesn't allow an argument\n"),
+ 		     argv[0], argv[optind - 1][0], pfound->name);
++		  }
+ 
+ 		  nextchar += strlen (nextchar);
+ 
diff --git a/textproc/namazu2/patches/patch-ag b/textproc/namazu2/patches/patch-ag
new file mode 100644
index 00000000000..60bedf47bf7
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ag
@@ -0,0 +1,183 @@
+$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+
+--- nmz/regex.c.orig	Sat Sep  1 18:40:52 2001
++++ nmz/regex.c
+@@ -71,6 +71,12 @@
+ void free _((void*));
+ #endif
+ 
++#ifdef HAVE_STRING_H
++# include <string.h>
++#else
++# include <strings.h>
++#endif
++
+ /* #define	NO_ALLOCA */	/* try it out for now */
+ #ifndef NO_ALLOCA
+ /* Make alloca work the best possible way.  */
+@@ -99,12 +105,6 @@
+ # endif
+ #endif /* __GNUC__ */
+ 
+-#ifdef HAVE_STRING_H
+-# include <string.h>
+-#else
+-# include <strings.h>
+-#endif
+-
+ #define RE_ALLOCATE alloca
+ #ifdef C_ALLOCA
+ #define FREE_VARIABLES() alloca(0)
+@@ -153,7 +153,9 @@
+ static void insert_jump _((int, char*, char*, char*));
+ static void store_jump_n _((char*, int, char*, unsigned));
+ static void insert_jump_n _((int, char*, char*, char*, unsigned));
++#if 0
+ static void insert_op _((int, char*, char*));
++#endif
+ static void insert_op_2 _((int, char*, char*, int, int));
+ static int memcmp_translate _((unsigned char*, unsigned char*, int));
+ 
+@@ -175,9 +177,7 @@
+ 
+ #undef P
+ 
+-#ifdef RUBY
+ #include "util.h"
+-#endif
+ 
+ static void
+ init_syntax_once()
+@@ -358,7 +358,7 @@
+     wordbeg,	 /* Succeeds if at word beginning.  */
+     wordend,	 /* Succeeds if at word end.  */
+     wordbound,   /* Succeeds if at a word boundary.  */
+-    notwordbound,/* Succeeds if not at a word boundary.  */
++    notwordbound /* Succeeds if not at a word boundary.  */
+   };
+ 
+ 
+@@ -409,6 +409,7 @@
+   long syntax;
+ {
+     /* obsolete */
++    return 0;
+ }
+ 
+ 
+@@ -442,7 +443,7 @@
+       int n = mbclen(c) - 1;						\
+       c &= (1<<(BYTEWIDTH-2-n)) - 1;					\
+       while (n--) {							\
+-	c = c << 6 | *p++ & ((1<<6)-1);					\
++	c = (c << 6) | (*p++ & ((1<<6)-1));				\
+       }									\
+     }									\
+     else {								\
+@@ -483,23 +484,28 @@
+ {
+   if (current_mbctype == MBCTYPE_UTF8) {
+     if (c < 0x80)
+-      printf("%c", c);
++      printf("%c", (int)c);
+     else if (c <= 0x7ff)
+-      printf("%c%c", utf8_firstbyte(c), c&0x3f);
++      printf("%c%c", (int)utf8_firstbyte(c), (int)(c & 0x3f));
+     else if (c <= 0xffff)
+-      printf("%c%c%c", utf8_firstbyte(c), (c>>6)&0x3f, c&0x3f);
++      printf("%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 6) & 0x3f),
++	     (int)(c & 0x3f));
+     else if (c <= 0x1fffff) 
+-      printf("%c%c%c%c", utf8_firstbyte(c), (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
++      printf("%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 12) & 0x3f),
++	     (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+     else if (c <= 0x3ffffff)
+-      printf("%c%c%c%c%c", utf8_firstbyte(c), (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
++      printf("%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 18) & 0x3f),
++	     (int)((c >> 12) & 0x3f), (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+     else if (c <= 0x7fffffff)
+-      printf("%c%c%c%c%c%c", utf8_firstbyte(c), (c>>24)&0x3f, (c>>18)&0x3f, (c>>12)&0x3f, (c>>6)&0x3f, c&0x3f);
++      printf("%c%c%c%c%c%c", (int)utf8_firstbyte(c), (int)((c >> 24) & 0x3f),
++	     (int)((c >> 18) & 0x3f), (int)((c >> 12) & 0x3f),
++	     (int)((c >> 6) & 0x3f), (int)(c & 0x3f));
+   }
+   else if (c < 0xff) {
+-    printf("\\%o", c);
++    printf("\\%o", (int)c);
+   }
+   else {
+-    printf("%c%c", c>>BYTEWIDTH, c&0xff);
++    printf("%c%c", (int)(c >> BYTEWIDTH), (int)(c &0xff));
+   }
+ }
+ 
+@@ -700,6 +706,7 @@
+   return 0;
+ }
+ 
++#if 0
+ static void
+ print_partial_compiled_pattern(start, end)
+     unsigned char *start;
+@@ -949,6 +956,7 @@
+ 
+   print_partial_compiled_pattern (buffer, buffer + bufp->used);
+ }
++#endif
+ 
+ static char*
+ calculate_must_string(start, end)
+@@ -1118,7 +1126,7 @@
+   register const char *p = pattern;
+   const char *nextp;
+   const char *pend = pattern + size;
+-  register unsigned int c, c1;
++  register unsigned int c, c1 = 0;
+   const char *p0;
+   int numlen;
+ 
+@@ -1412,8 +1420,8 @@
+ 	  case 'W':
+ 	    for (c = 0; c < (1 << BYTEWIDTH); c++) {
+ 	      if (SYNTAX(c) != Sword &&
+-		  (current_mbctype && !re_mbctab[c] ||
+-		  !current_mbctype && SYNTAX(c) != Sword2))
++		  ((current_mbctype && !re_mbctab[c]) ||
++		   (!current_mbctype && SYNTAX(c) != Sword2)))
+ 		SET_LIST_BIT(c);
+ 	    }
+ 	    last = -1;
+@@ -2241,6 +2249,8 @@
+ 	case dummy_failure_jump:
+ 	  bufp->options |= RE_OPTIMIZE_ANCHOR;
+ 	  break;
++	default:
++	  break;
+ 	}
+       }
+       else if (*laststart == charset || *laststart == charset_not) {
+@@ -2409,6 +2419,7 @@
+ }
+ 
+ 
++#if 0
+ /* Open up space at location THERE, and insert operation OP.
+    CURRENT_END gives the end of the storage in use, so
+    we know how much data to copy up.
+@@ -2428,7 +2439,7 @@
+ 
+   there[0] = (char)op;
+ }
+-
++#endif
+ 
+ /* Open up space at location THERE, and insert operation OP followed by
+    NUM_1 and NUM_2.  CURRENT_END gives the end of the storage in use, so
+@@ -4095,7 +4106,6 @@
+ 	p1 = p;
+ 	/* If failed to a backwards jump that's part of a repetition
+ 	   loop, need to pop this failure point and use the next one.  */
+-      pop_loop:
+ 	switch ((enum regexpcode)*p1) {
+ 	case jump_n:
+ 	case finalize_push_n:
diff --git a/textproc/namazu2/patches/patch-ah b/textproc/namazu2/patches/patch-ah
new file mode 100644
index 00000000000..fc7dd6efb43
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ah
@@ -0,0 +1,29 @@
+$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+
+--- nmz/util.c.orig	Sun Sep  2 16:13:37 2001
++++ nmz/util.c
+@@ -102,9 +102,9 @@
+  */
+ 
+ unsigned long
+-nmz_scan_oct(char *start, int len, int *retlen)
++nmz_scan_oct(const char *start, int len, int *retlen)
+ {
+-    register char *s = start;
++    register const char *s = start;
+     register unsigned long retval = 0;
+ 
+     while (len-- && *s >= '0' && *s <= '7') {
+@@ -117,10 +117,10 @@
+ }
+ 
+ unsigned long
+-nmz_scan_hex(char *start, int len, int *retlen)
++nmz_scan_hex(const char *start, int len, int *retlen)
+ {
+     static char hexdigit[] = "0123456789abcdef0123456789ABCDEFx";
+-    register char *s = start;
++    register const char *s = start;
+     register unsigned long retval = 0;
+     char *tmp;
+ 
diff --git a/textproc/namazu2/patches/patch-ai b/textproc/namazu2/patches/patch-ai
new file mode 100644
index 00000000000..f02c7aa182e
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+
+--- nmz/util.h.orig	Mon Jul  9 16:30:37 2001
++++ nmz/util.h
+@@ -14,8 +14,8 @@
+ #define nmz_iseuc_kana1st(c) ((uchar)(c) == 0x8e)
+ #define nmz_iseuc_hojo1st(c) ((uchar)(c) == 0x8f)
+ 
+-extern unsigned long nmz_scan_oct ( char *start, int len, int *retlen );
+-extern unsigned long nmz_scan_hex ( char *start, int len, int *retlen );
++extern unsigned long nmz_scan_oct (const char *start, int len, int *retlen );
++extern unsigned long nmz_scan_hex (const char *start, int len, int *retlen );
+ extern void * nmz_xmalloc ( unsigned long size );
+ extern void * nmz_xrealloc ( void *ptr, unsigned long size );
+ extern void nmz_tr ( char *str, const char *lstr, const char *rstr );
diff --git a/textproc/namazu2/patches/patch-al b/textproc/namazu2/patches/patch-al
new file mode 100644
index 00000000000..4784b938afe
--- /dev/null
+++ b/textproc/namazu2/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:01:42 seb Exp $
+
+--- scripts/mknmz.in.orig	Sun Nov 25 18:28:58 2001
++++ scripts/mknmz.in
+@@ -176,6 +176,8 @@
+     my $processed_num = 0;
+     my $file_size = util::filesize($cfile);
+ 
++    return ($file_size, $processed_num) unless $file_size;
++
+     if ($var::Opt{'htmlsplit'} && $cfile =~ $conf::HTML_SUFFIX) {
+ 	my @parts = htmlsplit::split($cfile, "NMZ.partial");
+ 	if (@parts > 1) {
diff --git a/textproc/namazu2/patches/patch-am b/textproc/namazu2/patches/patch-am
new file mode 100644
index 00000000000..3dc65d4463c
--- /dev/null
+++ b/textproc/namazu2/patches/patch-am
@@ -0,0 +1,40 @@
+$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:01:42 seb 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,15 +34,17 @@
+ 
+ my $xlconvpath  = undef;
+ my $utfconvpath = undef;
++my $convname = undef;
+ 
+ sub mediatype() {
+     return ('application/excel');
+ }
+ 
+ sub status() {
+-    $xlconvpath = util::checkcmd('xlHtml');
++    $xlconvpath = util::checkcmd('xlhtml') || util::checkcmd('xlHtml');
+ #    return 'no' unless defined $xlconvpath;
+     if (defined $xlconvpath) {
++	$convname = basename($xlconvpath);
+ 	if (!util::islang("ja")) {
+ 	    return 'yes';
+ 	} else {
+@@ -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/textproc/namazu2/patches/patch-an b/textproc/namazu2/patches/patch-an
new file mode 100644
index 00000000000..582e0e65386
--- /dev/null
+++ b/textproc/namazu2/patches/patch-an
@@ -0,0 +1,69 @@
+$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:01:42 seb 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/textproc/namazu2/patches/patch-ao b/textproc/namazu2/patches/patch-ao
new file mode 100644
index 00000000000..8679af32687
--- /dev/null
+++ b/textproc/namazu2/patches/patch-ao
@@ -0,0 +1,40 @@
+$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:01:42 seb 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,15 +33,17 @@
+ 
+ my $pptconvpath  = undef;
+ my $utfconvpath = undef;
++my $pptconvname = undef;
+ 
+ sub mediatype() {
+     return ('application/powerpoint');
+ }
+ 
+ sub status() {
+-	$pptconvpath = util::checkcmd('pptHtml');
++	$pptconvpath = util::checkcmd('ppthtml') || util::checkcmd('pptHtml');
+ #	return 'no' unless defined $pptconvpath
+ 	if (defined $pptconvpath) {
++	    $pptconvname = basename($pptconvpath);
+ 		if (!util::islang("ja")) {
+ 			return 'yes';
+ 		} else {
+@@ -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);