summaryrefslogtreecommitdiff
path: root/japanese/namazu2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'japanese/namazu2/patches')
-rw-r--r--japanese/namazu2/patches/patch-ac13
-rw-r--r--japanese/namazu2/patches/patch-ad13
-rw-r--r--japanese/namazu2/patches/patch-ae21
-rw-r--r--japanese/namazu2/patches/patch-af34
-rw-r--r--japanese/namazu2/patches/patch-ag183
-rw-r--r--japanese/namazu2/patches/patch-ah29
-rw-r--r--japanese/namazu2/patches/patch-ai15
-rw-r--r--japanese/namazu2/patches/patch-aj39
-rw-r--r--japanese/namazu2/patches/patch-ak14
-rw-r--r--japanese/namazu2/patches/patch-al13
10 files changed, 340 insertions, 34 deletions
diff --git a/japanese/namazu2/patches/patch-ac b/japanese/namazu2/patches/patch-ac
new file mode 100644
index 00000000000..505f834184f
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/09/24 03:56:02 taca Exp $
+
+--- filter/mhonarc.pl.orig Tue Feb 29 13:25:33 2000
++++ filter/mhonarc.pl
+@@ -105,7 +105,7 @@
+ $$contref =~ s/<!--X-Head-Body-Sep-Begin-->/\n/;
+
+ # Handle a field consists of two or more lines.
+- $$contref =~ s!^(<LI>)(.*?)(</LI>$)!$1 . lftospace($2) . $3!gems;
++ $$contref =~ s!^(<LI>)(.*?)(</LI>$)!$1 . lftospace($2) . $3!gemsi;
+
+ # For plugging spaces before headers
+ $$contref =~ s/^<LI>//gim;
diff --git a/japanese/namazu2/patches/patch-ad b/japanese/namazu2/patches/patch-ad
deleted file mode 100644
index 4a37a15a18f..00000000000
--- a/japanese/namazu2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index e00edefb78e..00000000000
--- a/japanese/namazu2/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$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/patches/patch-af b/japanese/namazu2/patches/patch-af
new file mode 100644
index 00000000000..228f2a61890
--- /dev/null
+++ b/japanese/namazu2/patches/patch-af
@@ -0,0 +1,34 @@
+$NetBSD: patch-af,v 1.1 2001/09/24 03:56:02 taca 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/japanese/namazu2/patches/patch-ag b/japanese/namazu2/patches/patch-ag
new file mode 100644
index 00000000000..4ee964160f5
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ag
@@ -0,0 +1,183 @@
+$NetBSD: patch-ag,v 1.1 2001/09/24 03:56:02 taca 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/japanese/namazu2/patches/patch-ah b/japanese/namazu2/patches/patch-ah
new file mode 100644
index 00000000000..3fadb7210b1
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ah
@@ -0,0 +1,29 @@
+$NetBSD: patch-ah,v 1.1 2001/09/24 03:56:02 taca 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/japanese/namazu2/patches/patch-ai b/japanese/namazu2/patches/patch-ai
new file mode 100644
index 00000000000..e3c3a5eb6f4
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2001/09/24 03:56:02 taca 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/japanese/namazu2/patches/patch-aj b/japanese/namazu2/patches/patch-aj
new file mode 100644
index 00000000000..4d7ed524201
--- /dev/null
+++ b/japanese/namazu2/patches/patch-aj
@@ -0,0 +1,39 @@
+$NetBSD: patch-aj,v 1.1 2001/09/24 03:56:02 taca Exp $
+
+--- pl/htmlsplit.pl.orig Wed Jan 10 17:42:52 2001
++++ pl/htmlsplit.pl
+@@ -72,15 +72,16 @@
+
+ my $id = 0;
+ # $cont =~ s/(<a\s[^>]*href=(["']))#(.+?)(\2[^>]*>)/$1$3.html$4/gi; #'
++ $cont =~ s#(<a[^>]*\s+)name=(["'])\2([^>]*>(.*?)</a>)#$1$4#sgi;
+ $cont =~ s {
+- \G(.+?) # 1
+- (<h([1-6])>)?\s* # 2, 3
+- <a[^>]*\s+name=([a-zA-Z0-9-\.]+| # 4,
+- (["']).+?\5)[^>]*>(.*?)</a> # 5,6
+- \s*(</h\3>)? # 7
+- } {
+- write_partial_file($1, $4, $6, $id++, $mtime, \%info)
+- }sgexi;
++ \G(.+?) # 1
++ (<h([1-6])>)?\s* # 2, 3
++ <a[^>]*\s+name=([a-zA-Z0-9-\.]+| # 4,
++ (["']).+?\5)[^>]*>(.*?)</a> # 5,6
++ \s*(</h\3>)? # 7
++ } {
++ write_partial_file($1, $4, $6, $id++, $mtime, \%info)
++ }sgexi;
+ write_partial_file($cont, "", "", $id, $mtime, \%info);
+
+ return @{$info{'names'}};
+@@ -130,6 +131,9 @@
+ my $orig_title = $info_ref->{'title'};
+ my $prev_name = $info_ref->{'name'};
+ my $prev_anchored = $info_ref->{'anchored'};
++
++ $prev_name =~ s#\n\r##sg;
++ $prev_name =~ s#\n##sg;
+
+ html::remove_html_elements(\$prev_anchored);
+ $prev_anchored =~ s/^\s+//;
diff --git a/japanese/namazu2/patches/patch-ak b/japanese/namazu2/patches/patch-ak
new file mode 100644
index 00000000000..50aa5079a11
--- /dev/null
+++ b/japanese/namazu2/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2001/09/24 03:56:02 taca Exp $
+
+--- pl/util.pl.orig Mon Aug 20 22:32:20 2001
++++ pl/util.pl
+@@ -145,7 +145,8 @@
+ return '';
+ }
+ } else {
+- $fh = efopen($arg) || return 0; # in case file is removed after find_file
++ $fh = fopen($arg) || return 0; # in case file is removed after find_file
++ # 2.0.7 had problem
+ }
+ my $size = -s $fh;
+ return $size;
diff --git a/japanese/namazu2/patches/patch-al b/japanese/namazu2/patches/patch-al
new file mode 100644
index 00000000000..8ac0c8c6b76
--- /dev/null
+++ b/japanese/namazu2/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2001/09/24 03:56:02 taca Exp $
+
+--- scripts/mknmz.in.orig Wed Aug 22 15:16:20 2001
++++ scripts/mknmz.in
+@@ -179,6 +179,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) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 01:52:30 +0000