Index: head/databases/clickhouse/Makefile
===================================================================
--- head/databases/clickhouse/Makefile	(revision 445863)
+++ head/databases/clickhouse/Makefile	(revision 445864)
@@ -1,85 +1,85 @@
 # Created by: proler@gmail.com
 # $FreeBSD$
 
 PORTNAME=	clickhouse
-PORTVERSION=	1.1.54236
+PORTVERSION=	1.1.54245
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-stable
-PORTREVISION=	1
+#PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	proler@gmail.com
 COMMENT=	ClickHouse is an column-oriented database management system
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	bash:shells/bash \
 				sparsehash>=0:devel/sparsehash
 LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools \
 		libodbc.so:databases/unixODBC \
 		libltdl.so:devel/libltdl \
 		libicudata.so:devel/icu \
 		libzookeeper_mt.so:devel/libzookeeper \
 		libre2.so:devel/re2 \
 		libdouble-conversion.so:devel/libdouble-conversion \
 		libzstd.so:archivers/zstd \
 		liblz4.so:archivers/liblz4 \
 		libPocoNet.so:devel/poco
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yandex
 GH_PROJECT=	ClickHouse
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64"
 
 BROKEN_FreeBSD_10=	Builds but does not work
 
 USES=		compiler:c++14-lang cmake iconv mysql ssl readline
 USE_LDCONFIG=	yes
 # Bug 218841: use bundled boost 1.62 to avoid 1.64 bustage
 CMAKE_ARGS=	-DUNBUNDLED=1 \
 		-DUSE_INTERNAL_BOOST_LIBRARY=1 \
 		-DUSE_STATIC_LIBRARIES=0 \
 		-DNO_WERROR=1 \
 		-DENABLE_TESTS=0 \
 		-DCXX11_ABI=
 
 USE_RC_SUBR=	${PORTNAME}
 USERS=		clickhouse
 GROUPS=		clickhouse
 
 SOVERSION=	${PORTVERSION}
 PLIST_SUB=	SOVERSION=${SOVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
 BUILD_DEPENDS+=	clang38:devel/llvm38
 CC=		clang38
 CXX=		clang++38
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|;s|/var/log/clickhouse-server|/var/log/clickhouse|;s|/etc/clickhouse-server|${PREFIX}/etc/clickhouse-server|' ${WRKSRC}/dbms/src/Server/config.xml
 	@${REINPLACE_CMD} -e 's|<listen_host>::1</listen_host>|<\!-- <listen_host>::1</listen_host> -->|;s|<listen_host>127.0.0.1</listen_host>|<\!-- <listen_host>127.0.0.1</listen_host> -->|' ${WRKSRC}/dbms/src/Server/config.xml
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/clickhouse-compressor
 	@${RM} ${STAGEDIR}${PREFIX}/bin/config-processor
 	@${RM} ${STAGEDIR}${PREFIX}/bin/corrector_utf8
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/gtest
 	@${RM} ${STAGEDIR}${PREFIX}/lib/libgtest*
 
-	${INSTALL_DATA} ${WRKSRC}/dbms/src/Client/config.xml \
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-client/config.xml \
 		${STAGEDIR}${PREFIX}/etc/clickhouse-client/config.xml.sample
-	${INSTALL_DATA} ${WRKSRC}/dbms/src/Server/config.xml \
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-server/config.xml \
 		${STAGEDIR}${PREFIX}/etc/clickhouse-server/config.xml.sample
-	${INSTALL_DATA} ${WRKSRC}/dbms/src/Server/users.xml \
+	${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/clickhouse-server/users.xml \
 		${STAGEDIR}${PREFIX}/etc/clickhouse-server/users.xml.sample
 
 	@${MKDIR} ${STAGEDIR}/var/db/clickhouse
 	@${MKDIR} ${STAGEDIR}/var/log/clickhouse
 	@${MKDIR} ${STAGEDIR}/var/run/clickhouse
 
 .include <bsd.port.post.mk>
Index: head/databases/clickhouse/distinfo
===================================================================
--- head/databases/clickhouse/distinfo	(revision 445863)
+++ head/databases/clickhouse/distinfo	(revision 445864)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495731164
-SHA256 (yandex-ClickHouse-v1.1.54236-stable_GH0.tar.gz) = 0b8d26de7487c7df3e2dae800f8b84068cb076b50af6a7ac53d97a48aab42648
-SIZE (yandex-ClickHouse-v1.1.54236-stable_GH0.tar.gz) = 14217680
+TIMESTAMP = 1500042016
+SHA256 (yandex-ClickHouse-v1.1.54245-stable_GH0.tar.gz) = b01c720ab3b05e2ae43a0d2ec9413fa9318f2073f3d76c96f86391f3550086ed
+SIZE (yandex-ClickHouse-v1.1.54245-stable_GH0.tar.gz) = 11936856
Index: head/databases/clickhouse/pkg-plist
===================================================================
--- head/databases/clickhouse/pkg-plist	(revision 445863)
+++ head/databases/clickhouse/pkg-plist	(revision 445864)
@@ -1,17 +1,18 @@
 bin/clickhouse
 bin/clickhouse-benchmark
 bin/clickhouse-client
 bin/clickhouse-local
 bin/clickhouse-server
+bin/clickhouse-performance-test
 bin/clickhouse-zookeeper-cli
 @dir(clickhouse,,) etc/clickhouse-server
 @dir(clickhouse,,) etc/clickhouse-client
 @sample etc/clickhouse-client/config.xml.sample
 @sample etc/clickhouse-server/config.xml.sample
 @sample etc/clickhouse-server/users.xml.sample
 lib/libclickhouse.so
 lib/libclickhouse.so.1
 lib/libclickhouse.so.%%SOVERSION%%
 @dir(clickhouse,clickhouse,700) /var/db/clickhouse
 @dir(clickhouse,clickhouse) /var/log/clickhouse
 @dir(clickhouse,clickhouse) /var/run/clickhouse