On Sat, Feb 08, 2020 at 12:09:47AM +0100, Björn Ketelaars wrote:
> On Fri 07/02/2020 20:16, Henrik Friedrichsen wrote:
> > Attached diff updates audio/ncspot to 0.1.2.
> >
> > OK?
>
> Is there a reason for dropping the license markers after
> MODCARGO_CRATES? If I'm not mistaken, these markers should be generated
> using 'make modcargo-gen-crates-licenses'.
>
'make modcargo-gen-crates-licenses' should generate them, but... Cargo.lock
format changed recently, and 'make modcargo-gen-crates-licenses' is broken with
the new format.
Henrik, could you try with the following diff ?
diff 6821f85e625acb4795498d6bad849cd0ce9645f5 /home/semarie/repos/openbsd/ports
blob - 77a89fa307c42326d5cf314cd37a95606cbfe295
file + devel/cargo/cargo.port.mk
--- devel/cargo/cargo.port.mk
+++ devel/cargo/cargo.port.mk
@@ -226,7 +226,7 @@ _modcargo-metadata:
# modcargo-gen-crates will output crates list from Cargo.lock file.
modcargo-gen-crates: extract
- @awk '/"checksum / { print "MODCARGO_CRATES += " $$2 " " $$3 }' \
+ @awk '/^name = / { n=$$3; gsub("\"", "", n); } /^version = / { v=$$3;
gsub("\"", "", v); print "MODCARGO_CRATES += " n " " v; }' \
<${MODCARGO_CARGOTOML:toml=lock}
# modcargo-gen-crates-licenses will try to grab license information from
downloaded crates.
--
Sebastien Marie
