Index: head/lang/go-devel/Makefile
===================================================================
--- head/lang/go-devel/Makefile	(revision 538477)
+++ head/lang/go-devel/Makefile	(revision 538478)
@@ -1,27 +1,28 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 # $FreeBSD$
 
-PORTVERSION=	g20200601
+PORTVERSION=	g20200610
 # Always set PORTREVISION and PORTEPOCH explicitly as otherwise it is inherited from lang/go
+PORTREVISION=	0
 PORTEPOCH=	0
 MASTER_SITES=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 PKGNAMESUFFIX=	-devel
 DISTFILES=	go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
 COMMENT=	Go programming language (development version)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
-GH_TAGNAME=	83b181c68bf332ac7948f145f33d128377a09c42
+GH_TAGNAME=	e92be18fd8b525b642ca25bdb3e2056b35d9d73c
 
 CONFLICTS_INSTALL=	go
 
 MASTERDIR=	${.CURDIR}/../go
 PATCHDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 post-extract:
 	@[ -f ${WRKSRC}/VERSION ] || ${ECHO_CMD} "devel +${GH_TAGNAME}" > ${WRKSRC}/VERSION
 
 .include "${MASTERDIR}/Makefile"
Index: head/lang/go-devel/distinfo
===================================================================
--- head/lang/go-devel/distinfo	(revision 538477)
+++ head/lang/go-devel/distinfo	(revision 538478)
@@ -1,13 +1,13 @@
-TIMESTAMP = 1591102554
+TIMESTAMP = 1591878640
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
-SHA256 (golang-go-g20200601-83b181c68bf332ac7948f145f33d128377a09c42_GH0.tar.gz) = 26967ea1f357b3942694b0ff1b86c1e3e1ecb6e0d1a0ac70a2bed9c1495044e3
-SIZE (golang-go-g20200601-83b181c68bf332ac7948f145f33d128377a09c42_GH0.tar.gz) = 22485615
+SHA256 (golang-go-g20200610-e92be18fd8b525b642ca25bdb3e2056b35d9d73c_GH0.tar.gz) = 9d4aa84085e6cc72cacc6c88555008187cc555d942e3d5f55364ed2cd2656b63
+SIZE (golang-go-g20200610-e92be18fd8b525b642ca25bdb3e2056b35d9d73c_GH0.tar.gz) = 22902410
 SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b
 SIZE (go-freebsd-amd64-go1.14.tar.xz) = 35927980
 SHA256 (go-freebsd-arm6-go1.14.tar.xz) = 5846b4bbc6881c6c04daffbdb647d53a5b002a0e177271ecfcabef734b209614
 SIZE (go-freebsd-arm6-go1.14.tar.xz) = 35164388
 SHA256 (go-freebsd-arm7-go1.14.tar.xz) = 3d40c0f093bc3dc6cb84e92f8462a9c6a88a19a0ba75f813211f9d5d766b7737
 SIZE (go-freebsd-arm7-go1.14.tar.xz) = 35398032
 SHA256 (go-freebsd-386-go1.14.tar.xz) = c1a798154ae1ed2be6027d883e4611dd19edbe07a3f6d4f71d9437bddf3ed9ca
 SIZE (go-freebsd-386-go1.14.tar.xz) = 36118928
Index: head/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go
===================================================================
--- head/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go	(revision 538477)
+++ head/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go	(nonexistent)
@@ -1,12 +0,0 @@
-Upstream PR: https://github.com/golang/go/issues/37948
---- src/cmd/go/internal/modload/init.go.orig	2020-02-25 18:32:50 UTC
-+++ src/cmd/go/internal/modload/init.go
-@@ -562,7 +562,7 @@ func checkVendorConsistency() {
- 	readVendorList()
- 
- 	pre114 := false
--	if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 {
-+	if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
- 		// Go versions before 1.14 did not include enough information in
- 		// vendor/modules.txt to check for consistency.
- 		// If we know that we're on an earlier version, relax the consistency check.

Property changes on: head/lang/go-devel/files/patch-src_cmd_go_internal_modload_init.go
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
===================================================================
--- head/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go	(nonexistent)
+++ head/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go	(revision 538478)
@@ -0,0 +1,11 @@
+--- src/cmd/go/internal/modload/vendor.go.orig	2020-06-11 12:36:37 UTC
++++ src/cmd/go/internal/modload/vendor.go
+@@ -133,7 +133,7 @@ func checkVendorConsistency() {
+ 	readVendorList()
+ 
+ 	pre114 := false
+-	if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 {
++	if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) {
+ 		// Go versions before 1.14 did not include enough information in
+ 		// vendor/modules.txt to check for consistency.
+ 		// If we know that we're on an earlier version, relax the consistency check.

Property changes on: head/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property