From owner-svn-ports-head@freebsd.org Tue Apr 25 10:47:22 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC3E1D4E7A4; Tue, 25 Apr 2017 10:47:22 +0000 (UTC) (envelope-from vg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACE491301; Tue, 25 Apr 2017 10:47:22 +0000 (UTC) (envelope-from vg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3PAlLkd025289; Tue, 25 Apr 2017 10:47:21 GMT (envelope-from vg@FreeBSD.org) Received: (from vg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3PAlLAw025285; Tue, 25 Apr 2017 10:47:21 GMT (envelope-from vg@FreeBSD.org) Message-Id: <201704251047.v3PAlLAw025285@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vg set sender to vg@FreeBSD.org using -f From: Veniamin Gvozdikov Date: Tue, 25 Apr 2017 10:47:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439372 - in head/databases/clickhouse: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2017 10:47:23 -0000 Author: vg Date: Tue Apr 25 10:47:21 2017 New Revision: 439372 URL: https://svnweb.freebsd.org/changeset/ports/439372 Log: - update to 1.1.54214 PR: ports/218666 Submitted by: proler@gmail.com (maintainer) Modified: head/databases/clickhouse/Makefile head/databases/clickhouse/distinfo head/databases/clickhouse/files/clickhouse.in (contents, props changed) head/databases/clickhouse/pkg-plist Modified: head/databases/clickhouse/Makefile ============================================================================== --- head/databases/clickhouse/Makefile Tue Apr 25 10:38:57 2017 (r439371) +++ head/databases/clickhouse/Makefile Tue Apr 25 10:47:21 2017 (r439372) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= clickhouse -PORTVERSION= 1.1.54165 -PORTREVISION= 1 +PORTVERSION= 1.1.54214 DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= -stable +#DISTVERSIONSUFFIX= -stable +DISTVERSIONSUFFIX= -testing CATEGORIES= databases MAINTAINER= proler@gmail.com @@ -13,13 +13,19 @@ COMMENT= ClickHouse is an column-oriente LICENSE= APACHE20 -BUILD_DEPENDS= bash:shells/bash -LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ - libtcmalloc.so:devel/google-perftools \ +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 \ - libboost_program_options.so:devel/boost-libs + libboost_program_options.so:devel/boost-libs \ + 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 @@ -28,40 +34,40 @@ 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 -CMAKE_ARGS= -DUSE_INTERNAL_GPERFTOOLS_LIBRARY=0 \ - -DUSE_INTERNAL_BOOST_LIBRARY=0 \ - -DUSE_INTERNAL_ZLIB_LIBRARY=0 \ +CMAKE_ARGS= -DUNBUNDLED=1 \ -DUSE_STATIC_LIBRARIES=0 \ - -DNO_WERROR=1 + -DNO_WERROR=1 \ + -DENABLE_TESTS=0 \ + -DCXX11_ABI= USE_RC_SUBR= ${PORTNAME} USERS= clickhouse GROUPS= clickhouse -#temporary! use PORTVERSION after version match -SOVERSION= 1.1.54164 +SOVERSION= ${PORTVERSION} PLIST_SUB= SOVERSION=${SOVERSION} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -BUILD_DEPENDS+= clang38:devel/llvm38 +BUILD_DEPENDS+= clang38:devel/llvm38 CC= clang38 CXX= clang++38 .endif post-patch: - @${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|' ${WRKSRC}/dbms/src/Server/config.xml + @${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|;s|/var/log/clickhouse-server|/var/log/clickhouse|' ${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} ${STAGEDIR}${PREFIX}/lib/cmake/Poco/PocoConfig.cmake - @${RMDIR} ${STAGEDIR}${PREFIX}/lib/cmake/Poco - @${RMDIR} ${STAGEDIR}${PREFIX}/lib/cmake + @${RM} -r ${STAGEDIR}${PREFIX}/include/gtest + @${RM} ${STAGEDIR}${PREFIX}/lib/libgtest* ${INSTALL_DATA} ${WRKSRC}/dbms/src/Client/config.xml \ ${STAGEDIR}${PREFIX}/etc/clickhouse-client/config.xml.sample Modified: head/databases/clickhouse/distinfo ============================================================================== --- head/databases/clickhouse/distinfo Tue Apr 25 10:38:57 2017 (r439371) +++ head/databases/clickhouse/distinfo Tue Apr 25 10:47:21 2017 (r439372) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488372403 -SHA256 (yandex-ClickHouse-v1.1.54165-stable_GH0.tar.gz) = 192dc82094e3350a5030a68a39ed08b484d48d05514ed6d6c16647f21520aeb5 -SIZE (yandex-ClickHouse-v1.1.54165-stable_GH0.tar.gz) = 13510381 +TIMESTAMP = 1492025852 +SHA256 (yandex-ClickHouse-v1.1.54214-testing_GH0.tar.gz) = 42d45c4154be269d00fb6cd1533ca798eb85714debd9bbf05ced6c761eb92125 +SIZE (yandex-ClickHouse-v1.1.54214-testing_GH0.tar.gz) = 48685881 Modified: head/databases/clickhouse/files/clickhouse.in ============================================================================== --- head/databases/clickhouse/files/clickhouse.in Tue Apr 25 10:38:57 2017 (r439371) +++ head/databases/clickhouse/files/clickhouse.in Tue Apr 25 10:47:21 2017 (r439372) @@ -39,15 +39,14 @@ load_rc_config ${name} : ${clickhouse_rundir="/var/run/clickhouse"} : ${clickhouse_user="clickhouse"} : ${clickhouse_group="clickhouse"} -: ${clickhouse_logdir="/var/log/clickhouse"} : ${clickhouse_dbdir="/var/db/clickhouse"} : ${clickhouse_flags=""} -: ${clickhouse_args="--server --config-file ${clickhouse_config} ${clickhouse_flags}"} +: ${clickhouse_pidfile="${clickhouse_rundir}/clickhouse.pid"} +: ${clickhouse_args="--server --daemon --pid-file ${clickhouse_pidfile} --config-file ${clickhouse_config} ${clickhouse_flags}"} -command=/usr/sbin/daemon -procname=/usr/local/bin/clickhouse -pidfile=${clickhouse_rundir}/clickhouse.pid -command_args="-c -f -p ${pidfile} ${procname} ${clickhouse_args}" +command=%%PREFIX%%/bin/clickhouse +pidfile=${clickhouse_pidfile} +command_args=${clickhouse_args} required_files=${clickhouse_config} start_precmd=clickhouse_prestart Modified: head/databases/clickhouse/pkg-plist ============================================================================== --- head/databases/clickhouse/pkg-plist Tue Apr 25 10:38:57 2017 (r439371) +++ head/databases/clickhouse/pkg-plist Tue Apr 25 10:47:21 2017 (r439372) @@ -3,6 +3,8 @@ bin/clickhouse-benchmark bin/clickhouse-client bin/clickhouse-local bin/clickhouse-server +@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