diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile index d94496a..71b592b 100644 --- a/chinese/opencc/Makefile +++ b/chinese/opencc/Makefile @@ -2,27 +2,32 @@ # $FreeBSD$ PORTNAME= opencc -PORTVERSION= 0.4.3 +PORTVERSION= 1.0.4 +DISTVERSIONPREFIX= ver. CATEGORIES= chinese converters -MASTER_SITES= GOOGLE_CODE +MASTER_SITES= GITHUB MAINTAINER= lichray@gmail.com COMMENT= Open Chinese Convert library and utilities LICENSE= APACHE20 -USES= cmake +USE_GITHUB= yes +GH_ACCOUNT= BYVoid +GH_PROJECT= OpenCC + +USES= cmake python:build USE_LDCONFIG= yes -OPTIONS_DEFINE= NLS +OPTIONS_DEFINE= TESTS -NLS_USES= gettext -NLS_CMAKE_ON= -DENABLE_GETTEXT=On +TESTS_DESC= Build the unit testing +TESTS_CMAKE_ON= -DENABLE_GTEST=ON -OPTIONS_SUB= yes +TEST_TARGET= test post-patch: - @${REINPLACE_CMD} -e 's@/usr/local@${LOCALBASE}@g' \ - ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e "s|python|${PYTHON_CMD}|g" \ + ${WRKSRC}/data/CMakeLists.txt .include diff --git a/chinese/opencc/distinfo b/chinese/opencc/distinfo index 6bfc8f8..f98f228 100644 --- a/chinese/opencc/distinfo +++ b/chinese/opencc/distinfo @@ -1,2 +1,3 @@ -SHA256 (opencc-0.4.3.tar.gz) = 7bdcf9e38ac05a16750d5276494d810db107c8a8b5f8b87e2357ee167a13a587 -SIZE (opencc-0.4.3.tar.gz) = 535151 +TIMESTAMP = 1467470273 +SHA256 (BYVoid-OpenCC-ver.1.0.4_GH0.tar.gz) = 0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac +SIZE (BYVoid-OpenCC-ver.1.0.4_GH0.tar.gz) = 1597309 diff --git a/chinese/opencc/files/patch-CMakeLists.txt b/chinese/opencc/files/patch-CMakeLists.txt index 181f72c..699df62 100644 --- a/chinese/opencc/files/patch-CMakeLists.txt +++ b/chinese/opencc/files/patch-CMakeLists.txt @@ -1,27 +1,11 @@ ---- CMakeLists.txt.orig 2010-12-23 07:18:23.000000000 -0600 -+++ CMakeLists.txt 2011-11-28 15:23:31.089426523 -0600 -@@ -42,6 +42,8 @@ set ( - - if (ENABLE_GETTEXT) - find_package(Gettext REQUIRED) -+ find_path(GETTEXT_INCLUDE_DIR libintl.h) -+ find_library(GETTEXT_LIBRARIES NAMES intl PATHS /usr/local/lib) - endif (ENABLE_GETTEXT) - - include (TestBigEndian) -@@ -75,7 +77,7 @@ install( - FILES - ${CMAKE_BINARY_DIR}/opencc.pc - DESTINATION -- ${DIR_LIBRARY}/pkgconfig -+ ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig +--- CMakeLists.txt.orig 2016-07-02 15:04:34 UTC ++++ CMakeLists.txt +@@ -98,7 +98,7 @@ install( + FILES + ${CMAKE_BINARY_DIR}/opencc.pc + DESTINATION +- ${DIR_LIBRARY}/pkgconfig ++ ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig ) - ######## Subdirectories -@@ -88,4 +90,4 @@ if (GETTEXT_FOUND AND ENABLE_GETTEXT) - add_subdirectory(po) - endif (GETTEXT_FOUND AND ENABLE_GETTEXT) - --add_subdirectory(test) -\ No newline at end of file -+add_subdirectory(test) + ######## Compiler flags diff --git a/chinese/opencc/files/patch-doc_CMakeLists.txt b/chinese/opencc/files/patch-doc_CMakeLists.txt deleted file mode 100644 index 23a05bf..0000000 --- a/chinese/opencc/files/patch-doc_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/CMakeLists.txt~ 2010-12-23 07:18:23.000000000 -0600 -+++ doc/CMakeLists.txt 2011-11-28 14:52:15.884747557 -0600 -@@ -3,5 +3,5 @@ install( - opencc.1 - opencc_dict.1 - DESTINATION -- ${DIR_SHARE}/man/man1 -+ ${CMAKE_INSTALL_PREFIX}/man/man1 - ) diff --git a/chinese/opencc/files/patch-src_tools_CMakeLists.txt b/chinese/opencc/files/patch-src_tools_CMakeLists.txt deleted file mode 100644 index f86d5d9..0000000 --- a/chinese/opencc/files/patch-src_tools_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- src/tools/CMakeLists.txt.orig 2010-12-23 07:18:23.000000000 -0600 -+++ src/tools/CMakeLists.txt 2011-11-28 15:46:19.473573693 -0600 -@@ -30,6 +30,10 @@ target_link_libraries( - ${LIBOPENCC_TARGET} - ) - -+if(ENABLE_GETTEXT) -+ target_link_libraries(opencc_dict ${GETTEXT_LIBRARIES}) -+endif(ENABLE_GETTEXT) -+ - install( - TARGETS - opencc_dict -@@ -61,6 +65,10 @@ target_link_libraries( - ${LIBOPENCC_TARGET} - ) - -+if(ENABLE_GETTEXT) -+ target_link_libraries(opencc ${GETTEXT_LIBRARIES}) -+endif(ENABLE_GETTEXT) -+ - install( - TARGETS - opencc diff --git a/chinese/opencc/files/patch-src_utils.c b/chinese/opencc/files/patch-src_utils.c deleted file mode 100644 index 855c3c8..0000000 --- a/chinese/opencc/files/patch-src_utils.c +++ /dev/null @@ -1,46 +0,0 @@ ---- src/utils.c.orig 2014-04-07 11:37:35.909060780 -0400 -+++ src/utils.c 2014-04-07 11:53:24.429168115 -0400 -@@ -19,6 +19,11 @@ - #include "utils.h" - #include - -+#ifdef __FreeBSD__ -+ #include -+ #include -+#endif -+ - #ifdef __APPLE__ - #include "TargetConditionals.h" - #ifdef TARGET_OS_MAC -@@ -95,14 +100,19 @@ const char* executable_path(void) { - static int calculated = 0; - - if (!calculated) { --#ifdef __linux -+#if defined(__linux) - ssize_t res = readlink("/proc/self/exe", path_buffer, sizeof(path_buffer)); - assert(res != -1); --#elif __APPLE__ -+#elif defined(__FreeBSD__) -+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ size_t size = sizeof(path_buffer); -+ int res = sysctl(mib, 4, path_buffer, &size, NULL, 0); -+ assert(res == 0); -+#elif defined(__APPLE__) - uint32_t size = sizeof(path_buffer); - int res = _NSGetExecutablePath(path_buffer, &size); - assert(res == 0); --#elif _WIN32 || _WIN64 -+#elif defined(_WIN32) || defined(_WIN64) - // NOTE: for "C:\\opencc.exe" on Windows, the returned path "C:" is - // incorrect until a '/' is appended to it later in try_open_file() - DWORD res = GetModuleFileNameA(NULL, path_buffer, PATH_BUFFER_SIZE); -@@ -110,7 +120,7 @@ const char* executable_path(void) { - #else - /* Other unsupported os */ - assert(0); --#endif /* ifdef __linux */ -+#endif /* if defined(__linux) */ - char* last_sep = strrchr(path_buffer, PATH_SEPARATOR); - assert(last_sep != NULL); - *last_sep = '\0'; diff --git a/chinese/opencc/pkg-plist b/chinese/opencc/pkg-plist index 2525a12..3653d5f 100644 --- a/chinese/opencc/pkg-plist +++ b/chinese/opencc/pkg-plist @@ -1,38 +1,55 @@ 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/DictEntry.hpp +include/opencc/DictGroup.hpp +include/opencc/Exception.hpp +include/opencc/Export.hpp +include/opencc/Lexicon.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/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.2 libdata/pkgconfig/opencc.pc -man/man1/opencc.1.gz -man/man1/opencc_dict.1.gz -%%NLS%%share/locale/zh_CN/LC_MESSAGES/opencc.mo -%%NLS%%share/locale/zh_HK/LC_MESSAGES/opencc.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/opencc.mo -%%DATADIR%%/from_tw_phrases.txt -%%DATADIR%%/from_tw_variants.txt -%%DATADIR%%/mix2zhs.ini -%%DATADIR%%/mix2zht.ini -%%DATADIR%%/simp_to_trad_characters.ocd -%%DATADIR%%/simp_to_trad_phrases.ocd -%%DATADIR%%/to_cn_phrases.txt -%%DATADIR%%/to_tw_phrases.txt -%%DATADIR%%/to_tw_variants.txt -%%DATADIR%%/trad_to_simp_characters.ocd -%%DATADIR%%/trad_to_simp_phrases.ocd -%%DATADIR%%/zhs2zht.ini -%%DATADIR%%/zhs2zhtw_p.ini -%%DATADIR%%/zhs2zhtw_v.ini -%%DATADIR%%/zhs2zhtw_vp.ini -%%DATADIR%%/zht2zhs.ini -%%DATADIR%%/zht2zhtw_p.ini -%%DATADIR%%/zht2zhtw_v.ini -%%DATADIR%%/zht2zhtw_vp.ini -%%DATADIR%%/zhtw2zhcn_s.ini -%%DATADIR%%/zhtw2zhcn_t.ini -%%DATADIR%%/zhtw2zhs.ini -%%DATADIR%%/zhtw2zht.ini +%%DATADIR%%/HKVariants.ocd +%%DATADIR%%/HKVariantsPhrases.ocd +%%DATADIR%%/HKVariantsRev.ocd +%%DATADIR%%/HKVariantsRevPhrases.ocd +%%DATADIR%%/JPVariants.ocd +%%DATADIR%%/STCharacters.ocd +%%DATADIR%%/STPhrases.ocd +%%DATADIR%%/TSCharacters.ocd +%%DATADIR%%/TSPhrases.ocd +%%DATADIR%%/TWPhrases.ocd +%%DATADIR%%/TWPhrasesRev.ocd +%%DATADIR%%/TWVariants.ocd +%%DATADIR%%/TWVariantsRev.ocd +%%DATADIR%%/TWVariantsRevPhrases.ocd +%%DATADIR%%/hk2s.json +%%DATADIR%%/s2hk.json +%%DATADIR%%/s2t.json +%%DATADIR%%/s2tw.json +%%DATADIR%%/s2twp.json +%%DATADIR%%/t2hk.json +%%DATADIR%%/t2s.json +%%DATADIR%%/t2tw.json +%%DATADIR%%/tw2s.json +%%DATADIR%%/tw2sp.json diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile index 9e6e418..38d60c4 100644 --- a/chinese/fcitx-rime/Makefile +++ b/chinese/fcitx-rime/Makefile @@ -3,6 +3,7 @@ PORTNAME= fcitx-rime PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= chinese MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/ DIST_SUBDIR= fcitx