CVS commit: pkgsrc/textproc/ripgrep

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Thu Oct 25 00:35:23 UTC 2018

Modified Files:
        pkgsrc/textproc/ripgrep: Makefile

Log Message:
textproc/ripgrep: Install with cargo, rather than manually


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/ripgrep/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/ripgrep/Makefile
diff -u pkgsrc/textproc/ripgrep/Makefile:1.2 pkgsrc/textproc/ripgrep/Makefile:1.3
--- pkgsrc/textproc/ripgrep/Makefile:1.2        Fri Sep 21 21:26:33 2018
+++ pkgsrc/textproc/ripgrep/Makefile    Thu Oct 25 00:35:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/09/21 21:26:33 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2018/10/25 00:35:22 minskim Exp $
 
 GITHUB_PROJECT=        ripgrep
 DISTNAME=      0.8.1
@@ -61,18 +61,12 @@ CARGO_CRATE_DEPENDS+=               \
        fuchsia-zircon-sys-0.3.3        \
        bitflags-1.0.1
 
-CARGO_INSTALL_FILES=   rg
-
 do-build:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
 
-
-INSTALLATION_DIRS+=    bin
-
 do-install:
-.for file in ${CARGO_INSTALL_FILES}
-       ${INSTALL_PROGRAM} ${WRKSRC}/target/release/${file} ${DESTDIR}${PREFIX}/bin
-.endfor
+       cd ${WRKSRC} && ${PREFIX}/bin/cargo install --root ${DESTDIR}${PREFIX}
+       rm ${DESTDIR}${PREFIX}/.crates.toml
 
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"