Received: by mail.netbsd.org (Postfix, from userid 605) id 0E41484DF5; Thu, 25 Oct 2018 00:35:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0B7D584DF3 for ; Thu, 25 Oct 2018 00:35:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hck16HZQ28Qu for ; Thu, 25 Oct 2018 00:35:23 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3136A84DD9 for ; Thu, 25 Oct 2018 00:35:23 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2394EFBEE; Thu, 25 Oct 2018 00:35:23 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1540427723186900" MIME-Version: 1.0 Date: Thu, 25 Oct 2018 00:35:23 +0000 From: "Min Sik Kim" Subject: CVS commit: pkgsrc/textproc/ripgrep To: pkgsrc-changes@NetBSD.org Reply-To: minskim@netbsd.org X-Mailer: log_accum Message-Id: <20181025003523.2394EFBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1540427723186900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1540427723186900 Content-Disposition: inline Content-Length: 1025 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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" --_----------=_1540427723186900--