mrust*: wip fixes; build the meta pkg; correct RUSTSRC_DIST typo

[Dave Berger <pkgsrc-mrust%web5by5.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dave Berger <pkgsrc-mrust%web5by5.com@localhost>
Pushed By:	dave
Date:		Wed Jan 12 08:24:45 2022 -0500
Changeset:	94d27d3718022ce301badec62da1b3d3232a6c41

Modified Files:
	mrust-cargo/Makefile
	mrust-libs/Makefile
	mrust-minicargo/Makefile
	mrust-mrustc/Makefile
	mrust-rustc/Makefile
	mrust/Makefile.common
Added Files:
	mrust/Makefile
	mrust/PLIST

Log Message:
mrust*: wip fixes; build the meta pkg; correct RUSTSRC_DIST typo

Packages were developed under the lang/ subdir of a private
pkgsrc hierarchy: substitute wip/ for lang/ in the essential
places (mostly DEPENDS and include entries) so they work in
wip.

Add a Makefile and PLIST, plus actual functionality, to the
"mrust" meta-package so that it explicitly depends on and
builds -cargo, -libs, -minicargo, -mrustc & -rustc

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

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

diffstat:
 mrust-cargo/Makefile     |  6 +++---
 mrust-libs/Makefile      |  6 +++---
 mrust-minicargo/Makefile |  2 +-
 mrust-mrustc/Makefile    |  2 +-
 mrust-rustc/Makefile     |  8 ++++----
 mrust/Makefile           | 21 +++++++++++++++++++++
 mrust/Makefile.common    |  6 +++---
 mrust/PLIST              |  1 +
 8 files changed, 37 insertions(+), 15 deletions(-)

diffs:
diff --git a/mrust-cargo/Makefile b/mrust-cargo/Makefile
index 2b73abae99..1bca0a5338 100644
--- a/mrust-cargo/Makefile
+++ b/mrust-cargo/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2021/10/12 08:50:00 dlb Exp $
 
-.include "../../lang/mrust/Makefile.common"
+.include "../../wip/mrust/Makefile.common"
 
 PKGNAME=	mrust-cargo-${SNAPSTAMP}
 COMMENT=	Cargo--built from rustc src, using mrustc toolchain
@@ -74,8 +74,8 @@ do-install:
 			${DESTDIR}${PREFIX}/bin )
 
 
-BUILD_DEPENDS+=		mrust-mrustc>=${SNAPSTAMP}:../../lang/mrust-mrustc
-BUILD_DEPENDS+=		mrust-libs>=${SNAPSTAMP}:../../lang/mrust-libs
+BUILD_DEPENDS+=		mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+BUILD_DEPENDS+=		mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
 ##BUILD_DEPENDS+=	cmake>=3.18.2:../../devel/cmake
 
 
diff --git a/mrust-libs/Makefile b/mrust-libs/Makefile
index 11095cb9dc..f96ac0dc95 100644
--- a/mrust-libs/Makefile
+++ b/mrust-libs/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2021/10/12 08:50:00 dlb Exp $
 
-.include "../../lang/mrust/Makefile.common"
+.include "../../wip/mrust/Makefile.common"
 
 PKGNAME=	mrust-libs-${SNAPSTAMP}
 COMMENT=	Rustc libraries & crates built using mrustc toolchain
@@ -73,8 +73,8 @@ do-install:
 	    done )
 
 
-BUILD_DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../lang/mrust-mrustc
-BUILD_DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../lang/mrust-minicargo
+BUILD_DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+BUILD_DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
 
 .include "../../devel/libatomic/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/mrust-minicargo/Makefile b/mrust-minicargo/Makefile
index eb44e2bef0..af973c7498 100644
--- a/mrust-minicargo/Makefile
+++ b/mrust-minicargo/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2021/10/12 08:50:00 dlb Exp $
 
-.include "../../lang/mrust/Makefile.common"
+.include "../../wip/mrust/Makefile.common"
 
 PKGNAME=	mrust-minicargo-${SNAPSTAMP}
 COMMENT=	Cargo workalike from the mrustc tool suite
diff --git a/mrust-mrustc/Makefile b/mrust-mrustc/Makefile
index be12a59198..240bf2de38 100644
--- a/mrust-mrustc/Makefile
+++ b/mrust-mrustc/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2021/10/12 08:50:00 dlb Exp $
 
-.include "../../lang/mrust/Makefile.common"
+.include "../../wip/mrust/Makefile.common"
 
 PKGNAME=	mrust-mrustc-${SNAPSTAMP}
 COMMENT=	Mutabah's Rust Compiler--the compiler itself
diff --git a/mrust-rustc/Makefile b/mrust-rustc/Makefile
index b7893f62d3..26450e706f 100644
--- a/mrust-rustc/Makefile
+++ b/mrust-rustc/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2021/10/12 08:50:00 dlb Exp $
 
-.include "../../lang/mrust/Makefile.common"
+.include "../../wip/mrust/Makefile.common"
 
 PKGNAME=	mrust-rustc-${SNAPSTAMP}
 COMMENT=	Rustc--built from rustc src, using mrustc toolchain
@@ -77,9 +77,9 @@ do-install:
 			${DESTDIR}${PREFIX}/bin )
 
 
-BUILD_DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../lang/mrust-mrustc
-BUILD_DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../lang/mrust-minicargo
-BUILD_DEPENDS+=	mrust-libs>=${SNAPSTAMP}:../../lang/mrust-libs
+BUILD_DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+BUILD_DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+BUILD_DEPENDS+=	mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
 BUILD_DEPENDS+=	cmake>=3.18.2:../../devel/cmake
 
 
diff --git a/mrust/Makefile b/mrust/Makefile
new file mode 100644
index 0000000000..a86b9fe55d
--- /dev/null
+++ b/mrust/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2022/01/11 20:10:00 dlb Exp $
+
+.include "../../wip/mrust/Makefile.common"
+
+PKGNAME=	mrust-${SNAPSTAMP}
+COMMENT=	mrustc meta package (builds several other "mrust-" packages)
+DISTFILES=	
+
+SUBST_STAGE.atomic-pathfix=	none
+
+DEPENDS+=	mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+DEPENDS+=	mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+DEPENDS+=	mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
+DEPENDS+=	mrust-rustc>=${SNAPSTAMP}:../../wip/mrust-rustc
+DEPENDS+=	mrust-cargo>=${SNAPSTAMP}:../../wip/mrust-cargo
+
+do-build:
+
+do-install:
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/mrust/Makefile.common b/mrust/Makefile.common
index 2d641e874e..ae30ca00d2 100644
--- a/mrust/Makefile.common
+++ b/mrust/Makefile.common
@@ -38,7 +38,7 @@ USE_TOOLS+=		gmake
 RUSTVER=		1.39.0
 
 RUSTSRC_DIST=		rustc-${RUSTVER}-src.tar.gz
-SITES.${RUSTRSRC_DIST}=	https://static.rust-lang.org/dist/
+SITES.${RUSTSRC_DIST}=	https://static.rust-lang.org/dist/
 
 MR_OUTDIR=		output-${RUSTVER}/
 
@@ -96,10 +96,10 @@ SUBST_FILES.atomic-pathfix=	src/trans/target.cpp
 SUBST_SED.atomic-pathfix=	-e '/define.*BACKEND_C_OPTS_GNU/s|"atomic"|"atomic", "-L", "${PREFIX}/lib"|'
 
 post-patch:
-	@(cd ${WRKSRC};							\
+	@if [ -e ${WRKSRC} ]; then (cd ${WRKSRC};			\
 	    ${MV} rust-version rust-version.dist;			\
 	    ${ECHO} ${RUSTVER} > rust-version;				\
-	    ${TOUCH} -t 200101010101 rust-version)
+	    ${TOUCH} -t 200101010101 rust-version); fi
 
 #post-extract: cp-gnu-config
 
diff --git a/mrust/PLIST b/mrust/PLIST
new file mode 100644
index 0000000000..48d96a5493
--- /dev/null
+++ b/mrust/PLIST
@@ -0,0 +1 @@
+@comment $NetBSD$