CVS commit: pkgsrc/www/firefox68

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 20:19:43 UTC 2020

Modified Files:
        pkgsrc/www/firefox68: Makefile

Log Message:
firefox68: Clean up checksum SUBSTs, following lang/rust


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/firefox68/Makefile

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

Modified files:

Index: pkgsrc/www/firefox68/Makefile
diff -u pkgsrc/www/firefox68/Makefile:1.23 pkgsrc/www/firefox68/Makefile:1.24
--- pkgsrc/www/firefox68/Makefile:1.23  Sun Jun  7 10:34:43 2020
+++ pkgsrc/www/firefox68/Makefile       Sun Jun 14 20:19:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/06/07 10:34:43 nia Exp $
+# $NetBSD: Makefile,v 1.24 2020/06/14 20:19:43 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            68.9
@@ -71,27 +71,44 @@ MOZILLA_NAME=       Firefox
 MOZILLA_NAME=  Browser
 .endif
 
+#
+# Generate list of subst entries for various .cargo-checksum.json files.  These
+# are all handled together in one big substitution to simplify things rather
+# than one substitution entry per file, but are kept separate below to ease
+# updating and verification.
+#
+
+CKSUM_CRATES+= third_party/rust/libc
+
+CKSUMS+=       4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212
+CKSUMS+=       7f3da734d5e2e9426051da4f406e46d9e9bed43ed2d7d048e8afc8af7ed44795
+
+CKSUMS+=       1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e
+CKSUMS+=       6ae549dd21581748b2f1d82880eaca3445c11e3354965e5b49b20342075a3e52
+
+CKSUM_CRATES+= third_party/rust/bindgen
+
+CKSUMS+=       5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd
+CKSUMS+=       8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4
+
+CKSUMS+=       8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f
+CKSUMS+=       71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675
+
+CKSUMS+=       34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db
+CKSUMS+=       e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe
+
+SUBST_CLASSES+=                cksum
+SUBST_STAGE.cksum=     pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+=    ${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+=      -e 's,${from},${to},g'
+.endfor
+
 post-extract:
        ${CP} ${FILESDIR}/cubeb_sun.c ${WRKSRC}/media/libcubeb/src/cubeb_sun.c
        mv ${WRKSRC}/gfx/ycbcr/yuv_row_arm.s ${WRKSRC}/gfx/ycbcr/yuv_row_arm.S
-# XXX Hack taken from lang/rust.
-# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
-# Replace checksum fields for following patches:
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs,v 1.1
-       ${CP} ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json \
-             ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json.orig
-       ${CAT} ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json.orig | \
-               ${SED} -e 's/4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212/7f3da734d5e2e9426051da4f406e46d9e9bed43ed2d7d048e8afc8af7ed44795/' | \
-               ${SED} -e 's/1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e/6ae549dd21581748b2f1d82880eaca3445c11e3354965e5b49b20342075a3e52/' \
-               > ${WRKSRC}/third_party/rust/libc/.cargo-checksum.json
-       ${CP} ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json \
-               ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json.orig
-       ${CAT} ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json.orig | \
-               ${SED} -e 's/5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd/8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4/' | \
-               ${SED} -e 's/8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f/71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675/' | \
-               ${SED} -e 's/34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db/e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe/' \
-               > ${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json
 
 pre-configure:
        cd ${WRKSRC} && autoconf