From owner-svn-ports-head@freebsd.org Mon Feb 24 13:02:11 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 06A7825C323; Mon, 24 Feb 2020 13:02:11 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48R2Jy4dkDz4GTt; Mon, 24 Feb 2020 13:02:10 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A5B625A74; Mon, 24 Feb 2020 13:02:10 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01OD2Ao0002228; Mon, 24 Feb 2020 13:02:10 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01OD2Ap9002227; Mon, 24 Feb 2020 13:02:10 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202002241302.01OD2Ap9002227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Mon, 24 Feb 2020 13:02:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526967 - head/textproc/ripgrep X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/textproc/ripgrep X-SVN-Commit-Revision: 526967 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 13:02:11 -0000 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/