git: 80498281e619 - main - devel/golangci-lint: Update to 1.41.1

[Lewis Cook]

The branch main has been updated by lcook:

URL: https://cgit.FreeBSD.org/ports/commit/?id=80498281e6194b0c4129442fa75f8899b8af9940

commit 80498281e6194b0c4129442fa75f8899b8af9940
Author:     Lewis Cook <lcook at FreeBSD.org>
AuthorDate: 2021-06-26 11:20:35 +0000
Commit:     Lewis Cook <lcook at FreeBSD.org>
CommitDate: 2021-06-26 11:48:06 +0000

    devel/golangci-lint: Update to 1.41.1
    
    Changes:        https://github.com/golangci/golangci-lint/compare/v1.40.1...v1.41.1
---
 devel/golangci-lint/Makefile  | 26 +++++++++++++++-----------
 devel/golangci-lint/distinfo  | 10 +++++-----
 devel/golangci-lint/pkg-plist |  4 ++++
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile
index b625a0d62775..a3352e65fce4 100644
--- a/devel/golangci-lint/Makefile
+++ b/devel/golangci-lint/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	golangci-lint
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.40.1
+DISTVERSION=	1.41.1
 CATEGORIES=	devel
 
 MAINTAINER=	lcook at FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go:modules
 
 _BUILD_VERSION=	${DISTVERSION}
-_BUILD_COMMIT=	625445b
+_BUILD_COMMIT=	a207480
 _BUILD_DATE=	$$(date -u "+%Y-%m-%dT%H:%M:%SZ")
 
 GO_MODULE=	github.com/${PORTNAME:S/-lint//}/${PORTNAME}
@@ -23,28 +23,32 @@ GO_BUILDFLAGS=	-ldflags "\
 		-X main.commit=${_BUILD_COMMIT} \
 		-X main.date=${_BUILD_DATE}"
 
-PLIST_FILES=	bin/${PORTNAME} \
-		etc/bash_completion.d/${PORTNAME} \
-		share/zsh/site_functions/_${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
 PORTEXAMPLES=	.golangci.example.yml
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=		COMPLETIONS DOCS EXAMPLES
+OPTIONS_DEFAULT=	COMPLETIONS
+OPTIONS_SUB=		yes
 
-post-build:
-.for SHELL in bash zsh
+COMPLETIONS_DESC=	Build and install shell completions
+
+do-build-COMPLETIONS-on:
+.for SHELL in bash fish zsh
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_WRKDIR_BIN}/${PORTNAME} completion \
 		${SHELL} > ${WRKSRC}/${SHELL}
 .endfor
 
-post-install:
+post-install-COMPLETIONS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
-		${STAGEDIR}${PREFIX}/share/zsh/site_functions
+		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 
 	${INSTALL_DATA} ${WRKSRC}/bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/fish \
+		${STAGEDIR}${PREFIX}/share/fish/vendor_completions.d/${PORTNAME}.fish
 	${INSTALL_DATA} ${WRKSRC}/zsh \
-		${STAGEDIR}${PREFIX}/share/zsh/site_functions/_${PORTNAME}
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/golangci-lint/distinfo b/devel/golangci-lint/distinfo
index 9ffb48f20f0c..b7f14846f522 100644
--- a/devel/golangci-lint/distinfo
+++ b/devel/golangci-lint/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1621093352
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.40.1/v1.40.1.mod) = c14eb3ef337cb54ad7ff100926887349beb291eaca3fbc9384f1269fcfd9283c
-SIZE (go/devel_golangci-lint/golangci-lint-v1.40.1/v1.40.1.mod) = 3988
-SHA256 (go/devel_golangci-lint/golangci-lint-v1.40.1/v1.40.1.zip) = f046aa1013b7468d72020fe3f28acf394dd9a5dc9b03789bc322531705d63a5e
-SIZE (go/devel_golangci-lint/golangci-lint-v1.40.1/v1.40.1.zip) = 1715628
+TIMESTAMP = 1624705749
+SHA256 (go/devel_golangci-lint/golangci-lint-v1.41.1/v1.41.1.mod) = 2b0111e279511bae28b0bd65e5c51774f1db8ecf317bbe65dbcaff71b4fd184b
+SIZE (go/devel_golangci-lint/golangci-lint-v1.41.1/v1.41.1.mod) = 3961
+SHA256 (go/devel_golangci-lint/golangci-lint-v1.41.1/v1.41.1.zip) = 3840b6d200ea46ff1939415795b43fb73181d2ac5cebc5a4775c25697d68e0b2
+SIZE (go/devel_golangci-lint/golangci-lint-v1.41.1/v1.41.1.zip) = 1714680
diff --git a/devel/golangci-lint/pkg-plist b/devel/golangci-lint/pkg-plist
new file mode 100644
index 000000000000..8942fc26095e
--- /dev/null
+++ b/devel/golangci-lint/pkg-plist
@@ -0,0 +1,4 @@
+bin/golangci-lint
+%%COMPLETIONS%%etc/bash_completion.d/golangci-lint
+%%COMPLETIONS%%share/fish/vendor_completions.d/golangci-lint.fish
+%%COMPLETIONS%%share/zsh/site-functions/_golangci-lint