svn commit: r526967 - head/textproc/ripgrep
Mateusz Piotrowski
0mp at FreeBSD.org
Mon Feb 24 13:02:11 UTC 2020
Author: 0mp
Date: Mon Feb 24 13:02:10 2020
New Revision: 526967
URL: https://svnweb.freebsd.org/changeset/ports/526967
Log:
Don't install completion file for fish
ripgrep tries to install a completion file for the fish shell.
But the next version of shells/fish includes that file, creating
a conflict. The best way to resolve the conflict is to let fish
manage the file itself.
PR: 244355
Submitted by: asomers
Approved by: Petteri Valkonen (maintainer)
Modified:
head/textproc/ripgrep/Makefile
Modified: head/textproc/ripgrep/Makefile
==============================================================================
--- head/textproc/ripgrep/Makefile Mon Feb 24 12:49:26 2020 (r526966)
+++ head/textproc/ripgrep/Makefile Mon Feb 24 13:02:10 2020 (r526967)
@@ -5,7 +5,7 @@
PORTNAME= ripgrep
DISTVERSION= 11.0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MAINTAINER= petteri.valkonen at iki.fi
@@ -94,7 +94,6 @@ CARGO_ENV= RIPGREP_OUTDIR=${RIPGREP_OUTDIR}
PLIST_FILES= bin/rg \
etc/bash_completion.d/rg.bash \
man/man1/rg.1.gz \
- share/fish/completions/rg.fish \
share/zsh/site-functions/_rg
PORTDOCS= CHANGELOG.md FAQ.md GUIDE.md
@@ -126,9 +125,6 @@ post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
${INSTALL_DATA} ${RIPGREP_OUTDIR}/rg.bash \
${STAGEDIR}${PREFIX}/etc/bash_completion.d/
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/
- ${INSTALL_DATA} ${RIPGREP_OUTDIR}/rg.fish \
- ${STAGEDIR}${PREFIX}/share/fish/completions/
@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
${INSTALL_DATA} ${WRKSRC}/complete/_rg \
${STAGEDIR}${PREFIX}/share/zsh/site-functions/
More information about the svn-ports-all
mailing list