5 files changed, 1 insertions, 45 deletions

diff --git a/MOVED b/MOVED
index 079d5b6b052c..1b956d678832 100644
--- a/MOVED
+++ b/MOVED
@@ -17532,3 +17532,4 @@ x11-servers/xephyr|x11-servers/xorg-server@xephyr|2022-08-02|Merged into flavori
 x11-servers/xorg-nestserver|x11-servers/xorg-server@xnest|2022-08-02|Merged into the flavorized version
 x11-servers/xorg-vfbserver|x11-servers/xorg-server@xvfb|2022-08-02|Merged into the flavorized version
 x11-servers/xorg-dmx||2022-08-02|Discontinued upstream
+lang/go117||2022-08-02|Upstream support ended
diff --git a/lang/Makefile b/lang/Makefile
index 72272284845e..1d8ca3a44866 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -114,7 +114,6 @@
     SUBDIR += gnustep-base
     SUBDIR += go
     SUBDIR += go-devel
-    SUBDIR += go117
     SUBDIR += go118
     SUBDIR += go119
     SUBDIR += gomacro
diff --git a/lang/go117/Makefile b/lang/go117/Makefile
deleted file mode 100644
index d8a4b483209a..000000000000
--- a/lang/go117/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-DISTVERSION=	1.17.12
-# Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
-PORTREVISION=	0
-MASTER_SITES=	https://golang.org/dl/ \
-		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
-		LOCAL/dmgk:bootstrap
-DISTFILES=	go${DISTVERSION}.src.tar.gz \
-		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
-
-# Avoid conflicting patch files
-PATCHFILES=
-
-COMMENT=	Go programming language
-
-MASTERDIR=	${.CURDIR}/../go-devel
-PATCHDIR=	${.CURDIR}/files
-WRKSRC=		${WRKDIR}/go
-DISTINFO_FILE=	${.CURDIR}/distinfo
-
-.include "${MASTERDIR}/Makefile"
diff --git a/lang/go117/distinfo b/lang/go117/distinfo
deleted file mode 100644
index d53acdeb3019..000000000000
--- a/lang/go117/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-TIMESTAMP = 1657714392
-SHA256 (go1.17.12.src.tar.gz) = 0d51b5b3f280c0f01f534598c0219db5878f337da6137a9ee698777413607209
-SIZE (go1.17.12.src.tar.gz) = 22205674
-SHA256 (go-freebsd-arm64-go1.17.9.tar.xz) = d9e9180bdc5ad0eec1654679a50084ebb31ecbe9bef24f0bd8ba917db8d1830c
-SIZE (go-freebsd-arm64-go1.17.9.tar.xz) = 38572776
-SHA256 (go-freebsd-amd64-go1.17.9.tar.xz) = fd439ad091ed57d0ad728c05fc60465aad2e46e98da96e2d5b60b0c470f2efec
-SIZE (go-freebsd-amd64-go1.17.9.tar.xz) = 41951936
-SHA256 (go-freebsd-arm6-go1.17.9.tar.xz) = ba24590b8cec761207eafc5a39c71b5b5041320c6fb0c95d35c123f6054f8d1c
-SIZE (go-freebsd-arm6-go1.17.9.tar.xz) = 38938596
-SHA256 (go-freebsd-arm7-go1.17.9.tar.xz) = 9dc039278e174757962d100a227959037d4d7af18094af6433fa4d57cfa57e5f
-SIZE (go-freebsd-arm7-go1.17.9.tar.xz) = 38862156
-SHA256 (go-freebsd-386-go1.17.9.tar.xz) = 74854fd9e7d596c6abb1ecd55707c58a2f4d6ee875376e26bb5519889507291b
-SIZE (go-freebsd-386-go1.17.9.tar.xz) = 40566908
diff --git a/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go b/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go
deleted file mode 100644
index 721bed32419f..000000000000
--- a/lang/go117/files/patch-src_cmd_go_internal_modload_vendor.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 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.