CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Fri, 14 Aug 2020 11:05:01 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Aug 14 11:05:00 UTC 2020

Modified Files:
        pkgsrc/devel/cbindgen: Makefile
        pkgsrc/lang/rust: cargo.mk
        pkgsrc/sysutils/exa: Makefile
        pkgsrc/sysutils/tealdeer: Makefile
        pkgsrc/textproc/ripgrep: Makefile
        pkgsrc/www/geckodriver: Makefile
        pkgsrc/www/zola: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/cbindgen/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/rust/cargo.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/exa/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/tealdeer/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/ripgrep/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/geckodriver/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/zola/Makefile

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

Modified files:

Index: pkgsrc/devel/cbindgen/Makefile
diff -u pkgsrc/devel/cbindgen/Makefile:1.17 pkgsrc/devel/cbindgen/Makefile:1.18
--- pkgsrc/devel/cbindgen/Makefile:1.17 Fri Jul 31 01:20:43 2020
+++ pkgsrc/devel/cbindgen/Makefile      Fri Aug 14 11:04:59 2020
@@ -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 @@ CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-w
 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

Index: pkgsrc/lang/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.18 pkgsrc/lang/rust/cargo.mk:1.19
--- pkgsrc/lang/rust/cargo.mk:1.18      Thu Aug  6 11:42:56 2020
+++ pkgsrc/lang/rust/cargo.mk   Fri Aug 14 11:05:00 2020
@@ -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".
 #

Index: pkgsrc/sysutils/exa/Makefile
diff -u pkgsrc/sysutils/exa/Makefile:1.3 pkgsrc/sysutils/exa/Makefile:1.4
--- pkgsrc/sysutils/exa/Makefile:1.3    Sun Jan 19 18:20:45 2020
+++ pkgsrc/sysutils/exa/Makefile        Fri Aug 14 11:05:00 2020
@@ -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 @@ INSTALLATION_DIRS=    bin \
                        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

Index: pkgsrc/sysutils/tealdeer/Makefile
diff -u pkgsrc/sysutils/tealdeer/Makefile:1.2 pkgsrc/sysutils/tealdeer/Makefile:1.3
--- pkgsrc/sysutils/tealdeer/Makefile:1.2       Sun Jun 14 15:33:28 2020
+++ pkgsrc/sysutils/tealdeer/Makefile   Fri Aug 14 11:05:00 2020
@@ -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 @@ MAKE_ENV+=          OPENSSL_DIR=${BUILDLINK_PREF
 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/

Index: pkgsrc/textproc/ripgrep/Makefile
diff -u pkgsrc/textproc/ripgrep/Makefile:1.8 pkgsrc/textproc/ripgrep/Makefile:1.9
--- pkgsrc/textproc/ripgrep/Makefile:1.8        Sun Jan 19 18:20:46 2020
+++ pkgsrc/textproc/ripgrep/Makefile    Fri Aug 14 11:05:00 2020
@@ -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 @@ CARGO_CRATE_DEPENDS+= wincolor-1.0.1
 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

Index: pkgsrc/www/geckodriver/Makefile
diff -u pkgsrc/www/geckodriver/Makefile:1.11 pkgsrc/www/geckodriver/Makefile:1.12
--- pkgsrc/www/geckodriver/Makefile:1.11        Sun Jun 14 15:33:29 2020
+++ pkgsrc/www/geckodriver/Makefile     Fri Aug 14 11:05:00 2020
@@ -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 @@ post-extract:
        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

Index: pkgsrc/www/zola/Makefile
diff -u pkgsrc/www/zola/Makefile:1.4 pkgsrc/www/zola/Makefile:1.5
--- pkgsrc/www/zola/Makefile:1.4        Tue Jun 16 17:14:43 2020
+++ pkgsrc/www/zola/Makefile    Fri Aug 14 11:05:00 2020
@@ -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 @@ INSTALLATION_DIRS=  bin
 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

Prev by Date: CVS commit: pkgsrc/devel/boost-libs
Next by Date: CVS commit: pkgsrc/net/lftp
Previous by Thread: CVS commit: pkgsrc/devel/boost-libs
Next by Thread: CVS commit: pkgsrc/net/lftp
Indexes:

Home | Main Index | Thread Index | Old Index