From owner-svn-ports-all@freebsd.org Sat Nov 11 19:01:57 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 0723FE71726; Sat, 11 Nov 2017 19:01:57 +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 C5BA36B0CC; Sat, 11 Nov 2017 19:01:56 +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 vABJ1t3G061822; Sat, 11 Nov 2017 19:01:55 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vABJ1t98061821; Sat, 11 Nov 2017 19:01:55 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201711111901.vABJ1t98061821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 11 Nov 2017 19:01:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453990 - head/textproc/ripgrep X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/textproc/ripgrep X-SVN-Commit-Revision: 453990 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, 11 Nov 2017 19:01:57 -0000 Author: tobik Date: Sat Nov 11 19:01:55 2017 New Revision: 453990 URL: https://svnweb.freebsd.org/changeset/ports/453990 Log: textproc/ripgrep: Restore BASH, FISH, ZSH options They were broken by r453382 which introduced new AVX, SIMD options which overwrote the old ones. PR: 223478, 223314 Submitted by: petteri.valkonen@iki.fi (maintainer) Modified: head/textproc/ripgrep/Makefile Modified: head/textproc/ripgrep/Makefile ============================================================================== --- head/textproc/ripgrep/Makefile Sat Nov 11 18:54:16 2017 (r453989) +++ head/textproc/ripgrep/Makefile Sat Nov 11 19:01:55 2017 (r453990) @@ -5,7 +5,7 @@ PORTNAME= ripgrep PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi @@ -20,16 +20,6 @@ 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 \ atty-0.2.3 \ @@ -74,21 +64,31 @@ CARGO_CRATES= aho-corasick-0.6.3 \ RIPGREP_OUTDIR= ${WRKDIR}/cargo-out CARGO_ENV= RIPGREP_OUTDIR=${RIPGREP_OUTDIR} -OPTIONS_DEFINE= SIMD -OPTIONS_DEFAULT=SIMD +PLIST_FILES= bin/rg \ + man/man1/rg.1.gz +OPTIONS_DEFINE= BASH FISH ZSH SIMD +OPTIONS_DEFAULT=BASH FISH ZSH SIMD + OPTIONS_DEFINE_amd64= AVX OPTIONS_DEFINE_i386= AVX AVX_DESC= ${SSE_DESC:S/SSE/AVX/} +FISH_DESC= Install programmable completions for Fish + AVX_VARS= CARGO_FEATURES+=avx-accel RUSTFLAGS+="-C target-feature=+avx" AVX_IMPLIES= SIMD +BASH_PLIST_FILES= etc/bash_completion.d/rg.bash-completion +FISH_PLIST_FILES= share/fish/completions/rg.fish + # simd crate uses cfg_target_feature which isn't stable yet, so unlock # unstable features similar to how lang/rust bootstraps. www/firefox # uses the same hack when building with --enable-rust-simd. SIMD_MAKE_ENV= RUSTC_BOOTSTRAP=1 SIMD_VARS= CARGO_FEATURES+=simd-accel + +ZSH_PLIST_FILES= share/zsh/site-functions/_rg post-patch: @${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs