CVS commit: [pkgsrc-2021Q2] pkgsrc/lang/rust-bin

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Thu Jul 15 11:29:20 UTC 2021

Modified Files:
        pkgsrc/lang/rust-bin [pkgsrc-2021Q2]: Makefile

Log Message:
Pullup ticket #6487 - requested by he
lang/rust-bin: build fix

Revisions pulled up:
- lang/rust-bin/Makefile                                        1.24

---
   Module Name: pkgsrc
   Committed By:        he
   Date:                Sun Jul 11 22:25:10 UTC 2021

   Modified Files:
        pkgsrc/lang/rust-bin: Makefile

   Log Message:
   Correct the names for the NetBSD versions to use.

   This uses the faster "install.sh" script, and also omits the
   "rust-doc" subset, for a much faster installation.

   This is a temporary hack for this version, will be removed on
   the next go-around.

   Apologies for this going un-committed, only myself to blame.
   Should fix part of PR#56304.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 pkgsrc/lang/rust-bin/Makefile

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

Modified files:

Index: pkgsrc/lang/rust-bin/Makefile
diff -u pkgsrc/lang/rust-bin/Makefile:1.23 pkgsrc/lang/rust-bin/Makefile:1.23.2.1
--- pkgsrc/lang/rust-bin/Makefile:1.23  Sun Jun 13 12:25:02 2021
+++ pkgsrc/lang/rust-bin/Makefile       Thu Jul 15 11:29:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/06/13 12:25:02 he Exp $
+# $NetBSD: Makefile,v 1.23.2.1 2021/07/15 11:29:20 bsiegert Exp $
 
 DISTNAME=      rust-1.52.1
 PKGNAME=       ${DISTNAME:S/rust/rust-bin/1}
@@ -90,36 +90,39 @@ DISTFILES:= ${DISTFILES} ${DISTNAME}-${R
 
 # NetBSD provided binaries:
 
+# Suffix for re-generated binary bootstrap
+NBSUF=nb1
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    aarch64-unknown-netbsd
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    armv7-unknown-netbsd-eabihf
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    i586-unknown-netbsd
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    powerpc-unknown-netbsd90
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .  if !empty(OS_VERSION:M8.*)
 RUST_ARCH:=    powerpc-unknown-netbsd
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
@@ -127,7 +130,7 @@ SITES.${DN}-${RUST_ARCH}.tar.gz= \
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    sparc64-unknown-netbsd
-DN:=           ${DISTNAME}nb${PKGREVISION}
+DN:=           ${DISTNAME}${NBSUF}
 DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
 SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}