Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Sep 2019 22:31:58 +0000 (UTC)
From:      Dmitri Goutnik <dmgk@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r513275 - in head: misc/cryptoballot misc/dive misc/exercism net-im/xmpp-client net-mgmt/carbon-relay-ng net-mgmt/carbonzipper net-mgmt/grok_exporter net-mgmt/intel-snap net-mgmt/kapaci...
Message-ID:  <201909292231.x8TMVwL3087043@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dmgk
Date: Sun Sep 29 22:31:57 2019
New Revision: 513275
URL: https://svnweb.freebsd.org/changeset/ports/513275

Log:
  Go ports: cleanup, finish transition to USES=go started with r505321 (cat. misc-shells)
  
  - Remove custom build/install targets left in place after r505321
  - Switch to the new GO_TARGET tuple syntax introduced in r512001
  - Switch to go:modules when upstream already uses them
  
  Reviewed by:	tobik
  Approved by:	araujo (mentor), portmgr (adamw)
  Differential Revision:	https://reviews.freebsd.org/D21743

Modified:
  head/misc/cryptoballot/Makefile
  head/misc/dive/Makefile
  head/misc/exercism/Makefile
  head/net-im/xmpp-client/Makefile
  head/net-mgmt/carbon-relay-ng/Makefile
  head/net-mgmt/carbonzipper/Makefile
  head/net-mgmt/grok_exporter/Makefile
  head/net-mgmt/intel-snap/Makefile
  head/net-mgmt/kapacitor/Makefile
  head/net-mgmt/mysqld_exporter/Makefile
  head/net-mgmt/nsd_exporter/Makefile
  head/net-mgmt/prometheus1/Makefile
  head/net-mgmt/semaphore/Makefile
  head/net-mgmt/telegraf/Makefile
  head/net-mgmt/unbound_exporter/Makefile
  head/net/cf/Makefile
  head/net/drive/Makefile
  head/net/go-cs/Makefile
  head/net/gobgp/Makefile
  head/net/goreplay/Makefile
  head/net/grpcurl/Makefile
  head/net/madonctl/Makefile
  head/net/nsq/Makefile
  head/net/traefik/Makefile
  head/net/v2ray/Makefile
  head/science/molgif/Makefile
  head/security/acmetool/Makefile
  head/security/go-cve-dictionary/Makefile
  head/security/meek/Makefile
  head/security/obfs4proxy-tor/Makefile
  head/security/onionscan/Makefile
  head/security/ssh-vault/Makefile
  head/security/ssllabs-scan/Makefile
  head/security/vuls/Makefile
  head/shells/antibody/Makefile

Modified: head/misc/cryptoballot/Makefile
==============================================================================
--- head/misc/cryptoballot/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/misc/cryptoballot/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -13,35 +13,24 @@ USES=		go
 
 USE_GITHUB=	yes
 GH_TAGNAME=	3753e1b
-GH_TUPLE=	${PORTNAME}:entropychecker:188ae6c:entropychecker/src/github.com/${PORTNAME}/entropychecker \
-		${PORTNAME}:fdh:5eb31ce:fdh/src/github.com/${PORTNAME}/fdh \
-		${PORTNAME}:rsablind:14f9913:rsablind/src/github.com/${PORTNAME}/rsablind \
-		urfave:cli:v1.20.0:cli/src/github.com/urfave/cli \
-		phayes:decryptpem:7e4f5bc:decryptpem/src/github.com/phayes/decryptpem \
-		phayes:errors:ad407e6:errors/src/github.com/phayes/errors \
-		dlintw:goconf:dcc0709:goconf/src/github.com/dlintw/goconf \
-		Sam-Izdat:govote:7d55c89:govote/src/github.com/Sam-Izdat/govote \
-		lib:pq:88edab0:pq/src/github.com/lib/pq \
-		golang:crypto:650f4a3:crypto/src/golang.org/x/crypto \
-		golang:sys:37707fd:sys/src/golang.org/x/sys
+GH_TUPLE=	${PORTNAME}:entropychecker:188ae6c:entropychecker/vendor/github.com/${PORTNAME}/entropychecker \
+		${PORTNAME}:fdh:5eb31ce:fdh/vendor/github.com/${PORTNAME}/fdh \
+		${PORTNAME}:rsablind:14f9913:rsablind/vendor/github.com/${PORTNAME}/rsablind \
+		urfave:cli:v1.20.0:cli/vendor/github.com/urfave/cli \
+		phayes:decryptpem:7e4f5bc:decryptpem/vendor/github.com/phayes/decryptpem \
+		phayes:errors:ad407e6:errors/vendor/github.com/phayes/errors \
+		dlintw:goconf:dcc0709:goconf/vendor/github.com/dlintw/goconf \
+		Sam-Izdat:govote:7d55c89:govote/vendor/github.com/Sam-Izdat/govote \
+		lib:pq:88edab0:pq/vendor/github.com/lib/pq \
+		golang:crypto:650f4a3:crypto/vendor/golang.org/x/crypto \
+		golang:sys:37707fd:sys/vendor/golang.org/x/sys
 GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 
-PROGS=		servers/ballotbox servers/electionclerk \
-		utils/cryptoballot \
-		utils/cryptoballot-getid utils/cryptoballot-public-key \
-		utils/cryptoballot-sign utils/cryptoballot-signature-request
+GO_TARGET=	./servers/ballotbox ./servers/electionclerk \
+		./utils/cryptoballot \
+		./utils/cryptoballot-getid ./utils/cryptoballot-public-key \
+		./utils/cryptoballot-sign ./utils/cryptoballot-signature-request
 
-PLIST_FILES=	${PROGS:C/.*\//bin\//}
-
-do-build:
-.for p in ${PROGS}
-	@cd ${WRKSRC}/${GH_SUBDIR}/${p}/ && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${p:C/.*\///}
-.endfor
-
-do-install:
-.for p in ${PROGS}
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR}/${p}/${p:C/.*\///} ${STAGEDIR}${PREFIX}/bin/${p:C/.*\///}
-.endfor
+PLIST_FILES=	${GO_TARGET:C/.*\//bin\//}
 
 .include <bsd.port.mk>

Modified: head/misc/dive/Makefile
==============================================================================
--- head/misc/dive/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/misc/dive/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -43,7 +43,7 @@ GH_TUPLE=	\
 		mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		mitchellh:go-homedir:v1.0.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
 		mitchellh:mapstructure:v1.0.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/moby/moby \
+		moby:moby:0b7cb16dde4a20d024c7be59801d63bcfd18611b:moby_moby/vendor/github.com/docker/docker \
 		nsf:termbox-go:60ab7e3d12ed:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
 		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
 		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
@@ -61,8 +61,5 @@ GH_TUPLE=	\
 		wagoodman:keybinding:6a824da6df05:wagoodman_keybinding/vendor/github.com/wagoodman/keybinding
 
 PLIST_FILES=	bin/${PORTNAME}
-
-post-patch:
-	@${GREP} -rl github.com/docker/docker ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} 's|github.com/docker/docker|github.com/moby/moby|'
 
 .include <bsd.port.mk>

Modified: head/misc/exercism/Makefile
==============================================================================
--- head/misc/exercism/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/misc/exercism/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -14,61 +14,60 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go
 USE_GITHUB=	yes
 GH_TUPLE=	\
-		exercism:cli:v${PORTVERSION}:DEFAULT/src/github.com/exercism/cli \
-		armon:consul-api:eb2c6b5:consulapi/src/github.com/armon/consul-api \
-		blang:semver:v3.5.1:semver/src/github.com/blang/semver \
-		coreos:etcd:v0.2.0:etcd/src/github.com/coreos/etcd \
-		coreos:go-semver:v0.2.0:gosemver/src/github.com/coreos/go-semver \
-		cpuguy83:go-md2man:v1.0.8:md2man/src/github.com/cpuguy83/go-md2man \
-		davecgh:go-spew:v1.1.0:gospew/src/github.com/davecgh/go-spew \
-		fsnotify:fsnotify:v1.4.2:fsnotify/src/github.com/fsnotify/fsnotify \
-		hashicorp:hcl:392dba7:hcl/src/github.com/hashicorp/hcl \
-		golang:protobuf:v1.2.0:protobuf/src/github.com/golang/protobuf \
-		inconshreveable:go-update:8152e7e:goupdate/src/github.com/inconshreveable/go-update \
-		inconshreveable:mousetrap:v1.0:mousetrap/src/github.com/inconshreveable/mousetrap \
-		kr:fs:v0.1.0:fs/src/github.com/kr/fs \
-		kr:pretty:v0.1.0:pretty/src/github.com/kr/pretty \
-		kr:text:v0.1.0:text/src/github.com/kr/text \
-		magiconair:properties:v1.7.3:properties/src/github.com/magiconair/properties \
-		mitchellh:go-homedir:v1.0.0:gohomedir/src/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:d0303fe:mapstructure/src/github.com/mitchellh/mapstructure \
-		pelletier:go-buffruneio:v0.2.0:gobuffruneio/src/github.com/pelletier/go-buffruneio \
-		pelletier:go-toml:v1.0.0:gotoml/src/github.com/pelletier/go-toml \
-		pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \
-		pkg:sftp:v1.8.3:sftp/src/github.com/pkg/sftp \
-		pmezard:go-difflib:v1.0.0:godifflib/src/github.com/pmezard/go-difflib \
-		russross:blackfriday:v1.5.1:blackfriday/src/github.com/russross/blackfriday \
-		spf13:afero:9be6508:afero/src/github.com/spf13/afero \
-		spf13:cast:v1.1.0:cast/src/github.com/spf13/cast \
-		spf13:cobra:b26b538:cobra/src/github.com/spf13/cobra \
-		spf13:jWalterWeatherman:0efa520:jww/src/github.com/spf13/jwalterweatherman \
-		spf13:pflag:e57e3ee:pflag/src/github.com/spf13/pflag \
-		spf13:viper:1573881:viper/src/github.com/spf13/viper \
-		stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \
-		stretchr:testify:v1.1.4:testify/src/github.com/stretchr/testify \
-		ugorji:go:v1.1.1:ugorji/src/github.com/ugorji/go \
-		xordataexchange:crypt:b2862e3:dataexchange/src/github.com/xordataexchange/crypt \
-		golang:crypto:0e37d00:crypto/src/golang.org/x/crypto \
-		golang:net:f5079bd:net/src/golang.org/x/net \
-		golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \
-		golang:sys:d8f5ea2:sys/src/golang.org/x/sys \
-		golang:text:3bd178b:text/src/golang.org/x/text \
-		golang:tools:90fa682:tour/src/golang.org/x/tools \
-		golang:appengine:ae0ab99:appengine/src/google.golang.org/appengine \
-		googleapis:google-api-go-client:920bb1b:gapis/src/google.golang.org/api \
-		GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/src/cloud.google.com/go \
-		go4org:go4:417644f:go4/src/go4.org \
-		go-check:check:788fd78:gocheck/src/gopkg.in/check.v1 \
-		go-yaml:yaml:25c4ec8:yaml/src/gopkg.in/yaml.v2
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+		exercism:cli:v${PORTVERSION}:DEFAULT \
+		armon:consul-api:eb2c6b5:consulapi/vendor/github.com/armon/consul-api \
+		blang:semver:v3.5.1:semver/vendor/github.com/blang/semver \
+		coreos:etcd:v0.2.0:etcd/vendor/github.com/coreos/etcd \
+		coreos:go-semver:v0.2.0:gosemver/vendor/github.com/coreos/go-semver \
+		cpuguy83:go-md2man:v1.0.8:md2man/vendor/github.com/cpuguy83/go-md2man \
+		davecgh:go-spew:v1.1.0:gospew/vendor/github.com/davecgh/go-spew \
+		fsnotify:fsnotify:v1.4.2:fsnotify/vendor/github.com/fsnotify/fsnotify \
+		hashicorp:hcl:392dba7:hcl/vendor/github.com/hashicorp/hcl \
+		golang:protobuf:v1.2.0:protobuf/vendor/github.com/golang/protobuf \
+		inconshreveable:go-update:8152e7e:goupdate/vendor/github.com/inconshreveable/go-update \
+		inconshreveable:mousetrap:v1.0:mousetrap/vendor/github.com/inconshreveable/mousetrap \
+		kr:fs:v0.1.0:fs/vendor/github.com/kr/fs \
+		kr:pretty:v0.1.0:pretty/vendor/github.com/kr/pretty \
+		kr:text:v0.1.0:text/vendor/github.com/kr/text \
+		magiconair:properties:v1.7.3:properties/vendor/github.com/magiconair/properties \
+		mitchellh:go-homedir:v1.0.0:gohomedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:mapstructure:d0303fe:mapstructure/vendor/github.com/mitchellh/mapstructure \
+		pelletier:go-buffruneio:v0.2.0:gobuffruneio/vendor/github.com/pelletier/go-buffruneio \
+		pelletier:go-toml:v1.0.0:gotoml/vendor/github.com/pelletier/go-toml \
+		pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \
+		pkg:sftp:v1.8.3:sftp/vendor/github.com/pkg/sftp \
+		pmezard:go-difflib:v1.0.0:godifflib/vendor/github.com/pmezard/go-difflib \
+		russross:blackfriday:v1.5.1:blackfriday/vendor/github.com/russross/blackfriday \
+		spf13:afero:9be6508:afero/vendor/github.com/spf13/afero \
+		spf13:cast:v1.1.0:cast/vendor/github.com/spf13/cast \
+		spf13:cobra:b26b538:cobra/vendor/github.com/spf13/cobra \
+		spf13:jWalterWeatherman:0efa520:jww/vendor/github.com/spf13/jwalterweatherman \
+		spf13:pflag:e57e3ee:pflag/vendor/github.com/spf13/pflag \
+		spf13:viper:1573881:viper/vendor/github.com/spf13/viper \
+		stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.1.4:testify/vendor/github.com/stretchr/testify \
+		ugorji:go:v1.1.1:ugorji/vendor/github.com/ugorji/go \
+		xordataexchange:crypt:b2862e3:dataexchange/vendor/github.com/xordataexchange/crypt \
+		golang:crypto:0e37d00:crypto/vendor/golang.org/x/crypto \
+		golang:net:f5079bd:net/vendor/golang.org/x/net \
+		golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \
+		golang:sys:d8f5ea2:sys/vendor/golang.org/x/sys \
+		golang:text:3bd178b:text/vendor/golang.org/x/text \
+		golang:tools:90fa682:tour/vendor/golang.org/x/tools \
+		golang:appengine:ae0ab99:appengine/vendor/google.golang.org/appengine \
+		googleapis:google-api-go-client:920bb1b:gapis/vendor/google.golang.org/api \
+		GoogleCloudPlatform:google-cloud-go:v0.28.0:gcloudgo/vendor/cloud.google.com/go \
+		go4org:go4:417644f:go4/vendor/go4.org \
+		go-check:check:788fd78:gocheck/vendor/gopkg.in/check.v1 \
+		go-yaml:yaml:25c4ec8:yaml/vendor/gopkg.in/yaml.v2
 
-PLIST_FILES=	bin/exercism
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=	./exercism
+GO_BUILDFLAGS=	-ldflags="\
+		-s -w \
+		-X github.com/exercism/cli/cmd.BuildOS=freebsd \
+		-X github.com/exercism/cli/cmd.BuildARCH=${ARCH}"
 
-do-build:
-	@(cd ${WRKSRC} ; \
-		${SETENV} ${MAKE_ENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -ldflags "-s -w -X github.com/exercism/cli/cmd.BuildOS=freebsd -X github.com/exercism/cli/cmd.BuildARCH=${ARCH}" -o out/exercism exercism/main.go)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/out/exercism ${STAGEDIR}${PREFIX}/bin
+PLIST_FILES=	bin/exercism
 
 .include <bsd.port.mk>

Modified: head/net-im/xmpp-client/Makefile
==============================================================================
--- head/net-im/xmpp-client/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-im/xmpp-client/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -14,20 +14,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go
 
 USE_GITHUB=	yes
-GH_TUPLE=	agl:xmpp-client:3030ad4:DEFAULT/src/github.com/agl/xmpp-client \
-		golang:crypto:c126467:crypto/src/golang.org/x/crypto \
-		golang:net:a680a1e:net/src/golang.org/x/net \
-		golang:sys:ac767d6:sys/src/golang.org/x/sys
+GH_TUPLE=	agl:xmpp-client:3030ad4:DEFAULT/vendor/github.com/agl/xmpp-client \
+		golang:crypto:c126467:crypto/vendor/golang.org/x/crypto \
+		golang:net:a680a1e:net/vendor/golang.org/x/net \
+		golang:sys:ac767d6:sys/vendor/golang.org/x/sys
 
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+
 PLIST_FILES=	bin/xmpp-client
 
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build  -o ${PORTNAME}
-
 do-test:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test . ./xmpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	cd ${WRKSRC}; \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ${GO_BUILDFLAGS} . ./xmpp
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/carbon-relay-ng/Makefile
==============================================================================
--- head/net-mgmt/carbon-relay-ng/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/carbon-relay-ng/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -19,19 +19,15 @@ GH_ACCOUNT=		graphite-ng
 GH_SUBDIR=		src/github.com/${GH_ACCOUNT}/${PORTNAME}
 USE_RC_SUBR=		${PORTNAME}
 
+GO_TARGET=		./cmd/${PORTNAME}
+
 USERS=			carbon
 GROUPS=			carbon
 
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} VERSION=${DISTVERSION} \
-		${MAKE_CMD} build
-
-do-install:
+post-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbon-relay-ng
 	@${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng
 	@${MKDIR} ${STAGEDIR}/var/run/carbon-relay-ng/spool
-	${INSTALL_PROGRAM} ${WRKSRC}/carbon-relay-ng ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/examples/carbon-relay-ng.ini ${STAGEDIR}${PREFIX}/etc/carbon-relay-ng/carbon-relay-ng.ini.sample
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/carbonzipper/Makefile
==============================================================================
--- head/net-mgmt/carbonzipper/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/carbonzipper/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -15,42 +15,38 @@ USES=			go
 USE_GITHUB=		yes
 GH_ACCOUNT=		go-graphite
 GH_SUBDIR=		src/github.com/go-graphite/${PORTNAME}
-GH_TUPLE=		bradfitz:gomemcache:1952afa:gomemcache/src/github.com/bradfitz/gomemcache \
-			dgryski:httputil:189c2918:httputil/src/github.com/dgryski/httputil \
-			dgryski:go-expirecache:743ef98:goexpirecache/src/github.com/dgryski/go-expirecache \
-			facebookgo:atomicfile:2de1f20:atomicfile/src/github.com/facebookgo/atomicfile \
-			facebookgo:clock:600d898:clock/src/github.com/facebookgo/clock \
-			facebookgo:grace:4afe952:grace/src/github.com/facebookgo/grace \
-			facebookgo:httpdown:a3b1354:httpdown/src/github.com/facebookgo/httpdown \
-			facebookgo:pidfile:f242e299:pidfile/src/github.com/facebookgo/pidfile \
-			facebookgo:stats:1b76add:stats/src/github.com/facebookgo/stats \
-			gogo:protobuf:v0.4:protobuf/src/github.com/gogo/protobuf \
-			go-yaml:yaml:v2.1.1:yaml/src/gopkg.in/yaml.v2 \
-			lestrrat:go-strftime:04ef93e:gostrftime/src/github.com/lestrrat/go-strftime \
-			lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/src/github.com/lestrrat/go-file-rotatelogs \
-			lomik:og-rek:628eefe:ogrek/src/github.com/lomik/og-rek \
-			lomik:zapwriter:d4499a3:zapwriter/src/github.com/lomik/zapwriter \
-		        peterbourgon:g2g:0c2bab2:g2g/src/github.com/peterbourgon/g2g \
-			pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \
-			satori:go.uuid:v1.1.0:gouuid/src/github.com/satori/go.uuid \
-			uber-go:atomic:v1.2.0:atomic/src/go.uber.org/atomic \
-			uber-go:multierr:v1.1.0:multierr/src/go.uber.org/multierr \
-			uber-go:zap:v1.5.0:zap/src/go.uber.org/zap
+GH_TUPLE=		bradfitz:gomemcache:1952afa:gomemcache/vendor/github.com/bradfitz/gomemcache \
+			dgryski:httputil:189c2918:httputil/vendor/github.com/dgryski/httputil \
+			dgryski:go-expirecache:743ef98:goexpirecache/vendor/github.com/dgryski/go-expirecache \
+			facebookgo:atomicfile:2de1f20:atomicfile/vendor/github.com/facebookgo/atomicfile \
+			facebookgo:clock:600d898:clock/vendor/github.com/facebookgo/clock \
+			facebookgo:grace:4afe952:grace/vendor/github.com/facebookgo/grace \
+			facebookgo:httpdown:a3b1354:httpdown/vendor/github.com/facebookgo/httpdown \
+			facebookgo:pidfile:f242e299:pidfile/vendor/github.com/facebookgo/pidfile \
+			facebookgo:stats:1b76add:stats/vendor/github.com/facebookgo/stats \
+			gogo:protobuf:v0.4:protobuf/vendor/github.com/gogo/protobuf \
+			go-yaml:yaml:v2.1.1:yaml/vendor/gopkg.in/yaml.v2 \
+			lestrrat:go-strftime:04ef93e:gostrftime/vendor/github.com/lestrrat/go-strftime \
+			lestrrat-go:file-rotatelogs:v2.1.0:filerotatelogs/vendor/github.com/lestrrat/go-file-rotatelogs \
+			lomik:og-rek:628eefe:ogrek/vendor/github.com/lomik/og-rek \
+			lomik:zapwriter:d4499a3:zapwriter/vendor/github.com/lomik/zapwriter \
+		        peterbourgon:g2g:0c2bab2:g2g/vendor/github.com/peterbourgon/g2g \
+			pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \
+			satori:go.uuid:v1.1.0:gouuid/vendor/github.com/satori/go.uuid \
+			uber-go:atomic:v1.2.0:atomic/vendor/go.uber.org/atomic \
+			uber-go:multierr:v1.1.0:multierr/vendor/go.uber.org/multierr \
+			uber-go:zap:v1.5.0:zap/vendor/go.uber.org/zap
 
+GO_BUILDFLAGS=		-ldflags='-X main.BuildVersion=${DISTVERSION}'
+
 USE_RC_SUBR=		${PORTNAME}
 
 USERS=			carbon
 GROUPS=			carbon
 
-do-build:
-	@cd ${WRKSRC}/ && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
-		go build --ldflags '-X main.BuildVersion=${DISTVERSION}' -o carbonzipper
-
-do-install:
+post-install:
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/etc/carbonzipper
 	@${MKDIR} ${STAGEDIR}/var/log/carbonzipper
-	${INSTALL_PROGRAM} ${WRKSRC}/carbonzipper ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/example.conf ${STAGEDIR}${PREFIX}/etc/carbonzipper
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/grok_exporter/Makefile
==============================================================================
--- head/net-mgmt/grok_exporter/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/grok_exporter/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -28,12 +28,10 @@ GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 USE_RC_SUBR=	grok_exporter
 SUB_FILES=	config.yml
 
-do-build:
+post-patch:
 	${LN} -sf ${WRKSRC}/tailer/fileTailer_darwin.go ${WRKSRC}/tailer/fileTailer_freebsd.go
-	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -o ${PORTNAME} .)
 
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/config.yml ${STAGEDIR}${ETCDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} example ${STAGEDIR}${DATADIR})

Modified: head/net-mgmt/intel-snap/Makefile
==============================================================================
--- head/net-mgmt/intel-snap/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/intel-snap/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -17,50 +17,38 @@ GH_ACCOUNT=	stdale
 GH_PROJECT=	snap-freebsd
 GH_TAGNAME=	ca8016d
 
-GH_TUPLE=	Sirupsen:logrus:61e43dc:logrus/src/github.com/Sirupsen/logrus \
-		vrischmann:jsonutil:d44b59f:jsonutil/src/github.com/vrischmann/jsonutil \
-		golang:crypto:f18420e:crypto/src/golang.org/x/crypto \
-		appc:spec:e99880c:schema/src/github.com/appc/spec \
-		asaskevich:govalidator:fdf1978:govalidator/src/github.com/asaskevich/govalidator \
-		coreos:go-semver:9474efc:semver/src/github.com/coreos/go-semver \
-		ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml \
-		golang:protobuf:8ee7999:protobuf/src/github.com/golang/protobuf \
-		hashicorp:go-msgpack:fa3f638:msgpack/src/github.com/hashicorp/go-msgpack \
-		hashicorp:memberlist:9888dc5:memberlist/src/github.com/hashicorp/memberlist \
-		armon:go-metrics:06b6099:metrics/src/github.com/armon/go-metrics \
-		intelsdi-x:gomit:db68f6f:gomit/src/github.com/intelsdi-x/gomit \
-		julienschmidt:httprouter:8a45e95:httprouter/src/github.com/julienschmidt/httprouter \
-		robfig:cron:9585fd5:cron/src/github.com/robfig/cron \
-		urfave:cli:347a988:cli2/src/github.com/urfave/cli \
-		urfave:negroni:61dbefc:negroni/src/github.com/urfave/negroni \
-		pborman:uuid:1b00554:uuid/src/github.com/pborman/uuid \
-		spf13:pflag:9ff6c69:pflag/src/github.com/spf13/pflag \
-		xeipuuv:gojsonschema:f06f290:gojsonschema/src/github.com/xeipuuv/gojsonschema \
-		xeipuuv:gojsonreference:e02fc20:gojsonreference/src/github.com/xeipuuv/gojsonreference \
-		xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/src/github.com/xeipuuv/gojsonpointer \
-		golang:net:41bba8d:net/src/golang.org/x/net \
-		abh:errorutil:f9bd360:errorutil/src/go4.org/errorutil \
-		go-yaml:yaml:4c78c97:yaml2/src/gopkg.in/yaml.v2 \
-		go-inf:inf:3887ee9:inf/src/gopkg.in/inf.v0 \
-		grpc:grpc-go:b1efb1e:grpc/src/google.golang.org/grpc \
-		ghodss:yaml:04f3134:yaml/src/github.com/ghodss/yaml
+GH_TUPLE=	Sirupsen:logrus:61e43dc:logrus/vendor/github.com/Sirupsen/logrus \
+		vrischmann:jsonutil:d44b59f:jsonutil/vendor/github.com/vrischmann/jsonutil \
+		golang:crypto:f18420e:crypto/vendor/golang.org/x/crypto \
+		appc:spec:e99880c:schema/vendor/github.com/appc/spec \
+		asaskevich:govalidator:fdf1978:govalidator/vendor/github.com/asaskevich/govalidator \
+		coreos:go-semver:9474efc:semver/vendor/github.com/coreos/go-semver \
+		ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml \
+		golang:protobuf:8ee7999:protobuf/vendor/github.com/golang/protobuf \
+		hashicorp:go-msgpack:fa3f638:msgpack/vendor/github.com/hashicorp/go-msgpack \
+		hashicorp:memberlist:9888dc5:memberlist/vendor/github.com/hashicorp/memberlist \
+		armon:go-metrics:06b6099:metrics/vendor/github.com/armon/go-metrics \
+		intelsdi-x:gomit:db68f6f:gomit/vendor/github.com/intelsdi-x/gomit \
+		julienschmidt:httprouter:8a45e95:httprouter/vendor/github.com/julienschmidt/httprouter \
+		robfig:cron:9585fd5:cron/vendor/github.com/robfig/cron \
+		urfave:cli:347a988:cli2/vendor/github.com/urfave/cli \
+		urfave:negroni:61dbefc:negroni/vendor/github.com/urfave/negroni \
+		pborman:uuid:1b00554:uuid/vendor/github.com/pborman/uuid \
+		spf13:pflag:9ff6c69:pflag/vendor/github.com/spf13/pflag \
+		xeipuuv:gojsonschema:f06f290:gojsonschema/vendor/github.com/xeipuuv/gojsonschema \
+		xeipuuv:gojsonreference:e02fc20:gojsonreference/vendor/github.com/xeipuuv/gojsonreference \
+		xeipuuv:gojsonpointer:e0fe6f6:gojsonpointer/vendor/github.com/xeipuuv/gojsonpointer \
+		golang:net:41bba8d:net/vendor/golang.org/x/net \
+		abh:errorutil:f9bd360:errorutil/vendor/go4.org/errorutil \
+		go-yaml:yaml:4c78c97:yaml2/vendor/gopkg.in/yaml.v2 \
+		go-inf:inf:3887ee9:inf/vendor/gopkg.in/inf.v0 \
+		grpc:grpc-go:b1efb1e:grpc/vendor/google.golang.org/grpc \
+		ghodss:yaml:04f3134:yaml/vendor/github.com/ghodss/yaml
 
-PLIST_FILES=	bin/snapctl bin/snapd
+GO_PKGNAME=	github.com/intelsdi-x/snap
+GO_TARGET=	.:snapd \
+		./cmd/snapctl
 
-do-build:
-	( cd ${WRKSRC}; ${LN} -s ${WRKSRC} ${WRKSRC}/src/github.com/intelsdi-x/snap )
-	( cd ${WRKSRC}/src/github.com/appc/spec; \
-		${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \
-		go build -o bin/actool github.com/appc/spec/actool )
-	( cd ${WRKSRC}; \
-		${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \
-		go build ${BUILD_FLAGS} -o bin/snapd )
-	( cd ${WRKSRC}/cmd/snapctl; \
-		${SETENV} ${BUILD_ENV} ${MAKE_ENV} GOPATH=${WRKSRC} CC=clang \
-		go build ${BUILD_FLAGS} -o bin/snapctl )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cmd/snapctl/bin/snapctl ${STAGEDIR}${PREFIX}/bin/snapctl
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/snapd ${STAGEDIR}${PREFIX}/bin/snapd
+PLIST_FILES=	bin/snapctl bin/snapd
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/kapacitor/Makefile
==============================================================================
--- head/net-mgmt/kapacitor/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/kapacitor/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -23,6 +23,10 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	influxdata
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
+GO_BUILDFLAGS+=	-ldflags "-X main.version=${DISTVERSION}"
+GO_TARGET=	./cmd/kapacitor \
+		./cmd/kapacitord
+
 SUB_FILES=	kapacitord
 SUB_LIST+=	KAPACITORD_USER=${KAPACITORD_USER} \
 		KAPACITORD_GROUP=${KAPACITORD_GROUP} \
@@ -52,21 +56,14 @@ SUB_LIST+=	KAPACITORD_LOGCMD="logger"
 KAPACITORD_DBDIR=	/var/db/${PORTNAME}/
 KAPACITORD_LOGDIR=	/var/log/${PORTNAME}/
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \
-		&& ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \
-		&& ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d
-
-do-install:
+post-install:
 	${MKDIR} ${STAGEDIR}${KAPACITORD_DBDIR} \
 	${STAGEDIR}${KAPACITORD_LOGDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME}d ${STAGEDIR}${PREFIX}/bin/${PORTNAME}d
 	@${SED} -i .bak -e \
 		"s|/var/lib/kapacitor|/var/db/kapacitor|g" \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf
+		${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf
 	${INSTALL_DATA} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf  \
+		${WRKSRC}/etc/${PORTNAME}/${PORTNAME}.conf  \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.post.mk>

Modified: head/net-mgmt/mysqld_exporter/Makefile
==============================================================================
--- head/net-mgmt/mysqld_exporter/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/mysqld_exporter/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -17,13 +17,9 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	prometheus
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
-GO_TARGET=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/mysqld_exporter
 
 USE_RC_SUBR=	mysqld_exporter
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/mysqld_exporter ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/nsd_exporter/Makefile
==============================================================================
--- head/net-mgmt/nsd_exporter/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/nsd_exporter/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -15,18 +15,17 @@ USES=		go
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	optix2000
-GH_TUPLE=	prometheus:client_golang:v0.8.0:client_golang \
-		prometheus:client_model:5c3871d:client_model \
-		prometheus:procfs:ae68e2d:procfs \
-		prometheus:common:7600349:common \
-		beorn7:perks:3a771d9:perks \
-		golang:protobuf:70b3af3:protobuf \
-		matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \
-		optix2000:go-nsdctl:ce14b32:go_nsdctl \
-		go-yaml:yaml:7f97868:go_yaml
+GH_TUPLE=	prometheus:client_golang:v0.8.0:client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \
+		prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \
+		prometheus:common:7600349:common/vendor/github.com/prometheus/common \
+		beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \
+		golang:protobuf:70b3af3:protobuf/vendor/github.com/golang/protobuf \
+		matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		optix2000:go-nsdctl:ce14b32:go_nsdctl/vendor/github.com/optix2000/go-nsdctl \
+		go-yaml:yaml:7f97868:go_yaml/vendor/gopkg.in/yaml.v2
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
-GO_TARGET=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/nsd_exporter
 
@@ -35,22 +34,5 @@ USE_RC_SUBR=	nsd_exporter
 post-patch:
 	${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC_go_nsdctl}/nsdctl.go
 	${REINPLACE_CMD} -e 's|"/etc|"${LOCALBASE}/etc|g' ${WRKSRC}/nsd_exporter.go
-
-pre-build:
-	${MKDIR} ${GO_WRKDIR_SRC}/github.com/prometheus ${GO_WRKDIR_SRC}/gopkg.in \
-		${GO_WRKDIR_SRC}/github.com/beorn7 ${GO_WRKDIR_SRC}/github.com/golang \
-		${GO_WRKDIR_SRC}/github.com/matttproud ${GO_WRKDIR_SRC}/github.com/optix2000
-	${MV} ${WRKSRC_golang_protobuf_extensions} ${GO_WRKDIR_SRC}/github.com/matttproud/golang_protobuf_extensions
-	${MV} ${WRKSRC_go_nsdctl} ${GO_WRKDIR_SRC}/github.com/optix2000/go-nsdctl
-	${MV} ${WRKSRC_client_golang} ${GO_WRKDIR_SRC}/github.com/prometheus/client_golang
-	${MV} ${WRKSRC_client_model} ${GO_WRKDIR_SRC}/github.com/prometheus/client_model
-	${MV} ${WRKSRC_procfs} ${GO_WRKDIR_SRC}/github.com/prometheus/procfs
-	${MV} ${WRKSRC_common} ${GO_WRKDIR_SRC}/github.com/prometheus/common
-	${MV} ${WRKSRC_protobuf} ${GO_WRKDIR_SRC}/github.com/golang/protobuf
-	${MV} ${WRKSRC_go_yaml} ${GO_WRKDIR_SRC}/gopkg.in/yaml.v2
-	${MV} ${WRKSRC_perks} ${GO_WRKDIR_SRC}/github.com/beorn7/perks
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/nsd_exporter ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/prometheus1/Makefile
==============================================================================
--- head/net-mgmt/prometheus1/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/prometheus1/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -14,7 +14,7 @@ COMMENT=	Systems monitoring and alerting toolkit
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go gmake
+USES=		go
 USE_GITHUB=	yes
 
 GO_PKGNAME=	github.com/${PORTNAME}/${PORTNAME}
@@ -26,24 +26,17 @@ GROUPS=		prometheus
 
 BUILD_USER?=	${USER}
 LD_FLAG_X_PREFIX=	-X ${GO_PKGNAME}/vendor/github.com/prometheus/common/version
-LD_FLAG_STRING=	-s \
-				${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
-				${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
-				${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
-				${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}
+GO_BUILDFLAGS=	-ldflags "\
+		-s \
+		${LD_FLAG_X_PREFIX}.Version=${PORTVERSION} \
+		${LD_FLAG_X_PREFIX}.Revision=${PORTREVISION} \
+		${LD_FLAG_X_PREFIX}.Branch=release-${PORTVERSION:R} \
+		${LD_FLAG_X_PREFIX}.BuildUser=${BUILD_USER}"
+GO_TARGET=	./cmd/prometheus \
+		./cmd/promtool
 
-do-build:
-	( cd ${GO_WRKSRC}/cmd/prometheus ; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" )
-
-	( cd ${GO_WRKSRC}/cmd/promtool ; \
-		${SETENV} ${MAKE_ENV} ${GO_ENV} go install -ldflags "${LD_FLAG_STRING}" )
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin
+post-install:
 	${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample
-
 	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus
 
 .include <bsd.port.mk>

Modified: head/net-mgmt/semaphore/Makefile
==============================================================================
--- head/net-mgmt/semaphore/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/semaphore/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -18,50 +18,51 @@ USES=		go
 USE_GITHUB=	yes
 USE_RC_SUBR=	semaphore
 
-GO_TARGET=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_TARGET=	./cli:${PORTNAME}
 
 GH_ACCOUNT=	ansible-semaphore
-GH_TUPLE=	ansible-semaphore:semaphore-vendor:a44f7be:ansible/github.com/ansible-semaphore/semaphore-vendor \
-		PuerkitoBio:purell:v1.1.0:PuerkitoBio/github.com/PuerkitoBio/purell \
-		PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/github.com/PuerkitoBio/urlesc \
-		Sirupsen:logrus:v1.0.4:Sirupsen/github.com/Sirupsen/logrus \
-		asaskevich:govalidator:v9:asaskevich/github.com/asaskevich/govalidator \
-		castawaylabs:mulekick:7029fb3:castawaylabs/github.com/castawaylabs/mulekick \
-		go-openapi:analysis:f59a71f:openapi/github.com/go-openapi/analysis \
-		go-openapi:errors:7bcb96a:openapi2/github.com/go-openapi/errors \
-		go-openapi:jsonpointer:3a0015a:openapi3/github.com/go-openapi/jsonpointer \
-		go-openapi:jsonreference:3fb327e:openapi4/github.com/go-openapi/jsonreference \
-		go-openapi:loads:2a2b323:openapi5/github.com/go-openapi/loads \
-		go-openapi:runtime:62281b6:openapi6/github.com/go-openapi/runtime \
-		go-openapi:spec:370d9e0:openapi7/github.com/go-openapi/spec \
-		go-openapi:strfmt:4818084:openapi8/github.com/go-openapi/strfmt \
-		go-openapi:swag:811b108:openapi9/github.com/go-openapi/swag \
-		go-openapi:validate:180bba5:openapi10/github.com/go-openapi/validate \
-		go-sql-driver:mysql:v1.3:sqldriver/github.com/go-sql-driver/mysql \
-		gobuffalo:packr:v1.10.4:buffalo/github.com/gobuffalo/packr \
-		google:go-github:v15.0.0:google/github.com/google/go-github \
-		google:go-querystring:53e6ce1:google2/github.com/google/go-querystring \
-		gorilla:context:v1.1:gorilla/github.com/gorilla/context \
-		gorilla:handlers:v1.3.0:gorilla2/github.com/gorilla/handlers \
-		gorilla:mux:v1.6.1:gorilla3/github.com/gorilla/mux \
-		gorilla:securecookie:v1.1.1:gorilla4/github.com/gorilla/securecookie \
-		gorilla:websocket:v1.2.0:gorilla5/github.com/gorilla/websocket \
-		lann:builder:1b87b36:lann/github.com/lann/builder \
-		lann:ps:62de8c4:lann2/github.com/lann/ps \
-		mailru:easyjson:8b799c4:mailru/github.com/mailru/easyjson \
-		masterminds:squirrel:v1.0:mastermindos/github.com/masterminds/squirrel \
-		mitchellh:mapstructure:00c29f5:mitchellh/github.com/mitchellh/mapstructure \
-		pkg:errors:v0.8.0:pkg/github.com/pkg/errors \
-		russross:blackfriday:v1.5.1:russross/github.com/russross/blackfriday \
-		golang:net:61147c4:golang/golang.org/x/net \
-		golang:sys:7dca6fe:golang2/golang.org/x/sys \
-		golang:text:v0.3.0:golang3/golang.org/x/text \
-		golang:crypto:c7dcf10:golang4/golang.org/x/crypto \
-		go-asn1-ber:asn1-ber:v1.2:pkgin/gopkg.in/asn1-ber.v1 \
-		go-gorp:gorp:v1.7.1:pkgin2/gopkg.in/gorp.v1 \
-		go-ldap:ldap:v2.5.1:pkgin3/gopkg.in/ldap.v2 \
-		go-mgo:mgo:3f83fa5:pkgin4/gopkg.in/mgo.v2 \
-		go-yaml:yaml:v2.2.1:pkgin5/gopkg.in/yaml.v2
+GH_TUPLE=	ansible-semaphore:semaphore-vendor:a44f7be:ansible/vendor/github.com/ansible-semaphore/semaphore-vendor \
+		PuerkitoBio:purell:v1.1.0:PuerkitoBio/vendor/github.com/PuerkitoBio/purell \
+		PuerkitoBio:urlesc:de5bf2a:PuerkitoBio2/vendor/github.com/PuerkitoBio/urlesc \
+		Sirupsen:logrus:v1.0.4:Sirupsen/vendor/github.com/Sirupsen/logrus \
+		asaskevich:govalidator:v9:asaskevich/vendor/github.com/asaskevich/govalidator \
+		castawaylabs:mulekick:7029fb3:castawaylabs/vendor/github.com/castawaylabs/mulekick \
+		go-openapi:analysis:f59a71f:openapi/vendor/github.com/go-openapi/analysis \
+		go-openapi:errors:7bcb96a:openapi2/vendor/github.com/go-openapi/errors \
+		go-openapi:jsonpointer:3a0015a:openapi3/vendor/github.com/go-openapi/jsonpointer \
+		go-openapi:jsonreference:3fb327e:openapi4/vendor/github.com/go-openapi/jsonreference \
+		go-openapi:loads:2a2b323:openapi5/vendor/github.com/go-openapi/loads \
+		go-openapi:runtime:62281b6:openapi6/vendor/github.com/go-openapi/runtime \
+		go-openapi:spec:370d9e0:openapi7/vendor/github.com/go-openapi/spec \
+		go-openapi:strfmt:4818084:openapi8/vendor/github.com/go-openapi/strfmt \
+		go-openapi:swag:811b108:openapi9/vendor/github.com/go-openapi/swag \
+		go-openapi:validate:180bba5:openapi10/vendor/github.com/go-openapi/validate \
+		go-sql-driver:mysql:v1.3:sqldriver/vendor/github.com/go-sql-driver/mysql \
+		gobuffalo:packr:v1.10.4:buffalo/vendor/github.com/gobuffalo/packr \
+		google:go-github:v15.0.0:google/vendor/github.com/google/go-github \
+		google:go-querystring:53e6ce1:google2/vendor/github.com/google/go-querystring \
+		gorilla:context:v1.1:gorilla/vendor/github.com/gorilla/context \
+		gorilla:handlers:v1.3.0:gorilla2/vendor/github.com/gorilla/handlers \
+		gorilla:mux:v1.6.1:gorilla3/vendor/github.com/gorilla/mux \
+		gorilla:securecookie:v1.1.1:gorilla4/vendor/github.com/gorilla/securecookie \
+		gorilla:websocket:v1.2.0:gorilla5/vendor/github.com/gorilla/websocket \
+		lann:builder:1b87b36:lann/vendor/github.com/lann/builder \
+		lann:ps:62de8c4:lann2/vendor/github.com/lann/ps \
+		mailru:easyjson:8b799c4:mailru/vendor/github.com/mailru/easyjson \
+		masterminds:squirrel:v1.0:mastermindos/vendor/github.com/masterminds/squirrel \
+		mitchellh:mapstructure:00c29f5:mitchellh/vendor/github.com/mitchellh/mapstructure \
+		pkg:errors:v0.8.0:pkg/vendor/github.com/pkg/errors \
+		russross:blackfriday:v1.5.1:russross/vendor/github.com/russross/blackfriday \
+		golang:net:61147c4:golang/vendor/golang.org/x/net \
+		golang:sys:7dca6fe:golang2/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:golang3/vendor/golang.org/x/text \
+		golang:crypto:c7dcf10:golang4/vendor/golang.org/x/crypto \
+		go-asn1-ber:asn1-ber:v1.2:pkgin/vendor/gopkg.in/asn1-ber.v1 \
+		go-gorp:gorp:v1.7.1:pkgin2/vendor/gopkg.in/gorp.v1 \
+		go-ldap:ldap:v2.5.1:pkgin3/vendor/gopkg.in/ldap.v2 \
+		go-mgo:mgo:3f83fa5:pkgin4/vendor/gopkg.in/mgo.v2 \
+		go-yaml:yaml:v2.2.1:pkgin5/vendor/gopkg.in/yaml.v2
 
 OPTIONS_DEFINE=	MYSQL
 MYSQL_USES=	mysql
@@ -70,18 +71,7 @@ post-patch:
 	${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' \
 	  ${WRKSRC}/util/config.go
 
-do-build:
-	${MKDIR} ${WRKSRC}/${GO_TARGET:H}
-	${MKDIR} ${WRKSRC}/public
-	${RLN} ${WRKSRC} ${WRKSRC}/${GO_TARGET}
-	${RLN} ${WRKSRC} ${GO_WRKSRC}/src
-	${RLN} ${WRKSRC} ${GO_WRKSRC}/public/vendor
-	(cd ${WRKSRC} && \
-	  ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} \
-	  build ${GO_BUILDFLAGS} -o ${WRKSRC}/bin/${PORTNAME} cli)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/semaphore
 	${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/semaphore/semaphore_config.json.sample
 

Modified: head/net-mgmt/telegraf/Makefile
==============================================================================
--- head/net-mgmt/telegraf/Makefile	Sun Sep 29 22:29:39 2019	(r513274)
+++ head/net-mgmt/telegraf/Makefile	Sun Sep 29 22:31:57 2019	(r513275)
@@ -21,151 +21,154 @@ USE_GITHUB=	yes
 
 GH_ACCOUNT=	influxdata
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}
-GH_TUPLE=	GoogleCloudPlatform:google-cloud-go:v0.27.0:go/src/cloud.google.com/go \
-		cloudfoundry:clock:02e53af:clock/src/code.cloudfoundry.org/clock \
-		collectd:go-collectd:v0.3.0:collectd_org/src/collectd.org \
-		census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/src/contrib.go.opencensus.io/exporter/stackdriver \
-		cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/src/github.com/cisco-ie/nx-telemetry-proto \
-		Azure:go-autorest:v10.12.0:go_autorest/src/github.com/Azure/go-autorest \
-		Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/src/github.com/Microsoft/ApplicationInsights-Go \
-		Microsoft:go-winio:v0.4.9:go_winio/src/github.com/Microsoft/go-winio \
-		influxdata:sarama:b12709e:sarama/src/github.com/Shopify/sarama \
-		StackExchange:wmi:1.0.0:wmi/src/github.com/StackExchange/wmi \
-		aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/src/github.com/aerospike/aerospike-client-go \
-		alecthomas:units:2efee85:units/src/github.com/alecthomas/units \
-		amir:raidman:1ccc43b:raidman/src/github.com/amir/raidman \
-		apache:thrift:f2867c2:thrift/src/github.com/apache/thrift \
-		aws:aws-sdk-go:v1.19.41:aws_sdk_go/src/github.com/aws/aws-sdk-go \
-		beorn7:perks:3a771d9:perks/src/github.com/beorn7/perks \
-		caio:go-tdigest:v2.3.0:go_tdigest/src/github.com/caio/go-tdigest \
-		cenkalti:backoff:v2.0.0:backoff/src/github.com/cenkalti/backoff \
-		couchbase:go-couchbase:16db1f1:go_couchbase/src/github.com/couchbase/go-couchbase \
-		couchbase:gomemcached:0da75df:gomemcached/src/github.com/couchbase/gomemcached \
-		couchbase:goutils:e865a14:goutils/src/github.com/couchbase/goutils \
-		davecgh:go-spew:v1.1.0:go_spew/src/github.com/davecgh/go-spew \
-		denisenkom:go-mssqldb:2be1aa5:go_mssqldb/src/github.com/denisenkom/go-mssqldb \
-		dgrijalva:jwt-go:v3.2.0:jwt_go/src/github.com/dgrijalva/jwt-go \
-		dimchansky:utfbom:6c6132f:utfbom/src/github.com/dimchansky/utfbom \
-		docker:distribution:edc3ab2:distribution/src/github.com/docker/distribution \
-		moby:moby:ed7b642:docker/src/github.com/docker/docker \
-		docker:go-connections:v0.3.0:go_connections/src/github.com/docker/go-connections \
-		docker:go-units:v0.3.3:go_units/src/github.com/docker/go-units \
-		docker:libnetwork:d7b6174:libnetwork/src/github.com/docker/libnetwork \
-		eapache:go-resiliency:v1.1.0:go_resiliency/src/github.com/eapache/go-resiliency \
-		eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/src/github.com/eapache/go-xerial-snappy \
-		eapache:queue:v1.1.0:queue/src/github.com/eapache/queue \
-		eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/src/github.com/eclipse/paho.mqtt.golang \
-		ericchiang:k8s:v1.2.0:k8s/src/github.com/ericchiang/k8s \
-		ghodss:yaml:25d852a:yaml/src/github.com/ghodss/yaml \
-		go-logfmt:logfmt:v0.4.0:go_logfmt/src/github.com/go-logfmt/logfmt \
-		go-ole:go-ole:v1.2.1:go_ole/src/github.com/go-ole/go-ole \
-		go-redis:redis:v6.12.0:redis/src/github.com/go-redis/redis \
-		go-sql-driver:mysql:v1.4.1:mysql/src/github.com/go-sql-driver/mysql \
-		gobwas:glob:v0.2.3:glob/src/github.com/gobwas/glob \
-		gogo:protobuf:v1.1.1:gogo_protobuf/src/github.com/gogo/protobuf \
-		golang:protobuf:v1.1.0:protobuf/src/github.com/golang/protobuf \
-		golang:snappy:2e65f85:snappy/src/github.com/golang/snappy \
-		google:go-github:v24.0.1:go_github/src/github.com/google/go-github \
-		google:go-cmp:v0.2.0:go_cmp/src/github.com/google/go-cmp \
-		google:go-querystring:v1.0.0:go_querystring/src/github.com/google/go-querystring \
-		google:uuid:0.2:uuid/src/github.com/google/uuid \
-		googleapis:gax-go:v2.0.0:gax_go/src/github.com/googleapis/gax-go \
-		gorilla:context:v1.1.1:context/src/github.com/gorilla/context \
-		gorilla:mux:v1.6.2:mux/src/github.com/gorilla/mux \
-		hailocab:go-hostpool:e80d13c:go_hostpool/src/github.com/hailocab/go-hostpool \
-		harlow:kinesis-consumer:2f58b13:kinesis_consumer/src/github.com/harlow/kinesis-consumer \
-		hashicorp:consul:v1.2.1:consul/src/github.com/hashicorp/consul \
-		hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/src/github.com/hashicorp/go-cleanhttp \
-		hashicorp:go-rootcerts:6bb64b3:go_rootcerts/src/github.com/hashicorp/go-rootcerts \
-		hashicorp:go-uuid:v1.0.1:gouuid/src/github.com/hashicorp/go-uuid \
-		hashicorp:serf:v0.8.1:serf/src/github.com/hashicorp/serf \
-		influxdata:go-syslog:v2.0.0:go_syslog/src/github.com/influxdata/go-syslog \
-		influxdata:tail:c434825:tail/src/github.com/influxdata/tail \
-		influxdata:toml:270119a:toml/src/github.com/influxdata/toml \
-		influxdata:wlog:7c63b0a:wlog/src/github.com/influxdata/wlog \
-		jackc:pgx:v3.2.0:pgx/src/github.com/jackc/pgx \
-		jcmturner:aescts:v1.0.1:aescts/src/gopkg.in/jcmturner/aescts.v1 \
-		jcmturner:dnsutils:v1.0.1:dnsutils/src/gopkg.in/jcmturner/dnsutils.v1 \
-		jcmturner:gofork:v1.0.0:gofork/src/github.com/jcmturner/gofork \
-		jcmturner:gokrb5:v7.3.0:gokrb5/src/gopkg.in/jcmturner/gokrb5.v7 \
-		jcmturner:rpc:v1.1.0:rpc/src/gopkg.in/jcmturner/rpc.v1 \
-		jmespath:go-jmespath:c2b33e84:go_jmespath/src/github.com/jmespath/go-jmespath \
-		kardianos:osext:ae77be6:osext/src/github.com/kardianos/osext \
-		kardianos:service:615a14e:service/src/github.com/kardianos/service \
-		karrick:godirwalk:v1.7.5:godirwalk/src/github.com/karrick/godirwalk \
-		kballard:go-shellquote:95032a8:go_shellquote/src/github.com/kballard/go-shellquote \
-		kr:logfmt:b84e30a:logfmt/src/github.com/kr/logfmt \
-		kubernetes:apimachinery:d41becf:apimachinery/src/github.com/kubernetes/apimachinery \
-		leodido:ragel-machinery:299bdde:ragel_machinery/src/github.com/leodido/ragel-machinery \
-		mailru:easyjson:efc7eb8:easyjson/src/github.com/mailru/easyjson \
-		matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/src/github.com/matttproud/golang_protobuf_extensions \
-		mdlayher:apcupsd:2fe55d9:apcupsd/src/github.com/mdlayher/apcupsd \
-		miekg:dns:v1.0.8:dns/src/github.com/miekg/dns \
-		mitchellh:go-homedir:3864e76:go_homedir/src/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:f15292f:mapstructure/src/github.com/mitchellh/mapstructure \
-		multiplay:go-ts3:v1.0.0:go_ts3/src/github.com/multiplay/go-ts3 \
-		naoina:go-stringutil:v0.1.0:go_stringutil/src/github.com/naoina/go-stringutil \
-		nats-io:gnatsd:v1.2.0:gnatsd/src/github.com/nats-io/gnatsd \
-		nats-io:go-nats:v1.5.0:nats/src/github.com/nats-io/go-nats \
-		nats-io:nuid:v1.0.0:nuid/src/github.com/nats-io/nuid \
-		nsqio:go-nsq:v1.0.7:go_nsq/src/github.com/nsqio/go-nsq \
-		openconfig:gnmi:33a1865:gnmi/src/github.com/openconfig/gnmi \
-		opencontainers:go-digest:v1.0.0-rc1:go_digest/src/github.com/opencontainers/go-digest \
-		opencontainers:image-spec:v1.0.1:image_spec/src/github.com/opencontainers/image-spec \
-		opentracing-contrib:go-observer:a52f234:go_observer/src/github.com/opentracing-contrib/go-observer \
-		opentracing:opentracing-go:v1.0.2:opentracing_go/src/github.com/opentracing/opentracing-go \
-		openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/src/github.com/openzipkin/zipkin-go-opentracing \
-		glinton:ping:v0.1.1:ping/src/github.com/glinton/ping \
-		pierrec:lz4:v2.0.3:lz4/src/github.com/pierrec/lz4 \
-		pkg:errors:v0.8.0:errors/src/github.com/pkg/errors \
-		pmezard:go-difflib:v1.0.0:go_difflib/src/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v0.9.2:client_golang/src/github.com/prometheus/client_golang \
-		prometheus:client_model:5c3871d:client_model/src/github.com/prometheus/client_model \
-		prometheus:common:7600349:common/src/github.com/prometheus/common \
-		prometheus:procfs:ae68e2d:procfs/src/github.com/prometheus/procfs \
-		rcrowley:go-metrics:e2704e1:go_metrics/src/github.com/rcrowley/go-metrics \
-		samuel:go-zookeeper:c4fab1a:go_zookeeper/src/github.com/samuel/go-zookeeper \
-		satori:go.uuid:v1.2.0:go_uuid/src/github.com/satori/go.uuid \
-		shirou:gopsutil:v2.19.7:gopsutil/src/github.com/shirou/gopsutil \
-		shirou:w32:bb4de01:w32/src/github.com/shirou/w32 \
-		sirupsen:logrus:v1.0.5:logrus/src/github.com/sirupsen/logrus \
-		soniah:gosnmp:96b8622:gosnmp/src/github.com/soniah/gosnmp \
-		streadway:amqp:e5adc2a:amqp/src/github.com/streadway/amqp \
-		stretchr:objx:v0.1.1:objx/src/github.com/stretchr/objx \
-		stretchr:testify:v1.2.2:testify/src/github.com/stretchr/testify \
-		tidwall:gjson:v1.3.0:gjson/src/github.com/tidwall/gjson \
-		tidwall:match:1731857:match/src/github.com/tidwall/match \
-		tidwall:pretty:v1.0.0:pretty/src/github.com/tidwall/pretty \
-		vishvananda:netlink:b2de5d1:netlink/src/github.com/vishvananda/netlink \
-		vishvananda:netns:13995c7:netns/src/github.com/vishvananda/netns \
-		vjeantet:grok:v1.0.0:grok/src/github.com/vjeantet/grok \
-		vmware:govmomi:v0.19.0:govmomi/src/github.com/vmware/govmomi \
-		wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/src/github.com/wavefronthq/wavefront-sdk-go \
-		wvanbergen:kafka:e2edea9:kafka/src/github.com/wvanbergen/kafka \
-		wvanbergen:kazoo-go:f72d861:kazoo_go/src/github.com/wvanbergen/kazoo-go \
-		yuin:gopher-lua:46796da:gopher_lua/src/github.com/yuin/gopher-lua \
-		census-instrumentation:opencensus-go:v0.17.0:opencensus_go/src/go.opencensus.io \
-		golang:crypto:a214413:crypto/src/golang.org/x/crypto \
-		golang:net:a680a1e:net/src/golang.org/x/net \
-		golang:oauth2:d2e6202:oauth2/src/golang.org/x/oauth2 \
-		golang:sync:42b3178:sync/src/golang.org/x/sync \
-		golang:sys:51ab0e2:sys/src/golang.org/x/sys \
-		golang:text:v0.3.0:text/src/golang.org/x/text \
-		googleapis:google-api-go-client:19ff876:googleapis/src/google.golang.org/api \
-		golang:appengine:v1.1.0:appengine/src/google.golang.org/appengine \
-		google:go-genproto:fedd286:genproto/src/google.golang.org/genproto \
-		grpc:grpc-go:v1.13.0:grpc/src/google.golang.org/grpc \
-		go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/src/gopkg.in/asn1-ber.v1 \
-		fatih:pool:v2.0.0:pool_v2/src/gopkg.in/fatih/pool.v2 \
-		fsnotify:fsnotify:v1.4.7:fsnotify_v1/src/gopkg.in/fsnotify.v1 \
-		rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/src/gopkg.in/gorethink/gorethink.v3 \
-		go-inf:inf:v0.9.1:inf_v0/src/gopkg.in/inf.v0 \
-		go-ldap:ldap:v2.5.1:ldap_v2/src/gopkg.in/ldap.v2 \
-		go-mgo:mgo:9856a29:mgo_v2/src/gopkg.in/mgo.v2 \
-		olivere:elastic:v5.0.70:elastic_v5/src/gopkg.in/olivere/elastic.v5 \
-		go-tomb:tomb:dd63297:tomb_v1/src/gopkg.in/tomb.v1 \
-		go-yaml:yaml:v2.2.1:yaml_v2/src/gopkg.in/yaml.v2
+GH_TUPLE=	GoogleCloudPlatform:google-cloud-go:v0.27.0:go/vendor/cloud.google.com/go \
+		cloudfoundry:clock:02e53af:clock/vendor/code.cloudfoundry.org/clock \
+		collectd:go-collectd:v0.3.0:collectd_org/vendor/collectd.org \
+		census-ecosystem:opencensus-go-exporter-stackdriver:v0.6.0:census_ecosystem/vendor/contrib.go.opencensus.io/exporter/stackdriver \
+		cisco-ie:nx-telemetry-proto:82441e2:nx_telemetry_proto/vendor/github.com/cisco-ie/nx-telemetry-proto \
+		Azure:go-autorest:v10.12.0:go_autorest/vendor/github.com/Azure/go-autorest \
+		Microsoft:ApplicationInsights-Go:d2df5d4:application_insights/vendor/github.com/Microsoft/ApplicationInsights-Go \
+		Microsoft:go-winio:v0.4.9:go_winio/vendor/github.com/Microsoft/go-winio \
+		influxdata:sarama:b12709e:sarama/vendor/github.com/Shopify/sarama \
+		StackExchange:wmi:1.0.0:wmi/vendor/github.com/StackExchange/wmi \
+		aerospike:aerospike-client-go:v1.27.0:aerospike_client_go/vendor/github.com/aerospike/aerospike-client-go \
+		alecthomas:units:2efee85:units/vendor/github.com/alecthomas/units \
+		amir:raidman:1ccc43b:raidman/vendor/github.com/amir/raidman \
+		apache:thrift:f2867c2:thrift/vendor/github.com/apache/thrift \
+		aws:aws-sdk-go:v1.19.41:aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		beorn7:perks:3a771d9:perks/vendor/github.com/beorn7/perks \
+		caio:go-tdigest:v2.3.0:go_tdigest/vendor/github.com/caio/go-tdigest \
+		cenkalti:backoff:v2.0.0:backoff/vendor/github.com/cenkalti/backoff \
+		couchbase:go-couchbase:16db1f1:go_couchbase/vendor/github.com/couchbase/go-couchbase \
+		couchbase:gomemcached:0da75df:gomemcached/vendor/github.com/couchbase/gomemcached \
+		couchbase:goutils:e865a14:goutils/vendor/github.com/couchbase/goutils \
+		davecgh:go-spew:v1.1.0:go_spew/vendor/github.com/davecgh/go-spew \
+		denisenkom:go-mssqldb:2be1aa5:go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
+		dgrijalva:jwt-go:v3.2.0:jwt_go/vendor/github.com/dgrijalva/jwt-go \
+		dimchansky:utfbom:6c6132f:utfbom/vendor/github.com/dimchansky/utfbom \
+		docker:distribution:edc3ab2:distribution/vendor/github.com/docker/distribution \
+		moby:moby:ed7b642:docker/vendor/github.com/docker/docker \
+		docker:go-connections:v0.3.0:go_connections/vendor/github.com/docker/go-connections \
+		docker:go-units:v0.3.3:go_units/vendor/github.com/docker/go-units \
+		docker:libnetwork:d7b6174:libnetwork/vendor/github.com/docker/libnetwork \
+		eapache:go-resiliency:v1.1.0:go_resiliency/vendor/github.com/eapache/go-resiliency \
+		eapache:go-xerial-snappy:040cc1a:go_xerial_snappy/vendor/github.com/eapache/go-xerial-snappy \
+		eapache:queue:v1.1.0:queue/vendor/github.com/eapache/queue \
+		eclipse:paho.mqtt.golang:v1.1.1:paho_mqtt_golang/vendor/github.com/eclipse/paho.mqtt.golang \
+		ericchiang:k8s:v1.2.0:k8s/vendor/github.com/ericchiang/k8s \
+		ghodss:yaml:25d852a:yaml/vendor/github.com/ghodss/yaml \
+		go-logfmt:logfmt:v0.4.0:go_logfmt/vendor/github.com/go-logfmt/logfmt \
+		go-ole:go-ole:v1.2.1:go_ole/vendor/github.com/go-ole/go-ole \
+		go-redis:redis:v6.12.0:redis/vendor/github.com/go-redis/redis \
+		go-sql-driver:mysql:v1.4.1:mysql/vendor/github.com/go-sql-driver/mysql \
+		gobwas:glob:v0.2.3:glob/vendor/github.com/gobwas/glob \
+		gogo:protobuf:v1.1.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:protobuf:v1.1.0:protobuf/vendor/github.com/golang/protobuf \
+		golang:snappy:2e65f85:snappy/vendor/github.com/golang/snappy \
+		google:go-github:v24.0.1:go_github/vendor/github.com/google/go-github \
+		google:go-cmp:v0.2.0:go_cmp/vendor/github.com/google/go-cmp \
+		google:go-querystring:v1.0.0:go_querystring/vendor/github.com/google/go-querystring \
+		google:uuid:0.2:uuid/vendor/github.com/google/uuid \
+		googleapis:gax-go:v2.0.0:gax_go/vendor/github.com/googleapis/gax-go \
+		gorilla:context:v1.1.1:context/vendor/github.com/gorilla/context \
+		gorilla:mux:v1.6.2:mux/vendor/github.com/gorilla/mux \
+		hailocab:go-hostpool:e80d13c:go_hostpool/vendor/github.com/hailocab/go-hostpool \
+		harlow:kinesis-consumer:2f58b13:kinesis_consumer/vendor/github.com/harlow/kinesis-consumer \
+		hashicorp:consul:v1.2.1:consul/vendor/github.com/hashicorp/consul \
+		hashicorp:go-cleanhttp:d5fe4b5:go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
+		hashicorp:go-rootcerts:6bb64b3:go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
+		hashicorp:go-uuid:v1.0.1:gouuid/vendor/github.com/hashicorp/go-uuid \
+		hashicorp:serf:v0.8.1:serf/vendor/github.com/hashicorp/serf \
+		influxdata:go-syslog:v2.0.0:go_syslog/vendor/github.com/influxdata/go-syslog \
+		influxdata:tail:c434825:tail/vendor/github.com/influxdata/tail \
+		influxdata:toml:270119a:toml/vendor/github.com/influxdata/toml \
+		influxdata:wlog:7c63b0a:wlog/vendor/github.com/influxdata/wlog \
+		jackc:pgx:v3.2.0:pgx/vendor/github.com/jackc/pgx \
+		jcmturner:aescts:v1.0.1:aescts/vendor/gopkg.in/jcmturner/aescts.v1 \
+		jcmturner:dnsutils:v1.0.1:dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \
+		jcmturner:gofork:v1.0.0:gofork/vendor/github.com/jcmturner/gofork \
+		jcmturner:gokrb5:v7.3.0:gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v7 \
+		jcmturner:rpc:v1.1.0:rpc/vendor/gopkg.in/jcmturner/rpc.v1 \
+		jmespath:go-jmespath:c2b33e84:go_jmespath/vendor/github.com/jmespath/go-jmespath \
+		kardianos:osext:ae77be6:osext/vendor/github.com/kardianos/osext \
+		kardianos:service:615a14e:service/vendor/github.com/kardianos/service \
+		karrick:godirwalk:v1.7.5:godirwalk/vendor/github.com/karrick/godirwalk \
+		kballard:go-shellquote:95032a8:go_shellquote/vendor/github.com/kballard/go-shellquote \
+		kr:logfmt:b84e30a:logfmt/vendor/github.com/kr/logfmt \
+		kubernetes:apimachinery:d41becf:apimachinery/vendor/github.com/kubernetes/apimachinery \
+		leodido:ragel-machinery:299bdde:ragel_machinery/vendor/github.com/leodido/ragel-machinery \
+		mailru:easyjson:efc7eb8:easyjson/vendor/github.com/mailru/easyjson \
+		matttproud:golang_protobuf_extensions:v1.0.1:golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		mdlayher:apcupsd:2fe55d9:apcupsd/vendor/github.com/mdlayher/apcupsd \
+		miekg:dns:v1.0.8:dns/vendor/github.com/miekg/dns \
+		mitchellh:go-homedir:3864e76:go_homedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:mapstructure:f15292f:mapstructure/vendor/github.com/mitchellh/mapstructure \
+		multiplay:go-ts3:v1.0.0:go_ts3/vendor/github.com/multiplay/go-ts3 \
+		naoina:go-stringutil:v0.1.0:go_stringutil/vendor/github.com/naoina/go-stringutil \
+		nats-io:gnatsd:v1.2.0:gnatsd/vendor/github.com/nats-io/gnatsd \
+		nats-io:go-nats:v1.5.0:nats/vendor/github.com/nats-io/go-nats \
+		nats-io:nuid:v1.0.0:nuid/vendor/github.com/nats-io/nuid \
+		nsqio:go-nsq:v1.0.7:go_nsq/vendor/github.com/nsqio/go-nsq \
+		openconfig:gnmi:33a1865:gnmi/vendor/github.com/openconfig/gnmi \
+		opencontainers:go-digest:v1.0.0-rc1:go_digest/vendor/github.com/opencontainers/go-digest \
+		opencontainers:image-spec:v1.0.1:image_spec/vendor/github.com/opencontainers/image-spec \
+		opentracing-contrib:go-observer:a52f234:go_observer/vendor/github.com/opentracing-contrib/go-observer \
+		opentracing:opentracing-go:v1.0.2:opentracing_go/vendor/github.com/opentracing/opentracing-go \
+		openzipkin:zipkin-go-opentracing:v0.3.4:zipkin_go_opentracing/vendor/github.com/openzipkin/zipkin-go-opentracing \
+		glinton:ping:v0.1.1:ping/vendor/github.com/glinton/ping \
+		pierrec:lz4:v2.0.3:lz4/vendor/github.com/pierrec/lz4 \
+		pkg:errors:v0.8.0:errors/vendor/github.com/pkg/errors \
+		pmezard:go-difflib:v1.0.0:go_difflib/vendor/github.com/pmezard/go-difflib \
+		prometheus:client_golang:v0.9.2:client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:5c3871d:client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:7600349:common/vendor/github.com/prometheus/common \
+		prometheus:procfs:ae68e2d:procfs/vendor/github.com/prometheus/procfs \
+		rcrowley:go-metrics:e2704e1:go_metrics/vendor/github.com/rcrowley/go-metrics \
+		samuel:go-zookeeper:c4fab1a:go_zookeeper/vendor/github.com/samuel/go-zookeeper \
+		satori:go.uuid:v1.2.0:go_uuid/vendor/github.com/satori/go.uuid \
+		shirou:gopsutil:v2.19.7:gopsutil/vendor/github.com/shirou/gopsutil \
+		shirou:w32:bb4de01:w32/vendor/github.com/shirou/w32 \
+		sirupsen:logrus:v1.0.5:logrus/vendor/github.com/sirupsen/logrus \
+		soniah:gosnmp:96b8622:gosnmp/vendor/github.com/soniah/gosnmp \
+		streadway:amqp:e5adc2a:amqp/vendor/github.com/streadway/amqp \
+		stretchr:objx:v0.1.1:objx/vendor/github.com/stretchr/objx \
+		stretchr:testify:v1.2.2:testify/vendor/github.com/stretchr/testify \
+		tidwall:gjson:v1.3.0:gjson/vendor/github.com/tidwall/gjson \
+		tidwall:match:1731857:match/vendor/github.com/tidwall/match \
+		tidwall:pretty:v1.0.0:pretty/vendor/github.com/tidwall/pretty \
+		vishvananda:netlink:b2de5d1:netlink/vendor/github.com/vishvananda/netlink \
+		vishvananda:netns:13995c7:netns/vendor/github.com/vishvananda/netns \
+		vjeantet:grok:v1.0.0:grok/vendor/github.com/vjeantet/grok \
+		vmware:govmomi:v0.19.0:govmomi/vendor/github.com/vmware/govmomi \
+		wavefronthq:wavefront-sdk-go:v0.9.2:wavefront_sdk_go/vendor/github.com/wavefronthq/wavefront-sdk-go \
+		wvanbergen:kafka:e2edea9:kafka/vendor/github.com/wvanbergen/kafka \
+		wvanbergen:kazoo-go:f72d861:kazoo_go/vendor/github.com/wvanbergen/kazoo-go \
+		yuin:gopher-lua:46796da:gopher_lua/vendor/github.com/yuin/gopher-lua \
+		census-instrumentation:opencensus-go:v0.17.0:opencensus_go/vendor/go.opencensus.io \
+		golang:crypto:a214413:crypto/vendor/golang.org/x/crypto \
+		golang:net:a680a1e:net/vendor/golang.org/x/net \
+		golang:oauth2:d2e6202:oauth2/vendor/golang.org/x/oauth2 \
+		golang:sync:42b3178:sync/vendor/golang.org/x/sync \
+		golang:sys:51ab0e2:sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:text/vendor/golang.org/x/text \
+		googleapis:google-api-go-client:19ff876:googleapis/vendor/google.golang.org/api \
+		golang:appengine:v1.1.0:appengine/vendor/google.golang.org/appengine \
+		google:go-genproto:fedd286:genproto/vendor/google.golang.org/genproto \
+		grpc:grpc-go:v1.13.0:grpc/vendor/google.golang.org/grpc \
+		go-asn1-ber:asn1-ber:v1.2:asn1_ber_v1/vendor/gopkg.in/asn1-ber.v1 \
+		fatih:pool:v2.0.0:pool_v2/vendor/gopkg.in/fatih/pool.v2 \
+		fsnotify:fsnotify:v1.4.7:fsnotify_v1/vendor/gopkg.in/fsnotify.v1 \
+		rethinkdb:rethinkdb-go:v3.0.5:gorethink_v3/vendor/gopkg.in/gorethink/gorethink.v3 \
+		go-inf:inf:v0.9.1:inf_v0/vendor/gopkg.in/inf.v0 \
+		go-ldap:ldap:v2.5.1:ldap_v2/vendor/gopkg.in/ldap.v2 \
+		go-mgo:mgo:9856a29:mgo_v2/vendor/gopkg.in/mgo.v2 \
+		olivere:elastic:v5.0.70:elastic_v5/vendor/gopkg.in/olivere/elastic.v5 \
+		go-tomb:tomb:dd63297:tomb_v1/vendor/gopkg.in/tomb.v1 \
+		go-yaml:yaml:v2.2.1:yaml_v2/vendor/gopkg.in/yaml.v2
 
+GO_BUILDFLAGS=	-ldflags "-X main.version=${DISTVERSION}"
+GO_TARGET=	./cmd/telegraf
+
 SUB_FILES=	telegraf
 SUB_LIST=	TELEGRAF_USER=${TELEGRAF_USER} \
 		TELEGRAF_GROUP=${TELEGRAF_GROUP} \
@@ -182,15 +185,12 @@ GROUPS=		${TELEGRAF_GROUP}
 
 TELEGRAF_LOGDIR=/var/log/${PORTNAME}
 
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${CP} src/github.com/shirou/gopsutil/disk/disk_freebsd_386.go src/github.com/shirou/gopsutil/disk/disk_freebsd_arm.go && \
-		${CP} src/github.com/shirou/gopsutil/cpu/cpu_freebsd_386.go src/github.com/shirou/gopsutil/cpu/cpu_freebsd_arm.go && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/telegraf
+post-patch:
+	${CP} ${WRKSRC_gopsutil}/disk/disk_freebsd_386.go ${WRKSRC_gopsutil}/disk/disk_freebsd_arm.go
+	${CP} ${WRKSRC_gopsutil}/cpu/cpu_freebsd_386.go ${WRKSRC_gopsutil}/cpu/cpu_freebsd_arm.go
 
-do-install:

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909292231.x8TMVwL3087043>