git: dee235a109f6 - main - lang/go-devel: Update to 1.21rc4

From: Dmitri Goutnik <dmgk_at_FreeBSD.org>
Date: Fri, 04 Aug 2023 15:24:08 UTC
The branch main has been updated by dmgk:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dee235a109f6785c1e0d8be8ab35ee6d56208465

commit dee235a109f6785c1e0d8be8ab35ee6d56208465
Author:     Dmitri Goutnik <dmgk@FreeBSD.org>
AuthorDate: 2023-08-04 14:40:50 +0000
Commit:     Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2023-08-04 15:22:04 +0000

    lang/go-devel: Update to 1.21rc4
    
    Changes:        https://tip.golang.org/doc/go1.21
---
 lang/go-devel/Makefile                                         |  6 +++---
 lang/go-devel/distinfo                                         |  6 +++---
 .../go-devel/files/patch-src_cmd_go_internal_modload_vendor.go | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lang/go-devel/Makefile b/lang/go-devel/Makefile
index 955752941efd..c893951ff6b7 100644
--- a/lang/go-devel/Makefile
+++ b/lang/go-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	go
-DISTVERSION?=	g20230201
+DISTVERSION?=	g20230802
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES?=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
@@ -35,8 +35,8 @@ CPE_VENDOR=	golang
 .ifndef MASTERDIR
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
-# go1.20
-GH_TAGNAME=	de4748c47c67392a57f250714509f590f68ad395
+# go1.21rc4
+GH_TAGNAME=	041dd5ce051caf72d64b6d5f2f975515b3676a71
 .endif
 
 SHEBANG_FILES=	misc/wasm/go_js_wasm_exec \
diff --git a/lang/go-devel/distinfo b/lang/go-devel/distinfo
index 1736d76e87e5..f0a7f5aaa65a 100644
--- a/lang/go-devel/distinfo
+++ b/lang/go-devel/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1675339575
+TIMESTAMP = 1691160011
 SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
 SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
-SHA256 (golang-go-g20230201-de4748c47c67392a57f250714509f590f68ad395_GH0.tar.gz) = 5fcebc8adbe308dda835dfcee83fff555000391b8c9a8594b86a7586789a7d6f
-SIZE (golang-go-g20230201-de4748c47c67392a57f250714509f590f68ad395_GH0.tar.gz) = 26098076
+SHA256 (golang-go-g20230802-041dd5ce051caf72d64b6d5f2f975515b3676a71_GH0.tar.gz) = 1c89acd6109ea55f90059cbd6096d02210b80c96ccdb410602d38c955d75b59c
+SIZE (golang-go-g20230802-041dd5ce051caf72d64b6d5f2f975515b3676a71_GH0.tar.gz) = 27145951
 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
 SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
 SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a
diff --git a/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
index 721bed32419f..9d2288522539 100644
--- a/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
+++ b/lang/go-devel/files/patch-src_cmd_go_internal_modload_vendor.go
@@ -1,11 +1,11 @@
---- src/cmd/go/internal/modload/vendor.go.orig	2020-12-17 16:03:19 UTC
+--- src/cmd/go/internal/modload/vendor.go.orig	2023-08-02 13:51:49 UTC
 +++ src/cmd/go/internal/modload/vendor.go
-@@ -133,7 +133,7 @@ func checkVendorConsistency() {
- 	readVendorList()
+@@ -144,7 +144,7 @@ func checkVendorConsistency(index *modFileIndex, modFi
+ 	readVendorList(MainModules.mustGetSingleMainModule())
  
  	pre114 := false
--	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) {
+-	if gover.Compare(index.goVersion, "1.14") < 0 {
++	if gover.Compare(index.goVersion, "1.14") < 0 || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" {
  		// 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.