Date: Mon, 24 Feb 2020 13:02:10 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526967 - head/textproc/ripgrep Message-ID: <202002241302.01OD2Ap9002227@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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@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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002241302.01OD2Ap9002227>