On Sat, Jan 08, 2022 at 01:32:12PM -0600, Matthew Martin wrote:
> Install the zsh completion function to site-functions. From other ports
> share/bash-completion/completions seems to be the right location, but
> someone should double check me on that.
That is correct:
$ pkg-config --variable=completionsdir bash-completion
/usr/local/share/bash-completion/completions
Committed, thanks.
>
> diff --git Makefile Makefile
> index 7c5972e0079..527dc13ef33 100644
> --- Makefile
> +++ Makefile
> @@ -10,7 +10,7 @@ COMMENT = small build system with a focus on speed
> GH_ACCOUNT = ninja-build
> GH_PROJECT = ninja
> GH_TAGNAME = v1.10.2
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = devel
>
> @@ -48,13 +48,15 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ninja
> ${INSTALL_DATA} ${WRKSRC}/doc/manual.asciidoc ${PREFIX}/share/doc/ninja
> ${INSTALL_DATA_DIR} ${PREFIX}/share/ninja
> - ${INSTALL_DATA} ${WRKSRC}/misc/bash-completion ${PREFIX}/share/ninja
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
> + ${INSTALL_DATA} ${WRKSRC}/misc/bash-completion
> ${PREFIX}/share/bash-completion/completions/ninja
> ${INSTALL_DATA} ${WRKSRC}/misc/ninja-mode.el ${PREFIX}/share/ninja
> ${INSTALL_DATA} ${WRKSRC}/misc/ninja.vim ${PREFIX}/share/ninja
> ${INSTALL_DATA} ${WRKSRC}/misc/ninja_syntax.py ${PREFIX}/share/ninja
> ${INSTALL_DATA} ${WRKSRC}/misc/write_fake_manifests.py
> ${PREFIX}/share/ninja
> ${INSTALL_DATA} ${WRKSRC}/misc/measure.py ${PREFIX}/share/ninja
> - ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion ${PREFIX}/share/ninja
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
> + ${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion
> ${PREFIX}/share/zsh/site-functions/_ninja
>
> do-test:
> @cd ${WRKSRC} && ${SETENV} ${ALL_TEST_ENV} ./ninja ninja_test \
> diff --git pkg/PLIST pkg/PLIST
> index a51ca80a2cd..ffa4fa99ff3 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1,12 +1,16 @@
> @comment $OpenBSD: PLIST,v 1.3 2017/09/20 07:30:19 giovanni Exp $
> @bin bin/ninja
> +share/bash-completion/
> +share/bash-completion/completions/
> +share/bash-completion/completions/ninja
> share/doc/ninja/
> share/doc/ninja/manual.asciidoc
> share/ninja/
> -share/ninja/bash-completion
> share/ninja/measure.py
> share/ninja/ninja-mode.el
> share/ninja/ninja.vim
> share/ninja/ninja_syntax.py
> share/ninja/write_fake_manifests.py
> -share/ninja/zsh-completion
> +share/zsh/
> +share/zsh/site-functions/
> +share/zsh/site-functions/_ninja
>
--
Antoine
