From nobody Tue Dec 13 21:15:41 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NWrrF629Cz4knKF; Tue, 13 Dec 2022 21:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NWrrF5Bqcz3hcy; Tue, 13 Dec 2022 21:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yY7nBnDwCbG04Cd+MCd4LUQ0hJlqzEeoqQG6tHD4DQ=; b=cksL0Gc/23j2Du326t8Wmo1re3v5fPVIjhM7NGtWL4whdFIRQCABkqJ+W0dBPJ9mTX6dzj A45lsqHiB3fwULoTp7tWYVw2uYSGcBBfkU1vfwqCqm7ba4tlMfm2nsjrlYuqos/Yo+Igth OBRynkfJQvdd5kictihVtOSjvhcawVjgVy0/7QQONEZzsFLjXrL0t1V0gbCpUp/oVCSYKO 8zPsr2RzG1shDBedFEfYfu7uFHdjqf8g0v0fJk0eF/rH95NXpXWyAU7EUp/4KjAGpVxyJN Rndh6q+Z/eajqO/sqU0DVQKucUG3AawpRlA4SGRNncu+c2TylePH3RoICUTChA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yY7nBnDwCbG04Cd+MCd4LUQ0hJlqzEeoqQG6tHD4DQ=; b=ToRpQlG78wU1Z6ro3afIsW+uPr6EaB75KI7H+e/tyj6p/ga0ThUABwxX8eveWpRJRtbrXf /86D9esN/Naya6CKZtcTq3jsdirZ1DymSucGHVgHHKkn8CR/gsjq+L0vP+8WzhZj80DOHD c0MzMQ5wD87pJYf6IkRutNgAyvxHjZSClhuPl9/rDtNU7gxZoX7ovol1rHTSy2zaNDvLp2 lV4We/ptsmKzJ9mOfrr54yq/Iep2MTVHew3gLKXKTuzBdqKQAHm5LquRA39KL7mkFACjnB hJJN4/IiwW8thAAW+6CLaHA9izuAkoazWGtVx5xI6XzkKIHTeRPwJSClOF+evw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670966141; a=rsa-sha256; cv=none; b=NK8iwCMpSyjEdy/2lhd4EYpTbBrKq5ZXXArEOpfYkkwq5+qvJKuLlF1sxhq7AOZibHu/pr yvGeyPo6YOVTdU2q6OKhKhLzVGi68txgzpdereg054mCpPoExZTUyVAr4vutM3BlmNLpkq UCEr/dFGyFQutEKUuzScMpVNlN26fGvtbYs3erqhNZL+Afx/Te2/TZcAkRqtG8vMOz9Hh+ aOt33nJG/xQQQ1wApQMi/O7zhEjGdXkYq0IMfzGjVcYrU1rdn3aTLjCiODS7ZRmCLuegEK Pwxt9I4QWv0PCWAMDktTZGrsTDS7Rhaxl8/TremprkEy/+zmyQsY5k3LLRPPUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NWrrF4GnPzT8Z; Tue, 13 Dec 2022 21:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BDLFfO2008478; Tue, 13 Dec 2022 21:15:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDLFfR4008477; Tue, 13 Dec 2022 21:15:41 GMT (envelope-from git) Date: Tue, 13 Dec 2022 21:15:41 GMT Message-Id: <202212132115.2BDLFfR4008477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lewis Cook Subject: git: d7308cf12f20 - main - devel/golangci-lint: Simplify shell completion installation List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lcook X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7308cf12f20097644244c8b6e7fd32d743acbc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7308cf12f20097644244c8b6e7fd32d743acbc4 commit d7308cf12f20097644244c8b6e7fd32d743acbc4 Author: Lewis Cook AuthorDate: 2022-12-13 20:34:32 +0000 Commit: Lewis Cook CommitDate: 2022-12-13 21:11:44 +0000 devel/golangci-lint: Simplify shell completion installation --- devel/golangci-lint/Makefile | 27 +++++++++------------------ devel/golangci-lint/pkg-plist | 4 ---- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/devel/golangci-lint/Makefile b/devel/golangci-lint/Makefile index d3711fc176d8..906bcd29e77a 100644 --- a/devel/golangci-lint/Makefile +++ b/devel/golangci-lint/Makefile @@ -24,32 +24,23 @@ GO_BUILDFLAGS= -ldflags "\ -X main.commit=${_BUILD_COMMIT} \ -X main.date=${_BUILD_DATE}" +PLIST_FILES= bin/${PORTNAME} PORTDOCS= CHANGELOG.md README.md PORTEXAMPLES= .golangci.reference.yml OPTIONS_DEFINE= COMPLETIONS DOCS EXAMPLES OPTIONS_DEFAULT= COMPLETIONS -OPTIONS_SUB= yes -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 +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} post-install-COMPLETIONS-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \ - ${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} +.for _shell in bash fish zsh + ${GO_WRKDIR_BIN}/${PORTNAME} completion ${_shell} \ + >${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*} +.endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/golangci-lint/pkg-plist b/devel/golangci-lint/pkg-plist deleted file mode 100644 index 8942fc26095e..000000000000 --- a/devel/golangci-lint/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -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