Update KAKASI to 2.3.6.

(in addtion to backported patches, dropped prototype patch of kakasi_do().
 Its committer doesn't know the reason anymore, and implemented part patches
 had been merged long time ago with
   "patch-aa and patch-ac patched the same file.  Merge them"
 but patch-aa was for lib/libkakasi.c, and patch-ac is for src/kakasi.c.
 From no problem reportes, it is considered this patch set is not relevant).

Changes from KAKASI 2.3.5 to 2.3.6

* Check runtime environment for test codes, and skip impossible tests.

* With configure, check compiler supported option.
  (for the issue old gcc cannot accept -Wno-unused-result option)

* Fixed to check iconv availability at configure instead of autconf.

* Fixed and added manual (by Osamu Aoki).

* Fixed a bug to ouput redundant delimiter at wakatigaki if the line
  start with ASCII character.

* Changed unitptr_t from macro to typedef (to avoid the issue that
  come compilers cannot handle such macro)

* Fixed missing iconv related casts.

Changes from KAKASI 2.3.4 to 2.3.5

* Added UTF-8 input/output support (iconv is required)

* Improve handling of japanese long-vowel.

* Fixed bug of do_kakasi(), may return invald memory area.

* Fixed a wrong entriy in kakasidict.

* Fixed bad hepburn romaji table.

* Added use_old_romaji_table variable and -t option.

* Fixed segfault on invalid SS2 sequences.

* Fixes warnings at compile.

* Added a test script.

* Added -S option for mutable separator (with -w or -s option).

* Added -l and -L option for level furigana and hiragana conversion.
  (See doc/README.level for more information)

* Newly added -F option for mutable parentheses around furigana
  (with -JH -f or -L option).

* Added -y option to display all yomi per one Kanji.

* Add endian independent dictionary format support.

* Fixed bad hepburn romaji table.
  (specify -t option fo use  old romaji table)

8 files changed, 39 insertions, 108 deletions

diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index d14cac41d08..b945a27af25 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.21 2013/04/08 11:17:23 rodent Exp $
+# $NetBSD: Makefile,v 1.22 2014/06/06 12:09:47 obache Exp $
 
-DISTNAME=	kakasi-2.3.4
-PKGREVISION=	5
+DISTNAME=	kakasi-2.3.6
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://kakasi.namazu.org/stable/
 
 MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://kakasi.namazu.org/
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
+LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
-INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/cat1 ${PKGMANDIR}/ja_JP.EUC/man1
+INSTALLATION_DIRS=	${PKGMANDIR}/ja_JP.EUC/man1
+
+TEST_TARGET=		check
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
+	${INSTALL_MAN} ${WRKSRC}/man/kakasi.1.ja ${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/kakasi.1
+
+.include "options.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/kakasi/PLIST b/textproc/kakasi/PLIST
index ec8b25a8342..e0dce4a241b 100644
--- a/textproc/kakasi/PLIST
+++ b/textproc/kakasi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/06 23:28:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/06/06 12:09:47 obache Exp $
 bin/atoc_conv
 bin/kakasi
 bin/kakasi-config
@@ -8,5 +8,7 @@ bin/wx2_conv
 include/libkakasi.h
 lib/libkakasi.la
 man/ja_JP.EUC/man1/kakasi.1
+man/man1/kakasi-config.1
+man/man1/kakasi.1
 share/kakasi/itaijidict
 share/kakasi/kanwadict
diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk
index b73e6def746..1f3d8707055 100644
--- a/textproc/kakasi/buildlink3.mk
+++ b/textproc/kakasi/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2014/06/06 12:09:47 obache Exp $
 
 BUILDLINK_TREE+=	kakasi
 
@@ -8,6 +8,14 @@ KAKASI_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.kakasi+=	kakasi>=2.3.0
 BUILDLINK_ABI_DEPENDS.kakasi+=	kakasi>=2.3.4nb4
 BUILDLINK_PKGSRCDIR.kakasi?=	../../textproc/kakasi
+
+pkgbase := kakasi
+.include "../../mk/pkg-build-options.mk"
+
+.  if !empty(PKG_BUILD_OPTIONS.kakasi:Mutf8)
+.include "../../converters/libiconv/buildlink3.mk"
+.  endif
+
 .endif # KAKASI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-kakasi
diff --git a/textproc/kakasi/distinfo b/textproc/kakasi/distinfo
index e99d5090242..6db772896d4 100644
--- a/textproc/kakasi/distinfo
+++ b/textproc/kakasi/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2006/03/13 09:17:51 taca Exp $
+$NetBSD: distinfo,v 1.7 2014/06/06 12:09:47 obache Exp $
 
-SHA1 (kakasi-2.3.4.tar.gz) = ab95a226f301955d2e8ae0d347afbb567e25fbe7
-RMD160 (kakasi-2.3.4.tar.gz) = 8ed84c5aaa0713484ab070871f555b12ded31802
-Size (kakasi-2.3.4.tar.gz) = 1099258 bytes
-SHA1 (patch-ab) = 06ad60e10c996500242fe038213164ddf3147178
-SHA1 (patch-ac) = c2100302e98e597ba50ea57e294b1053137ba8b3
-SHA1 (patch-ad) = 7b339bd53d801f0bedf047f840ce164e03a653cf
+SHA1 (kakasi-2.3.6.tar.gz) = 5f2e02264dda11940fb7b5387c327d4c4324bdb3
+RMD160 (kakasi-2.3.6.tar.gz) = db4a5dcacce407c54771c2473cd6b03751dba79f
+Size (kakasi-2.3.6.tar.gz) = 1352154 bytes
diff --git a/textproc/kakasi/options.mk b/textproc/kakasi/options.mk
new file mode 100644
index 00000000000..4bca22c211b
--- /dev/null
+++ b/textproc/kakasi/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2014/06/06 12:09:47 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kakasi
+PKG_SUPPORTED_OPTIONS=	utf8
+PKG_SUGGESTED_OPTIONS=	utf8
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mutf8)
+CONFIGURE_ARGS+=	--enable-utf8
+.include "../../converters/libiconv/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-utf8
+.endif
diff --git a/textproc/kakasi/patches/patch-ab b/textproc/kakasi/patches/patch-ab
deleted file mode 100644
index 2c65ffb7672..00000000000
--- a/textproc/kakasi/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 18:40:06 jlam Exp $
-
---- lib/libkakasi.h.orig	Mon Aug 27 11:11:56 2001
-+++ lib/libkakasi.h
-@@ -31,7 +31,7 @@
- #endif
- 
- int kakasi_getopt_argv PARAMS((int argc, char **argv));
--char *kakasi_do PARAMS((char *str));
-+char *kakasi_do PARAMS((unsigned char *str));
- int kakasi_close_kanwadict PARAMS((void));
- int kakasi_free PARAMS((char *p));
- 
diff --git a/textproc/kakasi/patches/patch-ac b/textproc/kakasi/patches/patch-ac
deleted file mode 100644
index 49962299c9e..00000000000
--- a/textproc/kakasi/patches/patch-ac
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/10/20 22:24:34 kristerw Exp $
-
---- 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>
- #endif
-+#ifdef HAVE_STRING_H
-+# include <string.h>
-+#endif
- #include <stdlib.h>
- #include "kakasi.h"
- #ifdef LIBRARY
-@@ -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;
-+		  } else if (pctype == 6) {
-+		    ptype = 6;
-+		  } else {
-+		    ptype = 5;
-+		  }
- 		} else {
- 		    ptype = 4;
- 		}
-@@ -604,7 +619,7 @@
-     {
- 	char *ret = getpbstr();
- 	if (ret == NULL)
--	    return "";
-+	    return strdup("");
- 	return ret;
-     }
- #endif
diff --git a/textproc/kakasi/patches/patch-ad b/textproc/kakasi/patches/patch-ad
deleted file mode 100644
index f96b0f4b524..00000000000
--- a/textproc/kakasi/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/03/13 09:17:51 taca Exp $
-
---- src/k2.c.orig	2001-01-16 16:51:47.000000000 +0900
-+++ src/k2.c
-@@ -127,7 +127,7 @@ k2rom_h_table[] = { 
-     "^", "\"", "_", "(maru)", "", ""};
- 
- 
--#define k2rom_buflen 10
-+#define k2rom_buflen 11
- 
- static int
- k2rom(c, n, type)
-@@ -154,7 +154,7 @@ k2rom(c, n, type)
- 	index_made = 1;
-     }
- 
--    buffer[k2rom_buflen] = '\0'; clen = k2rom_buflen;
-+    buffer[k2rom_buflen - 1] = '\0'; clen = k2rom_buflen - 1;
-     for (i = 0; i < k2rom_buflen; ++ i) {
- 	c1 = c[i].c1;
- 	if ((0 < c1) && (c1 < 0x20))