From 28a1c724e435ba4b32a90ac224cce554e7666cd2 Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Fri, 11 Apr 2025 00:11:53 -0400
Subject: [PATCH] Uses/go.mk: Back out 0647dd427458993a2a4589467d8256998c0ee649

0647dd42 seems to break a path expansion, causing go ports to be
unbuildable. Back it out until we can figure out what is going on.
---
 Mk/Uses/go.mk | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
index 6e924e039ede..60e6f615e067 100644
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -171,15 +171,16 @@ DISTFILES+=	go.mod
 # `GOPROXY` presents sources via the proxy service and in the downloaded
 # `WRKSRC` differently as of v2.x versions of projects. Support this different
 # directory/REST API scheme: https://go.dev/ref/mod#major-version-suffixes .
-GO_MODVERSION_MAJOR=	${GO_MODVERSION:C/^v//g:C/\..+//g}
-.if ${GO_MODVERSION_MAJOR} > 1
-WRKSRC=		${WRKDIR}/${GO_MODNAME}/v${GO_MODVERSION_MAJOR}@${GO_MODVERSION}
-MASTER_SITES+=	${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/v${GO_MODVERSION_MAJOR}/@v/
-.else
-WRKSRC=		${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
-MASTER_SITES+=	${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/
-.endif
+# GO_MODVERSION_MAJOR=	${GO_MODVERSION:C/^v//g:C/\..+//g}
+# .if ${GO_MODVERSION_MAJOR} > 1
+# WRKSRC=		${WRKDIR}/${GO_MODNAME}/v${GO_MODVERSION_MAJOR}@${GO_MODVERSION}
+# MASTER_SITES+=	${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/v${GO_MODVERSION_MAJOR}/@v/
+# .else
+# WRKSRC=		${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
+# MASTER_SITES+=	${GO_GOPROXY}/${GO_MODNAME:C/([A-Z])/!\1/g:tl}/@v/
+# .endif
 DISTFILES+=	${GO_MODFILE} ${GO_DISTFILE}
+WRKSRC=		${WRKDIR}/${GO_MODNAME}@${GO_MODVERSION}
 .        endif
 
 .      endif