Date: Sun, 05 Apr 2026 12:10:58 +0000 From: Stefa=?utf-8?Q?n E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d97c3e4443ad - main - devel/jujutsu: fix installation of shell autocompletion files Message-ID: <69d25152.22eef.535ec3f1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=d97c3e4443ad61b23779d05af9d403a52c50f501 commit d97c3e4443ad61b23779d05af9d403a52c50f501 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2026-04-05 12:07:27 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2026-04-05 12:07:27 +0000 devel/jujutsu: fix installation of shell autocompletion files The shells/fish port does already install the completion file for jj, leading to an install conflict with the previous revision of this port. --- devel/jujutsu/Makefile | 7 +++---- devel/jujutsu/pkg-plist | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/devel/jujutsu/Makefile b/devel/jujutsu/Makefile index 6c2076c0d218..835e6a0a2e3b 100644 --- a/devel/jujutsu/Makefile +++ b/devel/jujutsu/Makefile @@ -1,6 +1,7 @@ PORTNAME= jujutsu DISTVERSIONPREFIX= v DISTVERSION= 0.40.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= se@FreeBSD.org @@ -28,10 +29,8 @@ do-install: cd ${WRKSRC}/demos && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/bin/jj util install-man-pages ${STAGEDIR}${PREFIX}/share/man/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d - ${STAGEDIR}${PREFIX}/bin/jj util completion bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/jujutsu - ${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions - ${STAGEDIR}${PREFIX}/bin/jj util completion bash > ${STAGEDIR}${PREFIX}/share/fish/completions/jujutsu.fish + ${STAGEDIR}${PREFIX}/bin/jj util completion bash > ${STAGEDIR}${PREFIX}/etc/bash_completion.d/jj ${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${STAGEDIR}${PREFIX}/bin/jj util completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_jujutsu + ${STAGEDIR}${PREFIX}/bin/jj util completion zsh > ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_jj .include <bsd.port.mk> diff --git a/devel/jujutsu/pkg-plist b/devel/jujutsu/pkg-plist index 86d99a989849..8cbc25bffdbe 100644 --- a/devel/jujutsu/pkg-plist +++ b/devel/jujutsu/pkg-plist @@ -1,5 +1,5 @@ bin/jj -etc/bash_completion.d/jujutsu +etc/bash_completion.d/jj %%PORTDOCS%%%%DOCSDIR%%/FAQ.md %%PORTDOCS%%%%DOCSDIR%%/bookmarks.md %%PORTDOCS%%%%DOCSDIR%%/changelog.md @@ -80,7 +80,6 @@ etc/bash_completion.d/jujutsu %%PORTEXAMPLES%%%%EXAMPLESDIR%%/setup_standard_config.sh %%PORTEXAMPLES%%%%EXAMPLESDIR%%/working_copy.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/working_copy.svg -share/fish/completions/jujutsu.fish share/man/man1/jj-abandon.1.gz share/man/man1/jj-absorb.1.gz share/man/man1/jj-arrange.1.gz @@ -196,4 +195,4 @@ share/man/man1/jj-workspace-root.1.gz share/man/man1/jj-workspace-update-stale.1.gz share/man/man1/jj-workspace.1.gz share/man/man1/jj.1.gz -share/zsh/site-functions/_jujutsu +share/zsh/site-functions/_jjhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d25152.22eef.535ec3f1>