Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -922,6 +922,7 @@
     SUBDIR += goffice
     SUBDIR += gogs
     SUBDIR += golangci-lint
+    SUBDIR += golangci-lint1
     SUBDIR += golint
     SUBDIR += gomigrate
     SUBDIR += google-cloud-cpp
Index: devel/golangci-lint/Makefile
===================================================================
--- devel/golangci-lint/Makefile
+++ devel/golangci-lint/Makefile
@@ -12,11 +12,13 @@
 
 USES=		gmake go:1.23,modules
 
+CONFLICTS_INSTALL=	golangci-lint1-*
+
 _BUILD_VERSION=	${DISTVERSION}
 _BUILD_COMMIT=	2b224c2
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
+GO_MODULE=	github.com/${PORTNAME:C/-lint//}/${PORTNAME}
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
Index: devel/golangci-lint1/Makefile
===================================================================
--- devel/golangci-lint1/Makefile
+++ devel/golangci-lint1/Makefile
@@ -1,6 +1,7 @@
-PORTNAME=	golangci-lint
+PORTNAME=	golangci-lint1
+DISTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.2
+DISTVERSION=	1.64.8
 CATEGORIES=	devel
 
 MAINTAINER=	lcook@FreeBSD.org
@@ -12,19 +13,21 @@
 
 USES=		gmake go:1.23,modules
 
+CONFLICTS_INSTALL=	golangci-lint-2.*
+
 _BUILD_VERSION=	${DISTVERSION}
-_BUILD_COMMIT=	2b224c2
+_BUILD_COMMIT=	89476e7
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
-GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
-GO_TARGET=	./cmd/${PORTNAME}
+GO_MODULE=	github.com/${DISTNAME:C/-lint.*//}/${DISTNAME}
+GO_TARGET=	./cmd/${DISTNAME}
 GO_BUILDFLAGS=	-ldflags "\
 		-s -w \
 		-X main.version=${_BUILD_VERSION} \
 		-X main.commit=${_BUILD_COMMIT} \
 		-X main.date=${_BUILD_DATE}"
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${DISTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 PORTEXAMPLES=	.golangci.reference.yml
 
@@ -32,15 +35,15 @@
 OPTIONS_DEFAULT=	COMPLETIONS
 
 COMPLETIONS_DESC=		Build and install bash, fish and zsh shell completions
-COMPLETIONS_PLIST_FILES=	share/bash-completion/completions/${PORTNAME} \
-				share/fish/vendor_completions.d/${PORTNAME}.fish \
-				share/zsh/site-functions/_${PORTNAME}
+COMPLETIONS_PLIST_FILES=	share/bash-completion/completions/${DISTNAME} \
+				share/fish/vendor_completions.d/${DISTNAME}.fish \
+				share/zsh/site-functions/_${DISTNAME}
 
 BINARY_ALIAS=	make=gmake
 
 post-install-COMPLETIONS-on:
 .for _shell in bash fish zsh
-	${SET_ENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${PORTNAME} completion ${_shell} \
+	${SET_ENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${DISTNAME} completion ${_shell} \
 		>${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*}
 .endfor
 
Index: devel/golangci-lint1/distinfo
===================================================================
--- /dev/null
+++ devel/golangci-lint1/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1744339511
+SHA256 (go/devel_golangci-lint1/golangci-lint/v1.64.8.mod) = cb0665a41df2903bd1032133849f4b87b585700394842a4c8bfe31de5bd8d854
+SIZE (go/devel_golangci-lint1/golangci-lint/v1.64.8.mod) = 8634
+SHA256 (go/devel_golangci-lint1/golangci-lint/v1.64.8.zip) = a81c70e06ed29ca9a91bed98d763ad2366f87ca2a839c73a640cc9761ee4792b
+SIZE (go/devel_golangci-lint1/golangci-lint/v1.64.8.zip) = 2518926
Index: devel/golangci-lint1/pkg-descr
===================================================================
--- /dev/null
+++ devel/golangci-lint1/pkg-descr
@@ -0,0 +1,4 @@
+GolangCI-Lint is a linters aggregator. It's fast, on average 5 times
+faster than gometalinter. It's easy to integrate and use, has nice
+output and has a minimum number of false positives. It supports go
+modules.