2 files changed, 20 insertions, 28 deletions

diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile
index 9180703df9e5..0212a0536100 100644
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@@ -4,7 +4,7 @@
 # vim: ts=8 noet
 
 PORTNAME=	ripgrep
-DISTVERSION=	0.8.0
+DISTVERSION=	0.8.1
 CATEGORIES=	textproc
 
 MAINTAINER=	petteri.valkonen@iki.fi
@@ -27,7 +27,7 @@ CARGO_CRATES=	aho-corasick-0.6.4 \
 		bitflags-1.0.1 \
 		bytecount-0.3.1 \
 		cfg-if-0.1.2 \
-		clap-2.29.4 \
+		clap-2.30.0 \
 		crossbeam-0.3.2 \
 		encoding_rs-0.7.2 \
 		fnv-1.0.6 \
@@ -57,7 +57,7 @@ CARGO_CRATES=	aho-corasick-0.6.4 \
 		unreachable-1.0.0 \
 		utf8-ranges-1.0.0 \
 		void-1.0.2 \
-		walkdir-2.1.3 \
+		walkdir-2.1.4 \
 		winapi-0.3.4 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
@@ -66,11 +66,14 @@ RIPGREP_OUTDIR=	${WRKDIR}/cargo-out
 CARGO_ENV=	RIPGREP_OUTDIR=${RIPGREP_OUTDIR}
 
 PLIST_FILES=	bin/rg \
-		man/man1/rg.1.gz
+		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
 
-OPTIONS_DEFINE=	BASH DOCS FISH SIMD ZSH
-OPTIONS_DEFAULT=BASH FISH ZSH
+OPTIONS_DEFINE=	DOCS SIMD
 
 OPTIONS_DEFINE_amd64=	AVX
 OPTIONS_DEFINE_i386=	AVX
@@ -84,9 +87,6 @@ AVX_DESC=	${SSE_DESC:S/SSE/AVX/}
 AVX_VARS=	CARGO_FEATURES+=avx-accel RUSTFLAGS+="-C target-feature=+avx"
 AVX_IMPLIES=	SIMD
 
-BASH_PLIST_FILES=	etc/bash_completion.d/rg.bash
-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.
@@ -94,32 +94,24 @@ SIMD_MAKE_ENV=	RUSTC_BOOTSTRAP=1
 SIMD_VARS=	CARGO_FEATURES+=simd-accel ${SIMD_VARS_${ARCH}}
 SIMD_VARS_i386=	RUSTFLAGS+="-C target-feature=+sse2"
 
-ZSH_PLIST_FILES=	share/zsh/site-functions/_rg
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|OUT_DIR|RIPGREP_OUTDIR|' ${WRKSRC}/build.rs
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rg
 	${INSTALL_MAN} ${RIPGREP_OUTDIR}/rg.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 	${INSTALL_DATA} ${RIPGREP_OUTDIR}/rg.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
-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} ${WRKSRC}/complete/_rg \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/textproc/ripgrep/distinfo b/textproc/ripgrep/distinfo
index a3fb1be02989..0f0d60ef620a 100644
--- a/textproc/ripgrep/distinfo
+++ b/textproc/ripgrep/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1518468285
+TIMESTAMP = 1519506277
 SHA256 (rust/crates/aho-corasick-0.6.4.tar.gz) = d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4
 SIZE (rust/crates/aho-corasick-0.6.4.tar.gz) = 25443
 SHA256 (rust/crates/ansi_term-0.10.2.tar.gz) = 6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455
@@ -11,8 +11,8 @@ SHA256 (rust/crates/bytecount-0.3.1.tar.gz) = 882585cd7ec84e902472df34a5e0189120
 SIZE (rust/crates/bytecount-0.3.1.tar.gz) = 12347
 SHA256 (rust/crates/cfg-if-0.1.2.tar.gz) = d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de
 SIZE (rust/crates/cfg-if-0.1.2.tar.gz) = 6668
-SHA256 (rust/crates/clap-2.29.4.tar.gz) = 7b8f59bcebcfe4269b09f71dab0da15b355c75916a8f975d3876ce81561893ee
-SIZE (rust/crates/clap-2.29.4.tar.gz) = 190160
+SHA256 (rust/crates/clap-2.30.0.tar.gz) = 1c07b9257a00f3fc93b7f3c417fc15607ec7a56823bc2c37ec744e266387de5b
+SIZE (rust/crates/clap-2.30.0.tar.gz) = 190562
 SHA256 (rust/crates/crossbeam-0.3.2.tar.gz) = 24ce9782d4d5c53674646a6a4c1863a21a8fc0cb649b3c94dfc16e45071dea19
 SIZE (rust/crates/crossbeam-0.3.2.tar.gz) = 33440
 SHA256 (rust/crates/encoding_rs-0.7.2.tar.gz) = 98fd0f24d1fb71a4a6b9330c8ca04cbd4e7cc5d846b54ca74ff376bc7c9f798d
@@ -71,13 +71,13 @@ SHA256 (rust/crates/utf8-ranges-1.0.0.tar.gz) = 662fab6525a98beff2921d7f61a39e7d
 SIZE (rust/crates/utf8-ranges-1.0.0.tar.gz) = 8599
 SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d
 SIZE (rust/crates/void-1.0.2.tar.gz) = 2356
-SHA256 (rust/crates/walkdir-2.1.3.tar.gz) = b167e9a4420d8dddb260e70c90a4a375a1e5691f21f70e715553da87b6c2503a
-SIZE (rust/crates/walkdir-2.1.3.tar.gz) = 22544
+SHA256 (rust/crates/walkdir-2.1.4.tar.gz) = 63636bd0eb3d00ccb8b9036381b526efac53caf112b7783b730ab3f8e44da369
+SIZE (rust/crates/walkdir-2.1.4.tar.gz) = 22695
 SHA256 (rust/crates/winapi-0.3.4.tar.gz) = 04e3bd221fcbe8a271359c04f21a76db7d0c6028862d1bb5512d85e1e2eb5bb3
 SIZE (rust/crates/winapi-0.3.4.tar.gz) = 905247
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (BurntSushi-ripgrep-0.8.0_GH0.tar.gz) = c26391013522dfce3d870aec911fc602425e2eb385b75802b5b44440f4c32e24
-SIZE (BurntSushi-ripgrep-0.8.0_GH0.tar.gz) = 518238
+SHA256 (BurntSushi-ripgrep-0.8.1_GH0.tar.gz) = 7035379fce0c1e32552e8ee528b92c3d01b8d3935ea31d26c51a73287be74bb3
+SIZE (BurntSushi-ripgrep-0.8.1_GH0.tar.gz) = 521088