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

1 files changed, 36 insertions, 51 deletions

diff --git a/net/drive/Makefile b/net/drive/Makefile
index 6e7a56ed0886..236d1d8c585a 100644
--- a/net/drive/Makefile
+++ b/net/drive/Makefile
@@ -22,57 +22,42 @@ PLIST_FILES=	bin/drive
 
 GH_ACCOUNT=	odeke-em
 GH_TAGNAME=	b868c96
-GH_TUPLE=	boltdb:bolt:v1.3.1:boltdb_bolt/../src/github.com/boltdb/bolt \
-		census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/../src/go.opencensus.io \
-		cheggaaa:pb:v1.0.28:cheggaaa_pb/../src/github.com/cheggaaa/pb \
-		fatih:color:v1.7.0:fatih_color/../src/github.com/fatih/color \
-		golang:crypto:71b5226:golang_crypto/../src/golang.org/x/crypto \
-		golang:groupcache:869f871:golang_groupcache/../src/github.com/golang/groupcache \
-		golang:net:ba9fcec:golang_net/../src/golang.org/x/net \
-		golang:oauth2:0f29369:golang_oauth2/../src/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.2:golang_protobuf/../src/github.com/golang/protobuf \
-		golang:sys:749cb33:golang_sys/../src/golang.org/x/sys \
-		golang:text:3d0f797:golang_text/../src/golang.org/x/text \
-		google:go-genproto:92dd089:google_go_genproto/../src/google.golang.org/genproto \
-		google:google-api-go-client:v0.10.0:google_googleapigoclient/../src/google.golang.org/api \
-		googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/../src/cloud.google.com/go \
-		googleapis:gax-go:v2.0.5:googleapis_gaxgo/../src/github.com/googleapis/gax-go \
-		grpc:grpc-go:v1.23.0:grpc_grpc_go/../src/google.golang.org/grpc \
-		hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/../src/github.com/hashicorp/golang-lru \
-		mattn:go-colorable:v0.1.2:mattn_gocolorable/../src/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.9:mattn_goisatty/../src/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.4:mattn_gorunewidth/../src/github.com/mattn/go-runewidth \
-		mxk:go-flowrate:cca7078:mxk_goflowrate/../src/github.com/mxk/go-flowrate \
-		odeke-em:cache:baf8e43:odekeem_cache/../src/github.com/odeke-em/cache \
-		odeke-em:cli-spinner:610063b:odekeem_clispinner/../src/github.com/odeke-em/cli-spinner \
-		odeke-em:command:91ca5ec:odekeem_command/../src/github.com/odeke-em/command \
-		odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/../src/github.com/odeke-em/exponential-backoff \
-		odeke-em:extractor:801861a:odekeem_extractor/../src/github.com/odeke-em/extractor \
-		odeke-em:go-utils:e8ebaed:odekeem_go_utils/../src/github.com/odeke-em/go-utils \
-		odeke-em:go-uuid:b211d76:odekeem_gouuid/../src/github.com/odeke-em/go-uuid \
-		odeke-em:log:8d60a69:odekeem_log/../src/github.com/odeke-em/log \
-		odeke-em:meddler:d2b51d2:odekeem_meddler/../src/github.com/odeke-em/meddler \
-		odeke-em:namespace:0ab79ba:odekeem_namespace/../src/github.com/odeke-em/namespace \
-		odeke-em:pretty-words:9d37a7f:odekeem_prettywords/../src/github.com/odeke-em/pretty-words \
-		odeke-em:semalim:9c88bf5:odekeem_semalim/../src/github.com/odeke-em/semalim \
-		odeke-em:statos:292960a:odekeem_statos/../src/github.com/odeke-em/statos \
-		skratchdot:open-golang:79abb63:skratchdot_opengolang/../src/github.com/skratchdot/open-golang \
-		VividCortex:ewma:v1.1.1:VividCortex_ewma/../src/github.com/VividCortex/ewma
+GH_TUPLE=	boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
+		census-instrumentation:opencensus-go:v0.22.1:census_instrumentation_opencensus/vendor/go.opencensus.io \
+		cheggaaa:pb:v1.0.28:cheggaaa_pb/vendor/github.com/cheggaaa/pb \
+		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
+		golang:crypto:71b5226:golang_crypto/vendor/golang.org/x/crypto \
+		golang:groupcache:869f871:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:net:ba9fcec:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:0f29369:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:749cb33:golang_sys/vendor/golang.org/x/sys \
+		golang:text:3d0f797:golang_text/vendor/golang.org/x/text \
+		google:go-genproto:92dd089:google_go_genproto/vendor/google.golang.org/genproto \
+		google:google-api-go-client:v0.10.0:google_googleapigoclient/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:v0.45.1:googleapis_googlecloudgo/vendor/cloud.google.com/go \
+		googleapis:gax-go:v2.0.5:googleapis_gaxgo/vendor/github.com/googleapis/gax-go \
+		grpc:grpc-go:v1.23.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:golang-lru:v0.5.3:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		mattn:go-colorable:v0.1.2:mattn_gocolorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.9:mattn_goisatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-runewidth:v0.0.4:mattn_gorunewidth/vendor/github.com/mattn/go-runewidth \
+		mxk:go-flowrate:cca7078:mxk_goflowrate/vendor/github.com/mxk/go-flowrate \
+		odeke-em:cache:baf8e43:odekeem_cache/vendor/github.com/odeke-em/cache \
+		odeke-em:cli-spinner:610063b:odekeem_clispinner/vendor/github.com/odeke-em/cli-spinner \
+		odeke-em:command:91ca5ec:odekeem_command/vendor/github.com/odeke-em/command \
+		odeke-em:exponential-backoff:96e25d3:odekeem_exponential_backoff/vendor/github.com/odeke-em/exponential-backoff \
+		odeke-em:extractor:801861a:odekeem_extractor/vendor/github.com/odeke-em/extractor \
+		odeke-em:go-utils:e8ebaed:odekeem_go_utils/vendor/github.com/odeke-em/go-utils \
+		odeke-em:go-uuid:b211d76:odekeem_gouuid/vendor/github.com/odeke-em/go-uuid \
+		odeke-em:log:8d60a69:odekeem_log/vendor/github.com/odeke-em/log \
+		odeke-em:meddler:d2b51d2:odekeem_meddler/vendor/github.com/odeke-em/meddler \
+		odeke-em:namespace:0ab79ba:odekeem_namespace/vendor/github.com/odeke-em/namespace \
+		odeke-em:pretty-words:9d37a7f:odekeem_prettywords/vendor/github.com/odeke-em/pretty-words \
+		odeke-em:semalim:9c88bf5:odekeem_semalim/vendor/github.com/odeke-em/semalim \
+		odeke-em:statos:292960a:odekeem_statos/vendor/github.com/odeke-em/statos \
+		skratchdot:open-golang:79abb63:skratchdot_opengolang/vendor/github.com/skratchdot/open-golang \
+		VividCortex:ewma:v1.1.1:VividCortex_ewma/vendor/github.com/VividCortex/ewma
 USE_GITHUB=	yes
 
-post-patch:
-	@${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/cheggaaa/pb ${GO_WRKDIR_SRC}/gopkg.in/cheggaaa/pb.v1
-	@${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/fatih/
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/fatih/color ${GO_WRKDIR_SRC}/gopkg.in/fatih/color.v1
-	@${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/mattn/
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-colorable ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-colorable.v0
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-isatty ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-isatty.v0
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/mattn/go-runewidth ${GO_WRKDIR_SRC}/gopkg.in/mattn/go-runewidth.v0
-	@${MKDIR} ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/
-	@${LN} -s ${GO_WRKDIR_SRC}/github.com/VividCortex/ewma ${GO_WRKDIR_SRC}/gopkg.in/VividCortex/ewma.v1
-
-do-install:
-	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/drive ${STAGEDIR}${PREFIX}/bin/drive
-
 .include <bsd.port.mk>