apply patch sent by yamajun AT ofug.net to fix bug of anthy-dic-tool.

fix pkg/30448

3 files changed, 51 insertions, 9 deletions

diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile
index 58bb9a00280..1a1cfacbd11 100644
--- a/inputmethod/anthy/Makefile
+++ b/inputmethod/anthy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 14:03:15 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/12 08:52:54 taya Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 
+PKGREVISION=	1
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	taya@NetBSD.org
@@ -32,8 +33,8 @@ SITES_2ch.t+=	http://omaemona.sourceforge.net/packages/Zisyo/
 .endif
 
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-DISTFILES+=			okinawa-20050410.t
-SITES_okinawa-20050410.t+=	http://www.ofug.net/~yamajun/files/
+DISTFILES+=			okinawa-20050607.t
+SITES_okinawa-20050607.t+=	http://www.ofug.net/~yamajun/files/
 .endif
 
 post-patch:
@@ -43,8 +44,8 @@ post-patch:
 		ed -s ${WRKSRC}/mkanthydic/Makefile.in
 .endif
 .if !empty(PKG_OPTIONS:Mokinawa_dict)
-	${CP} ${DISTDIR}/okinawa-20050410.t ${WRKSRC}/mkanthydic
-	@printf '/^EXTRA_DICS\ns/$$/ okinawa-20050410.t/\nwq\n' | \
+	${CP} ${DISTDIR}/okinawa-20050607.t ${WRKSRC}/mkanthydic
+	@printf '/^EXTRA_DICS\ns/$$/ okinawa-20050607.t/\nwq\n' | \
 		ed -s ${WRKSRC}/mkanthydic/Makefile.in
 .endif
 
diff --git a/inputmethod/anthy/distinfo b/inputmethod/anthy/distinfo
index 3627004b73e..b13add99453 100644
--- a/inputmethod/anthy/distinfo
+++ b/inputmethod/anthy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/04/11 15:02:23 taya Exp $
+$NetBSD: distinfo,v 1.6 2005/06/12 08:52:54 taya Exp $
 
 SHA1 (anthy-6300.tar.gz) = bce93631d3249aa551f708bcb9b4724b26f71a70
 RMD160 (anthy-6300.tar.gz) = d6bdad88e15ef4edb0ead94dd65c14295dd9e53e
@@ -6,7 +6,8 @@ Size (anthy-6300.tar.gz) = 2020760 bytes
 SHA1 (2ch.t) = 2160d7b0079e2c1a14093da968f34e7f8dbc07c2
 RMD160 (2ch.t) = b05902485829eebb4e09c554f095275f5278dd8b
 Size (2ch.t) = 142157 bytes
-SHA1 (okinawa-20050410.t) = dd519410a4865b1fe9894d3b504fbd20f11a8d03
-RMD160 (okinawa-20050410.t) = e584074accf91a839329a7c856857d4b8a2560c1
-Size (okinawa-20050410.t) = 150102 bytes
+SHA1 (okinawa-20050607.t) = 50f9524e5f11240cbc486c32eb86fcc1a3075e6f
+RMD160 (okinawa-20050607.t) = 6ee9adeaddb0c62c6a4741761d14932603ee7a81
+Size (okinawa-20050607.t) = 150145 bytes
 SHA1 (patch-aa) = 79816563a3d1ff853bc1edcbfee7e22ae2e26991
+SHA1 (patch-ab) = c8847cd5d97161c07161358d31c4f15d8586e7a9
diff --git a/inputmethod/anthy/patches/patch-ab b/inputmethod/anthy/patches/patch-ab
new file mode 100644
index 00000000000..9c960dd14d1
--- /dev/null
+++ b/inputmethod/anthy/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1 2005/06/12 08:52:54 taya Exp $
+
+diff -ru ../Orig/anthy-6300/src-util/dic-tool.c ./src-util/dic-tool.c
+--- ../Orig/anthy-6300/src-util/dic-tool.c	2005-02-28 22:35:44.000000000 +0900
++++ ./src-util/dic-tool.c	2005-06-12 17:33:17.000000000 +0900
+@@ -16,7 +16,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <ctype.h>
+ 
+ #include <dicutil.h>
+ #include <config.h>
+@@ -287,24 +286,11 @@
+ find_head(char *yomi, char *freq, char *w)
+ {
+   char buf[256];
+-  char *p;
+-  int i;
+   do {
+     if (!read_line(buf, 256, fp_in)) {
+       return -1;
+     }
+-  } while (sscanf(buf, "%s %s %s",yomi, freq, w) != 3);
+-  /* 単語はspaceを含みうるので、切り直し */
+-  p = buf;
+-  for (i = 0; i < 2; i++) {
+-    while (!isspace(p[0]) ||
+-	   isspace(p[1])) {
+-      p++;
+-    }
+-    p++;
+-  }
+-  /* pは3つめのトークンの先頭*/
+-  strncpy(w, p, 256);
++  } while (sscanf(buf, "%s %s %[^\n]", yomi, freq, w) != 3);
+   return 0;
+ }
+ 
+Only in ./src-util: dic-tool.c.orig