CVS commit: pkgsrc/mail/thunderbird

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 15 08:31:19 UTC 2020

Modified Files:
        pkgsrc/mail/thunderbird: Makefile

Log Message:
thunderbird: sync cargo cksum bits with lang/rust


To generate a diff of this commit:
cvs rdiff -u -r1.248 -r1.249 pkgsrc/mail/thunderbird/Makefile

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

Modified files:

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.248 pkgsrc/mail/thunderbird/Makefile:1.249
--- pkgsrc/mail/thunderbird/Makefile:1.248      Sun Jun  7 10:30:38 2020
+++ pkgsrc/mail/thunderbird/Makefile    Mon Jun 15 08:31:19 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.248 2020/06/07 10:30:38 nia Exp $
+# $NetBSD: Makefile,v 1.249 2020/06/15 08:31:19 nia Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
@@ -44,17 +44,37 @@ LDFLAGS+=           ${COMPILER_RPATH_FLAG}${PREFI
 CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/toolkit/content/global/buildconfig.html
 CHECK_WRKREF_SKIP+=    lib/${MOZILLA}/chrome/messenger/content/messenger/buildconfig.html
 
+#
+# 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/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}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \
                ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.S
-       ${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} && mkdir ${OBJDIR}