Various minor adjustments:

 * Paste NetBSD rust URL only in one place.
 * Follow up a few pkglint messages
 * Add tentative support for NetBSD/powerpc 9.0, apparently ABI changed
   for C++ between 8.0 and 9.0, the 8.0 binary results in unresolved symbol.

2 files changed, 26 insertions, 14 deletions

diff --git a/lang/rust-bin/Makefile b/lang/rust-bin/Makefile
index 1a52b33f570..afa55174f91 100644
--- a/lang/rust-bin/Makefile
+++ b/lang/rust-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/05/18 18:00:01 nia Exp $
+# $NetBSD: Makefile,v 1.19 2021/05/18 19:29:52 he Exp $
 
 DISTNAME=	rust-1.50.0
 PKGNAME=	${DISTNAME:S/rust/rust-bin/1}
@@ -28,6 +28,8 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-i386
 ONLY_FOR_PLATFORM+=	NetBSD-*-powerpc
 ONLY_FOR_PLATFORM+=	NetBSD-*-sparc64
 
+NETBSD_REPO=	https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+
 CHECK_RELRO_SKIP+=	lib/rustlib/*/bin/*
 
 # The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
@@ -86,37 +88,43 @@ RUST_ARCH:=	x86_64-unknown-netbsd
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
 .endif
 
-# NetBSD provided binaries
+# NetBSD provided binaries:
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=	aarch64-unknown-netbsd
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
 SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
-		https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+		${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=	armv7-unknown-netbsd-eabihf
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
 SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
-		https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+		${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=	i586-unknown-netbsd
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-.endif
 SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
-		https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+		${NETBSD_REPO}
+.endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi)
+RUST_ARCH:=	powerpc-unknown-netbsd90
+DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
+SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+		${NETBSD_REPO}
+.  if !empty(OS_VERSION:M8.*)
 RUST_ARCH:=	powerpc-unknown-netbsd
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
 SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
-		https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+		${NETBSD_REPO}
+.  endif
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=	sparc64-unknown-netbsd
 DISTFILES:=	${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
 SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
-		https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/
+		${NETBSD_REPO}
 .endif
 
 do-install:
@@ -140,7 +148,7 @@ fix-darwin-install-name:
 	done
 .  endfor
 .  for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump 	\
-		llvm-profdata llvm-readobj llvm-size llvm-strip	
+		llvm-profdata llvm-readobj llvm-size llvm-strip
 	otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
 	    | ${GREP} '@rpath' | while read rpath rest; do		\
 		install_name_tool -change $$rpath			\
@@ -178,10 +186,10 @@ RUST_LLVM_RPATH=	${PREFIX}/lib
 FORCE_RPATH=		--force-rpath
 .  endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
-.  include "../../devel/libatomic/buildlink3.mk"
-.endif
+.  if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
+      !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
+.    include "../../devel/libatomic/buildlink3.mk"
+.  endif
 
 .PHONY: fix-relative-rpath
 post-install: fix-relative-rpath
diff --git a/lang/rust-bin/distinfo b/lang/rust-bin/distinfo
index c9e6fecd546..8ec005de6c9 100644
--- a/lang/rust-bin/distinfo
+++ b/lang/rust-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/05/18 18:00:01 nia Exp $
+$NetBSD: distinfo,v 1.8 2021/05/18 19:29:52 he Exp $
 
 SHA1 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3f078e2e2f55e43ba98cb2acd21d40e5e9cc49a8
 RMD160 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3847eaaa8072efe27b0e7411795d98aa6fca0003
@@ -28,6 +28,10 @@ SHA1 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 6f58b67c34871
 RMD160 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 60f565681f2cbed690c1551c7648609cfcb5148d
 SHA512 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 4e5db0d3a5aff3b67c5ec988e6d632fd81dc5cc305aa14bba595de28f3154d13fdcfea6fc69f4a5264220bf471fab1add8ae089a87a05427d7a3a936749941bb
 Size (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 313628339 bytes
+SHA1 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 0579809b8f384304ea95112b933edecdaacd083d
+RMD160 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 141743e14c9bc5fdce35c83b29262f59b5f062a0
+SHA512 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = d0186e7857c5836f260112c1676799816b39b6e424ea20866a9be97b80525f6c0b6f71daacb505844bb600158ca4c7d4c2f6431e198ef7e551a7f400368a2afe
+Size (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd90.tar.gz) = 319094630 bytes
 SHA1 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = 72b6d9e81ea186a049fa83bdcce973faf1bb91db
 RMD160 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = c26dafe0cdf12cce0b9314eacb2fe8a513a4ccdd
 SHA512 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = e990096d3b253522818cdd1fe6624b567e9d679d1e4c55fa1392805128b073d55334bc13c9d48e6a7befabb3673c098332e24b7b6e2a07d82eb4181228ab5d90