[pkgsrc/trunk]: pkgsrc rust/cargo: replace "--frozen --locked" with "--offlin...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/35cfbc85b2fd
branches:  trunk
changeset: 437008:35cfbc85b2fd
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Aug 14 11:04:59 2020 +0000

description:
rust/cargo: replace "--frozen --locked" with "--offline" in various places

The intent of "--frozen --locked" was to not use the network, but the new
"--offline" option is better suited for this purpose.
It for example allows us to patch Cargo.toml if necessary without having
to regen checksums.

diffstat:

 devel/cbindgen/Makefile    |  4 ++--
 lang/rust/cargo.mk         |  6 +++---
 sysutils/exa/Makefile      |  4 ++--
 sysutils/tealdeer/Makefile |  4 ++--
 textproc/ripgrep/Makefile  |  4 ++--
 www/geckodriver/Makefile   |  4 ++--
 www/zola/Makefile          |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diffs (131 lines):

diff -r 67653bd816da -r 35cfbc85b2fd devel/cbindgen/Makefile
--- a/devel/cbindgen/Makefile   Fri Aug 14 10:54:52 2020 +0000
+++ b/devel/cbindgen/Makefile   Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/07/31 01:20:43 maya Exp $
+# $NetBSD: Makefile,v 1.18 2020/08/14 11:04:59 tnn Exp $
 
 DISTNAME=      cbindgen-0.14.3
 CATEGORIES=    devel
@@ -50,7 +50,7 @@
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin
diff -r 67653bd816da -r 35cfbc85b2fd lang/rust/cargo.mk
--- a/lang/rust/cargo.mk        Fri Aug 14 10:54:52 2020 +0000
+++ b/lang/rust/cargo.mk        Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.18 2020/08/06 11:42:56 jperkin Exp $
+# $NetBSD: cargo.mk,v 1.19 2020/08/14 11:05:00 tnn Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -10,11 +10,11 @@
 # CARGO_CRATE_DEPENDS+=        sha1-0.20
 # .include "../../lang/rust/cargo.mk"
 # do-build:
-#      cargo build --locked --frozen
+#      cargo build --offline
 #
 #
 # If modifying the list of dependencies, re-run the build once without
-# --locked --frozen to generate a new valid Cargo.lock.
+# --offline to generate a new valid Cargo.lock.
 #
 # a list of CARGO_CRATE_DEPENDS can be generated via "make show-cargo-depends".
 #
diff -r 67653bd816da -r 35cfbc85b2fd sysutils/exa/Makefile
--- a/sysutils/exa/Makefile     Fri Aug 14 10:54:52 2020 +0000
+++ b/sysutils/exa/Makefile     Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/19 18:20:45 maya Exp $
+# $NetBSD: Makefile,v 1.4 2020/08/14 11:05:00 tnn Exp $
 
 DISTNAME=      exa-0.9.0
 CATEGORIES=    sysutils
@@ -85,7 +85,7 @@
                        share/zsh/site-functions
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin
diff -r 67653bd816da -r 35cfbc85b2fd sysutils/tealdeer/Makefile
--- a/sysutils/tealdeer/Makefile        Fri Aug 14 10:54:52 2020 +0000
+++ b/sysutils/tealdeer/Makefile        Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/06/14 15:33:28 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/08/14 11:05:00 tnn Exp $
 
 DISTNAME=      tealdeer-1.3.0
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -183,7 +183,7 @@
 INSTALLATION_DIRS=     bin share/bash-completion/completions
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/tldr ${DESTDIR}${PREFIX}/bin/
diff -r 67653bd816da -r 35cfbc85b2fd textproc/ripgrep/Makefile
--- a/textproc/ripgrep/Makefile Fri Aug 14 10:54:52 2020 +0000
+++ b/textproc/ripgrep/Makefile Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/01/19 18:20:46 maya Exp $
+# $NetBSD: Makefile,v 1.9 2020/08/14 11:05:00 tnn Exp $
 
 DISTNAME=      ripgrep-11.0.2
 CATEGORIES=    textproc
@@ -79,7 +79,7 @@
 INSTALLATION_DIRS=     bin
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin
diff -r 67653bd816da -r 35cfbc85b2fd www/geckodriver/Makefile
--- a/www/geckodriver/Makefile  Fri Aug 14 10:54:52 2020 +0000
+++ b/www/geckodriver/Makefile  Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/06/14 15:33:29 nia Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/14 11:05:00 tnn Exp $
 
 DISTNAME=      geckodriver-0.24.0
 CATEGORIES=    www
@@ -170,7 +170,7 @@
        cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin
diff -r 67653bd816da -r 35cfbc85b2fd www/zola/Makefile
--- a/www/zola/Makefile Fri Aug 14 10:54:52 2020 +0000
+++ b/www/zola/Makefile Fri Aug 14 11:04:59 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/06/16 17:14:43 nikita Exp $
+# $NetBSD: Makefile,v 1.5 2020/08/14 11:05:00 tnn Exp $
 
 DISTNAME=      zola-0.11.0
 PKGREVISION=   1
@@ -324,7 +324,7 @@
 MAKE_ENV+=             OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N}
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/target/release/zola ${DESTDIR}${PREFIX}/bin