On Sat, 22 Feb 2020 at 07:06:03 -0700, Aaron Bieber wrote:
> Hi,
>
> Here is an update to fish. This is quite a big update:
> https://fishshell.com/release_notes.html
>
> From the port perspective:
>
> - Remove our now-upstream'd patches.
> - Switch to cmake.
>
> OK?
>
> Cheers,
> Aaron
>
I forgot to mention this includes a conflict with textproc/ripgrep. Fish has
built in completions for it, so here is a diff to remove it from the ripgrep
package:
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 520a01d0e9d..7308522fce4 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -5,6 +5,7 @@ COMMENT = line oriented search tool using Rust's
regex library #'
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
GH_TAGNAME = 11.0.2
+REVISION = 0
CATEGORIES = textproc sysutils
@@ -97,14 +98,13 @@ MODCARGO_RUSTFLAGS = -C debuginfo=0
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out
+# fish completion excluded as it is shipped with shells/fish
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/rg ${PREFIX}/bin/
${INSTALL_MAN} ${OUT_DIR}/rg.1 ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
${INSTALL_DATA} ${OUT_DIR}/rg.bash \
${PREFIX}/share/bash-completion/completions/rg
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions
- ${INSTALL_DATA} ${OUT_DIR}/rg.fish ${PREFIX}/share/fish/completions/
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${OUT_DIR}/_rg.ps1
${PREFIX}/share/zsh/site-functions/_rg
>
> --
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
>
--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
