1 files changed, 21 insertions, 28 deletions

diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 1d30e4e7d069..b20b3e4dd2de 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	clickhouse
-PORTVERSION=	20.5.4.40
+PORTVERSION=	20.7.2.30
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	olevole@olevole.ru
@@ -28,25 +27,27 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	yandex
 GH_PROJECT=	ClickHouse
 GH_TUPLE=	\
-		apache:arrow:b789226:apache_arrow/contrib/arrow \
-		ClickHouse-Extras:avro:6cfcf6c:ClickHouse_Extras_avro/contrib/avro \
+		CopernicaMarketingSoftware:AMQP-CPP:1c08399:CopernicaMarketingSoftware_AMQP_CPP/contrib/AMQP-CPP \
+		apache:arrow:3cbcb7b:apache_arrow/contrib/arrow \
+		ClickHouse-Extras:avro:92caca2:ClickHouse_Extras_avro/contrib/avro \
 		ClickHouse-Extras:aws-sdk-cpp:17e10c0:ClickHouse_Extras_aws_sdk_cpp/contrib/aws \
 		ClickHouse-Extras:aws-c-common:736a82d:ClickHouse_Extras_aws_c_common/contrib/aws-c-common \
 		ClickHouse-Extras:aws-c-event-stream:3bc3366:ClickHouse_Extras_aws_c_event_stream/contrib/aws-c-event-stream \
 		ClickHouse-Extras:aws-checksums:519d6d9:ClickHouse_Extras_aws_checksums/contrib/aws-checksums \
-		powturbo:Turbo-Base64:95ba56a:powturbo_Turbo_Base64/contrib/base64 \
+		ClickHouse-Extras:Turbo-Base64:af9b331:ClickHouse_Extras_Turbo_Base64/contrib/base64 \
 		ClickHouse-Extras:boost:a04e72c:ClickHouse_Extras_boost/contrib/boost \
 		google:brotli:5805f99:google_brotli/contrib/brotli \
 		capnproto:capnproto:a00ccd9:capnproto_capnproto/contrib/capnproto \
 		ClickHouse-Extras:cpp-driver:a49b4e0:ClickHouse_Extras_cpp_driver/contrib/cassandra \
 		ClickHouse-Extras:cctz:7a2db4e:ClickHouse_Extras_cctz/contrib/cctz \
-		ClickHouse-Extras:cppkafka:f555ee3:ClickHouse_Extras_cppkafka/contrib/cppkafka \
+		mfontanini:cppkafka:b06e64e:mfontanini_cppkafka/contrib/cppkafka \
 		curl:curl:3b8bbbb:curl_curl/contrib/curl \
 		google:double-conversion:cf2f0f3:google_double_conversion/contrib/double-conversion \
 		ClickHouse-Extras:fastops:88752a5:ClickHouse_Extras_fastops/contrib/fastops \
-		google:flatbuffers:bf9eb67:google_flatbuffers/contrib/flatbuffers \
-		fmtlib:fmt:297c3b2:fmtlib_fmt/contrib/fmtlib \
-		google:googletest:703bd9c:google_googletest/contrib/googletest \
+		google:flatbuffers:6df40a2:google_flatbuffers/contrib/flatbuffers \
+		fmtlib:fmt:c108ee1:fmtlib_fmt/contrib/fmtlib \
+		kthohr:gcem:8d4f1b5:kthohr_gcem/contrib/gcem \
+		google:googletest:356f2d2:google_googletest/contrib/googletest \
 		ClickHouse-Extras:grpc:8aea4e1:ClickHouse_Extras_grpc/contrib/grpc \
 		uber:h3:6cfd649:uber_h3/contrib/h3 \
 		ClickHouse-Extras:hyperscan:3907fd0:ClickHouse_Extras_hyperscan/contrib/hyperscan \
@@ -58,8 +59,8 @@ GH_TUPLE=	\
 		ClickHouse-Extras:libcxx:9f71e12:ClickHouse_Extras_libcxx/contrib/libcxx \
 		ClickHouse-Extras:libcxxabi:1ebc83a:ClickHouse_Extras_libcxxabi/contrib/libcxxabi \
 		ClickHouse-Extras:libgsasl:140fb58:ClickHouse_Extras_libgsasl/contrib/libgsasl \
-		ClickHouse-Extras:libhdfs3:e2131aa:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \
-		edenhill:librdkafka:b0d91bd:edenhill_librdkafka/contrib/librdkafka \
+		ClickHouse-Extras:libhdfs3:1b66657:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \
+		ClickHouse-Extras:librdkafka:2090cbf:ClickHouse_Extras_librdkafka/contrib/librdkafka \
 		ClickHouse-Extras:libunwind:27026ef:ClickHouse_Extras_libunwind/contrib/libunwind \
 		ClickHouse-Extras:libuv:8443830:ClickHouse_Extras_libuv/contrib/libuv \
 		GNOME:libxml2:18890f4:GNOME_libxml2/contrib/libxml2 \
@@ -70,21 +71,23 @@ GH_TUPLE=	\
 		openldap:openldap:34b9ba9:openldap_openldap/contrib/openldap \
 		ClickHouse-Extras:openssl:07e9623:ClickHouse_Extras_openssl/contrib/openssl \
 		apache:orc:5981208:apache_orc/contrib/orc \
-		ClickHouse-Extras:poco:be2ab90:ClickHouse_Extras_poco/contrib/poco \
+		ClickHouse-Extras:poco:74c9344:ClickHouse_Extras_poco/contrib/poco \
 		ClickHouse-Extras:protobuf:d6a10dd:ClickHouse_Extras_protobuf/contrib/protobuf \
-		Tencent:rapidjson:8f4c021:Tencent_rapidjson/contrib/rapidjson \
+		ClickHouse-Extras:rapidjson:c4ef90c:ClickHouse_Extras_rapidjson/contrib/rapidjson \
 		google:re2:7cf8b88:google_re2/contrib/re2 \
-		ClickHouse-Extras:replxx:2d37daa:ClickHouse_Extras_replxx/contrib/replxx \
+		ClickHouse-Extras:replxx:94b1f56:ClickHouse_Extras_replxx/contrib/replxx \
 		ClickHouse-Extras:ryu:5b4a853:ClickHouse_Extras_ryu/contrib/ryu \
-		lemire:simdjson:560f074:lemire_simdjson/contrib/simdjson \
+		ClickHouse-Extras:sentry-native:94644e9:ClickHouse_Extras_sentry_native/contrib/sentry-native \
+		ClickHouse-Extras:simdjson:3190d66:ClickHouse_Extras_simdjson/contrib/simdjson \
 		google:snappy:3f194ac:google_snappy/contrib/snappy \
 		sparsehash:sparsehash-c11:cf0bffa:sparsehash_sparsehash_c11/contrib/sparsehash-c11 \
+		kthohr:stats:b6dd459:kthohr_stats/contrib/stats \
 		apache:thrift:010ccf0:apache_thrift/contrib/thrift \
 		ClickHouse-Extras:UnixODBC:b0ad30f:ClickHouse_Extras_UnixODBC/contrib/unixodbc \
 		ClickHouse-Extras:zlib-ng:bba56a7:ClickHouse_Extras_zlib_ng/contrib/zlib-ng \
 		facebook:zstd:10f0e69:facebook_zstd/contrib/zstd \
 		apache:parquet-testing:46c9e97:apache_parquet_testing/contrib/arrow/cpp/submodules/parquet-testing \
-		apache:arrow-testing:93f33ae:apache_arrow_testing/contrib/arrow/testing \
+		apache:arrow-testing:3772a1b:apache_arrow_testing/contrib/arrow/testing \
 		hillbig:esaxx:ca7cb33:hillbig_esaxx/contrib/brotli/research/esaxx \
 		y-256:libdivsufsort:5f60d6f:y_256_libdivsufsort/contrib/brotli/research/libdivsufsort \
 		catchorg:Catch2:d2d8455:catchorg_Catch2/contrib/cppkafka/third_party/Catch2 \
@@ -92,18 +95,7 @@ GH_TUPLE=	\
 		boostorg:predef:560ff52:boostorg_predef/contrib/msgpack-c/external/boost/predef \
 		boostorg:preprocessor:56090c5:boostorg_preprocessor/contrib/msgpack-c/external/boost/preprocessor \
 		google:googletest:ba96d0b:google_googletest/contrib/rapidjson/thirdparty/gtest \
-		google:benchmark:8982e1e:google_benchmark/contrib/simdjson/dependencies/benchmark \
-		DaveGamble:cJSON:c69134d:DaveGamble_cJSON/contrib/simdjson/dependencies/cJSON \
-		mikeando:fastjson:485f994:mikeando_fastjson/contrib/simdjson/dependencies/fastjson \
-		vivkin:gason:7aee524:vivkin_gason/contrib/simdjson/dependencies/gason \
-		zserge:jsmn:18e9fe4:zserge_jsmn/contrib/simdjson/dependencies/jsmn \
-		nlohmann:json:a015b78:nlohmann_json/contrib/simdjson/dependencies/json \
-		dropbox:json11:ec4e452:dropbox_json11/contrib/simdjson/dependencies/json11 \
-		open-source-parsers:jsoncpp:0c1cc6e:open_source_parsers_jsoncpp/contrib/simdjson/dependencies/jsoncpp \
-		Tencent:rapidjson:b32cd94:Tencent_rapidjson/contrib/simdjson/dependencies/rapidjson \
-		chadaustin:sajson:2dcfd35:chadaustin_sajson/contrib/simdjson/dependencies/sajson \
-		esnme:ujson4c:e14f3fd:esnme_ujson4c/contrib/simdjson/dependencies/ujson4c \
-		google:googletest:0a43962:google_googletest/contrib/simdjson/dependencies/rapidjson/thirdparty/gtest
+		jarro2783:cxxopts:794c975:jarro2783_cxxopts/contrib/simdjson/dependencies/cxxopts
 
 SHEBANG_LANG=		expect
 expect_OLD_CMD=		/usr/bin/expect
@@ -132,6 +124,7 @@ SHEBANG_FILES=	src/Storages/System/StorageSystemLicenses.sh \
 		tests/queries/0_stateless/01293_client_interactive_vertical_multiline.sh \
 		tests/queries/0_stateless/01293_client_interactive_vertical_singleline.sh \
 		tests/queries/0_stateless/01300_client_save_history_when_terminated.sh \
+		tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.sh \
 		utils/build/build_debian_shared.sh \
 		utils/build/build_debian_unbundled_split.sh \
 		utils/build/build_debian_unbundled.sh \