Update to latest version

PR:	214760

3 files changed, 167 insertions, 27 deletions

diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile
index 25362cebc443..7b401bb1a833 100644
--- a/net-mgmt/kapacitor/Makefile
+++ b/net-mgmt/kapacitor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kapacitor
-PORTVERSION=	0.13.1
+PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -20,8 +20,38 @@ USE_RC_SUBR=	kapacitord
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	influxdata:DEFAULT
-GH_TUPLE=	golang:crypto:b6789ab:crypto \
-		stretchr:testify:6cb3b85:testify
+GH_TUPLE=	bmizerany:pat:c068ca2:pat \
+		collectd:go-collectd:9fc824c:go_collectd \
+		dgryski:go-bits:2ad8d70:go_bits \
+		dgryski:go-bitstream:7d46cd2:go_bitstream \
+		dominikh:go-js-dom:24aa052:go_js_dom \
+		fsnotify:fsnotify:fd9ec7d:fsnotify \
+		go-pipe:pipe:3c2ca4d:pipe \
+		golang:crypto:c197bcf:crypto \
+		golang:net:6acef71:net \
+		golang:snappy:d9eb7a3:snappy \
+		golang:tools:fc2b74b:tools \
+		golang:sys:b699b70:sys \
+		gopherjs:gopherjs:e34a5cd:gopherjs \
+		jwilder:encoding:4dada27:encoding \
+		kardianos:osext:c2c54e5:osext \
+		microcosm-cc:bluemonday:f77f16f:bluemonday \
+		neelance:sourcemap:8c68805:sourcemap \
+		paulbellamy:ratecounter:5a11f58:ratecounter \
+		peterh:liner:8975875:liner \
+		rakyll:statik:274df12:statik \
+		retailnext:hllpp:38a7bb7:hllpp \
+		russross:blackfriday:5f33e7b:blackfriday \
+		sergi:go-diff:552b4e9:go_diff \
+		shurcooL:github_flavored_markdown:7bcab91:github_flavored_markdown \
+		shurcooL:gopherjslib:feb6d39:gopherjslib \
+		shurcooL:highlight_diff:d3b292e:highlight_diff \
+		shurcooL:highlight_go:7867c2d:highlight_go \
+		shurcooL:httpfs:01ca90b:httpfs \
+		shurcooL:sanitized_anchor_name:1dba4b3:sanitized_anchor_name \
+		sourcegraph:annotate:f4cad6c:annotate \
+		sourcegraph:syntaxhighlight:c95ac47:syntaxhighlight \
+		stretchr:testify:18a02ba:testify
 
 SUB_FILES=	kapacitord
 SUB_LIST+=	KAPACITORD_PIDDIR=${KAPACITORD_PIDDIR}
@@ -30,25 +60,75 @@ PLIST_SUB=	KAPACITORD_PIDDIR=${KAPACITORD_PIDDIR}
 STRIP=		# stripping can break go binaries
 
 post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} \
-	${WRKSRC}/src/github.com/stretchr \
-	${WRKSRC}/src/golang.org/x
-	@cd ${WRKSRC} && ${MV} CHANGELOG.md CONTRIBUTING.md DESIGN.md Dockerfile_build_ubuntu32 \
-	Dockerfile_build_ubuntu64 Dockerfile_build_ubuntu64_git LICENSE LICENSE_OF_DEPENDENCIES.md \
-	README.md alert.go batch.go build.py build.sh circle-test.sh circle.yml client clock cmd \
-	default.go derivative.go doc.go edge.go edge_test.go etc eval.go examples expr.go expvar \
-	global_stats.go gobuild.sh group_by.go http_out.go influxdb_out.go influxql.gen.go \
-	influxql.gen.go.tmpl influxql.go install-deps.sh integrations join.go log.go models \
-	node.go noop.go output.go pipeline query.go replay.go result.go sample.go scripts services \
-	shift.go stats.go stream.go task.go task_master.go test.sh tick tickdoc.conf timer \
-	tmpldata udf udf.go udf_test.go union.go update_tick_docs.sh vendor vendor.yml where.go \
-	window.go window_test.go \
+	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
+	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
+	@${MKDIR} ${WRKSRC}/src/github.com/dgryski
+	@${MKDIR} ${WRKSRC}/src/github.com/fsnotify
+	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/gopherjs
+	@${MKDIR} ${WRKSRC}/src/github.com/jwilder
+	@${MKDIR} ${WRKSRC}/src/github.com/kardianos
+	@${MKDIR} ${WRKSRC}/src/github.com/microcosm-cc
+	@${MKDIR} ${WRKSRC}/src/github.com/neelance
+	@${MKDIR} ${WRKSRC}/src/github.com/paulbellamy
+	@${MKDIR} ${WRKSRC}/src/github.com/peterh
+	@${MKDIR} ${WRKSRC}/src/github.com/rakyll
+	@${MKDIR} ${WRKSRC}/src/github.com/retailnext
+	@${MKDIR} ${WRKSRC}/src/github.com/russross
+	@${MKDIR} ${WRKSRC}/src/github.com/sergi
+	@${MKDIR} ${WRKSRC}/src/github.com/shurcooL
+	@${MKDIR} ${WRKSRC}/src/github.com/sourcegraph
+	@${MKDIR} ${WRKSRC}/src/github.com/stretchr
+	@${MKDIR} ${WRKSRC}/src/golang.org/x
+	@${MKDIR} ${WRKSRC}/src/gopkg.in
+	@${MKDIR} ${WRKSRC}/src/honnef.co/go/js
+	@cd ${WRKSRC} && ${MV} \
+	LICENSE alert.go auth batch.go build.py build.sh circle-test.sh circle.yml client clock cmd \
+	combine.go combine_test.go default.go delete.go derivative.go doc.go edge.go edge_test.go \
+	etc eval.go examples expr.go expvar flatten.go global_stats.go gobuild.sh group_by.go \
+	http_out.go influxdb influxdb_out.go influxql.gen.go influxql.gen.go.tmpl influxql.go \
+	integrations join.go k8s_autoscale.go list-deps log.go metaclient.go models node.go noop.go \
+	output.go pipeline query.go query_test.go replay.go result.go sample.go scripts server \
+	services shift.go stats.go stream.go task.go task_master.go template.go test.sh tick \
+	tickdoc.conf timer tmpldata udf udf.go udf_test.go union.go update_tick_docs.sh usr vendor \
+	vendor.list vendor.sh where.go window.go window_test.go \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
-	@${MV} ${WRKSRC_testify} ${WRKSRC}/src/github.com/stretchr/testify ;\
-	${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
+	@${MV} ${WRKSRC_annotate} ${WRKSRC}/src/github.com/sourcegraph/annotate
+	@${MV} ${WRKSRC_blackfriday} ${WRKSRC}/src/github.com/russross/blackfriday
+	@${MV} ${WRKSRC_bluemonday} ${WRKSRC}/src/github.com/microcosm-cc/bluemonday
+	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
+	@${MV} ${WRKSRC_encoding} ${WRKSRC}/src/github.com/jwilder/encoding
+	@${MV} ${WRKSRC_fsnotify} ${WRKSRC}/src/github.com/fsnotify/fsnotify
+	@${MV} ${WRKSRC_github_flavored_markdown} ${WRKSRC}/src/github.com/shurcooL/github_flavored_markdown
+	@${MV} ${WRKSRC_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream
+	@${MV} ${WRKSRC_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits
+	@${MV} ${WRKSRC_go_collectd} ${WRKSRC}/src/collectd.org
+	@${MV} ${WRKSRC_go_diff} ${WRKSRC}/src/github.com/sergi/go-diff
+	@${MV} ${WRKSRC_go_js_dom} ${WRKSRC}/src/honnef.co/go/js/dom
+	@${MV} ${WRKSRC_gopherjslib} ${WRKSRC}/src/github.com/shurcooL/gopherjslib
+	@${MV} ${WRKSRC_gopherjs} ${WRKSRC}/src/github.com/gopherjs/gopherjs
+	@${MV} ${WRKSRC_highlight_diff} ${WRKSRC}/src/github.com/shurcooL/highlight_diff
+	@${MV} ${WRKSRC_highlight_go} ${WRKSRC}/src/github.com/shurcooL/highlight_go
+	@${MV} ${WRKSRC_hllpp} ${WRKSRC}/src/github.com/retailnext/hllpp
+	@${MV} ${WRKSRC_httpfs} ${WRKSRC}/src/github.com/shurcooL/httpfs
+	@${MV} ${WRKSRC_liner} ${WRKSRC}/src/github.com/peterh/liner
+	@${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
+	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext
+	@${MV} ${WRKSRC_pat} ${WRKSRC}/src/github.com/bmizerany/pat
+	@${MV} ${WRKSRC_pipe} ${WRKSRC}/src/gopkg.in/pipe.v2
+	@${MV} ${WRKSRC_ratecounter} ${WRKSRC}/src/github.com/paulbellamy/ratecounter
+	@${MV} ${WRKSRC_sanitized_anchor_name} ${WRKSRC}/src/github.com/shurcooL/sanitized_anchor_name
+	@${MV} ${WRKSRC_snappy} ${WRKSRC}/src/github.com/golang/snappy
+	@${MV} ${WRKSRC_sourcemap} ${WRKSRC}/src/github.com/neelance/sourcemap
+	@${MV} ${WRKSRC_statik} ${WRKSRC}/src/github.com/rakyll/statik
+	@${MV} ${WRKSRC_syntaxhighlight} ${WRKSRC}/src/github.com/sourcegraph/syntaxhighlight
+	@${MV} ${WRKSRC_sys} ${WRKSRC}/src/golang.org/x/sys
+	@${MV} ${WRKSRC_testify} ${WRKSRC}/src/github.com/stretchr/testify
+	@${MV} ${WRKSRC_tools} ${WRKSRC}/src/golang.org/x/tools
 
 do-build:
-	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} && ${SETENV} GOPATH=${WRKSRC} go install ./...
+	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \
+		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./...
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/net-mgmt/kapacitor/distinfo b/net-mgmt/kapacitor/distinfo
index 92b46ee6ea9a..e3490f254df1 100644
--- a/net-mgmt/kapacitor/distinfo
+++ b/net-mgmt/kapacitor/distinfo
@@ -1,7 +1,67 @@
-TIMESTAMP = 1465294291
-SHA256 (influxdata-kapacitor-v0.13.1_GH0.tar.gz) = 5ea34857f7c2aa6270acdead5953c7fe6f1f3aa065d8f7188eb712ad597631c2
-SIZE (influxdata-kapacitor-v0.13.1_GH0.tar.gz) = 1493172
-SHA256 (golang-crypto-b6789ab_GH0.tar.gz) = 8e59ebf79fa9bb4554f2e5c9b271e3a8774e9624019f96fe527c598109710227
-SIZE (golang-crypto-b6789ab_GH0.tar.gz) = 1026715
-SHA256 (stretchr-testify-6cb3b85_GH0.tar.gz) = abae34a655da56b099f25f622e0f5db982c691cb77384e8ac0bda5fe80c7d177
-SIZE (stretchr-testify-6cb3b85_GH0.tar.gz) = 81558
+TIMESTAMP = 1479848996
+SHA256 (influxdata-kapacitor-v1.1.0_GH0.tar.gz) = c70ba2b2e4d0e450418d974f6afaa59dd5fa19a245565e4460476f2708d26ce0
+SIZE (influxdata-kapacitor-v1.1.0_GH0.tar.gz) = 5735206
+SHA256 (bmizerany-pat-c068ca2_GH0.tar.gz) = 1bff463e4313717c5561a97020e5b6ae8095560fa834aa565c488b85b5549433
+SIZE (bmizerany-pat-c068ca2_GH0.tar.gz) = 6246
+SHA256 (collectd-go-collectd-9fc824c_GH0.tar.gz) = 4d6f6d88f85e48eff7fa5443145ab62c30463b102dbcc70c3309519b7e01e546
+SIZE (collectd-go-collectd-9fc824c_GH0.tar.gz) = 24548
+SHA256 (dgryski-go-bits-2ad8d70_GH0.tar.gz) = 732ddc81419cd7fa5e43394c384bff3708c47206982c87975b6adc7b428e90db
+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 (dominikh-go-js-dom-24aa052_GH0.tar.gz) = 6545874b1a214d94a4bdbb1e649b6fd2ce5d1811df082a1327ad5789e50379d2
+SIZE (dominikh-go-js-dom-24aa052_GH0.tar.gz) = 17617
+SHA256 (fsnotify-fsnotify-fd9ec7d_GH0.tar.gz) = 6841ad738e14637194726389faf2bdaf3e72929d7d2c3e4aca497243390069be
+SIZE (fsnotify-fsnotify-fd9ec7d_GH0.tar.gz) = 29971
+SHA256 (go-pipe-pipe-3c2ca4d_GH0.tar.gz) = 119fd9432f68d6bd63ae865441521bdad18f1f17171ef1e367b44681ad12680b
+SIZE (go-pipe-pipe-3c2ca4d_GH0.tar.gz) = 9315
+SHA256 (golang-crypto-c197bcf_GH0.tar.gz) = 1b5885280a6290b9840aa1e5171095e690bcd8b0c9a01931d82f23562277bea6
+SIZE (golang-crypto-c197bcf_GH0.tar.gz) = 903965
+SHA256 (golang-net-6acef71_GH0.tar.gz) = aeea3d55a6e2f29329dfac8330817ccd449ffcb930b496fec0a47f011fa53f19
+SIZE (golang-net-6acef71_GH0.tar.gz) = 741883
+SHA256 (golang-snappy-d9eb7a3_GH0.tar.gz) = 857fd1a142bc62ed05610c9daec12c6f6e4ff68b6cd5594311496b96bd8cbc2d
+SIZE (golang-snappy-d9eb7a3_GH0.tar.gz) = 62041
+SHA256 (golang-tools-fc2b74b_GH0.tar.gz) = 2ced86211f2a8bcd3d3a726c935b20455fb04ec1e0206654785e39dd546090e4
+SIZE (golang-tools-fc2b74b_GH0.tar.gz) = 2219852
+SHA256 (golang-sys-b699b70_GH0.tar.gz) = 36aefb1a239c9d5eb7d0ea9f9f185114f6d399cd1d3a71f2ec0cb89066793daa
+SIZE (golang-sys-b699b70_GH0.tar.gz) = 620914
+SHA256 (gopherjs-gopherjs-e34a5cd_GH0.tar.gz) = 715a02a33aad08bb27e5ee0f591bc0613f84e290398c19a6559772d7e456dbbe
+SIZE (gopherjs-gopherjs-e34a5cd_GH0.tar.gz) = 166807
+SHA256 (jwilder-encoding-4dada27_GH0.tar.gz) = 96d48ce4f2d88056216f88e22758d2f9142e86eda11793d9683be8a55a959228
+SIZE (jwilder-encoding-4dada27_GH0.tar.gz) = 9479
+SHA256 (kardianos-osext-c2c54e5_GH0.tar.gz) = a88e50c075ae7a99dc643ea325992c44324d9b8d7094e77c692ab66b357c1b42
+SIZE (kardianos-osext-c2c54e5_GH0.tar.gz) = 4724
+SHA256 (microcosm-cc-bluemonday-f77f16f_GH0.tar.gz) = a627895ae7a455c8bb0fdf73e8b11fadee27a85869136bd4f4522ff8821b21a3
+SIZE (microcosm-cc-bluemonday-f77f16f_GH0.tar.gz) = 133754
+SHA256 (neelance-sourcemap-8c68805_GH0.tar.gz) = d0a775123ab0045976bc60f1f67bdce5e34a9b5fb9c50203c1154993578b201f
+SIZE (neelance-sourcemap-8c68805_GH0.tar.gz) = 3105
+SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba
+SIZE (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = 2877
+SHA256 (peterh-liner-8975875_GH0.tar.gz) = a754997d65d419cab0d76b1abbd93d392dc4bc038091f23ddac9247ef6228c3d
+SIZE (peterh-liner-8975875_GH0.tar.gz) = 19672
+SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49
+SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898
+SHA256 (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 904156542b8cc404710f5689f7944e2d0c9a2fb8a6f53ae763bc922724f8c603
+SIZE (retailnext-hllpp-38a7bb7_GH0.tar.gz) = 43008
+SHA256 (russross-blackfriday-5f33e7b_GH0.tar.gz) = 30ec0d8bb17b404f7f3a59d574fa5728adc15b0248d433bd14d3ade1b8935b0e
+SIZE (russross-blackfriday-5f33e7b_GH0.tar.gz) = 71950
+SHA256 (sergi-go-diff-552b4e9_GH0.tar.gz) = 01fb4f98188551a659ba9cce7acde794877d3aa4358d8a66142e100668b27e29
+SIZE (sergi-go-diff-552b4e9_GH0.tar.gz) = 39875
+SHA256 (shurcooL-github_flavored_markdown-7bcab91_GH0.tar.gz) = b396dd6b0d607ad4325b017e58bcd244204eb20c16425f158bb80053d22796f3
+SIZE (shurcooL-github_flavored_markdown-7bcab91_GH0.tar.gz) = 13271
+SHA256 (shurcooL-gopherjslib-feb6d39_GH0.tar.gz) = 52afa2c5cdc019d1e1504c77fd93ea1fd88a85873e425bff46c5041566cb06bf
+SIZE (shurcooL-gopherjslib-feb6d39_GH0.tar.gz) = 3463
+SHA256 (shurcooL-highlight_diff-d3b292e_GH0.tar.gz) = 3147d25f1f27558b1dfcded055b548ac0ddf2e33940ae042b58ed901659467bd
+SIZE (shurcooL-highlight_diff-d3b292e_GH0.tar.gz) = 2387
+SHA256 (shurcooL-highlight_go-7867c2d_GH0.tar.gz) = 0037815e77ebebde2f842fb58a9ac6ef8637623b6ed1797167d92456185e93a0
+SIZE (shurcooL-highlight_go-7867c2d_GH0.tar.gz) = 2536
+SHA256 (shurcooL-httpfs-01ca90b_GH0.tar.gz) = c4fbd100db7b802daa6ccbf653c33dce5f55b1f45f37a5db0c88c3c427799c16
+SIZE (shurcooL-httpfs-01ca90b_GH0.tar.gz) = 8014
+SHA256 (shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 0188ebad02ba0773a70431647bf7f40655dc0fdfccec8a3c682a20e97fd42d36
+SIZE (shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 2054
+SHA256 (sourcegraph-annotate-f4cad6c_GH0.tar.gz) = 1369f59a54f37ed2805e71bcbae209e7c77e183178fb785fedd3a6bdbb87deb1
+SIZE (sourcegraph-annotate-f4cad6c_GH0.tar.gz) = 5962
+SHA256 (sourcegraph-syntaxhighlight-c95ac47_GH0.tar.gz) = a7882ab696afbfb9f5608a823026948dae1a6740a397186c87010246f4a44045
+SIZE (sourcegraph-syntaxhighlight-c95ac47_GH0.tar.gz) = 12855
+SHA256 (stretchr-testify-18a02ba_GH0.tar.gz) = a161aa712268eae69c7ac5164eee1109902254e94a780235e5066bc965810e1f
+SIZE (stretchr-testify-18a02ba_GH0.tar.gz) = 83511
diff --git a/net-mgmt/kapacitor/files/kapacitord.in b/net-mgmt/kapacitor/files/kapacitord.in
index c0ddf4352890..e8ef5bdb0e51 100644
--- a/net-mgmt/kapacitor/files/kapacitord.in
+++ b/net-mgmt/kapacitor/files/kapacitord.in
@@ -29,7 +29,7 @@ load_rc_config $name
 start_precmd=kapacitord_prestart
 pidfile="/var/run/${name}.pid"
 command=/usr/sbin/daemon
-command_args="-crP ${pidfile} %%PREFIX%%/bin/${name} ${kapacitord_flags} -config=${kapacitord_conf} 2>> /var/log/kapacitord.log"
+command_args="-f -crP ${pidfile} %%PREFIX%%/bin/${name} ${kapacitord_flags} -config=${kapacitord_conf} >> /var/log/kapacitord.log 2>&1"
 
 kapacitord_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)