From nobody Tue Dec 13 21:15:43 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 4NWrrJ0nWhz4knPp; Tue, 13 Dec 2022 21:15:44 +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 4NWrrH6nN2z3hrr; Tue, 13 Dec 2022 21:15:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966144; 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=oIr5zmfL4d54p5eIXqrIo5R7jr7TrHjYRwvieIn9cZQ=; b=QFi0Y3RSM9HFGxr2oasU5KUX5xDObYmiFvTnf+3ril9J3pIsw6gpXtjJ7D+0y7Hfl/ChDw fIgwAh7mAlURVnNzCmMa+I5qtdf1i0fyqS5mfpWkEiZ9++kn1NBeTu2/oW6amuy8jMkIkz NKDubfgVhClt7htfm3r/vF9SUAPVfupd589bPyq8u44BGCsABqWs6hOvavcLHFt9Ry/H6T T1l3Y9v1D+mlaCKLjKdjbXQx8ODGh7Otl+VT1+h0lc0GPcY78ixCGq5cN2zhDKPwwi09Nl AquQ6BZM4Iq7kfClEoU2yMzWUV8fL7EcC0QsB+yt9VehGBWuxK7xeY6ewk4ZPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670966144; 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=oIr5zmfL4d54p5eIXqrIo5R7jr7TrHjYRwvieIn9cZQ=; b=xFUMBfscedt9i0H1sFz6cYMwkakg90qF7kWtTklkhqvnHvf21RewwNwkX6a+XkadEsewqA lweiLTykmD48yTv38r4PrXkG8NTcPVqSaTY7Nd37jZsShhFcV09yJyLT1bY2O4cWPrn+nN AqMwq05U/aWLFi330F5AVemO8LZbtTG6bnRtTP48bsw32Bgz72bnJrWAUlAk2qBg/yD3WQ 8IRP6yaydYzxyXOf3pDn2xzoDe02gWEI/SVS4fIxDPl5bAD2t6Zx+uEj8XuDHsT4GS8uYs GmUP7kfgu6QbBSfvU4TgP8Mvx5QZBHfflCiNrEBZ01azrGvr9Zi7JW5vFugCGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670966144; a=rsa-sha256; cv=none; b=LCZIRbzTXxAIxb52Dbe5er0+vUTyTbyWdSU05buVoMD4LYn5T2LTKWbF0ZXxhSlroS9RDD /IrOntHRiQdnr6NRWr540a0atC19H7YDE3Hkv6n8UJlkeuWnukIdapSIMsBlk2SGjuQ2zG 0h79HBAZnBFe7vcKWD0xRman+QNZzExlzDb5siq6x8E9v0yIKy/FGHMXxB9EqUfQCgK72U mOCZ2IwUkYcXNKbB3codICAqNXmHiOVBIhkEWBTM7Gy+KU7irgbzcO7HPqNI/PLVldFxzD IpZXg5vLuQc48wa4XFJp/OkNtnXbi7vmy1TLPmeApokctsoLNqerW9Wq5R2aYg== 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 4NWrrH5hb0zSXK; Tue, 13 Dec 2022 21:15:43 +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 2BDLFh6J008526; Tue, 13 Dec 2022 21:15:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BDLFhro008525; Tue, 13 Dec 2022 21:15:43 GMT (envelope-from git) Date: Tue, 13 Dec 2022 21:15:43 GMT Message-Id: <202212132115.2BDLFhro008525@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: 69709b474bb7 - main - dns/dog: 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: 69709b474bb799f6393c4b43a0b828403cd4656f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lcook: URL: https://cgit.FreeBSD.org/ports/commit/?id=69709b474bb799f6393c4b43a0b828403cd4656f commit 69709b474bb799f6393c4b43a0b828403cd4656f Author: Lewis Cook AuthorDate: 2022-12-13 20:55:16 +0000 Commit: Lewis Cook CommitDate: 2022-12-13 21:11:45 +0000 dns/dog: Simplify shell completion installation --- dns/dog/Makefile | 20 +++++++++----------- dns/dog/pkg-plist | 4 ---- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dns/dog/Makefile b/dns/dog/Makefile index d1c4744b6049..b0bf180fa362 100644 --- a/dns/dog/Makefile +++ b/dns/dog/Makefile @@ -94,27 +94,25 @@ CARGO_CRATES= addr2line-0.14.0 \ winreg-0.6.2 \ mutagen,mutagen-core,mutagen-transform@git+https://github.com/llogiq/mutagen\#c7abc956a10e8a3e2cc71f21279ea0a42f7b7c10 +PLIST_FILES= bin/${PORTNAME} PORTDOCS= README.md OPTIONS_DEFINE= COMPLETIONS DOCS OPTIONS_DEFAULT= COMPLETIONS -OPTIONS_SUB= yes -COMPLETIONS_DESC= Install shell completions for bash, fish and zsh +COMPLETIONS_DESC= 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: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} post-install-COMPLETIONS-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - ${INSTALL_DATA} ${WRKSRC}/completions/${PORTNAME}.bash \ - ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions - ${INSTALL_DATA} ${WRKSRC}/completions/${PORTNAME}.fish \ - ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish - @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/completions/${PORTNAME}.zsh \ - ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} +.for _shell in bash fish zsh + ${INSTALL_DATA} ${WRKSRC}/completions/${PORTNAME}.${_shell} \ + ${STAGEDIR}${PREFIX}/${COMPLETIONS_PLIST_FILES:M*${_shell}*} +.endfor post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/dns/dog/pkg-plist b/dns/dog/pkg-plist deleted file mode 100644 index ed035134fc7e..000000000000 --- a/dns/dog/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/dog -%%COMPLETIONS%%etc/bash_completion.d/dog -%%COMPLETIONS%%share/fish/completions/dog.fish -%%COMPLETIONS%%share/zsh/site-functions/_dog