On Sun, Jan 28, 2018 at 04:05:46PM +0100, Klemens Nanni wrote:
> On Sun, Jan 28, 2018 at 05:15:51PM +0800, Ray Lai wrote:
> > Fixes "too many open file descriptors in ripgrep 0.7.0":
> > https://github.com/BurntSushi/ripgrep/issues/648
> Thanks for beating me to it!
>
> 0.71 indeed fixes the issue on my amd64 machine where the following
> command for example would result in above mentioned failure:
>
> $ rg -F FIX_EXTRACT /usr/ports
>
> Looks good to me, all tests pass:
>
> test result: ok. 142 passed; 0 failed; 0 ignored; 0 measured; 0
> filtered out
>
> Any takers?
Updated diff with INSTALL_DATA_DIR instead of `mkdir -p' in post-install.
Feedback? Any takers?
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 1 Nov 2017 20:27:22 -0000 1.5
+++ Makefile 28 Jan 2018 15:52:31 -0000
@@ -4,7 +4,7 @@ COMMENT = line oriented search tool usi
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 0.7.0
+GH_TAGNAME = 0.7.1
CATEGORIES = textproc sysutils
@@ -65,10 +65,10 @@ CONFIGURE_STYLE = cargo
post-install:
chmod a+rx ${PREFIX}/bin/rg
${INSTALL_MAN} ${WRKSRC}/doc/rg.1 ${PREFIX}/man/man1/
- mkdir -p ${PREFIX}/share/bash-completion/completions
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions
${INSTALL_DATA}
${MODCARGO_TARGET_DIR}/release/build/ripgrep-*/out/rg.bash-completion \
${PREFIX}/share/bash-completion/completions/rg
- mkdir -p ${PREFIX}/share/zsh/site-functions
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA}
${MODCARGO_TARGET_DIR}/release/build/ripgrep-*/out/_rg.ps1 \
${PREFIX}/share/zsh/site-functions/_rg
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/ripgrep/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 1 Nov 2017 20:27:22 -0000 1.5
+++ distinfo 28 Jan 2018 15:52:31 -0000
@@ -38,7 +38,7 @@ SHA256 (cargo/void-1.0.2.tar.gz) = agLki
SHA256 (cargo/walkdir-2.0.1.tar.gz) =
QLbSAfT4mYqDcZa23pxz41rxTJksu5LEq2QdLC3OUt4=
SHA256 (cargo/winapi-0.2.8.tar.gz) =
Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo=
SHA256 (cargo/winapi-build-0.1.1.tar.gz) =
LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw=
-SHA256 (ripgrep-0.7.0.tar.gz) = XC8jnfvcWvGPUlUJB3omgm9D193k6j9+3RVuetJwY2Y=
+SHA256 (ripgrep-0.7.1.tar.gz) = 4BBpNjes67QJ89unyvWe8JPRiUozsUAVBBuNQ1R2ZfU=
SIZE (cargo/aho-corasick-0.6.3.tar.gz) = 24963
SIZE (cargo/ansi_term-0.9.0.tar.gz) = 11718
SIZE (cargo/atty-0.2.3.tar.gz) = 5486
@@ -79,4 +79,4 @@ SIZE (cargo/void-1.0.2.tar.gz) = 2356
SIZE (cargo/walkdir-2.0.1.tar.gz) = 21483
SIZE (cargo/winapi-0.2.8.tar.gz) = 455145
SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669
-SIZE (ripgrep-0.7.0.tar.gz) = 474530
+SIZE (ripgrep-0.7.1.tar.gz) = 474458