diff options
| author | kristerw <kristerw@pkgsrc.org> | 2003-10-20 22:24:34 +0000 |
|---|---|---|
| committer | kristerw <kristerw@pkgsrc.org> | 2003-10-20 22:24:34 +0000 |
| commit | 17364e4495504819788faf647bb0889fc53da60b (patch) | |
| tree | 875b0d0ccb1a8038a1c3b7ef79a11bf265c9b4b6 /textproc/kakasi | |
| parent | 72fe0ea0082a6e76af11337e078b03eac132f651 (diff) | |
| download | pkgsrc-17364e4495504819788faf647bb0889fc53da60b.tar.gz | |
patch-aa and patch-ac patched the same file. Merge them.
Diffstat (limited to 'textproc/kakasi')
| -rw-r--r-- | textproc/kakasi/distinfo | 5 | ||||
| -rw-r--r-- | textproc/kakasi/patches/patch-aa | 26 | ||||
| -rw-r--r-- | textproc/kakasi/patches/patch-ac | 36 |
3 files changed, 31 insertions, 36 deletions
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo index 20a05364f02..3b1e301adea 100644 --- a/textproc/kakasi/distinfo +++ b/textproc/kakasi/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/10/06 14:51:28 taca Exp $ +$NetBSD: distinfo,v 1.4 2003/10/20 22:24:34 kristerw 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 +SHA1 (patch-ac) = c2100302e98e597ba50ea57e294b1053137ba8b3 diff --git a/textproc/kakasi/patches/patch-aa b/textproc/kakasi/patches/patch-aa deleted file mode 100644 index 9597437ff37..00000000000 --- a/textproc/kakasi/patches/patch-aa +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/08/25 18:40:06 jlam Exp $ - ---- lib/libkakasi.c.orig Sun Sep 2 20:43:21 2001 -+++ lib/libkakasi.c -@@ -105,6 +105,12 @@ - static int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); - static void digest_shift PARAMS((Character *c, int s)); - #else /* LIBRARY */ -+void digest_start_copy PARAMS((Character *c, Character *r)); -+void put_separator PARAMS((void)); -+void putchars PARAMS((Character *results)); -+void digest_out PARAMS((Character *c, int ret)); -+int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); -+void digest_shift PARAMS((Character *c, int s)); - static void free_jisyo PARAMS((void)); - #endif /* LIBRARY */ - -@@ -497,7 +503,7 @@ - - char * - kakasi_do(str) -- char *str; -+ unsigned char *str; - { - Character c[KAKASIBUF], r[KAKASIBUF]; - int clen, ptype, pctype; diff --git a/textproc/kakasi/patches/patch-ac b/textproc/kakasi/patches/patch-ac index 80932a827f3..49962299c9e 100644 --- a/textproc/kakasi/patches/patch-ac +++ b/textproc/kakasi/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2002/10/06 14:51:28 taca Exp $ +$NetBSD: patch-ac,v 1.2 2003/10/20 22:24:34 kristerw Exp $ ---- src/kakasi.c.orig Sun Sep 2 20:43:21 2001 -+++ src/kakasi.c +--- src/kakasi.c.orig Sun Sep 2 13:43:21 2001 ++++ src/kakasi.c Tue Oct 21 00:11:03 2003 @@ -41,6 +41,9 @@ #ifdef HAVE_MALLOC_H # include <malloc.h> @@ -12,21 +12,43 @@ $NetBSD: patch-ac,v 1.1 2002/10/06 14:51:28 taca Exp $ #include <stdlib.h> #include "kakasi.h" #ifdef LIBRARY -@@ -559,7 +562,13 @@ kakasi_do(str) +@@ -105,6 +108,12 @@ + static int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); + static void digest_shift PARAMS((Character *c, int s)); + #else /* LIBRARY */ ++void digest_start_copy PARAMS((Character *c, Character *r)); ++void put_separator PARAMS((void)); ++void putchars PARAMS((Character *results)); ++void digest_out PARAMS((Character *c, int ret)); ++int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void))); ++void digest_shift PARAMS((Character *c, int s)); + static void free_jisyo PARAMS((void)); + #endif /* LIBRARY */ + +@@ -497,7 +506,7 @@ + + char * + kakasi_do(str) +- char *str; ++ unsigned char *str; + { + Character c[KAKASIBUF], r[KAKASIBUF]; + int clen, ptype, pctype; +@@ -559,7 +568,13 @@ } else if (c[0].c1 == 0xa5) { ptype = 5; } else if ((c[0].c1 == 0xa1) && (c[0].c2 == 0xbc)) { + if (pctype == 5) { -+ ptype = 5; + ptype = 5; + } else if (pctype == 6) { + ptype = 6; + } else { - ptype = 5; ++ ptype = 5; + } } else { ptype = 4; } -@@ -604,7 +613,7 @@ kakasi_do(str) +@@ -604,7 +619,7 @@ { char *ret = getpbstr(); if (ret == NULL) |