Update to latest version, 1.2.0

Approved-by:	maintainer
PR:		217492

2 files changed, 23 insertions, 111 deletions

diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile
index 8f1e63fdec84..56245e30fda9 100644
--- a/net-mgmt/kapacitor/Makefile
+++ b/net-mgmt/kapacitor/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kapacitor
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -11,7 +11,7 @@ COMMENT=	Time-series data collection
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go>=1.5.0:lang/go
+BUILD_DEPENDS=	go>=1.6.0:lang/go
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6
 
@@ -20,38 +20,7 @@ USE_RC_SUBR=	kapacitord
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	influxdata:DEFAULT
-GH_TUPLE=	bmizerany:pat:c068ca2:pat/src/github.com/bmizerany/pat \
-		collectd:go-collectd:9fc824c:go_collectd/src/collectd.org \
-		dgryski:go-bits:2ad8d70:go_bits/src/github.com/dgryski/go-bits \
-		dgryski:go-bitstream:7d46cd2:go_bitstream/src/github.com/dgryski/go-bitstream \
-		dominikh:go-js-dom:24aa052:go_js_dom/src/honnef.co/go/js/dom \
-		fsnotify:fsnotify:fd9ec7d:fsnotify/src/github.com/fsnotify/fsnotify \
-		go-pipe:pipe:3c2ca4d:pipe/src/gopkg.in/pipe.v2 \
-		golang:crypto:c197bcf:crypto/src/golang.org/x/crypto \
-		golang:net:6acef71:net/src/golang.org/x/net \
-		golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \
-		golang:tools:fc2b74b:tools/src/golang.org/x/tools \
-		golang:sys:b699b70:sys/src/golang.org/x/sys \
-		gopherjs:gopherjs:e34a5cd:gopherjs/src/github.com/gopherjs/gopherjs \
-		jwilder:encoding:4dada27:encoding/src/github.com/jwilder/encoding \
-		kardianos:osext:c2c54e5:osext/src/github.com/kardianos/osext \
-		microcosm-cc:bluemonday:f77f16f:bluemonday/src/github.com/microcosm-cc/bluemonday \
-		neelance:sourcemap:8c68805:sourcemap/src/github.com/neelance/sourcemap \
-		paulbellamy:ratecounter:5a11f58:ratecounter/src/github.com/paulbellamy/ratecounter \
-		peterh:liner:8975875:liner/src/github.com/peterh/liner \
-		rakyll:statik:274df12:statik/src/github.com/rakyll/statik \
-		retailnext:hllpp:38a7bb7:hllpp/src/github.com/retailnext/hllpp \
-		russross:blackfriday:5f33e7b:blackfriday/src/github.com/russross/blackfriday \
-		sergi:go-diff:552b4e9:go_diff/src/github.com/sergi/go-diff \
-		shurcooL:github_flavored_markdown:7bcab91:github_flavored_markdown/src/github.com/shurcooL/github_flavored_markdown \
-		shurcooL:gopherjslib:feb6d39:gopherjslib/src/github.com/shurcooL/gopherjslib \
-		shurcooL:highlight_diff:d3b292e:highlight_diff/src/github.com/shurcooL/highlight_diff \
-		shurcooL:highlight_go:7867c2d:highlight_go/src/github.com/shurcooL/highlight_go \
-		shurcooL:httpfs:01ca90b:httpfs/src/github.com/shurcooL/httpfs \
-		shurcooL:sanitized_anchor_name:1dba4b3:sanitized_anchor_name/src/github.com/shurcooL/sanitized_anchor_name \
-		sourcegraph:annotate:f4cad6c:annotate/src/github.com/sourcegraph/annotate \
-		sourcegraph:syntaxhighlight:c95ac47:syntaxhighlight/src/github.com/sourcegraph/syntaxhighlight \
-		stretchr:testify:18a02ba:testify/src/github.com/stretchr/testify
+
 # This should work, but go gets confused with the symlinks.
 #GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
@@ -64,20 +33,27 @@ STRIP=		# stripping can break go binaries
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 	@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 \
+	alert alert.go auth batch.go BLOB_STORE_DESIGN.md bufpool build.py \
+	build.sh CHANGELOG.md circle-test.sh circle.yml client clock cmd \
+	combine_test.go combine.go command CONTRIBUTING.md default.go delete.go \
+	derivative.go DESIGN.md doc.go Dockerfile_build_ubuntu32 \
+	Dockerfile_build_ubuntu64 Dockerfile_build_ubuntu64_git edge_test.go \
+	edge.go etc eval.go examples expr.go expvar flatten.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 \
+	LICENSE LICENSE_OF_DEPENDENCIES.md list-deps log.go metaclient.go \
+	models node.go noop.go output.go pipeline query_test.go query.go \
+	README.md replay.go result.go sample.go scripts server services \
+	shift.go stats.go stream.go task_master.go task.go template.go \
+	test.sh tick tickdoc.conf timer tmpldata udf udf_test.go udf.go \
+	union.go update_tick_docs.sh usr vars vendor vendor.list vendor.sh \
+	where.go window_test.go window.go \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \
-		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./...
+		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \
+		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/net-mgmt/kapacitor/distinfo b/net-mgmt/kapacitor/distinfo
index e3490f254df1..30fbcc8694b0 100644
--- a/net-mgmt/kapacitor/distinfo
+++ b/net-mgmt/kapacitor/distinfo
@@ -1,67 +1,3 @@
-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
+TIMESTAMP = 1486074397
+SHA256 (influxdata-kapacitor-v1.2.0_GH0.tar.gz) = da13321520930f86e65de7989abb076a0e3dbc23da09b400f3299d7b6d452416
+SIZE (influxdata-kapacitor-v1.2.0_GH0.tar.gz) = 5961658