Index: Mk/Uses/go.mk =================================================================== --- Mk/Uses/go.mk +++ Mk/Uses/go.mk @@ -107,7 +107,8 @@ GO_TESTFLAGS+= -mod=vendor GO_WRKSRC= ${WRKSRC} GO_ENV+= GOPATH="" \ - GOBIN="${GO_WRKDIR_BIN}" + GOBIN="${GO_WRKDIR_BIN}" \ + GO_NO_VENDOR_CHECKS=1 .else GO_WRKSRC= ${WRKDIR}/src/${GO_PKGNAME} GO_ENV+= GOPATH="${WRKDIR}" \ Index: lang/go/Makefile =================================================================== --- lang/go/Makefile +++ lang/go/Makefile @@ -3,7 +3,7 @@ PORTNAME= go PORTVERSION= 1.14 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= https://golang.org/dl/ \ Index: lang/go/files/patch-src_cmd_go_internal_modload_init.go =================================================================== --- /dev/null +++ lang/go/files/patch-src_cmd_go_internal_modload_init.go @@ -0,0 +1,12 @@ +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.