From owner-svn-ports-all@freebsd.org Sat Jul 8 11:27:56 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E5D3D97EF0; Sat, 8 Jul 2017 11:27:56 +0000 (UTC) (envelope-from tobik@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 mx1.freebsd.org (Postfix) with ESMTPS id CFFD27DC1A; Sat, 8 Jul 2017 11:27:55 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v68BRsED063465; Sat, 8 Jul 2017 11:27:54 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v68BRsXf063464; Sat, 8 Jul 2017 11:27:54 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201707081127.v68BRsXf063464@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 8 Jul 2017 11:27:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445321 - head/textproc/ripgrep X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/textproc/ripgrep X-SVN-Commit-Revision: 445321 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Jul 2017 11:27:56 -0000 Author: tobik Date: Sat Jul 8 11:27:54 2017 New Revision: 445321 URL: https://svnweb.freebsd.org/changeset/ports/445321 Log: Add options for installing Bash, Fish and Zsh completions. - Fix license block PR: 220361 Submitted by: petteri.valkonen@iki.fi (maintainer) Approved by: lme (mentor) Differential Revision: https://reviews.freebsd.org/D11509 Modified: head/textproc/ripgrep/Makefile Modified: head/textproc/ripgrep/Makefile ============================================================================== --- head/textproc/ripgrep/Makefile Sat Jul 8 11:27:39 2017 (r445320) +++ head/textproc/ripgrep/Makefile Sat Jul 8 11:27:54 2017 (r445321) @@ -5,6 +5,7 @@ PORTNAME= ripgrep PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -12,15 +13,22 @@ COMMENT= Command line search tool LICENSE= MIT UNLICENSE LICENSE_COMB= dual -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT LICENSE_FILE_UNLICENSE= ${WRKSRC}/UNLICENSE USES= cargo USE_GITHUB= yes GH_ACCOUNT= BurntSushi +OPTIONS_DEFINE= BASH FISH ZSH +OPTIONS_DEFAULT=BASH FISH ZSH +FISH_DESC= Install programmable completions for Fish + PLIST_FILES= bin/rg \ man/man1/rg.1.gz +BASH_PLIST_FILES= etc/bash_completion.d/rg.bash-completion +FISH_PLIST_FILES= share/fish/completions/rg.fish +ZSH_PLIST_FILES= share/zsh/site-functions/_rg CARGO_CRATES= aho-corasick-0.6.3 \ ansi_term-0.9.0 \ @@ -59,7 +67,29 @@ CARGO_CRATES= aho-corasick-0.6.3 \ winapi-0.2.8 \ winapi-build-0.1.1 +RIPGREP_OUTDIR= ${WRKDIR}/cargo-out +CARGO_ENV= RIPGREP_OUTDIR=${RIPGREP_OUTDIR} + +post-patch: + @${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs + post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg ${INSTALL_MAN} ${WRKSRC}/doc/rg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +post-install-BASH-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ + ${INSTALL_DATA} ${RIPGREP_OUTDIR}/rg.bash-completion \ + ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ + +post-install-FISH-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/ + ${INSTALL_DATA} ${RIPGREP_OUTDIR}/rg.fish \ + ${STAGEDIR}${PREFIX}/share/fish/completions/ + +post-install-ZSH-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ + ${INSTALL_DATA} ${RIPGREP_OUTDIR}/_rg \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ .include