Index: head/devel/gitlab-runner/Makefile
===================================================================
--- head/devel/gitlab-runner/Makefile
+++ head/devel/gitlab-runner/Makefile
@@ -203,10 +203,6 @@
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
 
-gomod-deps: patch
-	(cd ${WRKSRC} && go mod vendor)
-	(cd ${WRKSRC} && modules2tuple vendor/modules.txt)
-
 pre-build:
 	@cd ${WRKSRC} && go-bindata \
 		-pkg docker \
Index: head/devel/gitlab-shell/Makefile
===================================================================
--- head/devel/gitlab-shell/Makefile
+++ head/devel/gitlab-shell/Makefile
@@ -27,7 +27,7 @@
 
 # for go dependencies
 USE_GITHUB=	nodefault
-# generated with: make gomod-deps
+# generated with: make gomod-vendor
 # 38dd
 GH_TUPLE=	\
 		DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
@@ -76,11 +76,6 @@
 	${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample
 	${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml
 	${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile
-
-# Build the go deps, use `pkg install modules2tuple`
-gomod-deps: patch
-	(cd ${WRKSRC} && go mod vendor)
-	(cd ${WRKSRC} && modules2tuple vendor/modules.txt)
 
 pre-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build)
Index: head/net/gitlab-agent/Makefile
===================================================================
--- head/net/gitlab-agent/Makefile
+++ head/net/gitlab-agent/Makefile
@@ -208,10 +208,6 @@
 
 PLIST_FILES=	bin/kas
 
-gomod-deps: patch
-	(cd ${WRKSRC} && go mod vendor)
-	(cd ${WRKSRC} && modules2tuple vendor/modules.txt)
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas