diff --git a/lang/go124/Makefile b/lang/go124/Makefile
index 5e3b685cdec6..fc144e1799f2 100644
--- a/lang/go124/Makefile
+++ b/lang/go124/Makefile
@@ -1,29 +1,32 @@
 DISTVERSION=	1.24.9
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
 PORTREVISION=	0
 MASTER_SITES=	https://go.dev/dl/
 DISTFILES=	go${DISTVERSION}.src.tar.gz \
 		go1.23.12.${OPSYS:tl}-${GOARCH_${ARCH}}.tar.gz
+EXTRACT_ONLY=	${DISTFILES:[1]}
 
 # Avoid conflicting patch files
 PATCHFILES=
-PATCHDIR=	${.CURDIR}/files
 
 COMMENT=	Go programming language
 
+SHEBANG_FILES=	lib/wasm/go_js_wasm_exec lib/wasm/go_wasip1_wasm_exec
+
 MASTERDIR=	${.CURDIR}/../go-devel
+PATCHDIR=	${.CURDIR}/files
+PORTSCOUT=	limit:^1\.24\.
+
 WRKSRC=		${WRKDIR}/go
-DISTINFO_FILE=	${.CURDIR}/distinfo
-EXTRACT_ONLY=	${DISTFILES:[1]}
 
-SHEBANG_FILES=	lib/wasm/go_js_wasm_exec lib/wasm/go_wasip1_wasm_exec
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
 BOOTSTRAP_WRKSRC=	${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap
 
 pre-extract:
 	${MKDIR} ${BOOTSTRAP_WRKSRC}
 	cd ${BOOTSTRAP_WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${DISTFILES:[2]} \
 		--strip-components 1 ${EXTRACT_AFTER_ARGS}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/go125/Makefile b/lang/go125/Makefile
index 2983dea41c2f..303b249fd25c 100644
--- a/lang/go125/Makefile
+++ b/lang/go125/Makefile
@@ -1,29 +1,32 @@
 DISTVERSION=	1.25.3
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
 PORTREVISION=	0
 MASTER_SITES=	https://go.dev/dl/
 DISTFILES=	go${DISTVERSION}.src.tar.gz \
 		go1.24.6.${OPSYS:tl}-${GOARCH_${ARCH}}.tar.gz
+EXTRACT_ONLY=	${DISTFILES:[1]}
 
 # Avoid conflicting patch files
 PATCHFILES=
-PATCHDIR=	${.CURDIR}/files
 
 COMMENT=	Go programming language
 
+SHEBANG_FILES=	lib/wasm/go_js_wasm_exec lib/wasm/go_wasip1_wasm_exec
+
 MASTERDIR=	${.CURDIR}/../go-devel
+PATCHDIR=	${.CURDIR}/files
+PORTSCOUT=	limit:^1\.25\.
+
 WRKSRC=		${WRKDIR}/go
-DISTINFO_FILE=	${.CURDIR}/distinfo
-EXTRACT_ONLY=	${DISTFILES:[1]}
 
-SHEBANG_FILES=	lib/wasm/go_js_wasm_exec lib/wasm/go_wasip1_wasm_exec
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
 BOOTSTRAP_WRKSRC=	${WRKDIR}/go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-bootstrap
 
 pre-extract:
 	${MKDIR} ${BOOTSTRAP_WRKSRC}
 	cd ${BOOTSTRAP_WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DIST_SUBDIR}/${DISTFILES:[2]} \
 		--strip-components 1 ${EXTRACT_AFTER_ARGS}
 
 .include "${MASTERDIR}/Makefile"