Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1626042310128980"
MIME-Version: 1.0
Date: Sun, 11 Jul 2021 22:25:10 +0000
From: "Havard Eidnes" <he@netbsd.org>
Subject: CVS commit: pkgsrc/lang/rust-bin
To: pkgsrc-changes@NetBSD.org
Reply-To: he@netbsd.org
Message-Id: <20210711222510.5C82BFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1626042310128980
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

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.24 pkgsrc/lang/rust-bin/Makefile

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


--_----------=_1626042310128980
Content-Disposition: inline
Content-Length: 2426
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/rust-bin/Makefile
diff -u pkgsrc/lang/rust-bin/Makefile:1.23 pkgsrc/lang/rust-bin/Makefile:1.24
--- pkgsrc/lang/rust-bin/Makefile:1.23	Sun Jun 13 12:25:02 2021
+++ pkgsrc/lang/rust-bin/Makefile	Sun Jul 11 22:25:09 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2021/06/13 12:25:02 he Exp $
+# $NetBSD: Makefile,v 1.24 2021/07/11 22:25:09 he 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}


--_----------=_1626042310128980--