libpinyin: Update to 2.6.0

* Enable libzhuyin.

Changelog:
version 2.6.0
* bug fixes

version 2.4.92
* update pinyin data
* bug fixes

version 2.4.91
* improve full pinyin auto correction
* bug fixes

version 2.3.0
* update pinyin data

version 2.2.2
* minor fixes

version 2.2.1
* fixes predicted candidates

version 2.2.0
* bug fixes

version 2.1.91
* fixes zhuyin parsers;

version 2.1.0
* support sort option in pinyin_guess_candidates function;

version 2.0.92
* reduce memory consumption after imported user dictionary;

version 2.0.91
* merge libzhuyin code;

version 2.0.0
* the first official release of 2.0.x;
* fixes autoconf;

version 1.9.92
* fixes crash in double pinyin;

version 1.9.91
* multiple sentence candidates;

version 1.7.0
* fixes build on FreeBSD;
* update cmake files;

version 1.6.91
* change license to GPLv3+;
* import open-gram dictionary and remove pinyin tones;
* add some checks when load data from file;

version 1.6.0
* bug fixes.

version 1.5.91
* change pinyin/phrase tables to use dbm.
* enhance pinyin key representation and pinyin parsers.

version 1.2.0
* bug fixes.

version 1.1.91
* support Kyoto Cabinet as alternative to Berkeley DB.
* improve multiple dictionaries support feature.

version 1.1.0
* support to export user phrases.

6 files changed, 24 insertions, 48 deletions

diff --git a/textproc/libpinyin/Makefile b/textproc/libpinyin/Makefile
index e9fac7f1b0f..f805594b614 100644
--- a/textproc/libpinyin/Makefile
+++ b/textproc/libpinyin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2020/03/08 16:48:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/20 13:39:46 ryoon Exp $
 
-DISTNAME=	libpinyin-1.0.0
-PKGREVISION=	1
+DISTNAME=	libpinyin-2.6.0
 CATEGORIES=	textproc chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libpinyin/}
 
@@ -15,7 +14,10 @@ USE_TOOLS+=	gmake pkg-config
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
+CONFIGURE_ARGS+=	--enable-libzhuyin
+
 PKGCONFIG_OVERRIDE+=	libpinyin.pc.in
+PKGCONFIG_OVERRIDE+=	libzhuyin.pc.in
 
 BUILDLINK_TRANSFORM.Darwin+=	rm:-Wl,--version-script=./libpinyin.ver
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./libpinyin.ver
diff --git a/textproc/libpinyin/PLIST b/textproc/libpinyin/PLIST
index 028b396af11..734cf674beb 100644
--- a/textproc/libpinyin/PLIST
+++ b/textproc/libpinyin/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/01 13:25:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/02/20 13:39:46 ryoon Exp $
 bin/gen_binary_files
 bin/gen_unigram
 bin/import_interpolation
 include/${PKGNAME}/novel_types.h
 include/${PKGNAME}/pinyin.h
 include/${PKGNAME}/pinyin_custom2.h
+include/${PKGNAME}/zhuyin.h
+include/${PKGNAME}/zhuyin_custom2.h
 lib/libpinyin.la
+lib/libpinyin/data/addon_phrase_index.bin
+lib/libpinyin/data/addon_pinyin_index.bin
 lib/libpinyin/data/art.bin
 lib/libpinyin/data/bigram.db
 lib/libpinyin/data/culture.bin
@@ -17,14 +21,16 @@ lib/libpinyin/data/history.bin
 lib/libpinyin/data/life.bin
 lib/libpinyin/data/merged.bin
 lib/libpinyin/data/nature.bin
+lib/libpinyin/data/opengram.bin
+lib/libpinyin/data/people.bin
 lib/libpinyin/data/phrase_index.bin
 lib/libpinyin/data/pinyin_index.bin
-lib/libpinyin/data/scitech.bin
+lib/libpinyin/data/science.bin
 lib/libpinyin/data/society.bin
 lib/libpinyin/data/sport.bin
 lib/libpinyin/data/table.conf
+lib/libpinyin/data/technology.bin
+lib/libzhuyin.la
 lib/pkgconfig/libpinyin.pc
-man/man1/gen_binary_files.1
-man/man1/gen_unigram.1
-man/man1/import_interpolation.1
+lib/pkgconfig/libzhuyin.pc
 man/man1/libpinyin.1
diff --git a/textproc/libpinyin/buildlink3.mk b/textproc/libpinyin/buildlink3.mk
index 0f29b428898..dc99a8b5745 100644
--- a/textproc/libpinyin/buildlink3.mk
+++ b/textproc/libpinyin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/03/08 16:48:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2021/02/20 13:39:46 ryoon Exp $
 #
 
 BUILDLINK_TREE+=	libpinyin
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	libpinyin
 .if !defined(LIBPINYIN_BUILDLINK3_MK)
 LIBPINYIN_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libpinyin+=	libpinyin>=1.0.0
-BUILDLINK_ABI_DEPENDS.libpinyin?=		libpinyin>=1.0.0nb1
+BUILDLINK_API_DEPENDS.libpinyin+=	libpinyin>=2.6.0
+BUILDLINK_ABI_DEPENDS.libpinyin?=	libpinyin>=2.6.0
 BUILDLINK_PKGSRCDIR.libpinyin?=		../../textproc/libpinyin
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/textproc/libpinyin/distinfo b/textproc/libpinyin/distinfo
index 2f8bed5fe30..3c950fb8c03 100644
--- a/textproc/libpinyin/distinfo
+++ b/textproc/libpinyin/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:59:38 agc Exp $
+$NetBSD: distinfo,v 1.5 2021/02/20 13:39:46 ryoon Exp $
 
-SHA1 (libpinyin-1.0.0.tar.gz) = fd1748074c61c4fc420bdbe61c957f3a13669b0e
-RMD160 (libpinyin-1.0.0.tar.gz) = 578c6e8193ee1162c4aafd83ed8d18cba8144b07
-SHA512 (libpinyin-1.0.0.tar.gz) = c271e2f5f7bc7f9897c5fefb19b727197fe7fd329d41067b87602bf72f1f9b22490eada59fffa41b180d54e309d3b36be385d9b9487351f31090f8a79e73f9c8
-Size (libpinyin-1.0.0.tar.gz) = 19726060 bytes
-SHA1 (patch-src_lookup_phrase__lookup.cpp) = 13f179f40428a3fd5c5f46ec3135be0d0978d8e1
-SHA1 (patch-src_lookup_pinyin__lookup2.cpp) = 97f1b86d8605ca3b770d616c313717511dfbea7a
+SHA1 (libpinyin-2.6.0.tar.gz) = 19cd27bcb2ba6eb53fbf576f876a4be19fec8afe
+RMD160 (libpinyin-2.6.0.tar.gz) = e3bc9125ce127154b4e757d76930ad389b3f422c
+SHA512 (libpinyin-2.6.0.tar.gz) = da6245ca31ea1ecfe42cab6cb9251f924c2ecb54ca0e8d48768c5f4157e44a4eaa891401142f2100636f548e5731530c607beeacd9a81a1ac8bb54ad54e42bf3
+Size (libpinyin-2.6.0.tar.gz) = 20564001 bytes
diff --git a/textproc/libpinyin/patches/patch-src_lookup_phrase__lookup.cpp b/textproc/libpinyin/patches/patch-src_lookup_phrase__lookup.cpp
deleted file mode 100644
index 8efcf0b4fc2..00000000000
--- a/textproc/libpinyin/patches/patch-src_lookup_phrase__lookup.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lookup_phrase__lookup.cpp,v 1.1 2014/07/12 12:11:12 obache Exp $
-
-* resolve ambiguos usage of log(3), lookup_value_t expect gfloat.
-
---- src/lookup/phrase_lookup.cpp.orig	2013-06-18 05:56:09.000000000 +0000
-+++ src/lookup/phrase_lookup.cpp
-@@ -39,7 +39,7 @@ static bool populate_prefixes(GPtrArray 
-                               GPtrArray * steps_content) {
- 
-     lookup_key_t initial_key = sentence_start;
--    lookup_value_t initial_value(log(1));
-+    lookup_value_t initial_value(log((gfloat)1));
-     initial_value.m_handles[1] = sentence_start;
- 
-     LookupStepContent initial_step_content = (LookupStepContent)
diff --git a/textproc/libpinyin/patches/patch-src_lookup_pinyin__lookup2.cpp b/textproc/libpinyin/patches/patch-src_lookup_pinyin__lookup2.cpp
deleted file mode 100644
index 4f592657636..00000000000
--- a/textproc/libpinyin/patches/patch-src_lookup_pinyin__lookup2.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_lookup_pinyin__lookup2.cpp,v 1.1 2014/07/14 08:12:04 obache Exp $
-
-* resolve ambiguos usage of log(3), lookup_value_t expect gfloat.
-
---- src/lookup/pinyin_lookup2.cpp.orig	2013-06-18 05:56:09.000000000 +0000
-+++ src/lookup/pinyin_lookup2.cpp
-@@ -133,7 +133,7 @@ static bool populate_prefixes(GPtrArray 
-     for (size_t i = 0; i < prefixes->len; ++i) {
-         phrase_token_t token = g_array_index(prefixes, phrase_token_t, i);
-         lookup_key_t initial_key = token;
--        lookup_value_t initial_value(log(1));
-+        lookup_value_t initial_value(log((gfloat)1));
-         initial_value.m_handles[1] = token;
- 
-         LookupStepContent initial_step_content = (LookupStepContent)