20 files changed, 22 insertions, 41 deletions

diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index 730cc559a971..7395eaaee04d 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -10,9 +10,10 @@ COMMENT=	Amazon Simple Systems Manager Agent
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
+USES=		go
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 GH_SUBDIR=	src/github.com/aws/amazon-ssm-agent
diff --git a/sysutils/circonus-agent/Makefile b/sysutils/circonus-agent/Makefile
index effcddc9e8b8..d9d28db8aa67 100644
--- a/sysutils/circonus-agent/Makefile
+++ b/sysutils/circonus-agent/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Circonus host agent for metric collection
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.10:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 
diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile
index 03a6ccf04a7a..7d82e534f8bd 100644
--- a/sysutils/consul-alerts/Makefile
+++ b/sysutils/consul-alerts/Makefile
@@ -10,8 +10,6 @@ COMMENT=	Simple daemon to send notifications based on Consul health checks
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
 USES=		compiler go
 
 USE_GITHUB=	yes
diff --git a/sysutils/consul-replicate/Makefile b/sysutils/consul-replicate/Makefile
index 3cd17457c76f..e8a7e549c2b1 100644
--- a/sysutils/consul-replicate/Makefile
+++ b/sysutils/consul-replicate/Makefile
@@ -11,9 +11,7 @@ COMMENT=	Consul cross-DC KV replication daemon
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
-USES=		compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index ba3d3b6e85be..4b014e40bc43 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Service discovery and configuration made easy
 
 LICENSE=	MPL20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
-USES=		compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
diff --git a/sysutils/consul_exporter/Makefile b/sysutils/consul_exporter/Makefile
index 72f75bf23276..fdc9c6ba6c35 100644
--- a/sysutils/consul_exporter/Makefile
+++ b/sysutils/consul_exporter/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Exporter for Consul metrics
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
-USES=		compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	prometheus
diff --git a/sysutils/direnv/Makefile b/sysutils/direnv/Makefile
index 1da884c526e8..ae87834e3897 100644
--- a/sysutils/direnv/Makefile
+++ b/sysutils/direnv/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Environment variable manager for your shell
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go \
-		bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
-USES=		gmake
+USES=		gmake go:no_targets
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	direnv
diff --git a/sysutils/docker-freebsd/Makefile b/sysutils/docker-freebsd/Makefile
index a0a35da9ad2b..931776c75f22 100644
--- a/sysutils/docker-freebsd/Makefile
+++ b/sysutils/docker-freebsd/Makefile
@@ -14,13 +14,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	go>=1.4:lang/go \
-		bash:shells/bash \
+BUILD_DEPENDS=	bash:shells/bash \
 		sqlite3:databases/sqlite3
-RUN_DEPENDS=	go>=1.4:lang/go \
-		bash:shells/bash \
+RUN_DEPENDS=	bash:shells/bash \
 		sqlite3:databases/sqlite3
 
+USES=		go:run
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	kvasdopil
 GH_PROJECT=	docker
diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile
index 44174b604ed6..e8c5b59acbdc 100644
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Populate values from Consul into a process environment
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
diff --git a/sysutils/epazote/Makefile b/sysutils/epazote/Makefile
index 92fbe45be234..c2a6cfa10258 100644
--- a/sysutils/epazote/Makefile
+++ b/sysutils/epazote/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Automated HTTP (microservices) supervisor
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.7:lang/go
-
-USES=	compiler
+USES=		compiler go
 
 USE_GITHUB=	yes
 GH_TUPLE=	epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \
diff --git a/sysutils/goawk/Makefile b/sysutils/goawk/Makefile
index fbce447aa123..214348535ab5 100644
--- a/sysutils/goawk/Makefile
+++ b/sysutils/goawk/Makefile
@@ -11,7 +11,7 @@ COMMENT=	AWK interpreter written in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE.txt
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	nodefault # the main code is in GH_TUPLE
 GH_ACCOUNT=	benhoyt
diff --git a/sysutils/gomplate/Makefile b/sysutils/gomplate/Makefile
index 4278f1b3279c..014534f3546b 100644
--- a/sysutils/gomplate/Makefile
+++ b/sysutils/gomplate/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Command-line tool for rendering templates before executing binaries
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hairyhenderson
diff --git a/sysutils/goss/Makefile b/sysutils/goss/Makefile
index 776e8cb1f1d4..64beb041c974 100644
--- a/sysutils/goss/Makefile
+++ b/sysutils/goss/Makefile
@@ -12,7 +12,7 @@ COMMENT=		Quick and Easy server validation
 LICENSE=		APACHE20
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=		go:lang/go
+USES=			go
 
 ONLY_FOR_ARCHS=		amd64
 ONLY_FOR_ARCHS_REASON=	go-ps only supports amd64
diff --git a/sysutils/gotop/Makefile b/sysutils/gotop/Makefile
index 55a0abaef996..5712f9765473 100644
--- a/sysutils/gotop/Makefile
+++ b/sysutils/gotop/Makefile
@@ -10,8 +10,6 @@ COMMENT=	Terminal based graphical activity monitor inspired by gtop and vtop
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
-
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	cjbassi
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index c9aed005cf05..6c3e2ce0c370 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -13,11 +13,10 @@ LICENSE=	BSD2CLAUSE
 
 # gb 0.4 includes FreeBSD-specific fixes that this port requires
 #   https://github.com/constabulary/gb/issues/506
-BUILD_DEPENDS=	go>=1.5:lang/go \
-		gb>=0.4:devel/gb \
+BUILD_DEPENDS=	gb>=0.4:devel/gb \
 		${LOCALBASE}/lib/libucl.a:textproc/libucl
 
-USES=		compiler:c++11-lang
+USES=		compiler:c++11-lang go:no_targets
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	derekmarcotte
diff --git a/sysutils/log-courier/Makefile b/sysutils/log-courier/Makefile
index cf67f206b102..b3595f3e7b71 100644
--- a/sysutils/log-courier/Makefile
+++ b/sysutils/log-courier/Makefile
@@ -12,8 +12,6 @@ LICENSE=	APACHE20
 
 BROKEN=		fails to build
 
-BUILD_DEPENDS=	go:lang/go
-
 USES=		go gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	driskell
diff --git a/sysutils/logstash-forwarder/Makefile b/sysutils/logstash-forwarder/Makefile
index b941fae74439..6e69cdb07c6f 100644
--- a/sysutils/logstash-forwarder/Makefile
+++ b/sysutils/logstash-forwarder/Makefile
@@ -12,8 +12,6 @@ LICENSE=	APACHE20
 
 DEPRECATED=	Migrate to sysutils/beats
 
-BUILD_DEPENDS=	go:lang/go
-
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	elasticsearch
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index 5d742219675b..8dcb8e8f7c31 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -14,9 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	On i386: go compiler crashes: https://github.com/golang/go/issues/23763
 
-BUILD_DEPENDS=	go:lang/go
-
-USES=		compiler
+USES=		compiler go
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
 GH_SUBDIR=	src/github.com/hashicorp/nomad
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index b3f1e80b7e1c..85d37433251f 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Service discovery and configuration made easy
 
 LICENSE=	MPL20
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 
diff --git a/sysutils/sockaddr/Makefile b/sysutils/sockaddr/Makefile
index af3ec71b8b34..9e909d3a0ac9 100644
--- a/sysutils/sockaddr/Makefile
+++ b/sysutils/sockaddr/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Command line utility for querying IP information
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_SUBDIR=	src/github.com/hashicorp/go-sockaddr