opencc: Update to 1.1.1

Changelog:
Not available in English or Japanese, only in Chinese.
Some functions are added at least.

5 files changed, 74 insertions, 70 deletions

diff --git a/converters/opencc/Makefile b/converters/opencc/Makefile
index 7c1ec199930..f2c7797e5fd 100644
--- a/converters/opencc/Makefile
+++ b/converters/opencc/Makefile
@@ -1,17 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 20:03:24 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.4 2021/02/20 13:56:07 ryoon Exp $
 
-DISTNAME=	opencc-0.4.2
+GITHUB_PROJECT=	OpenCC
+GITHUB_TAG=	ver.${PKGVERSION_NOREV}
+DISTNAME=	OpenCC-ver.1.1.1
+PKGNAME=	${DISTNAME:S/OpenCC-ver./opencc-/}
 CATEGORIES=	converters chinese
-MASTER_SITES=	http://dl.bintray.com/byvoid/opencc/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=BYVoid/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://opencc.byvoid.com/
 COMMENT=	Convertion between Traditional and Simplified Chinese
 LICENSE=	apache-2.0
 
+WRKSRC=		${WRKDIR}/${DISTNAME} # GitHub rule is not relevant for this.
+
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c
+USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	opencc.pc.in
 
@@ -21,10 +26,5 @@ MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/src
 
 TEST_TARGET=	test
 
-SUBST_CLASSES+=		mandir
-SUBST_STAGE.mandir=	pre-configure
-SUBST_FILES.mandir=	doc/CMakeLists.txt
-SUBST_SED.mandir=	-e 's,$${DIR_SHARE}/man,${PKGMANDIR},'
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/opencc/PLIST b/converters/opencc/PLIST
index 51764cba20a..3de21086124 100644
--- a/converters/opencc/PLIST
+++ b/converters/opencc/PLIST
@@ -1,36 +1,63 @@
-@comment $NetBSD: PLIST,v 1.1 2014/12/01 00:05:38 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/02/20 13:56:07 ryoon Exp $
 bin/opencc
 bin/opencc_dict
+bin/opencc_phrase_extract
+include/opencc/BinaryDict.hpp
+include/opencc/Common.hpp
+include/opencc/Config.hpp
+include/opencc/Conversion.hpp
+include/opencc/ConversionChain.hpp
+include/opencc/Converter.hpp
+include/opencc/DartsDict.hpp
+include/opencc/Dict.hpp
+include/opencc/DictConverter.hpp
+include/opencc/DictEntry.hpp
+include/opencc/DictGroup.hpp
+include/opencc/Exception.hpp
+include/opencc/Export.hpp
+include/opencc/Lexicon.hpp
+include/opencc/MarisaDict.hpp
+include/opencc/MaxMatchSegmentation.hpp
+include/opencc/Optional.hpp
+include/opencc/PhraseExtract.hpp
+include/opencc/Segmentation.hpp
+include/opencc/Segments.hpp
+include/opencc/SerializableDict.hpp
+include/opencc/SerializedValues.hpp
+include/opencc/SimpleConverter.hpp
+include/opencc/TextDict.hpp
+include/opencc/UTF8StringSlice.hpp
+include/opencc/UTF8Util.hpp
 include/opencc/opencc.h
-include/opencc/opencc_types.h
-include/opencc/openccxx.h
-lib/libopencc.a
 lib/libopencc.so
-lib/libopencc.so.1
-lib/libopencc.so.1.0.0
+lib/libopencc.so.1.1
+lib/libopencc.so.${PKGVERSION}
 lib/pkgconfig/opencc.pc
-man/man1/opencc.1
-man/man1/opencc_dict.1
-share/opencc/from_tw_phrases.txt
-share/opencc/from_tw_variants.txt
-share/opencc/mix2zhs.ini
-share/opencc/mix2zht.ini
-share/opencc/simp_to_trad_characters.ocd
-share/opencc/simp_to_trad_phrases.ocd
-share/opencc/to_cn_phrases.txt
-share/opencc/to_tw_phrases.txt
-share/opencc/to_tw_variants.txt
-share/opencc/trad_to_simp_characters.ocd
-share/opencc/trad_to_simp_phrases.ocd
-share/opencc/zhs2zht.ini
-share/opencc/zhs2zhtw_p.ini
-share/opencc/zhs2zhtw_v.ini
-share/opencc/zhs2zhtw_vp.ini
-share/opencc/zht2zhs.ini
-share/opencc/zht2zhtw_p.ini
-share/opencc/zht2zhtw_v.ini
-share/opencc/zht2zhtw_vp.ini
-share/opencc/zhtw2zhcn_s.ini
-share/opencc/zhtw2zhcn_t.ini
-share/opencc/zhtw2zhs.ini
-share/opencc/zhtw2zht.ini
+share/opencc/HKVariants.ocd2
+share/opencc/HKVariantsRev.ocd2
+share/opencc/HKVariantsRevPhrases.ocd2
+share/opencc/JPShinjitaiCharacters.ocd2
+share/opencc/JPShinjitaiPhrases.ocd2
+share/opencc/JPVariants.ocd2
+share/opencc/JPVariantsRev.ocd2
+share/opencc/STCharacters.ocd2
+share/opencc/STPhrases.ocd2
+share/opencc/TSCharacters.ocd2
+share/opencc/TSPhrases.ocd2
+share/opencc/TWPhrases.ocd2
+share/opencc/TWPhrasesRev.ocd2
+share/opencc/TWVariants.ocd2
+share/opencc/TWVariantsRev.ocd2
+share/opencc/TWVariantsRevPhrases.ocd2
+share/opencc/hk2s.json
+share/opencc/jp2t.json
+share/opencc/s2hk.json
+share/opencc/s2t.json
+share/opencc/s2tw.json
+share/opencc/s2twp.json
+share/opencc/t2hk.json
+share/opencc/t2jp.json
+share/opencc/t2s.json
+share/opencc/t2tw.json
+share/opencc/tw2s.json
+share/opencc/tw2sp.json
diff --git a/converters/opencc/buildlink3.mk b/converters/opencc/buildlink3.mk
index 8cd8d188435..746b6673297 100644
--- a/converters/opencc/buildlink3.mk
+++ b/converters/opencc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/12/01 00:05:38 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/02/20 13:56:07 ryoon Exp $
 #
 
 BUILDLINK_TREE+=	opencc
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	opencc
 .if !defined(OPENCC_BUILDLINK3_MK)
 OPENCC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.opencc+=	opencc>=0.4.2
+BUILDLINK_API_DEPENDS.opencc+=	opencc>=1.1.1
 BUILDLINK_PKGSRCDIR.opencc?=	../../converters/opencc
 .endif	# OPENCC_BUILDLINK3_MK
 
diff --git a/converters/opencc/distinfo b/converters/opencc/distinfo
index 701d22d3dea..12e65429e19 100644
--- a/converters/opencc/distinfo
+++ b/converters/opencc/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:43:50 agc Exp $
+$NetBSD: distinfo,v 1.4 2021/02/20 13:56:07 ryoon Exp $
 
-SHA1 (opencc-0.4.2.tar.gz) = 1e4216e5fe21b16836063f23d0341cb54dbce97c
-RMD160 (opencc-0.4.2.tar.gz) = 9aed1e700250601d653baf2a7284b489441a08be
-SHA512 (opencc-0.4.2.tar.gz) = 27c817b65dcba894a53f0d2e3ee675f88cd9df40e027184b333be3f20f14206136a42db9cfb0e2e0636a54434778e4785a368ed29a42350de1c03c431a28773c
-Size (opencc-0.4.2.tar.gz) = 725353 bytes
-SHA1 (patch-src_symbols.cmake) = e7ef6f750532e8a6cbdc9ad003d76853336e9bd7
+SHA1 (OpenCC-ver.1.1.1.tar.gz) = e183302ee93e300a954c8f79050fed0a550c7622
+RMD160 (OpenCC-ver.1.1.1.tar.gz) = 16934c802a3c7d3e9582edf6f04bfbc11a934dee
+SHA512 (OpenCC-ver.1.1.1.tar.gz) = 48ccf61f63cf0a1c0fc484a52ae1d406a28949a52be7d7d1595e6aaf87f40ac47ea4697308441a9381f0cd6f404ee5a28b85a2fa2f288c4b3933be36f4a41363
+Size (OpenCC-ver.1.1.1.tar.gz) = 2212256 bytes
diff --git a/converters/opencc/patches/patch-src_symbols.cmake b/converters/opencc/patches/patch-src_symbols.cmake
deleted file mode 100644
index 580962adcc0..00000000000
--- a/converters/opencc/patches/patch-src_symbols.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_symbols.cmake,v 1.1 2015/02/13 17:07:52 jperkin Exp $
-
-Don't use GNU ld arguments on SunOS.
-
---- src/symbols.cmake.orig	2013-04-11 17:23:05.000000000 +0000
-+++ src/symbols.cmake
-@@ -21,7 +21,7 @@ if (APPLE)
- 	set(LINK_FLAGS
- 		"${LINK_FLAGS} -Wl,-exported_symbols_list,'${_symbols_list}'")
- 
--elseif (CMAKE_C_COMPILER_ID STREQUAL GNU)
-+elseif (CMAKE_C_COMPILER_ID STREQUAL GNU AND NOT CPACK_SYSTEM_NAME STREQUAL SunOS)
- 	# Create a version script for GNU ld.
- 	set(_symbols "{ global: ${OPENCC_SYMBOLS}; local: *; };")
- 	set(_version_script "${CMAKE_CURRENT_BINARY_DIR}/version.script")
-@@ -37,4 +37,4 @@ set_target_properties(
- 	PROPERTIES
- 		LINK_FLAGS
- 			"${LINK_FLAGS}"
--)
-\ No newline at end of file
-+)