2 files changed, 65 insertions, 24 deletions

diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index d62b5a7957b4..c1e5f0d05564 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	influxdb
-PORTVERSION=	1.4.2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.5.0
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	cheffo@freebsd-bg.org
@@ -20,6 +20,8 @@ USE_RC_SUBR=	influxd
 USE_GITHUB=	yes
 GH_ACCOUNT=	influxdata:DEFAULT
 GH_TUPLE=	BurntSushi:toml:a368813:toml/src/github.com/BurntSushi/toml \
+		RoaringBitmap:roaring:cefad6e:roaring/src/github.com/RoaringBitmap/roaring \
+		beorn7:perks:4c0e845:perks/src/github.com/beorn7/perks \
 		bmizerany:pat:c068ca2:pat/src/github.com/bmizerany/pat \
 		boltdb:bolt:4b1ebc1:bolt/src/github.com/boltdb/bolt \
 		cespare:xxhash:1b6d2e4:xxhash/src/github.com/cespare/xxhash \
@@ -27,27 +29,41 @@ GH_TUPLE=	BurntSushi:toml:a368813:toml/src/github.com/BurntSushi/toml \
 		dgrijalva:jwt-go:24c63f5:jwt_go/src/github.com/dgrijalva/jwt-go \
 		dgryski:go-bits:2ad8d70:go_bits/src/github.com/dgryski/go-bits \
 		dgryski:go-bitstream:7d46cd2:go_bitstream/src/github.com/dgryski/go-bitstream \
+		glycerine:go-unsnap-stream:62a9a9e:go_unsnap_stream/src/github.com/glycerine/go-unsnap-stream \
 		gogo:protobuf:1c2b16b:protobuf/src/github.com/gogo/protobuf \
+		golang:protobuf:1e59b77:golang_protobuf/src/github.com/golang/protobuf \
 		golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \
 		google:go-cmp:18107e6:go_cmp/src/google/go-cmp \
-		influxdata:influxql:3921ab7:influxql/src/github.com/influxdata/influxql \
+		influxdata:influxql:c0a433a:influxql/src/github.com/influxdata/influxql \
 		influxdata:usage-client:6d38953:usage_client/src/github.com/influxdata/usage-client \
 		influxdata:yamux:1f58ded:yamux/src/github.com/influxdata/yamux \
 		influxdata:yarpc:036268c:yarpc/src/github.com/influxdata/yarpc \
+		jsternberg:zap-logfmt:5ea5386:zap_logfmt/src/github.com/jsternberg/zap-logfmt \
 		jwilder:encoding:278947:encoding/src/github.com/jwilder/encoding \
+		mattn:go-isatty:6ca4dbf:go_isatty/src/github.com/mattn/go-isatty \
+		matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
+		opentracing:opentracing-go:1361b9c:opentracing_go/src/github.com/opentracing/opentracing-go \
 		paulbellamy:ratecounter:5a11f58:ratecounter/src/github.com/paulbellamy/ratecounter \
 		peterh:liner:8860952:liner/src/github.com/peterh/liner \
 		philhofer:fwd:1612a29:fwd/src/github.com/philhofer/fwd \
+		prometheus:client_golang:661e31b:client_golang/src/github.com/prometheus/client_golang \
+		prometheus:client_model:99fa1f4:client_model/src/github.com/prometheus/client_model \
+		prometheus:common:2e54d0b:common/src/github.com/prometheus/common \
+		prometheus:procfs:a6e9df8:procfs/src/github.com/prometheus/procfs \
 		retailnext:hllpp:38a7bb7:hllpp/src/github.com/retailnext/hllpp \
-		spaolacci:murmur3:0d12bf8:murmur3/src/github.com/spaolacci/murmur3 \
 		tinylib:msgp:ad0ff2e:msgp/src/github.com/tinylib/msgp \
+		xlab:treeprint:06dfc6f:treeprint/src/github.com/xlab/treeprint \
 		collectd:go-collectd:e84e8af:go_collectd/src/collectd.org \
-		uber-go:atomic:74ca5ec:atomic/src/github.com/uber-go/atomic \
-		uber-go:zap:fbae028:zap/src/github.com/uber-go/zap \
+		uber-go:atomic:74ca5ec:atomic/src//go.uber.org/atomic \
+		uber-go:multierr:fb7d312:multierr/src/go.uber.org/multierr \
+		uber-go:zap:35aad58:zap/src/go.uber.org/zap \
 		xlab:treeprint:06dfc6f:treeprint/src/github.com/xlab/treeprint \
 		golang:crypto:9477e0b:crypto/src/golang.org/x/crypto \
+		golang:net:9dfe398:net/src/golang.org/x/net \
+		golang:sync:fd80eb9:sync/src/golang.org/x/sync \
 		golang:sys:062cd7e:sys/src/golang.org/x/sys \
-		golang:text:a71fd10:text/src/golang.org/x/text
+		golang:text:a71fd10:text/src/golang.org/x/text \
+		golang:time:6dc1736:time/src/golang.org/x/time
 
 SUB_FILES=	influxd
 SUB_LIST=	INFLUXD_USER=${INFLUXD_USER} \
@@ -93,14 +109,9 @@ SUB_LIST+=	INFLUXD_LOGCMD="logger"
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
-		${MV} CHANGELOG.md CODING_GUIDELINES.md CONTRIBUTING.md \
-		Dockerfile Dockerfile_build_ubuntu32 Dockerfile_build_ubuntu64 \
-		Dockerfile_build_ubuntu64_git Dockerfile_build_ubuntu64_go19 \
-		Dockerfile_test_ubuntu32 Godeps \
-		LICENSE_OF_DEPENDENCIES.md QUERIES.md README.md TODO.md \
-		appveyor.yml build.py build.sh circle-test.sh circle.yml \
+		${MV} appveyor.yml build.py build.sh circle-test.sh circle.yml \
 		client cmd coordinator docker errors.go etc gobuild.sh importer \
-		influxdb.go internal man models monitor nightly.sh node.go pkg \
+		influxdb.go internal logger man models monitor nightly.sh node.go pkg \
 		prometheus query releng scripts services stress tcp test.sh \
 		tests toml tsdb uuid \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
diff --git a/databases/influxdb/distinfo b/databases/influxdb/distinfo
index 72ba0844816d..b35303314fa4 100644
--- a/databases/influxdb/distinfo
+++ b/databases/influxdb/distinfo
@@ -1,8 +1,12 @@
-TIMESTAMP = 1511453641
-SHA256 (influxdata-influxdb-v1.4.2_GH0.tar.gz) = 7ff8d0464bbb96c3bbe9b07147d0e9153dfea9fc1590109d724eb80574209e6f
-SIZE (influxdata-influxdb-v1.4.2_GH0.tar.gz) = 1126527
+TIMESTAMP = 1520600461
+SHA256 (influxdata-influxdb-v1.5.0_GH0.tar.gz) = 1ef9745c8295df9ee7cea360b3a3b74f9d8c204cc67e470f4b5b9fb974b199c2
+SIZE (influxdata-influxdb-v1.5.0_GH0.tar.gz) = 1224087
 SHA256 (BurntSushi-toml-a368813_GH0.tar.gz) = 68dc067c4105cd20a642ddf1f4acaada7474c1b58e5b249d4bd9b0d7e8edebc2
 SIZE (BurntSushi-toml-a368813_GH0.tar.gz) = 42252
+SHA256 (RoaringBitmap-roaring-cefad6e_GH0.tar.gz) = 8205b3d72b7ad39e0ba67f5e59eba168e77eb1816138dfb77aff668cb1fc2835
+SIZE (RoaringBitmap-roaring-cefad6e_GH0.tar.gz) = 140424
+SHA256 (beorn7-perks-4c0e845_GH0.tar.gz) = 2d0c7784d2695b09c87710bc8c3c3d5b88ffeece31a650ed901763d215615478
+SIZE (beorn7-perks-4c0e845_GH0.tar.gz) = 10593
 SHA256 (bmizerany-pat-c068ca2_GH0.tar.gz) = 1bff463e4313717c5561a97020e5b6ae8095560fa834aa565c488b85b5549433
 SIZE (bmizerany-pat-c068ca2_GH0.tar.gz) = 6246
 SHA256 (boltdb-bolt-4b1ebc1_GH0.tar.gz) = ee9abc065d95c96d3e519f28cbecefb69342504d41b285886294d26ace49c500
@@ -17,45 +21,71 @@ SHA256 (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 732ddc81419cd7fa5e43394c384bff3708
 SIZE (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 2193
 SHA256 (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = ba7a2b22ea94d4541da4fce08e7c58fdbcde6feec1a652c3174a89907567667f
 SIZE (dgryski-go-bitstream-7d46cd2_GH0.tar.gz) = 3006
+SHA256 (glycerine-go-unsnap-stream-62a9a9e_GH0.tar.gz) = fcc89d2433af82e64315bcd3717ffae1dd23fd576071c40e37e9bbbac0edcc29
+SIZE (glycerine-go-unsnap-stream-62a9a9e_GH0.tar.gz) = 19018
 SHA256 (gogo-protobuf-1c2b16b_GH0.tar.gz) = 90f582454d78ddd1a108fd34cd2c6d0e7ea9b207295ba96e33973b39d69be1fc
 SIZE (gogo-protobuf-1c2b16b_GH0.tar.gz) = 2567473
+SHA256 (golang-protobuf-1e59b77_GH0.tar.gz) = 62401254217178e9f88311d5ac86a33311a77fecd0c7099244b598b92d7dff92
+SIZE (golang-protobuf-1e59b77_GH0.tar.gz) = 268300
 SHA256 (golang-snappy-d9eb7a3_GH0.tar.gz) = 857fd1a142bc62ed05610c9daec12c6f6e4ff68b6cd5594311496b96bd8cbc2d
 SIZE (golang-snappy-d9eb7a3_GH0.tar.gz) = 62041
 SHA256 (google-go-cmp-18107e6_GH0.tar.gz) = 1eea9950ccff2279d9c04d8988210bb40f6b95863439cf2d48e463c0c1fa0491
 SIZE (google-go-cmp-18107e6_GH0.tar.gz) = 54129
-SHA256 (influxdata-influxql-3921ab7_GH0.tar.gz) = bcd51efc4bbd121577318bf1064803aeae9f9cfc8fd829e571c90afea5975de0
-SIZE (influxdata-influxql-3921ab7_GH0.tar.gz) = 87427
+SHA256 (influxdata-influxql-c0a433a_GH0.tar.gz) = 9e86f2acc53aaeaf2ef9628e2be04b9013841d5aaa4d96d8b9c2918571fdf21c
+SIZE (influxdata-influxql-c0a433a_GH0.tar.gz) = 88517
 SHA256 (influxdata-usage-client-6d38953_GH0.tar.gz) = aa828fc1f3fb5fa7c68eee58b4b5a7886e664cbdcac853d6a32945c2f0dd9024
 SIZE (influxdata-usage-client-6d38953_GH0.tar.gz) = 6578
 SHA256 (influxdata-yamux-1f58ded_GH0.tar.gz) = bfae5651c1b712a0b16d0becde0af61db1992d9fab659c157cfc183296602b98
 SIZE (influxdata-yamux-1f58ded_GH0.tar.gz) = 22644
 SHA256 (influxdata-yarpc-036268c_GH0.tar.gz) = fa9d522cb4610104afb1bd1145c6425ae10d1511f3a926941eb4de34163b6c12
 SIZE (influxdata-yarpc-036268c_GH0.tar.gz) = 34681
+SHA256 (jsternberg-zap-logfmt-5ea5386_GH0.tar.gz) = 0452bcf72e75f3399cb56864f265972dbb85be819f4a554229150f067c29a515
+SIZE (jsternberg-zap-logfmt-5ea5386_GH0.tar.gz) = 5598
 SHA256 (jwilder-encoding-278947_GH0.tar.gz) = fe47034e6b071ccc6a68c3f3bfbcf7247ffe3c05c70441e459cf92aafafe9569
 SIZE (jwilder-encoding-278947_GH0.tar.gz) = 9677
+SHA256 (mattn-go-isatty-6ca4dbf_GH0.tar.gz) = 4ae0da6d6d3f5bf7b86570e38a057331f7b2830bd5d0c1fc670758672f7521cf
+SIZE (mattn-go-isatty-6ca4dbf_GH0.tar.gz) = 3383
+SHA256 (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = da165c9275b77a0994b815bc7d761dcb2e4799a90fe49eec08d8bdff3a683f48
+SIZE (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = 37200
+SHA256 (opentracing-opentracing-go-1361b9c_GH0.tar.gz) = 19e4ba5099edcc2cda5d16e0ec797c2d98cc334cd45b6309cf6aa2f2535ae237
+SIZE (opentracing-opentracing-go-1361b9c_GH0.tar.gz) = 24597
 SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba
 SIZE (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = 2877
 SHA256 (peterh-liner-8860952_GH0.tar.gz) = 653956f128fe495487cd2dbd44b9121b2776b7073e849f0fec40d998cdea750d
 SIZE (peterh-liner-8860952_GH0.tar.gz) = 20386
 SHA256 (philhofer-fwd-1612a29_GH0.tar.gz) = 0432a75da81b1635ace9afe2c58cce24b09fbe861688654700ab4681d009c0b2
 SIZE (philhofer-fwd-1612a29_GH0.tar.gz) = 9224
+SHA256 (prometheus-client_golang-661e31b_GH0.tar.gz) = 0511e3d050e7f3000f2f6c53d1ebcf184a2aee7fccc3753fdfaf70ecaae011d9
+SIZE (prometheus-client_golang-661e31b_GH0.tar.gz) = 94672
+SHA256 (prometheus-client_model-99fa1f4_GH0.tar.gz) = 11c3da0c9a3e4879aa2de15b8e1f494cd74ce3afca831a759f564edeea232f69
+SIZE (prometheus-client_model-99fa1f4_GH0.tar.gz) = 54653
+SHA256 (prometheus-common-2e54d0b_GH0.tar.gz) = 0a0468fe62d463412bfec3c5e1f1eae4f74c272069ece4f1c2c33146a1556803
+SIZE (prometheus-common-2e54d0b_GH0.tar.gz) = 62688
+SHA256 (prometheus-procfs-a6e9df8_GH0.tar.gz) = c3d1f1c1b1a92a1fbff21eedba631ffd18b54ff18f03db8fce76a32e5d2c133e
+SIZE (prometheus-procfs-a6e9df8_GH0.tar.gz) = 43916
 SHA256 (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 904156542b8cc404710f5689f7944e2d0c9a2fb8a6f53ae763bc922724f8c603
 SIZE (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 43008
-SHA256 (spaolacci-murmur3-0d12bf8_GH0.tar.gz) = 8c0dcee38d517b7decd2aa6e982cebc7fecb36834d3d4289b043b870b8bba07c
-SIZE (spaolacci-murmur3-0d12bf8_GH0.tar.gz) = 6766
 SHA256 (tinylib-msgp-ad0ff2e_GH0.tar.gz) = 2ee1b887819763f8b5ad90a14392446c12a83c4ea196d46837ded5d699d6a113
 SIZE (tinylib-msgp-ad0ff2e_GH0.tar.gz) = 67426
+SHA256 (xlab-treeprint-06dfc6f_GH0.tar.gz) = 32fcee2802c46711cc408c4fd7e967c0d7d0dd1557325f8e55af5dccf2dc29ff
+SIZE (xlab-treeprint-06dfc6f_GH0.tar.gz) = 6362
 SHA256 (collectd-go-collectd-e84e8af_GH0.tar.gz) = 24fc759dbe743b1c070fad1c420cf3813581b0fa801d2445809a91440dd4c354
 SIZE (collectd-go-collectd-e84e8af_GH0.tar.gz) = 38938
 SHA256 (uber-go-atomic-74ca5ec_GH0.tar.gz) = a2ac91075dcd85013fe012b2596bc374edd81d7b2818722ea8d7ab97bdbd4949
 SIZE (uber-go-atomic-74ca5ec_GH0.tar.gz) = 6580
-SHA256 (uber-go-zap-fbae028_GH0.tar.gz) = 78db0dbf47496a26333172802867c3c930d156e3ddb92d53aecd74c92b9b76ab
-SIZE (uber-go-zap-fbae028_GH0.tar.gz) = 54647
-SHA256 (xlab-treeprint-06dfc6f_GH0.tar.gz) = 32fcee2802c46711cc408c4fd7e967c0d7d0dd1557325f8e55af5dccf2dc29ff
-SIZE (xlab-treeprint-06dfc6f_GH0.tar.gz) = 6362
+SHA256 (uber-go-multierr-fb7d312_GH0.tar.gz) = e9596b093afc557170f1622102ee6678fd84aaa2f5361f162bc2e63919f07947
+SIZE (uber-go-multierr-fb7d312_GH0.tar.gz) = 9234
+SHA256 (uber-go-zap-35aad58_GH0.tar.gz) = a71846515d360fc773d21bb26bd91728091141b16feed7a659c8cecb0fc7c49f
+SIZE (uber-go-zap-35aad58_GH0.tar.gz) = 103004
 SHA256 (golang-crypto-9477e0b_GH0.tar.gz) = 133589653318a665b277bd5bce223955e4f1ca6ce80fce7a338fd24ad0ccdff0
 SIZE (golang-crypto-9477e0b_GH0.tar.gz) = 1297866
+SHA256 (golang-net-9dfe398_GH0.tar.gz) = 0295d04500c538c0d5d18cf6969d26fa670b706b90660819b0018f601c163065
+SIZE (golang-net-9dfe398_GH0.tar.gz) = 925910
+SHA256 (golang-sync-fd80eb9_GH0.tar.gz) = bae73bd7b81336d67b38c72e55b185bcb5a3e194f1210dc475fc811d32afaff4
+SIZE (golang-sync-fd80eb9_GH0.tar.gz) = 16385
 SHA256 (golang-sys-062cd7e_GH0.tar.gz) = 2e4f1daaa6ae968a868940381decb21d97867593e0779176b253d569287d99d0
 SIZE (golang-sys-062cd7e_GH0.tar.gz) = 768071
 SHA256 (golang-text-a71fd10_GH0.tar.gz) = 8b8bfda09d60729c50162b67f5f3451980e7ce5c6580769c99a423172a6a75ad
 SIZE (golang-text-a71fd10_GH0.tar.gz) = 4030980
+SHA256 (golang-time-6dc1736_GH0.tar.gz) = 10fe5c8c082657221ea9bcbcbe582e91b2ed7770bc7500375dbd5e677d71e16c
+SIZE (golang-time-6dc1736_GH0.tar.gz) = 9534