Fri Aug 14 11:05:00 2020 UTC ()
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.


(tnn)
diff -r1.17 -r1.18 pkgsrc/devel/cbindgen/Makefile
diff -r1.18 -r1.19 pkgsrc/lang/rust/cargo.mk
diff -r1.3 -r1.4 pkgsrc/sysutils/exa/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/tealdeer/Makefile
diff -r1.8 -r1.9 pkgsrc/textproc/ripgrep/Makefile
diff -r1.11 -r1.12 pkgsrc/www/geckodriver/Makefile
diff -r1.4 -r1.5 pkgsrc/www/zola/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/devel/cbindgen/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cbindgen/Makefile 2020/07/31 01:20:43 1.17
+++ pkgsrc/devel/cbindgen/Makefile 2020/08/14 11:04:59 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2020/07/31 01:20:43 maya Exp $ 1# $NetBSD: Makefile,v 1.18 2020/08/14 11:04:59 tnn Exp $
2 2
3DISTNAME= cbindgen-0.14.3 3DISTNAME= cbindgen-0.14.3
4CATEGORIES= devel 4CATEGORIES= devel
5EXTRACT_SUFX= .crate 5EXTRACT_SUFX= .crate
6 6
7MAINTAINER= ryoon@NetBSD.org 7MAINTAINER= ryoon@NetBSD.org
8HOMEPAGE= https://github.com/eqrion/cbindgen/releases 8HOMEPAGE= https://github.com/eqrion/cbindgen/releases
9COMMENT= Generating C bindings from Rust code 9COMMENT= Generating C bindings from Rust code
10LICENSE= mpl-2.0 10LICENSE= mpl-2.0
11 11
12CARGO_CRATE_DEPENDS+= ansi_term-0.11.0 12CARGO_CRATE_DEPENDS+= ansi_term-0.11.0
13CARGO_CRATE_DEPENDS+= atty-0.2.13 13CARGO_CRATE_DEPENDS+= atty-0.2.13
14CARGO_CRATE_DEPENDS+= bitflags-1.2.1 14CARGO_CRATE_DEPENDS+= bitflags-1.2.1
@@ -40,21 +40,21 @@ CARGO_CRATE_DEPENDS+= textwrap-0.11.0 @@ -40,21 +40,21 @@ CARGO_CRATE_DEPENDS+= textwrap-0.11.0
40CARGO_CRATE_DEPENDS+= toml-0.5.5 40CARGO_CRATE_DEPENDS+= toml-0.5.5
41CARGO_CRATE_DEPENDS+= unicode-segmentation-1.6.0 41CARGO_CRATE_DEPENDS+= unicode-segmentation-1.6.0
42CARGO_CRATE_DEPENDS+= unicode-width-0.1.7 42CARGO_CRATE_DEPENDS+= unicode-width-0.1.7
43CARGO_CRATE_DEPENDS+= unicode-xid-0.2.0 43CARGO_CRATE_DEPENDS+= unicode-xid-0.2.0
44CARGO_CRATE_DEPENDS+= vec_map-0.8.1 44CARGO_CRATE_DEPENDS+= vec_map-0.8.1
45CARGO_CRATE_DEPENDS+= wasi-0.7.0 45CARGO_CRATE_DEPENDS+= wasi-0.7.0
46CARGO_CRATE_DEPENDS+= winapi-0.3.8 46CARGO_CRATE_DEPENDS+= winapi-0.3.8
47CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0 47CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
48CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 48CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
49 49
50INSTALLATION_DIRS= bin 50INSTALLATION_DIRS= bin
51 51
52do-build: 52do-build:
53 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 53 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
54 54
55do-install: 55do-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin 56 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/cbindgen ${DESTDIR}${PREFIX}/bin
57 57
58RUST_RUNTIME= yes 58RUST_RUNTIME= yes
59.include "../../lang/rust/cargo.mk" 59.include "../../lang/rust/cargo.mk"
60.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/lang/rust/cargo.mk (expand / switch to unified diff)

--- pkgsrc/lang/rust/cargo.mk 2020/08/06 11:42:56 1.18
+++ pkgsrc/lang/rust/cargo.mk 2020/08/14 11:05:00 1.19
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: cargo.mk,v 1.18 2020/08/06 11:42:56 jperkin Exp $ 1# $NetBSD: cargo.mk,v 1.19 2020/08/14 11:05:00 tnn Exp $
2# 2#
3# Common logic that can be used by packages that depend on cargo crates 3# Common logic that can be used by packages that depend on cargo crates
4# from crates.io. This lets existing pkgsrc infrastructure fetch and verify 4# from crates.io. This lets existing pkgsrc infrastructure fetch and verify
5# cargo crates instead of using the rust package manager in the build phase. 5# cargo crates instead of using the rust package manager in the build phase.
6# Inspired by cargo.mk from FreeBSD ports. 6# Inspired by cargo.mk from FreeBSD ports.
7# 7#
8# Usage example: 8# Usage example:
9# 9#
10# CARGO_CRATE_DEPENDS+= sha1-0.20 10# CARGO_CRATE_DEPENDS+= sha1-0.20
11# .include "../../lang/rust/cargo.mk" 11# .include "../../lang/rust/cargo.mk"
12# do-build: 12# do-build:
13# cargo build --locked --frozen 13# cargo build --offline
14# 14#
15# 15#
16# If modifying the list of dependencies, re-run the build once without 16# If modifying the list of dependencies, re-run the build once without
17# --locked --frozen to generate a new valid Cargo.lock. 17# --offline to generate a new valid Cargo.lock.
18# 18#
19# a list of CARGO_CRATE_DEPENDS can be generated via "make show-cargo-depends". 19# a list of CARGO_CRATE_DEPENDS can be generated via "make show-cargo-depends".
20# 20#
21# See also www/geckodriver for a full example. 21# See also www/geckodriver for a full example.
22 22
23MASTER_SITES?= -${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download 23MASTER_SITES?= -${MASTER_SITE_CRATESIO}${PKGBASE}/${PKGVERSION_NOREV}/download
24 24
25.include "../../lang/rust/rust.mk" 25.include "../../lang/rust/rust.mk"
26 26
27USE_TOOLS+= bsdtar digest 27USE_TOOLS+= bsdtar digest
28CARGO_VENDOR_DIR= ${WRKDIR}/vendor 28CARGO_VENDOR_DIR= ${WRKDIR}/vendor
29 29
30DISTFILES?= ${DEFAULT_DISTFILES} 30DISTFILES?= ${DEFAULT_DISTFILES}
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/exa/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/exa/Makefile 2020/01/19 18:20:45 1.3
+++ pkgsrc/sysutils/exa/Makefile 2020/08/14 11:05:00 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2020/01/19 18:20:45 maya Exp $ 1# $NetBSD: Makefile,v 1.4 2020/08/14 11:05:00 tnn Exp $
2 2
3DISTNAME= exa-0.9.0 3DISTNAME= exa-0.9.0
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_GITHUB:=ogham/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=ogham/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7DIST_SUBDIR= ${PKGBASE} 7DIST_SUBDIR= ${PKGBASE}
8EXTRACT_USING= bsdtar 8EXTRACT_USING= bsdtar
9 9
10MAINTAINER= fox@NetBSD.org 10MAINTAINER= fox@NetBSD.org
11HOMEPAGE= https://the.exa.website/ 11HOMEPAGE= https://the.exa.website/
12COMMENT= Replacement for ls(1) written in Rust 12COMMENT= Replacement for ls(1) written in Rust
13LICENSE= mit 13LICENSE= mit
14 14
@@ -75,27 +75,27 @@ CARGO_CRATE_DEPENDS+= winapi-build-0.1.1 @@ -75,27 +75,27 @@ CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
75CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0 75CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
76CARGO_CRATE_DEPENDS+= winapi-util-0.1.2 76CARGO_CRATE_DEPENDS+= winapi-util-0.1.2
77CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 77CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
78CARGO_CRATE_DEPENDS+= wincolor-1.0.1 78CARGO_CRATE_DEPENDS+= wincolor-1.0.1
79CARGO_CRATE_DEPENDS+= zoneinfo_compiled-0.4.8 79CARGO_CRATE_DEPENDS+= zoneinfo_compiled-0.4.8
80 80
81INSTALLATION_DIRS= bin \ 81INSTALLATION_DIRS= bin \
82 ${PKGMANDIR}/man1 \ 82 ${PKGMANDIR}/man1 \
83 share/bash-completion/completions \ 83 share/bash-completion/completions \
84 share/fish/vendor_completions.d \ 84 share/fish/vendor_completions.d \
85 share/zsh/site-functions 85 share/zsh/site-functions
86 86
87do-build: 87do-build:
88 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 88 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
89 89
90do-install: 90do-install:
91 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin 91 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/exa ${DESTDIR}${PREFIX}/bin
92 ${INSTALL_MAN} ${WRKSRC}/contrib/man/exa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 92 ${INSTALL_MAN} ${WRKSRC}/contrib/man/exa.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
93 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash \ 93 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.bash \
94 ${DESTDIR}${PREFIX}/share/bash-completion/completions/exa 94 ${DESTDIR}${PREFIX}/share/bash-completion/completions/exa
95 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish \ 95 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.fish \
96 ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/exa.fish 96 ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/exa.fish
97 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh \ 97 ${INSTALL_DATA} ${WRKSRC}/contrib/completions.zsh \
98 ${DESTDIR}${PREFIX}/share/zsh/site-functions/_exa 98 ${DESTDIR}${PREFIX}/share/zsh/site-functions/_exa
99 99
100 100
101.include "../../lang/rust/cargo.mk" 101.include "../../lang/rust/cargo.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/tealdeer/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/tealdeer/Makefile 2020/06/14 15:33:28 1.2
+++ pkgsrc/sysutils/tealdeer/Makefile 2020/08/14 11:05:00 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2020/06/14 15:33:28 nia Exp $ 1# $NetBSD: Makefile,v 1.3 2020/08/14 11:05:00 tnn Exp $
2 2
3DISTNAME= tealdeer-1.3.0 3DISTNAME= tealdeer-1.3.0
4GITHUB_TAG= v${PKGVERSION_NOREV} 4GITHUB_TAG= v${PKGVERSION_NOREV}
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_GITHUB:=dbrgn/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=dbrgn/}
7 7
8MAINTAINER= bsiegert@NetBSD.org 8MAINTAINER= bsiegert@NetBSD.org
9HOMEPAGE= https://github.com/dbrgn/tealdeer/ 9HOMEPAGE= https://github.com/dbrgn/tealdeer/
10COMMENT= Simplified, example based and community-driven man pages 10COMMENT= Simplified, example based and community-driven man pages
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13USE_LANGUAGES= c # rust 13USE_LANGUAGES= c # rust
14 14
@@ -173,22 +173,22 @@ CARGO_CRATE_DEPENDS+= winapi-build-0.1.1 @@ -173,22 +173,22 @@ CARGO_CRATE_DEPENDS+= winapi-build-0.1.1
173CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0 173CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
174CARGO_CRATE_DEPENDS+= winapi-util-0.1.3 174CARGO_CRATE_DEPENDS+= winapi-util-0.1.3
175CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 175CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
176CARGO_CRATE_DEPENDS+= winreg-0.6.2 176CARGO_CRATE_DEPENDS+= winreg-0.6.2
177CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1 177CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
178CARGO_CRATE_DEPENDS+= xattr-0.2.2 178CARGO_CRATE_DEPENDS+= xattr-0.2.2
179CARGO_CRATE_DEPENDS+= xdg-2.2.0 179CARGO_CRATE_DEPENDS+= xdg-2.2.0
180 180
181MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q} 181MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
182 182
183INSTALLATION_DIRS= bin share/bash-completion/completions 183INSTALLATION_DIRS= bin share/bash-completion/completions
184 184
185do-build: 185do-build:
186 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 186 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
187 187
188do-install: 188do-install:
189 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/tldr ${DESTDIR}${PREFIX}/bin/ 189 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/tldr ${DESTDIR}${PREFIX}/bin/
190 ${INSTALL_DATA} ${WRKSRC}/bash_tealdeer ${DESTDIR}${PREFIX}/share/bash-completion/completions/tldr 190 ${INSTALL_DATA} ${WRKSRC}/bash_tealdeer ${DESTDIR}${PREFIX}/share/bash-completion/completions/tldr
191 191
192.include "../../lang/rust/cargo.mk" 192.include "../../lang/rust/cargo.mk"
193.include "../../security/openssl/buildlink3.mk" 193.include "../../security/openssl/buildlink3.mk"
194.include "../../mk/bsd.pkg.mk" 194.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/textproc/ripgrep/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ripgrep/Makefile 2020/01/19 18:20:46 1.8
+++ pkgsrc/textproc/ripgrep/Makefile 2020/08/14 11:05:00 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2020/01/19 18:20:46 maya Exp $ 1# $NetBSD: Makefile,v 1.9 2020/08/14 11:05:00 tnn Exp $
2 2
3DISTNAME= ripgrep-11.0.2 3DISTNAME= ripgrep-11.0.2
4CATEGORIES= textproc 4CATEGORIES= textproc
5EXTRACT_SUFX= .crate 5EXTRACT_SUFX= .crate
6 6
7MAINTAINER= maya@NetBSD.org 7MAINTAINER= maya@NetBSD.org
8HOMEPAGE= https://github.com/BurntSushi/ripgrep/ 8HOMEPAGE= https://github.com/BurntSushi/ripgrep/
9COMMENT= Line-oriented search tool 9COMMENT= Line-oriented search tool
10LICENSE= unlicense 10LICENSE= unlicense
11 11
12WRKSRC= ${WRKDIR}/${PKGNAME} 12WRKSRC= ${WRKDIR}/${PKGNAME}
13USE_LANGUAGES= c 13USE_LANGUAGES= c
14 14
@@ -69,20 +69,20 @@ CARGO_CRATE_DEPENDS+= ucd-util-0.1.5 @@ -69,20 +69,20 @@ CARGO_CRATE_DEPENDS+= ucd-util-0.1.5
69CARGO_CRATE_DEPENDS+= unicode-width-0.1.5 69CARGO_CRATE_DEPENDS+= unicode-width-0.1.5
70CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0 70CARGO_CRATE_DEPENDS+= unicode-xid-0.1.0
71CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.3 71CARGO_CRATE_DEPENDS+= utf8-ranges-1.0.3
72CARGO_CRATE_DEPENDS+= walkdir-2.2.9 72CARGO_CRATE_DEPENDS+= walkdir-2.2.9
73CARGO_CRATE_DEPENDS+= winapi-0.3.7 73CARGO_CRATE_DEPENDS+= winapi-0.3.7
74CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0 74CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
75CARGO_CRATE_DEPENDS+= winapi-util-0.1.2 75CARGO_CRATE_DEPENDS+= winapi-util-0.1.2
76CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 76CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
77CARGO_CRATE_DEPENDS+= wincolor-1.0.1 77CARGO_CRATE_DEPENDS+= wincolor-1.0.1
78 78
79INSTALLATION_DIRS= bin 79INSTALLATION_DIRS= bin
80 80
81do-build: 81do-build:
82 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 82 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
83 83
84do-install: 84do-install:
85 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin 85 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/rg ${DESTDIR}${PREFIX}/bin
86 86
87.include "../../lang/rust/cargo.mk" 87.include "../../lang/rust/cargo.mk"
88.include "../../mk/bsd.pkg.mk" 88.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/www/geckodriver/Makefile (expand / switch to unified diff)

--- pkgsrc/www/geckodriver/Makefile 2020/06/14 15:33:29 1.11
+++ pkgsrc/www/geckodriver/Makefile 2020/08/14 11:05:00 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2020/06/14 15:33:29 nia Exp $ 1# $NetBSD: Makefile,v 1.12 2020/08/14 11:05:00 tnn Exp $
2 2
3DISTNAME= geckodriver-0.24.0 3DISTNAME= geckodriver-0.24.0
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_GITHUB:=mozilla/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mozilla/}
6GITHUB_PROJECT= geckodriver 6GITHUB_PROJECT= geckodriver
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= https://github.com/mozilla/geckodriver/ 10HOMEPAGE= https://github.com/mozilla/geckodriver/
11COMMENT= W3C WebDriver-compatible proxy for Gecko-based browsers 11COMMENT= W3C WebDriver-compatible proxy for Gecko-based browsers
12LICENSE= mpl-1.1 12LICENSE= mpl-1.1
13 13
14CARGO_CRATE_DEPENDS+= adler32-1.0.3 14CARGO_CRATE_DEPENDS+= adler32-1.0.3
@@ -160,20 +160,20 @@ CARGO_CRATE_DEPENDS+= winapi-i686-pc-win @@ -160,20 +160,20 @@ CARGO_CRATE_DEPENDS+= winapi-i686-pc-win
160CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 160CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
161CARGO_CRATE_DEPENDS+= winreg-0.5.1 161CARGO_CRATE_DEPENDS+= winreg-0.5.1
162CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1 162CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
163CARGO_CRATE_DEPENDS+= zip-0.4.2 163CARGO_CRATE_DEPENDS+= zip-0.4.2
164 164
165INSTALLATION_DIRS= bin 165INSTALLATION_DIRS= bin
166 166
167# Mozilla stopped providing a standalone Cargo.lock for geckodriver. 167# Mozilla stopped providing a standalone Cargo.lock for geckodriver.
168# So, we have to maintain a local copy. 168# So, we have to maintain a local copy.
169post-extract: 169post-extract:
170 cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock 170 cp ${FILESDIR}/Cargo.lock ${WRKSRC}/Cargo.lock
171 171
172do-build: 172do-build:
173 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 173 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
174 174
175do-install: 175do-install:
176 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin 176 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/geckodriver ${DESTDIR}${PREFIX}/bin
177 177
178.include "../../lang/rust/cargo.mk" 178.include "../../lang/rust/cargo.mk"
179.include "../../mk/bsd.pkg.mk" 179.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/www/zola/Makefile (expand / switch to unified diff)

--- pkgsrc/www/zola/Makefile 2020/06/16 17:14:43 1.4
+++ pkgsrc/www/zola/Makefile 2020/08/14 11:05:00 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2020/06/16 17:14:43 nikita Exp $ 1# $NetBSD: Makefile,v 1.5 2020/08/14 11:05:00 tnn Exp $
2 2
3DISTNAME= zola-0.11.0 3DISTNAME= zola-0.11.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_GITHUB:=getzola/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=getzola/}
7GITHUB_PROJECT= zola 7GITHUB_PROJECT= zola
8GITHUB_TAG= v0.11.0 8GITHUB_TAG= v0.11.0
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.getzola.org/ 11HOMEPAGE= https://www.getzola.org/
12COMMENT= Static website generator 12COMMENT= Static website generator
13LICENSE= mit 13LICENSE= mit
14USE_LANGUAGES+= c c++ 14USE_LANGUAGES+= c c++
@@ -314,21 +314,21 @@ CARGO_CRATE_DEPENDS+= winapi-util-0.1.5 @@ -314,21 +314,21 @@ CARGO_CRATE_DEPENDS+= winapi-util-0.1.5
314CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0 314CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
315CARGO_CRATE_DEPENDS+= winreg-0.6.2 315CARGO_CRATE_DEPENDS+= winreg-0.6.2
316CARGO_CRATE_DEPENDS+= ws-0.9.1 316CARGO_CRATE_DEPENDS+= ws-0.9.1
317CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1 317CARGO_CRATE_DEPENDS+= ws2_32-sys-0.2.1
318CARGO_CRATE_DEPENDS+= xml-rs-0.8.3 318CARGO_CRATE_DEPENDS+= xml-rs-0.8.3
319CARGO_CRATE_DEPENDS+= xml5ever-0.16.1 319CARGO_CRATE_DEPENDS+= xml5ever-0.16.1
320CARGO_CRATE_DEPENDS+= yaml-rust-0.4.3 320CARGO_CRATE_DEPENDS+= yaml-rust-0.4.3
321 321
322INSTALLATION_DIRS= bin 322INSTALLATION_DIRS= bin
323 323
324MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q} 324MAKE_ENV+= OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
325 325
326do-build: 326do-build:
327 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release -j${_MAKE_JOBS_N} 327 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --offline --release -j${_MAKE_JOBS_N}
328 328
329do-install: 329do-install:
330 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/zola ${DESTDIR}${PREFIX}/bin 330 ${INSTALL_PROGRAM} ${WRKSRC}/target/release/zola ${DESTDIR}${PREFIX}/bin
331 331
332.include "../../lang/rust/cargo.mk" 332.include "../../lang/rust/cargo.mk"
333.include "../../security/openssl/buildlink3.mk" 333.include "../../security/openssl/buildlink3.mk"
334.include "../../mk/bsd.pkg.mk" 334.include "../../mk/bsd.pkg.mk"