From 4388542076aa1b37ec59450b872bd40dcc328e4b Mon Sep 17 00:00:00 2001
From: Dmitri Goutnik <dmgk@FreeBSD.org>
Date: Wed, 17 Feb 2021 11:44:50 +0000
Subject: [PATCH] lang/go: Update to 1.16

Changes:	https://golang.org/doc/go1.16
---
 lang/go/Makefile                                          | 8 ++++----
 lang/go/distinfo                                          | 6 +++---
 lang/go/files/patch-src_cmd_go_internal_modload_vendor.go | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lang/go/Makefile b/lang/go/Makefile
index fec6e66978ed..9d3a0fe6c4fb 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	go
-PORTVERSION?=	1.15.8
+PORTVERSION?=	1.16
 PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES=	lang
@@ -46,11 +46,11 @@ EXTRACT_CMD=	${SETENV} LC_ALL=en_US.UTF-8 ${TAR}
 WRKSRC=		${WRKDIR}/go
 .endif
 
-OPTIONS_DEFINE_i386=	GO387
+OPTIONS_DEFINE_i386=	SOFTFLOAT
 
-GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
+SOFTFLOAT_DESC=	Use soft float on non-SSE2 processors (Pentium 4 and older)
 
-GO387_VARS=	GO386=387
+SOFTFLOAT_VARS=	GO386=softfloat
 
 BINARIES=	go gofmt
 BOOTSTRAP_TAG=	go1.14
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 81bd984a2c3d..b78899530899 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1612525048
-SHA256 (go1.15.8.src.tar.gz) = 540c0ab7781084d124991321ed1458e479982de94454a98afab6acadf38497c2
-SIZE (go1.15.8.src.tar.gz) = 23018628
+TIMESTAMP = 1613525787
+SHA256 (go1.16.src.tar.gz) = 7688063d55656105898f323d90a79a39c378d86fe89ae192eb3b7fc46347c95a
+SIZE (go1.16.src.tar.gz) = 20895394
 SHA256 (go-freebsd-arm64-go1.14.tar.xz) = f8b0cf0d323e581c9e3e0d5c217847a3e0294fcc92dbac92a5b02cea9d97ad8d
 SIZE (go-freebsd-arm64-go1.14.tar.xz) = 34944548
 SHA256 (go-freebsd-amd64-go1.14.tar.xz) = 3b259247fb228258a4f31e283e9aa23cafd590eabce334666a9e9b2ffe47c19b
diff --git a/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go
index d4610796b18f..721bed32419f 100644
--- a/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go
+++ b/lang/go/files/patch-src_cmd_go_internal_modload_vendor.go
@@ -1,11 +1,11 @@
---- src/cmd/go/internal/modload/vendor.go.orig	2020-06-11 12:36:37 UTC
+--- src/cmd/go/internal/modload/vendor.go.orig	2020-12-17 16:03:19 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) {
+-	if semver.Compare(index.goVersionV, "v1.14") < 0 {
++	if semver.Compare(index.goVersionV, "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.