summaryrefslogtreecommitdiff
path: root/textproc/kakasi
diff options
context:
space:
mode:
authortaca <taca>2002-10-06 14:51:27 +0000
committertaca <taca>2002-10-06 14:51:27 +0000
commitf22b82f5e0d9dd44d7b1ca7f5c48bfe9794d708d (patch)
treefb6a7c64d5ffef690fa5ad8bb02ea44745f406d3 /textproc/kakasi
parent33c3bb72cd21c1524159f0a672fb4ebfb7e0afb3 (diff)
downloadpkgsrc-f22b82f5e0d9dd44d7b1ca7f5c48bfe9794d708d.tar.gz
Add some fix to src/kakasi.c: kakasi_do().
from http://cvs.namazu.org/kakasi/src/kakasi.c. 1.20 -> 1.21 a long vowel processing improvement http://www.namazu.org/ml/namazu-users-ja/msg02377.html 1.21 -> 1.22 return value consistency; always returns pointer allocated by malloc(3) Bump to kakasi-2.3.4nb1.
Diffstat (limited to 'textproc/kakasi')
-rw-r--r--textproc/kakasi/Makefile3
-rw-r--r--textproc/kakasi/distinfo3
-rw-r--r--textproc/kakasi/patches/patch-ac37
3 files changed, 41 insertions, 2 deletions
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 803ddcfa785..fd3f5b764fb 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 18:40:05 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/10/06 14:51:27 taca Exp $
# FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
DISTNAME= kakasi-2.3.4
+PKGREVISION= 1
CATEGORIES= japanese textproc
MASTER_SITES= ftp://kakasi.namazu.org/pub/kakasi/stable/
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo
index bc455481dd9..20a05364f02 100644
--- a/textproc/kakasi/distinfo
+++ b/textproc/kakasi/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/08/25 18:40:06 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/10/06 14:51:28 taca Exp $
SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
SHA1 (patch-aa) = 4b724f71d04fe52467b37bed79eef6407427ab29
SHA1 (patch-ab) = 06ad60e10c996500242fe038213164ddf3147178
+SHA1 (patch-ac) = a49c2c8e8a0f2c970d6fce2d516e4bdc05d8f972
diff --git a/textproc/kakasi/patches/patch-ac b/textproc/kakasi/patches/patch-ac
new file mode 100644
index 00000000000..80932a827f3
--- /dev/null
+++ b/textproc/kakasi/patches/patch-ac
@@ -0,0 +1,37 @@
+$NetBSD: patch-ac,v 1.1 2002/10/06 14:51:28 taca Exp $
+
+--- src/kakasi.c.orig Sun Sep 2 20:43:21 2001
++++ src/kakasi.c
+@@ -41,6 +41,9 @@
+ #ifdef HAVE_MALLOC_H
+ # include <malloc.h>
+ #endif
++#ifdef HAVE_STRING_H
++# include <string.h>
++#endif
+ #include <stdlib.h>
+ #include "kakasi.h"
+ #ifdef LIBRARY
+@@ -559,7 +562,13 @@ kakasi_do(str)
+ } else if (c[0].c1 == 0xa5) {
+ ptype = 5;
+ } else if ((c[0].c1 == 0xa1) && (c[0].c2 == 0xbc)) {
++ if (pctype == 5) {
++ ptype = 5;
++ } else if (pctype == 6) {
++ ptype = 6;
++ } else {
+ ptype = 5;
++ }
+ } else {
+ ptype = 4;
+ }
+@@ -604,7 +613,7 @@ kakasi_do(str)
+ {
+ char *ret = getpbstr();
+ if (ret == NULL)
+- return "";
++ return strdup("");
+ return ret;
+ }
+ #endif