Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Jun 2019 03:51:14 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r505321 - in head: Mk/Uses databases/cayley databases/cockroach databases/go-carbon databases/influxdb databases/mongodb34-tools databases/mongodb36-tools databases/pgmetrics databases/...
Message-ID:  <201906290351.x5T3pERk030533@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Jun 29 03:51:13 2019
New Revision: 505321
URL: https://svnweb.freebsd.org/changeset/ports/505321

Log:
  Convert all Go ports to USES=go
  
  This allows for port testing with lang/go-devel via GO_PORT, setting
  up the Go build environment in a single place, and is step one in
  simplifying Go ports that often define too complicated do-build
  targets themselves.
  
  USES=go gains new arguments 'run' to add lang/go to RUN_DEPENDS and
  'no_targets' for ports with composite builds that call 'go' themselves
  and do not need the do-build/do-install targets of USES=go.
  
  PR:		238849
  Submitted by:	dg@syrec.org (also D20745)
  Reviewed by:	mat, tobik
  Exp-run by:	antoine
  Differential Revision:	https://reviews.freebsd.org/D20746

Modified:
  head/Mk/Uses/go.mk
  head/databases/cayley/Makefile
  head/databases/cockroach/Makefile
  head/databases/go-carbon/Makefile
  head/databases/influxdb/Makefile
  head/databases/mongodb34-tools/Makefile
  head/databases/mongodb36-tools/Makefile
  head/databases/pgmetrics/Makefile
  head/databases/tile38/Makefile
  head/databases/usql/Makefile
  head/deskutils/chart/Makefile
  head/devel/arduino-builder/Makefile
  head/devel/arduinoOTA/Makefile
  head/devel/awless/Makefile
  head/devel/bloaty/Makefile
  head/devel/git-codereview/Makefile
  head/devel/git-town/Makefile
  head/devel/gitaly/Makefile
  head/devel/gitlab-runner/Makefile
  head/devel/gitlab-shell/Makefile
  head/devel/go-bindata/Makefile
  head/devel/go-protobuf/Makefile
  head/devel/go-tools/Makefile
  head/devel/gogs/Makefile
  head/devel/goprotobuf/Makefile
  head/devel/gpm/Makefile
  head/devel/grpc/Makefile
  head/devel/grumpy/Makefile
  head/devel/grv/Makefile
  head/devel/gvp/Makefile
  head/devel/jiri/Makefile
  head/devel/lab/Makefile
  head/devel/liteide/Makefile
  head/devel/loccount/Makefile
  head/devel/mage/Makefile
  head/devel/pprof/Makefile
  head/dns/amass/Makefile
  head/dns/knot-resolver/Makefile
  head/editors/micro/Makefile
  head/finance/fixc/Makefile
  head/misc/cryptoballot/Makefile
  head/misc/exercism/Makefile
  head/net-im/coyim/Makefile
  head/net-im/matterbridge/Makefile
  head/net-im/matterircd/Makefile
  head/net-im/slack-term/Makefile
  head/net-im/ssh-chat/Makefile
  head/net-im/xmpp-client/Makefile
  head/net-mgmt/carbon-relay-ng/Makefile
  head/net-mgmt/carbonzipper/Makefile
  head/net-mgmt/intel-snap/Makefile
  head/net-mgmt/kapacitor/Makefile
  head/net-mgmt/telegraf/Makefile
  head/net-p2p/go-ethereum/Makefile
  head/net/clash/Makefile
  head/net/geoipupdate/Makefile
  head/net/goreplay/Makefile
  head/net/grpcurl/Makefile
  head/net/nncp/Makefile
  head/net/nsq/Makefile
  head/net/syncthing/Makefile
  head/net/wireguard-go/Makefile
  head/print/cloud-print-connector/Makefile
  head/print/cloud-print-connector/distinfo
  head/science/molgif/Makefile
  head/security/2fa/Makefile
  head/security/acmetool/Makefile
  head/security/boringssl/Makefile
  head/security/govpn/Makefile
  head/security/honeybadger/Makefile
  head/security/meek/Makefile
  head/security/onionscan/Makefile
  head/security/teleport/Makefile
  head/security/vault/Makefile
  head/sysutils/amazon-ssm-agent/Makefile
  head/sysutils/circonus-agent/Makefile
  head/sysutils/consul-alerts/Makefile
  head/sysutils/consul-replicate/Makefile
  head/sysutils/consul/Makefile
  head/sysutils/consul_exporter/Makefile
  head/sysutils/direnv/Makefile
  head/sysutils/docker-freebsd/Makefile
  head/sysutils/envconsul/Makefile
  head/sysutils/epazote/Makefile
  head/sysutils/goawk/Makefile
  head/sysutils/gomplate/Makefile
  head/sysutils/goss/Makefile
  head/sysutils/gotop/Makefile
  head/sysutils/hfm/Makefile
  head/sysutils/log-courier/Makefile
  head/sysutils/logstash-forwarder/Makefile
  head/sysutils/nomad/Makefile
  head/sysutils/serf/Makefile
  head/sysutils/sockaddr/Makefile
  head/textproc/consul-template/Makefile
  head/textproc/spiff/Makefile
  head/www/carbonapi/Makefile
  head/www/gitlab-pages/Makefile
  head/www/gitlab-workhorse/Makefile
  head/www/go-appengine-sdk/Makefile
  head/www/gobuffalo/Makefile
  head/www/grafana2/Makefile
  head/www/grafana3/Makefile
  head/www/grafana4/Makefile
  head/www/grafana5/Makefile
  head/www/grafana6/Makefile
  head/www/kurly/Makefile
  head/www/mattermost-server/Makefile
  head/www/minio-client/Makefile
  head/www/minio/Makefile
  head/www/s/Makefile
  head/www/uchiwa/Makefile
  head/www/ytdl/Makefile
  head/x11/aminal/Makefile

Modified: head/Mk/Uses/go.mk
==============================================================================
--- head/Mk/Uses/go.mk	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/Mk/Uses/go.mk	Sat Jun 29 03:51:13 2019	(r505321)
@@ -5,11 +5,17 @@
 #
 # Feature:	go
 # Usage:	USES=go
-# Valid ARGS:	(none), modules
+# Valid ARGS:	(none), modules, no_targets, run
 #
 # (none)	Setup GOPATH and build in GOPATH mode.
 # modules	If the upstream uses Go modules, this can be set to build
 #		in modules-aware mode.
+# no_targets	Indicates that Go is needed at build time as a part of
+#		make/CMake build.  This will setup build environment like
+#		GO_ENV, GO_BUILDFLAGS but will not create post-extract, do-build
+#		and do-install targets.
+# run		Indicates that Go is needed at run time and adds it to
+#		RUN_DEPENDS.
 #
 # You can set the following variables to control the process.
 #
@@ -40,15 +46,15 @@
 #	The Go port to use.  By default this is lang/go but can be set
 #	to lang/go-devel in make.conf for testing with future Go versions.
 #
-#	This variable should not be set by individual ports!
+#	This variable must not be set by individual ports!
 #
 # MAINTAINER: jlaffaye@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_GO_MK)
 _INCLUDE_USES_GO_MK=	yes
 
-.if !empty(go_ARGS) && ${go_ARGS:Nmodules}
-IGNORE=	USES=go only accepts no arguments or 'modules'
+.if !empty(go_ARGS:Nmodules:Nno_targets:Nrun)
+IGNORE=	USES=go has invalid arguments: ${go_ARGS:Nmodules:Nno_targets:Nrun}
 .endif
 
 # Settable variables
@@ -91,6 +97,9 @@ GO_ENV+=	GOPATH="${WRKDIR}" \
 
 GO_PORT?=	lang/go
 BUILD_DEPENDS+=	${GO_CMD}:${GO_PORT}
+.if ${go_ARGS:Mrun}
+RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
+.endif
 PLIST_SUB+=	GO_PKGNAME=${GO_PKGNAME}
 
 _USES_POST+=	go
@@ -105,13 +114,13 @@ post-extract:
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
 .endif
 
-.if !target(do-build)
+.if !target(do-build) && empty(go_ARGS:Mno_targets)
 do-build:
 	(cd ${GO_WRKSRC}; \
 		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET})
 .endif
 
-.if !target(do-install)
+.if !target(do-install) && empty(go_ARGS:Mno_targets)
 do-install:
 .for _TARGET in ${GO_TARGET}
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${_TARGET:T} ${STAGEDIR}${PREFIX}/bin

Modified: head/databases/cayley/Makefile
==============================================================================
--- head/databases/cayley/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/cayley/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	gopkg.in/mgo.v2/bson/json.go:320:7: constant 9007199254740992 overflows int
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}graph

Modified: head/databases/cockroach/Makefile
==============================================================================
--- head/databases/cockroach/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/cockroach/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -18,10 +18,9 @@ ONLY_FOR_ARCHS_REASON=	"Only supported on amd64"
 
 BUILD_DEPENDS=	autoconf:devel/autoconf \
 		bash:shells/bash \
-		cmake:devel/cmake \
-		go:lang/go
+		cmake:devel/cmake
 
-USES=		gmake libedit
+USES=		gmake go libedit
 
 USE_RC_SUBR=	cockroach
 

Modified: head/databases/go-carbon/Makefile
==============================================================================
--- head/databases/go-carbon/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/go-carbon/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,8 +12,6 @@ COMMENT=		Go implementation of carbon
 LICENSE=		MIT
 LICENSE_FILE=		${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=		go>=1.8:lang/go
-
 USES=			go
 
 USE_GITHUB=		yes

Modified: head/databases/influxdb/Makefile
==============================================================================
--- head/databases/influxdb/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/influxdb/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	depends on go which is not supported in this architecture
 
-BUILD_DEPENDS=	go>=1.10.3:lang/go
+USES=		go
 
 USE_RC_SUBR=	influxd
 

Modified: head/databases/mongodb34-tools/Makefile
==============================================================================
--- head/databases/mongodb34-tools/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/mongodb34-tools/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -15,9 +15,7 @@ BROKEN_SSL_REASON_openssl111=	variable has incomplete 
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
-BUILD_DEPENDS=	go>0:lang/go
-
-USES=	localbase
+USES=	go localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb

Modified: head/databases/mongodb36-tools/Makefile
==============================================================================
--- head/databases/mongodb36-tools/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/mongodb36-tools/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -17,11 +17,9 @@ BROKEN_SSL_REASON_openssl111=	variable has incomplete 
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
 
-BUILD_DEPENDS=	go>0:lang/go
-
 CONFLICTS_INSTALL=	mongodb mongodb[32-34]-tools
 
-USES=	localbase
+USES=	go localbase
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb

Modified: head/databases/pgmetrics/Makefile
==============================================================================
--- head/databases/pgmetrics/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/pgmetrics/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,9 +11,10 @@ COMMENT=	Collect and display info & stats from a runni
 
 LICENSE=	APACHE20
 
+USES=		go
+
 USE_GITHUB=	yes
 
-BUILD_DEPENDS=	go>=1.9:lang/go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GH_ACCOUNT=	rapidloop
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT_DEFAULT}

Modified: head/databases/tile38/Makefile
==============================================================================
--- head/databases/tile38/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/tile38/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,10 +11,9 @@ COMMENT=	In-memory geolocation data store, spatial ind
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.7:lang/go \
-		bash:shells/bash
+BUILD_DEPENDS=	bash:shells/bash
 
-USES=		shebangfix
+USES=		go shebangfix
 SHEBANG_FILES=	build.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	tidwall

Modified: head/databases/usql/Makefile
==============================================================================
--- head/databases/usql/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/databases/usql/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Universal command-line interface for SQL data
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	xo

Modified: head/deskutils/chart/Makefile
==============================================================================
--- head/deskutils/chart/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/deskutils/chart/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	CLI tool to create quick plots
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.10:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 

Modified: head/devel/arduino-builder/Makefile
==============================================================================
--- head/devel/arduino-builder/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/arduino-builder/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Command line tool for building Arduino sketch
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino
@@ -27,7 +27,6 @@ TOOLS_DESC=		Add arduino-tools for a standalone build 
 TOOLS_RUN_DEPENDS=	arduino-tools>=${_COMPAT_VER}:devel/arduino-tools
 TOOLS_PLIST_FILES=	arduino/arduino-builder.options
 
-GO_ENV+=	GOPATH=${WRKSRC}
 _COMPAT_VER=	1.6.12
 _IDE_VER=	10612
 
@@ -42,7 +41,7 @@ do-patch-TOOLS-on:
 			${WRKSRC}/arduino-builder.options
 
 do-build:
-	@( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go build arduino.cc/arduino-builder )
+	@( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC} go build arduino.cc/arduino-builder )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

Modified: head/devel/arduinoOTA/Makefile
==============================================================================
--- head/devel/arduinoOTA/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/arduinoOTA/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -9,7 +9,7 @@ COMMENT=	OTA upload tool for Arduino/ESP8266
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino

Modified: head/devel/awless/Makefile
==============================================================================
--- head/devel/awless/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/awless/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Fast, powerful and easy-to-use CLI for AWS
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wallix

Modified: head/devel/bloaty/Makefile
==============================================================================
--- head/devel/bloaty/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/bloaty/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,14 +12,13 @@ COMMENT=	Size profiler for binaries
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		cmake:devel/cmake \
+BUILD_DEPENDS=	cmake:devel/cmake \
 		ninja:devel/ninja
 LIB_DEPENDS=	libre2.so:devel/re2 \
 		libcapstone.so:devel/capstone4 \
 		libprotobuf.so:devel/protobuf
 
-USES=		cmake pkgconfig
+USES=		cmake go:no_targets pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google

Modified: head/devel/git-codereview/Makefile
==============================================================================
--- head/devel/git-codereview/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/git-codereview/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -7,7 +7,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Command-line tool for working with Gerrit
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang

Modified: head/devel/git-town/Makefile
==============================================================================
--- head/devel/git-town/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/git-town/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,8 +11,9 @@ COMMENT=	Git extension for generic, high-level git wor
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	git:devel/git
+
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Originate

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gitaly/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -28,13 +28,12 @@ MY_DEPENDS=	git>=2.21:devel/git \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
 		rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \
 		rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371
-BUILD_DEPENDS=	go>=1.11:lang/go \
-		gem:devel/ruby-gems \
+BUILD_DEPENDS=	gem:devel/ruby-gems \
 		${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS} \
 		gitlab-shell>=6.0.4:devel/gitlab-shell
 
-USES=		gmake
+USES=		gmake go:no_targets
 USE_RUBY=	yes
 
 USE_GITLAB=	yes

Modified: head/devel/gitlab-runner/Makefile
==============================================================================
--- head/devel/gitlab-runner/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gitlab-runner/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -18,11 +18,12 @@ COMMENT=	Official GitLab Runner written in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		go-bindata:devel/go-bindata
+BUILD_DEPENDS=	go-bindata:devel/go-bindata
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		bash:shells/bash \
 		git:devel/git
+
+USES=		go
 
 USE_GITLAB=	yes
 

Modified: head/devel/gitlab-shell/Makefile
==============================================================================
--- head/devel/gitlab-shell/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gitlab-shell/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,8 +10,9 @@ COMMENT=	GitLab Shell handles git commands for GitLab
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	gem:devel/ruby-gems \
-		go>=1.5.3:lang/go
+BUILD_DEPENDS=	gem:devel/ruby-gems
+
+USES=		go
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org

Modified: head/devel/go-bindata/Makefile
==============================================================================
--- head/devel/go-bindata/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/go-bindata/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -8,7 +8,7 @@ CATEGORIES=	devel
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generates Go code from any file
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jteeuwen

Modified: head/devel/go-protobuf/Makefile
==============================================================================
--- head/devel/go-protobuf/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/go-protobuf/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -14,7 +14,7 @@ COMMENT=	Protocol Buffers for Go with Gadgets
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gogo

Modified: head/devel/go-tools/Makefile
==============================================================================
--- head/devel/go-tools/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/go-tools/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,7 +12,7 @@ COMMENT=	Go Tools
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_TUPLE=	golang:tools:bfb5194:DEFAULT/src/golang.org/x/tools \

Modified: head/devel/gogs/Makefile
==============================================================================
--- head/devel/gogs/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gogs/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,9 +11,10 @@ COMMENT=	Painless self-hosted Git service
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	git:devel/git \
 		bash:shells/bash
+
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gogs

Modified: head/devel/goprotobuf/Makefile
==============================================================================
--- head/devel/goprotobuf/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/goprotobuf/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -13,8 +13,9 @@ COMMENT=	Go support for Google's protocol buffers
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	protoc:devel/protobuf
+
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang

Modified: head/devel/gpm/Makefile
==============================================================================
--- head/devel/gpm/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gpm/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,8 +12,9 @@ COMMENT=	Go Package Manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	bash:shells/bash \
-		go:lang/go
+RUN_DEPENDS=	bash:shells/bash
+
+USES=		go:run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pote

Modified: head/devel/grpc/Makefile
==============================================================================
--- head/devel/grpc/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/grpc/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -13,13 +13,13 @@ COMMENT=	HTTP/2-based RPC framework
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		yasm:devel/yasm
+BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libprotobuf.so:devel/protobuf \
 		libcares.so:dns/c-ares
 
-USES=		cmake localbase:ldflags perl5 pkgconfig ssl
+USES=		cmake go:no_targets localbase:ldflags perl5 pkgconfig ssl
+
 USE_GITHUB=	yes
 GH_TUPLE=	google:benchmark:v1.4.1:benchmark/third_party/benchmark
 USE_LDCONFIG=	yes

Modified: head/devel/grumpy/Makefile
==============================================================================
--- head/devel/grumpy/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/grumpy/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -9,14 +9,11 @@ COMMENT=	Python to Go source code transcompiler and ru
 
 BROKEN_i386=	constant 2147762812 overflows int
 
-BUILD_DEPENDS=	go:lang/go
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_TAGNAME=	3ec8795
 
-USES=		gmake python:2.7 shebangfix
+USES=		gmake go:no_targets,run python:2.7 shebangfix
 SHEBANG_FILES=	tools/benchcmp tools/coverparse tools/diffrange tools/grumpc
 BINARY_ALIAS=	python=${PYTHON_CMD}
 

Modified: head/devel/grv/Makefile
==============================================================================
--- head/devel/grv/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/grv/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,10 +12,9 @@ COMMENT=	Terminal interface for viewing git repositori
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 LIB_DEPENDS=	libgit2.so:devel/libgit2
 
-USES=		ncurses pkgconfig readline:port
+USES=		go ncurses pkgconfig readline:port
 USE_GITHUB=	yes
 GH_ACCOUNT=	rgburke
 GH_SUBDIR=	src/github.com/rgburke/grv

Modified: head/devel/gvp/Makefile
==============================================================================
--- head/devel/gvp/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/gvp/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,10 +12,9 @@ COMMENT=	Go Versioning Manager
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-RUN_DEPENDS=	bash:shells/bash \
-		go:lang/go
+RUN_DEPENDS=	bash:shells/bash
 
-USES=		shebangfix
+USES=		go:run shebangfix
 
 SHEBANG_FILES=	bin/gvp
 

Modified: head/devel/jiri/Makefile
==============================================================================
--- head/devel/jiri/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/jiri/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -13,11 +13,12 @@ COMMENT=	Tool for multi-repo development
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/go/src/fuchsia.googlesource.com/jiri/LICENSE
 
-BUILD_DEPENDS=	go:lang/go \
-		cmake:devel/cmake \
+BUILD_DEPENDS=	cmake:devel/cmake \
 		ninja:devel/ninja
 RUN_DEPENDS=	git:devel/git
 
+USES=		go
+
 GITHASH=	56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1
 TIMESTAMP=	2019-01-03T00:00:00.000000
 EXTRACT_AFTER_ARGS=	-s "!^!${DISTNAME}/go/src/fuchsia.googlesource.com/jiri/!"
@@ -28,7 +29,7 @@ pre-extract:
 
 do-build:
 	cd ${WRKSRC}/go/src/fuchsia.googlesource.com/jiri && \
-		${SETENV} GOPATH=${WRKSRC}/go \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH=${WRKSRC}/go \
 			go build -ldflags "-s -w -X \"fuchsia.googlesource.com/jiri/version.GitCommit=${GITHASH}\" -X \"fuchsia.googlesource.com/jiri/version.BuildTime=${TIMESTAMP}\"" -a -o jiri fuchsia.googlesource.com/jiri/cmd/jiri
 
 do-install:

Modified: head/devel/lab/Makefile
==============================================================================
--- head/devel/lab/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/lab/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Lab makes it simple to work with repositories
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go>=1.10,1:lang/go
+USES=		go
 
 OPTIONS_DEFINE=	GIT_SUBVERSION
 

Modified: head/devel/liteide/Makefile
==============================================================================
--- head/devel/liteide/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/liteide/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,10 +11,7 @@ COMMENT=	Simple, open source, cross-platform Go IDE
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL
 
-BUILD_DEPENDS=	go:lang/go
-RUN_DEPENDS=	go:lang/go
-
-USES=		gl qmake qt:5
+USES=		gl go:no_targets,run qmake qt:5
 USE_GL=		gl
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 USE_QT=		buildtools_build core gui network printsupport widgets xml

Modified: head/devel/loccount/Makefile
==============================================================================
--- head/devel/loccount/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/loccount/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	Count source lines of code in a project
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	esr

Modified: head/devel/mage/Makefile
==============================================================================
--- head/devel/mage/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/mage/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Command-line make-like build tool using Go as
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	magefile

Modified: head/devel/pprof/Makefile
==============================================================================
--- head/devel/pprof/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/devel/pprof/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	Tool for visualization and analysis of profil
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google

Modified: head/dns/amass/Makefile
==============================================================================
--- head/dns/amass/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/dns/amass/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	In-depth DNS enumeration
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	nodefault # main code is in GH_TUPLE, otherwise build fails with circular dependency errors
 GH_ACCOUNT=	OWASP

Modified: head/dns/knot-resolver/Makefile
==============================================================================
--- head/dns/knot-resolver/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/dns/knot-resolver/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -64,7 +64,7 @@ DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 
 GO_DESC=			go
-GO_BUILD_DEPENDS=		go>=1.5:lang/go
+GO_USES=			go:no_targets
 GO_MAKE_ARGS=			HAS_go=yes
 GO_MAKE_ARGS_OFF=		HAS_go=no
 

Modified: head/editors/micro/Makefile
==============================================================================
--- head/editors/micro/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/editors/micro/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Modern and intuitive terminal-based text edit
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zyedidia

Modified: head/finance/fixc/Makefile
==============================================================================
--- head/finance/fixc/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/finance/fixc/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -8,7 +8,7 @@ CATEGORIES=		finance
 MAINTAINER=		blttll@gmail.com
 COMMENT=		Simple Financial Information eXchange (FIX) protocol console client
 
-BUILD_DEPENDS=		${LOCALBASE}/bin/go:lang/go
+USES=			go
 
 PLIST_FILES=		bin/fixc
 USE_GITHUB=		yes

Modified: head/misc/cryptoballot/Makefile
==============================================================================
--- head/misc/cryptoballot/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/misc/cryptoballot/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -9,7 +9,7 @@ COMMENT=	Cryptographically secure online voting
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_TAGNAME=	3753e1b

Modified: head/misc/exercism/Makefile
==============================================================================
--- head/misc/exercism/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/misc/exercism/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	CLI client for exercism.io
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 

Modified: head/net-im/coyim/Makefile
==============================================================================
--- head/net-im/coyim/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/coyim/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,11 +12,10 @@ COMMENT=	Safe and secure by default chat client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gnome pkgconfig shebangfix
+USES=		gnome go pkgconfig shebangfix
 
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
 

Modified: head/net-im/matterbridge/Makefile
==============================================================================
--- head/net-im/matterbridge/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/matterbridge/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Chat network bridge
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	42wim

Modified: head/net-im/matterircd/Makefile
==============================================================================
--- head/net-im/matterircd/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/matterircd/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
-BUILD_DEPENDS=	go>=1.8:lang/go
+USES=		go
 
 USE_RC_SUBR=	matterircd
 

Modified: head/net-im/slack-term/Makefile
==============================================================================
--- head/net-im/slack-term/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/slack-term/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Slack client for your terminal
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	erroneousboat

Modified: head/net-im/ssh-chat/Makefile
==============================================================================
--- head/net-im/ssh-chat/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/ssh-chat/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,7 +12,7 @@ COMMENT=	Chat over SSH
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	nodefault # the main code is in GH_TUPLE
 GH_ACCOUNT=	shazow

Modified: head/net-im/xmpp-client/Makefile
==============================================================================
--- head/net-im/xmpp-client/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-im/xmpp-client/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	XMPP client with OTR support
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_TUPLE=	agl:xmpp-client:3030ad4:DEFAULT/src/github.com/agl/xmpp-client \

Modified: head/net-mgmt/carbon-relay-ng/Makefile
==============================================================================
--- head/net-mgmt/carbon-relay-ng/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-mgmt/carbon-relay-ng/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,10 +10,9 @@ COMMENT=		Go implementation of carbonapi
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=		go>=1.8:lang/go \
-			go-bindata:devel/go-bindata
+BUILD_DEPENDS=		go-bindata:devel/go-bindata
 
-USES=			gmake
+USES=			gmake go
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		graphite-ng

Modified: head/net-mgmt/carbonzipper/Makefile
==============================================================================
--- head/net-mgmt/carbonzipper/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-mgmt/carbonzipper/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,8 +10,6 @@ COMMENT=		Proxy between carbonapi and go-carbon
 LICENSE=		BSD2CLAUSE
 LICENSE_FILE=		${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=		go>=1.8:lang/go
-
 USES=			go
 
 USE_GITHUB=		yes

Modified: head/net-mgmt/intel-snap/Makefile
==============================================================================
--- head/net-mgmt/intel-snap/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-mgmt/intel-snap/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	Intels open telemetry framework
 
 #LICENSE=	APACHE2
 
-BUILD_DEPENDS=	go>=1.5:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stdale

Modified: head/net-mgmt/kapacitor/Makefile
==============================================================================
--- head/net-mgmt/kapacitor/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-mgmt/kapacitor/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
-BUILD_DEPENDS=	go>=1.6.0:lang/go
+USES=		go
 
 USE_RC_SUBR=	kapacitord
 

Modified: head/net-mgmt/telegraf/Makefile
==============================================================================
--- head/net-mgmt/telegraf/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-mgmt/telegraf/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,7 +12,7 @@ LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	amd64 i386 armv6 armv7
 
-BUILD_DEPENDS=	go>=1.9:lang/go
+USES=		go
 
 USE_RC_SUBR=	telegraf
 

Modified: head/net-p2p/go-ethereum/Makefile
==============================================================================
--- head/net-p2p/go-ethereum/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net-p2p/go-ethereum/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Go implementation of the Ethereum y/w paper
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	go>=1.9.2:lang/go
+USES=		go:no_targets
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ethereum

Modified: head/net/clash/Makefile
==============================================================================
--- head/net/clash/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/clash/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Rule-based tunnel in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Dreamacro

Modified: head/net/geoipupdate/Makefile
==============================================================================
--- head/net/geoipupdate/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/geoipupdate/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -14,10 +14,9 @@ LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
-BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	ca_root_nss>=3:security/ca_root_nss
 
-USES=		gmake
+USES=		gmake go:no_targets
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 

Modified: head/net/goreplay/Makefile
==============================================================================
--- head/net/goreplay/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/goreplay/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Tool for capturing and replaying live HTTP tr
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	buger

Modified: head/net/grpcurl/Makefile
==============================================================================
--- head/net/grpcurl/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/grpcurl/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Command-line tool that lets you interact with
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fullstorydev

Modified: head/net/nncp/Makefile
==============================================================================
--- head/net/nncp/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/nncp/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,9 +11,7 @@ COMMENT=	Utilities for secure store-and-forward files,
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	go:lang/go
-
-USES=		tar:xz
+USES=		go:no_targets tar:xz
 MAKEFILE=	BSDmakefile
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
 INSTALL_TARGET=	install-strip

Modified: head/net/nsq/Makefile
==============================================================================
--- head/net/nsq/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/nsq/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,8 +12,6 @@ LICENSE=	MIT
 
 ONLY_FOR_ARCHS=	amd64
 
-BUILD_DEPENDS=	go>=1.7:lang/go
-
 USES=	compiler go
 
 USE_RC_SUBR=	nsqd nsqlookupd nsqadmin

Modified: head/net/syncthing/Makefile
==============================================================================
--- head/net/syncthing/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/syncthing/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -13,7 +13,7 @@ COMMENT=	Encrypted file sync tool
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/${PORTNAME}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+USES=		go
 
 USE_RC_SUBR=	syncthing syncthing-discosrv syncthing-relaysrv syncthing-relaypoolsrv
 

Modified: head/net/wireguard-go/Makefile
==============================================================================
--- head/net/wireguard-go/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/net/wireguard-go/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -12,16 +12,14 @@ COMMENT=	WireGuard implementation in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	go:lang/go
+USES=		gmake go:modules,no_targets tar:xz
 
-USES=		gmake tar:xz
-
 USE_GITHUB=	nodefault
 GH_TUPLE=	golang:crypto:b7391e95e576:crypto/vendor/golang.org/x/crypto \
 		golang:net:1272bf9dcd53:net/vendor/golang.org/x/net \
 		golang:sys:f7bb7a8bee54:sys/vendor/golang.org/x/sys
 
-MAKE_ENV+=	GOFLAGS=-mod=vendor
+MAKE_ENV+=	GOFLAGS="${GO_BUILDFLAGS}"
 
 PLIST_FILES=	bin/${PORTNAME}
 

Modified: head/print/cloud-print-connector/Makefile
==============================================================================
--- head/print/cloud-print-connector/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/print/cloud-print-connector/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cloud-print-connector
 PORTVERSION=	1.16
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	print
 
@@ -11,55 +12,33 @@ COMMENT=	Share CUPS printers via Google Cloud Print
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
-
 LIB_DEPENDS=	libcups.so:print/cups \
 		libavahi-client.so:net/avahi-app \
 		libavahi-common.so:net/avahi-app
 
-USES=		compiler pkgconfig
+USES=		compiler go pkgconfig
 USE_GITHUB=	yes
+GH_ACCOUNT=	google
+GH_SUBDIR=	src/github.com/google/cloud-print-connector
+GH_TUPLE=	urfave:cli:8e01ec4:cli/vendor/github.com/urfave/cli \
+		satori:go.uuid:36e9d2e:gouuid/vendor/github.com/satori/go.uuid \
+		coreos:go-systemd:88bfeed:gosystemd/vendor/github.com/coreos/go-systemd \
+		golang:oauth2:ef14785:oauth2/vendor/golang.org/x/oauth2 \
+		golang:net:039a425:net/vendor/golang.org/x/net \
+		mildred:go-xdg:96b70c9:xdg/vendor/launchpad.net/go-xdg/v0
 USE_RC_SUBR=	gcp-cups-connectord
-GH_TUPLE=	google:cloud-print-connector:7d5f127:DEFAULT/src/github.com/google/cloud-print-connector \
-		urfave:cli:8e01ec4:cli/src/github.com/urfave/cli \
-		satori:go.uuid:36e9d2e:gouuid/src/github.com/satori/go.uuid \
-		coreos:go-systemd:88bfeed:gosystemd/src/github.com/coreos/go-systemd \
-		golang:oauth2:ef14785:oauth2/src/golang.org/x/oauth2 \
-		golang:net:039a425:net/src/golang.org/x/net \
-		mildred:go-xdg:96b70c9:xdg/src/launchpad.net/go-xdg/v0
 
-BIN_FILES=	gcp-connector-util gcp-cups-connector
-PLIST_FILES=	${BIN_FILES:S/^/bin\//}
+GO_TARGET=	./gcp-connector-util ./gcp-cups-connector
+PLIST_FILES=	${GO_TARGET:S/./bin/}
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	CONTRIBUTING.md README.md
 
-do-build:
-.for bin in ${BIN_FILES}
-	@cd ${WRKSRC}/src/github.com/google/cloud-print-connector; ${SETENV} \
-		${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -o \
-		${WRKSRC}/bin/${bin} ./${bin}
-.endfor
-
-do-install:
-.for bin in ${BIN_FILES}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${bin} \
-		${STAGEDIR}${PREFIX}/bin/${bin}
-.endfor
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${CP} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.pre.mk>
-
-# golang assumes that if clang is in use, it is called "clang" and not "cc". If
-# it's called "cc", go may fail
-.if ${COMPILER_TYPE} == clang
-BUILD_ENV=	CC=clang
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/print/cloud-print-connector/distinfo
==============================================================================
--- head/print/cloud-print-connector/distinfo	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/print/cloud-print-connector/distinfo	Sat Jun 29 03:51:13 2019	(r505321)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1531335199
-SHA256 (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = abd89462880284d8c8d42b6ddd7bf2517881f21ad62619124715c7b4f230ab02
-SIZE (google-cloud-print-connector-1.16-7d5f127_GH0.tar.gz) = 122101
+TIMESTAMP = 1561470998
+SHA256 (google-cloud-print-connector-v1.16_GH0.tar.gz) = e7ef1dbc9e326c59a08fea1a37b62d2e689d2a1aed8c717969be89055c4996c8
+SIZE (google-cloud-print-connector-v1.16_GH0.tar.gz) = 122106
 SHA256 (urfave-cli-8e01ec4_GH0.tar.gz) = d8654573173cef6b639f00884c146bdb7f9130817e0b2d3f44d86d701428a63d
 SIZE (urfave-cli-8e01ec4_GH0.tar.gz) = 64657
 SHA256 (satori-go.uuid-36e9d2e_GH0.tar.gz) = aa54b317ac4122e7a4db33f84bac64fa9079637f4fd0517206c06d1aa1341b2d

Modified: head/science/molgif/Makefile
==============================================================================
--- head/science/molgif/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/science/molgif/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	Tool to create GIF animations of molecules
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ilyak

Modified: head/security/2fa/Makefile
==============================================================================
--- head/security/2fa/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/security/2fa/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -11,7 +11,7 @@ COMMENT=	Two-factor authentication on the command line
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsc

Modified: head/security/acmetool/Makefile
==============================================================================
--- head/security/acmetool/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/security/acmetool/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -10,7 +10,7 @@ COMMENT=	CLI tool for automatically acquiring certific
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	go>=1.8:lang/go
+USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hlandau

Modified: head/security/boringssl/Makefile
==============================================================================
--- head/security/boringssl/Makefile	Sat Jun 29 03:35:37 2019	(r505320)
+++ head/security/boringssl/Makefile	Sat Jun 29 03:51:13 2019	(r505321)
@@ -7,12 +7,10 @@ CATEGORIES=	security
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Fork of OpenSSL
 
-BUILD_DEPENDS=	go:lang/go
-
 USE_GITHUB=	yes

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



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