diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index 118e2234edff..ed016e93d5a1 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -1,30 +1,37 @@
 PORTNAME=	opencc
 DISTVERSIONPREFIX=	ver.
 DISTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	chinese converters
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Open Chinese Convert library and utilities
 WWW=		https://github.com/BYVoid/OpenCC
 
 LICENSE=	APACHE20
 
-USES=		cmake:testing compiler:c++17-lang python:build
+BUILD_DEPENDS=	rapidjson>=0:devel/rapidjson \
+		${LOCALBASE}/include/tclap/CmdLine.h:devel/tclap12
+LIB_DEPENDS=	libmarisa.so:devel/marisa-trie
+TEST_DEPENDS=	googletest>=0:devel/googletest
+
+USES=		cmake:testing compiler:c++17-lang localbase:ldflags python:build
 USE_GITHUB=	yes
-USE_LDCONFIG=	yes
 GH_ACCOUNT=	BYVoid
 GH_PROJECT=	OpenCC
+USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DPython3_EXECUTABLE=${PYTHON_CMD}
-CMAKE_TESTING_ON=	ENABLE_GTEST
-
-TEST_TARGET=	test
+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
+		USE_SYSTEM_MARISA \
+		USE_SYSTEM_RAPIDJSON \
+		USE_SYSTEM_TCLAP
+CMAKE_TESTING_ON=	ENABLE_GTEST USE_SYSTEM_GTEST
 
 OPTIONS_DEFINE=	JIEBA
 OPTIONS_DEFAULT=	JIEBA
 OPTIONS_SUB=	yes
 
 JIEBA_DESC=	Jieba segmentation plugin
 JIEBA_CMAKE_BOOL=	BUILD_OPENCC_JIEBA_PLUGIN
 
 .include <bsd.port.mk>
diff --git a/chinese/opencc/pkg-plist b/chinese/opencc/pkg-plist
index c34fa0725d89..65de242c4bc1 100644
--- a/chinese/opencc/pkg-plist
+++ b/chinese/opencc/pkg-plist
@@ -1,89 +1,88 @@
 bin/opencc
 bin/opencc_dict
 bin/opencc_phrase_extract
 include/opencc/Common.hpp
 include/opencc/Config.hpp
 include/opencc/Conversion.hpp
 include/opencc/ConversionChain.hpp
 include/opencc/ConversionInspection.hpp
 include/opencc/Converter.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/MarisaDict.hpp
 include/opencc/MaxMatchSegmentation.hpp
 include/opencc/Optional.hpp
 include/opencc/ResourceProvider.hpp
 include/opencc/Segmentation.hpp
 include/opencc/Segments.hpp
 include/opencc/SerializableDict.hpp
 include/opencc/SimpleConverter.hpp
 include/opencc/TextDict.hpp
 include/opencc/UTF8Util.hpp
 include/opencc/opencc.h
 include/opencc/plugin/OpenCCPlugin.h
 lib/cmake/opencc/OpenCCConfig.cmake
 lib/cmake/opencc/OpenCCConfigVersion.cmake
 lib/cmake/opencc/OpenCCTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/opencc/OpenCCTargets.cmake
-lib/libmarisa.a
 lib/libopencc.so
 lib/libopencc.so.1.4
 lib/libopencc.so.1.4.2
 libdata/pkgconfig/opencc.pc
 %%DATADIR%%/CJK_Compatibility_Ideographs.ocd2
 %%DATADIR%%/HKPhrases.ocd2
 %%DATADIR%%/HKPhrasesRev.ocd2
 %%DATADIR%%/HKVariants.ocd2
 %%DATADIR%%/HKVariantsPhrases.ocd2
 %%DATADIR%%/HKVariantsRev.ocd2
 %%DATADIR%%/HKVariantsRevPhrases.ocd2
 %%DATADIR%%/JPShinjitaiCharacters.ocd2
 %%DATADIR%%/JPShinjitaiCharactersRev.ocd2
 %%DATADIR%%/JPShinjitaiPhrases.ocd2
 %%DATADIR%%/STCharacters.ocd2
 %%DATADIR%%/STPhrases.ocd2
 %%DATADIR%%/STPhrases_GeneratedFromRegionalPhrases.ocd2
 %%DATADIR%%/TSCharacters.ocd2
 %%DATADIR%%/TSCharactersExt.ocd2
 %%DATADIR%%/TSPhrases.ocd2
 %%DATADIR%%/TWPhrases.ocd2
 %%DATADIR%%/TWPhrasesRev.ocd2
 %%DATADIR%%/TWVariants.ocd2
 %%DATADIR%%/TWVariantsPhrases.ocd2
 %%DATADIR%%/TWVariantsRev.ocd2
 %%DATADIR%%/TWVariantsRevPhrases.ocd2
 %%DATADIR%%/hk2s.json
 %%DATADIR%%/hk2sp.json
 %%DATADIR%%/hk2t.json
 %%DATADIR%%/jp2t.json
 %%DATADIR%%/s2hk.json
 %%DATADIR%%/s2hkp.json
 %%DATADIR%%/s2t.json
 %%DATADIR%%/s2tw.json
 %%DATADIR%%/s2twp.json
 %%DATADIR%%/t2hk.json
 %%DATADIR%%/t2jp.json
 %%DATADIR%%/t2s.json
 %%DATADIR%%/t2tw.json
 %%DATADIR%%/tw2s.json
 %%DATADIR%%/tw2sp.json
 %%DATADIR%%/tw2t.json
 @comment Jieba segmentation plugin (JIEBA option)
 %%JIEBA%%lib/opencc/plugins/libopencc-jieba.so
 %%JIEBA%%%%DATADIR%%/hk2sp_jieba.json
 %%JIEBA%%%%DATADIR%%/s2hk_jieba.json
 %%JIEBA%%%%DATADIR%%/s2hkp_jieba.json
 %%JIEBA%%%%DATADIR%%/s2t_jieba.json
 %%JIEBA%%%%DATADIR%%/s2tw_jieba.json
 %%JIEBA%%%%DATADIR%%/s2twp_jieba.json
 %%JIEBA%%%%DATADIR%%/tw2sp_jieba.json
 %%JIEBA%%%%DATADIR%%/jieba_dict/hmm_model.utf8
 %%JIEBA%%%%DATADIR%%/jieba_dict/idf.utf8
 %%JIEBA%%%%DATADIR%%/jieba_dict/jieba.dict.utf8
 %%JIEBA%%%%DATADIR%%/jieba_dict/jieba_merged.ocd2
 %%JIEBA%%%%DATADIR%%/jieba_dict/stop_words.utf8
 %%JIEBA%%%%DATADIR%%/jieba_dict/user.dict.utf8