rust: adapt to 'xz' compression, and handle non-null PKGREVISION.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sat May 14 15:15:27 2022 +0000
Changeset:	4f8572b210396eee8be1c8d47252f96e850f4aa7

Modified Files:
	rust/do-cross.mk

Log Message:
rust: adapt to 'xz' compression, and handle non-null PKGREVISION.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4f8572b210396eee8be1c8d47252f96e850f4aa7

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

diffstat:
 rust/do-cross.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diffs:
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index 2deb7a5f3e..ae734f8cea 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -2,6 +2,7 @@
 # Collect the bootstrap kits in dist/
 
 VERSION!=	make show-var VARNAME=PKGVERSION
+V_NOREV!=	make show-var VARNAME=PKGVERSION_NOREV
 
 SHORT_TARGETS+=	armv7
 SHORT_TARGETS+=	sparc64
@@ -80,16 +81,16 @@ do-${st}:
 	else \
 		TT=${TGT.${st}}; \
 	fi; \
-	distdir=${WRKDIR}/rustc-${VERSION}-src/build/dist; \
+	distdir=${WRKDIR}/rustc-${V_NOREV}-src/build/dist; \
 	for comp in rust rust-std; do \
-		src=$${distdir}/$${comp}-${VERSION}-${TGT.${st}}.tar.gz; \
-		tgt=dist/$${comp}-${VERSION}-$${TT}.tar.gz; \
+		src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
+		tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
 		if [ ! -f "$${tgt}" ]; then \
 			echo ln $${src} $${tgt}; \
 			${DEBUG} ln $${src} $${tgt}; \
 		fi; \
 	done; \
-	src_comp=rust-src-${VERSION}.tar.gz; \
+	src_comp=rust-src-${V_NOREV}.tar.xz; \
 	if [ ! -f dist/$${src_comp} ]; then \
 		echo ln $${distdir}/$${src_comp} dist; \
 		${DEBUG} ln $${distdir}/$${src_comp} dist; \