pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

g/c old rust packages (see lang/rust)



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Thu Jan 24 20:17:45 2019 +0100
Changeset:	c19d94a964a50c27cfe7431e2a1f0d8d9901e7b9

Modified Files:
	Makefile
Removed Files:
	rust/DESCR
	rust/Makefile
	rust/PLIST
	rust/PLIST.gdb
	rust/PLIST.lldb
	rust/TODO
	rust/available.mk
	rust/buildlink3.mk
	rust/distinfo
	rust/files/config.toml
	rust/patches/patch-src_compiler-rt_lib_builtins_CMakeLists.txt
	rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
	rust/patches/patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp
	rustc/DESCR
	rustc/Makefile
	rustc/PLIST
	rustc/PLIST.gdb
	rustc/PLIST.lldb
	rustc/TODO
	rustc/distinfo
	rustc/patches/patch-configure
	rustc/patches/patch-src_bootstrap_native.rs
	rustc/patches/patch-src_libbacktrace_configure
	rustc/patches/patch-src_libcompiler__builtins_build.rs
	rustc/patches/patch-src_rust-installer_gen-install-script.sh
	rustc/patches/patch-src_rust-installer_gen-installer.sh
	rustc/patches/patch-src_rust-installer_install-template.sh
	rustc/patches/patch-src_rust-installer_test.sh

Log Message:
g/c old rust packages (see lang/rust)

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

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

diffstat:
 Makefile                                           |   2 -
 rust/DESCR                                         |  13 -
 rust/Makefile                                      | 108 -------
 rust/PLIST                                         | 107 -------
 rust/PLIST.gdb                                     |   4 -
 rust/PLIST.lldb                                    |   3 -
 rust/TODO                                          |  10 -
 rust/available.mk                                  |  12 -
 rust/buildlink3.mk                                 |  14 -
 rust/distinfo                                      |  21 --
 rust/files/config.toml                             | 322 ---------------------
 ...tch-src_compiler-rt_lib_builtins_CMakeLists.txt |  20 --
 .../patch-src_llvm_cmake_modules_AddLLVM.cmake     |  15 -
 ...c_llvm_lib_CodeGen_MachineDominanceFrontier.cpp |  14 -
 rustc/DESCR                                        |  11 -
 rustc/Makefile                                     | 215 --------------
 rustc/PLIST                                        |  18 --
 rustc/PLIST.gdb                                    |   4 -
 rustc/PLIST.lldb                                   |   3 -
 rustc/TODO                                         |   3 -
 rustc/distinfo                                     |  86 ------
 rustc/patches/patch-configure                      |  29 --
 rustc/patches/patch-src_bootstrap_native.rs        |  14 -
 rustc/patches/patch-src_libbacktrace_configure     |  13 -
 .../patch-src_libcompiler__builtins_build.rs       |  14 -
 .../patch-src_rust-installer_gen-install-script.sh |  21 --
 .../patch-src_rust-installer_gen-installer.sh      |  31 --
 .../patch-src_rust-installer_install-template.sh   |  17 --
 rustc/patches/patch-src_rust-installer_test.sh     |  15 -
 29 files changed, 1159 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 1f5156b49d..a9e3188d08 100644
--- a/Makefile
+++ b/Makefile
@@ -4189,9 +4189,7 @@ SUBDIR+=	ruby-versionomy
 SUBDIR+=	ruby-xmpp4r
 SUBDIR+=	ruby-yaml_waml
 SUBDIR+=	runit
-SUBDIR+=	rust
 SUBDIR+=	rust-bin
-SUBDIR+=	rustc
 SUBDIR+=	rygel
 SUBDIR+=	s3cmd
 SUBDIR+=	s3funnel
diff --git a/rust/DESCR b/rust/DESCR
deleted file mode 100644
index 6dc90a671e..0000000000
--- a/rust/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Rust is a systems programming language focused on three goals: safety,
-speed, and concurrency.  It maintains these goals without having a
-garbage collector, making it a useful language for a number of use cases
-other languages aren't good at: embedding in other languages, programs
-with specific space and time requirements, and writing low-level code,
-like device drivers and operating systems.
-
-It improves on current languages targeting this space by having a number
-of compile-time safety checks that produce no runtime overhead, while
-eliminating all data races.  Rust also aims to achieve "zero-cost
-abstractions" even though some of these abstractions feel like those of
-a high-level language.  Even then, Rust still allows precise control
-like a low-level language would.
diff --git a/rust/Makefile b/rust/Makefile
deleted file mode 100644
index 2895920d18..0000000000
--- a/rust/Makefile
+++ /dev/null
@@ -1,108 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2017/03/20 11:36:35 jperkin Exp $
-
-DISTNAME=	rustc-1.19.0-src
-PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
-CATEGORIES=	lang
-MASTER_SITES=	http://static.rust-lang.org/dist/
-MASTER_SITES+=	https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.rust-lang.org/
-COMMENT=	Safe, concurrent, practical language
-LICENSE=	mit OR apache-2.0
-
-USE_GCC_RUNTIME=	yes
-USE_TOOLS+=		bash gmake
-
-UNLIMIT_RESOURCES+=	cputime
-
-# builtin LLVM pulls in c++11 and requires GCC 4.8
-USE_LANGUAGES=		c c++11
-GCC_REQD+=		4.8
-
-.include "../../mk/bsd.prefs.mk"
-
-DISTFILES:=		${DEFAULT_DISTFILES}
-RUST_STAGE0_VER=	1.18.0
-CARGO_STAGE0_VER=	0.19.0
-# If this wrong, rust will begin fetching and creating these directories
-# in rustc*-src/build/cache.
-CARGO_DIRNAME=		${WRKSRC}/build/cache/2017-06-08
-
-# Rust doesn't support pre-i686 Intel
-.if ${MACHINE_ARCH} == "i386"
-RUST_ARCH=		i686
-.else
-RUST_ARCH=		${MACHINE_ARCH}
-.endif
-
-.if !empty(LOWER_VENDOR)
-RUST_VENDOR=		${LOWER_VENDOR}
-.else
-RUST_VENDOR=		unknown
-.endif
-
-RUST_MACHINE=		${RUST_ARCH}-${RUST_VENDOR}-${LOWER_OPSYS}
-
-RUSTC_STAGE0=		rustc-${RUST_STAGE0_VER}-${RUST_MACHINE}.tar.gz
-RUST_STD_STAGE0=	rust-std-${RUST_STAGE0_VER}-${RUST_MACHINE}.tar.gz
-CARGO_STAGE0=		cargo-${CARGO_STAGE0_VER}-${RUST_MACHINE}.tar.gz
-DISTFILES+=		${RUSTC_STAGE0} ${RUST_STD_STAGE0} ${CARGO_STAGE0}
-
-pre-extract:
-	${MKDIR} ${CARGO_DIRNAME}
-	${CP} ${DISTDIR}/${RUSTC_STAGE0} ${CARGO_DIRNAME}
-	${CP} ${DISTDIR}/${RUST_STD_STAGE0} ${CARGO_DIRNAME}
-	${CP} ${DISTDIR}/${CARGO_STAGE0} ${CARGO_DIRNAME}
-
-do-configure:
-	${CP} ${FILESDIR}/config.toml ${WRKSRC}/src/bootstrap/config.toml
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-configure
-SUBST_FILES.paths=	src/bootstrap/config.toml
-SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},'
-
-do-build:
-	cd ${WRKSRC}; ${PYTHONBIN} x.py build --verbose
-
-do-install:
-	cd ${WRKSRC}; ${PYTHONBIN} x.py install --verbose
-
-# XXX tell it where rustc is
-#do-test:
-#	cd ${WRKSRC}; ${PYTHONBIN} x.py test
-
-BUILDLINK_TRANSFORM.NetBSD+=	rm:-Wl,--enable-new-dtags
-
-
-# Package maintenance bits
-
-# invoke "make mdi PLUS_BOOTSTRAPS=1"
-.if defined(PLUS_BOOTSTRAPS)
-
-# When adding a target here, also add it to available.mk
-RUST_MACHINES=		\
-	i686-apple-darwin \
-	x86_64-apple-darwin \
-	i686-unknown-linux-gnu \
-	x86_64-unknown-linux-gnu \
-	x86_64-unknown-netbsd
-#RUST_MACHINES+=	x86_64-sun-solaris
-
-.  for MACHINE in ${RUST_MACHINES}
-RUSTCS+=	rustc-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
-RUST_STDS+=	rust-std-${RUST_STAGE0_VER}-${MACHINE}.tar.gz
-CARGOS+=	cargo-${CARGO_STAGE0_VER}-${MACHINE}.tar.gz
-.  endfor
-
-DISTFILES+=	${RUSTCS} ${RUST_STDS} ${CARGOS}
-
-.endif
-
-
-# XXX using builtin LLVM
-#.include "../../lang/llvm/buildlink3.mk"
-.include "../../devel/cmake/buildlink3.mk"
-.include "../../lang/python/tool.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rust/PLIST b/rust/PLIST
deleted file mode 100644
index 0b77a57abf..0000000000
--- a/rust/PLIST
+++ /dev/null
@@ -1,107 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2017/03/20 11:36:35 jperkin Exp $
-bin/rustc
-bin/rustdoc
-lib/libarena-${RUST_VERHASH}.${SOEXT}
-lib/libflate-${RUST_VERHASH}.${SOEXT}
-lib/libfmt_macros-${RUST_VERHASH}.${SOEXT}
-lib/libgetopts-${RUST_VERHASH}.${SOEXT}
-lib/libgraphviz-${RUST_VERHASH}.${SOEXT}
-lib/liblog-${RUST_VERHASH}.${SOEXT}
-lib/libproc_macro-${RUST_VERHASH}.${SOEXT}
-lib/libproc_macro_plugin-${RUST_VERHASH}.${SOEXT}
-lib/librustc-${RUST_VERHASH}.${SOEXT}
-lib/librustc_back-${RUST_VERHASH}.${SOEXT}
-lib/librustc_borrowck-${RUST_VERHASH}.${SOEXT}
-lib/librustc_const_eval-${RUST_VERHASH}.${SOEXT}
-lib/librustc_const_math-${RUST_VERHASH}.${SOEXT}
-lib/librustc_data_structures-${RUST_VERHASH}.${SOEXT}
-lib/librustc_driver-${RUST_VERHASH}.${SOEXT}
-lib/librustc_errors-${RUST_VERHASH}.${SOEXT}
-lib/librustc_incremental-${RUST_VERHASH}.${SOEXT}
-lib/librustc_lint-${RUST_VERHASH}.${SOEXT}
-lib/librustc_llvm-${RUST_VERHASH}.${SOEXT}
-lib/librustc_metadata-${RUST_VERHASH}.${SOEXT}
-lib/librustc_mir-${RUST_VERHASH}.${SOEXT}
-lib/librustc_passes-${RUST_VERHASH}.${SOEXT}
-lib/librustc_platform_intrinsics-${RUST_VERHASH}.${SOEXT}
-lib/librustc_plugin-${RUST_VERHASH}.${SOEXT}
-lib/librustc_privacy-${RUST_VERHASH}.${SOEXT}
-lib/librustc_resolve-${RUST_VERHASH}.${SOEXT}
-lib/librustc_save_analysis-${RUST_VERHASH}.${SOEXT}
-lib/librustc_trans-${RUST_VERHASH}.${SOEXT}
-lib/librustc_typeck-${RUST_VERHASH}.${SOEXT}
-lib/librustdoc-${RUST_VERHASH}.${SOEXT}
-lib/libserialize-${RUST_VERHASH}.${SOEXT}
-lib/libstd-${RUST_VERHASH}.${SOEXT}
-lib/libsyntax-${RUST_VERHASH}.${SOEXT}
-lib/libsyntax_ext-${RUST_VERHASH}.${SOEXT}
-lib/libsyntax_pos-${RUST_VERHASH}.${SOEXT}
-lib/libterm-${RUST_VERHASH}.${SOEXT}
-lib/libtest-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/manifest-rust-std-${RUST_ARCH}
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/${RUST_ARCH}/lib/liballoc-${RUST_VERHASH}.rlib
-${PLIST.jemalloc}lib/rustlib/${RUST_ARCH}/lib/liballoc_jemalloc-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/liballoc_system-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libarena-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libcollections-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libcompiler_builtins-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libcore-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libflate-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libfmt_macros-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libgetopts-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libgetopts-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libgraphviz-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/liblibc-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/liblog-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libpanic_abort-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libpanic_unwind-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libproc_macro-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libproc_macro_plugin-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librand-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librustc-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_back-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_bitflags-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librustc_borrowck-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_const_eval-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_const_math-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_data_structures-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_driver-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_errors-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_i128-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/librustc_incremental-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_lint-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_llvm-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_metadata-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_mir-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_passes-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_platform_intrinsics-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_plugin-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_privacy-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_resolve-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_save_analysis-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_trans-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustc_typeck-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/librustdoc-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libserialize-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libstd-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libstd-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libstd_unicode-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libsyntax-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libsyntax_ext-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libsyntax_pos-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libterm-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libterm-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libtest-${RUST_VERHASH}.rlib
-lib/rustlib/${RUST_ARCH}/lib/libtest-${RUST_VERHASH}.${SOEXT}
-lib/rustlib/${RUST_ARCH}/lib/libunwind-${RUST_VERHASH}.rlib
-man/man1/rustc.1
-man/man1/rustdoc.1
-share/doc/rust/COPYRIGHT
-share/doc/rust/LICENSE-APACHE
-share/doc/rust/LICENSE-MIT
-share/doc/rust/README.md
diff --git a/rust/PLIST.gdb b/rust/PLIST.gdb
deleted file mode 100644
index 1d4ff65586..0000000000
--- a/rust/PLIST.gdb
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.gdb,v 1.1 2016/09/06 10:36:49 jperkin Exp $
-bin/rust-gdb
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
diff --git a/rust/PLIST.lldb b/rust/PLIST.lldb
deleted file mode 100644
index 2da9c455d6..0000000000
--- a/rust/PLIST.lldb
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.lldb,v 1.1 2016/09/06 10:36:49 jperkin Exp $
-bin/rust-lldb
-lib/rustlib/etc/lldb_rust_formatters.py
diff --git a/rust/TODO b/rust/TODO
deleted file mode 100644
index fde8281760..0000000000
--- a/rust/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-IMPORTANT:
-lacking an install / PLIST! (XXX use DESTDIR?)
-Need bootstrap for platforms for which upstream doesn't release binaries
-Fetching shit to ~/.cargo (XXX prepare combined tarball, use HOME as an environment variable)
-
-Secondary:
-Test target doesn't work
-
-Maybe not worth caring about:
-LLVM is builtin, not a dependency (jakllsch mentions it might be hard to tear out)
diff --git a/rust/available.mk b/rust/available.mk
deleted file mode 100644
index 55f66be507..0000000000
--- a/rust/available.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || \
-    !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || \
-    !empty(MACHINE_PLATFORM:MLinux-*-i386) || \
-    !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \
-    !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64)
-RUST_AVAILABLE=		yes
-.else
-RUST_AVAILABLE=		no
-.endif
diff --git a/rust/buildlink3.mk b/rust/buildlink3.mk
deleted file mode 100644
index dcced31a5c..0000000000
--- a/rust/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/02/23 09:35:16 jperkin Exp $
-
-BUILDLINK_TREE+=	rust
-
-.if !defined(RUST_BUILDLINK3_MK)
-RUST_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.rust+=	rust>=1.15.1
-BUILDLINK_PKGSRCDIR.rust?=	../../lang/rust
-
-BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/lib/rustlib
-.endif
-
-BUILDLINK_TREE+=	-rust
diff --git a/rust/distinfo b/rust/distinfo
deleted file mode 100644
index 3cafb50b8d..0000000000
--- a/rust/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-SHA1 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 969493ba707053fb7e87b85c99a1a16c1a55c920
-RMD160 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 7d6e06332ceaea8f91e165703100e84d95530444
-SHA512 (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 68b9fcbff434e86b98f56da058d56ce630f31d0107ac3d6b1da2b224c1485adb72e48db70c1bd52b0f064098cc0c6b8055001ec8a83f2707fb747194a677f30b
-Size (cargo-0.19.0-x86_64-unknown-netbsd.tar.gz) = 4560096 bytes
-SHA1 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 98efbc7a9a739472b9e5e4b4675a8dcf9a5930da
-RMD160 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 87f429e28b4bc267a09a9679972da49933086e01
-SHA512 (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 2443f90032efd7b35d193d1dc73a1121f1bd2f6193bf4955fb25926359bee1c722160f6c7df0fb38949456b7fefea7bdd4240c051de8032881b2dfb5ac52e0c8
-Size (rust-std-1.18.0-x86_64-unknown-netbsd.tar.gz) = 61732328 bytes
-SHA1 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = d1501fe4ec858943668e8364aa79e8599b95f835
-RMD160 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = 289d06ba7d8f8d3d4988492dd2acd786d5f990ff
-SHA512 (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = eab40e98fd58bd119837ba80ebcf0755a8125136952e5340f6f57cfa9e75a1a077c046e11377d32525c6d550f35f8499f381744a4c59e6171647e9082ea56248
-Size (rustc-1.18.0-x86_64-unknown-netbsd.tar.gz) = 42502136 bytes
-SHA1 (rustc-1.19.0-src.tar.gz) = 846b7a8ce1f33c3fc5e0d3b0b4258540515d67a9
-RMD160 (rustc-1.19.0-src.tar.gz) = d044efd6f860571a332c3d9c629061f911ebd1d1
-SHA512 (rustc-1.19.0-src.tar.gz) = 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24
-Size (rustc-1.19.0-src.tar.gz) = 50108626 bytes
-SHA1 (patch-src_compiler-rt_lib_builtins_CMakeLists.txt) = 288870c40b5e4ce29cbfb19cc9f56d35152c47fa
-SHA1 (patch-src_llvm_cmake_modules_AddLLVM.cmake) = 282d97cce8d01cfefe565185d4999c2db9ccc13f
-SHA1 (patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp) = 2899771b1a23be840b9305eff7e5e5f957239ccb
diff --git a/rust/files/config.toml b/rust/files/config.toml
deleted file mode 100644
index fe144c2aa8..0000000000
--- a/rust/files/config.toml
+++ /dev/null
@@ -1,322 +0,0 @@
-# Sample TOML configuration file for building Rust.
-#
-# To configure rustbuild, copy this file to the directory from which you will be
-# running the build, and name it config.toml.
-#
-# All options are commented out by default in this file, and they're commented
-# out with their default values. The build system by default looks for
-# `config.toml` in the current directory of a build for build configuration, but
-# a custom configuration file can also be specified with `--config` to the build
-# system.
-
-# =============================================================================
-# Tweaking how LLVM is compiled
-# =============================================================================
-[llvm]
-
-# Indicates whether the LLVM build is a Release or Debug build
-#optimize = true
-
-# Indicates whether an LLVM Release build should include debug info
-#release-debuginfo = false
-
-# Indicates whether the LLVM assertions are enabled or not
-#assertions = false
-
-# Indicates whether ccache is used when building LLVM
-#ccache = false
-# or alternatively ...
-#ccache = "/path/to/ccache"
-
-# If an external LLVM root is specified, we automatically check the version by
-# default to make sure it's within the range that we're expecting, but setting
-# this flag will indicate that this version check should not be done.
-#version-check = false
-
-# Link libstdc++ statically into the librustc_llvm instead of relying on a
-# dynamic version to be available.
-#static-libstdcpp = false
-
-# Tell the LLVM build system to use Ninja instead of the platform default for
-# the generated build system. This can sometimes be faster than make, for
-# example.
-#ninja = false
-
-# LLVM targets to build support for.
-# Note: this is NOT related to Rust compilation targets. However, as Rust is
-# dependent on LLVM for code generation, turning targets off here WILL lead to
-# the resulting rustc being unable to compile for the disabled architectures.
-# Also worth pointing out is that, in case support for new targets are added to
-# LLVM, enabling them here doesn't mean Rust is automatically gaining said
-# support. You'll need to write a target specification at least, and most
-# likely, teach rustc about the C ABI of the target. Get in touch with the
-# Rust team and file an issue if you need assistance in porting!
-#targets = "X86;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX;Hexagon"
-
-# Cap the number of parallel linker invocations when compiling LLVM.
-# This can be useful when building LLVM with debug info, which significantly
-# increases the size of binaries and consequently the memory required by
-# each linker process.
-# If absent or 0, linker invocations are treated like any other job and
-# controlled by rustbuild's -j parameter.
-#link-jobs = 0
-
-# Delete LLVM build directory on LLVM rebuild.
-# This option defaults to `false` for local development, but CI may want to
-# always perform clean full builds (possibly accelerated by (s)ccache).
-#clean-rebuild = false
-
-# =============================================================================
-# General build configuration options
-# =============================================================================
-[build]
-
-# Build triple for the original snapshot compiler. This must be a compiler that
-# nightlies are already produced for. The current platform must be able to run
-# binaries of this build triple and the nightly will be used to bootstrap the
-# first compiler.
-#build = "x86_64-unknown-linux-gnu"    # defaults to your host platform
-
-# In addition to the build triple, other triples to produce full compiler
-# toolchains for. Each of these triples will be bootstrapped from the build
-# triple and then will continue to bootstrap themselves. This platform must
-# currently be able to run all of the triples provided here.
-#host = ["x86_64-unknown-linux-gnu"]   # defaults to just the build triple
-
-# In addition to all host triples, other triples to produce the standard library
-# for. Each host triple will be used to produce a copy of the standard library
-# for each target triple.
-#target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
-
-# Instead of downloading the src/stage0.txt version of Cargo specified, use
-# this Cargo binary instead to build all Rust code
-#cargo = "/path/to/bin/cargo"
-
-# Instead of downloading the src/stage0.txt version of the compiler
-# specified, use this rustc binary instead as the stage0 snapshot compiler.
-#rustc = "/path/to/bin/rustc"
-
-# Flag to specify whether any documentation is built. If false, rustdoc and
-# friends will still be compiled but they will not be used to generate any
-# documentation.
-#docs = true
-
-# Indicate whether the compiler should be documented in addition to the standard
-# library and facade crates.
-#compiler-docs = false
-
-# Indicate whether submodules are managed and updated automatically.
-#submodules = true
-
-# The path to (or name of) the GDB executable to use. This is only used for
-# executing the debuginfo test suite.
-#gdb = "gdb"
-
-# The node.js executable to use. Note that this is only used for the emscripten
-# target when running tests, otherwise this can be omitted.
-#nodejs = "node"
-
-# Python interpreter to use for various tasks throughout the build, notably
-# rustdoc tests, the lldb python interpreter, and some dist bits and pieces.
-# Note that Python 2 is currently required.
-#python = "python2.7"
-
-# Force Cargo to check that Cargo.lock describes the precise dependency
-# set that all the Cargo.toml files create, instead of updating it.
-#locked-deps = false
-
-# Indicate whether the vendored sources are used for Rust dependencies or not
-#vendor = false
-
-# Typically the build system will build the rust compiler twice. The second
-# compiler, however, will simply use its own libraries to link against. If you
-# would rather to perform a full bootstrap, compiling the compiler three times,
-# then you can set this option to true. You shouldn't ever need to set this
-# option to true.
-#full-bootstrap = false
-
-# Enable a build of the and extended rust tool set which is not only the
-# compiler but also tools such as Cargo. This will also produce "combined
-# installers" which are used to install Rust and Cargo together. This is
-# disabled by default.
-#extended = false
-
-# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
-verbose = 2
-
-# Build the sanitizer runtimes
-#sanitizers = false
-
-# Indicates whether the OpenSSL linked into Cargo will be statically linked or
-# not. If static linkage is specified then the build system will download a
-# known-good version of OpenSSL, compile it, and link it to Cargo.
-#openssl-static = false
-
-# Run the build with low priority, by setting the process group's "nice" value
-# to +10 on Unix platforms, and by using a "low priority" job object on Windows.
-#low-priority = false
-
-# =============================================================================
-# General install configuration options
-# =============================================================================
-[install]
-
-# Instead of installing to /usr/local, install to this path instead.
-prefix = @PREFIX@
-
-# Where to install system configuration files
-# If this is a relative path, it will get installed in `prefix` above
-#sysconfdir = "/etc"
-
-# Where to install documentation in `prefix` above
-#docdir = "share/doc/rust"
-
-# Where to install binaries in `prefix` above
-#bindir = "bin"
-
-# Where to install libraries in `prefix` above
-#libdir = "lib"
-
-# Where to install man pages in `prefix` above
-#mandir = "share/man"
-
-# =============================================================================
-# Options for compiling Rust code itself
-# =============================================================================
-[rust]
-
-# Whether or not to optimize the compiler and standard library
-# Note: the slowness of the non optimized compiler compiling itself usually
-#       outweighs the time gains in not doing optimizations, therefore a
-#       full bootstrap takes much more time with optimize set to false.
-#optimize = true
-
-# Number of codegen units to use for each compiler invocation. A value of 0
-# means "the number of cores on this machine", and 1+ is passed through to the
-# compiler.
-#codegen-units = 1
-
-# Whether or not debug assertions are enabled for the compiler and standard
-# library
-#debug-assertions = false
-
-# Whether or not debuginfo is emitted
-#debuginfo = false
-
-# Whether or not line number debug information is emitted
-#debuginfo-lines = false
-
-# Whether or not to only build debuginfo for the standard library if enabled.
-# If enabled, this will not compile the compiler with debuginfo, just the
-# standard library.
-#debuginfo-only-std = false
-
-# Whether or not jemalloc is built and enabled
-#use-jemalloc = true
-
-# Whether or not jemalloc is built with its debug option set
-#debug-jemalloc = false
-
-# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
-#backtrace = true
-
-# The default linker that will be used by the generated compiler. Note that this
-# is not the linker used to link said compiler.
-#default-linker = "cc"
-
-# The default ar utility that will be used by the generated compiler if LLVM
-# cannot be used. Note that this is not used to assemble said compiler.
-#default-ar = "ar"
-
-# The "channel" for the Rust build to produce. The stable/beta channels only
-# allow using stable features, whereas the nightly and dev channels allow using
-# nightly features
-#channel = "dev"
-
-# By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
-# platforms to ensure that the compiler is usable by default from the build
-# directory (as it links to a number of dynamic libraries). This may not be
-# desired in distributions, for example.
-#rpath = true
-
-# Flag indicating whether tests are compiled with optimizations (the -O flag) or
-# with debuginfo (the -g flag)
-#optimize-tests = true
-#debuginfo-tests = true
-
-# Flag indicating whether codegen tests will be run or not. If you get an error
-# saying that the FileCheck executable is missing, you may want to disable this.
-#codegen-tests = true
-
-# =============================================================================
-# Options for specific targets
-#
-# Each of the following options is scoped to the specific target triple in
-# question and is used for determining how to compile each target.
-# =============================================================================
-[target.x86_64-unknown-linux-gnu]
-
-# C compiler to be used to compiler C code and link Rust code. Note that the
-# default value is platform specific, and if not specified it may also depend on
-# what platform is crossing to what platform.
-#cc = "cc"
-
-# C++ compiler to be used to compiler C++ code (e.g. LLVM and our LLVM shims).
-# This is only used for host targets.
-#cxx = "c++"
-
-# Path to the `llvm-config` binary of the installation of a custom LLVM to link
-# against. Note that if this is specifed we don't compile LLVM at all for this
-# target.
-#llvm-config = "../path/to/llvm/root/bin/llvm-config"
-
-# Path to the custom jemalloc static library to link into the standard library
-# by default. This is only used if jemalloc is still enabled above
-#jemalloc = "/path/to/jemalloc/libjemalloc_pic.a"
-
-# If this target is for Android, this option will be required to specify where
-# the NDK for the target lives. This is used to find the C compiler to link and
-# build native code.
-#android-ndk = "/path/to/ndk"
-
-# The root location of the MUSL installation directory. The library directory
-# will also need to contain libunwind.a for an unwinding implementation. Note
-# that this option only makes sense for MUSL targets that produce statically
-# linked binaries
-#musl-root = "..."
-
-# =============================================================================
-# Distribution options
-#
-# These options are related to distribution, mostly for the Rust project itself.
-# You probably won't need to concern yourself with any of these options
-# =============================================================================
-[dist]
-
-# This is the folder of artifacts that the build system will sign. All files in
-# this directory will be signed with the default gpg key using the system `gpg`
-# binary. The `asc` and `sha256` files will all be output into the standard dist
-# output folder (currently `build/dist`)
-#
-# This folder should be populated ahead of time before the build system is
-# invoked.
-#sign-folder = "path/to/folder/to/sign"
-
-# This is a file which contains the password of the default gpg key. This will
-# be passed to `gpg` down the road when signing all files in `sign-folder`
-# above. This should be stored in plaintext.
-#gpg-password-file = "path/to/gpg/password"
-
-# The remote address that all artifacts will eventually be uploaded to. The
-# build system generates manifests which will point to these urls, and for the
-# manifests to be correct they'll have to have the right URLs encoded.
-#
-# Note that this address should not contain a trailing slash as file names will
-# be appended to it.
-#upload-addr = "https://example.com/folder";
-
-# Whether to build a plain source tarball to upload
-# We disable that on Windows not to override the one already uploaded on S3
-# as the one built on Windows will contain backslashes in paths causing problems
-# on linux
-#src-tarball = true
diff --git a/rust/patches/patch-src_compiler-rt_lib_builtins_CMakeLists.txt b/rust/patches/patch-src_compiler-rt_lib_builtins_CMakeLists.txt
deleted file mode 100644
index b057d8f5ce..0000000000
--- a/rust/patches/patch-src_compiler-rt_lib_builtins_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_compiler-rt_lib_builtins_CMakeLists.txt,v 1.1 2016/09/12 13:27:33 ryoon Exp $
-
-* On NetBSD, do not misdetect unwind.h
-  We do not support ARM build currently, so remove this unconditionally.
-
---- src/compiler-rt/lib/builtins/CMakeLists.txt.orig	2016-08-16 01:54:40.000000000 +0000
-+++ src/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -159,12 +159,6 @@ if(NOT WIN32 OR MINGW)
-       emutls.c)
- endif()
- 
--if (HAVE_UNWIND_H)
--  set(GENERIC_SOURCES
--      ${GENERIC_SOURCES}
--      gcc_personality_v0.c)
--endif ()
--
- if (NOT MSVC)
-   set(x86_64_SOURCES
-       x86_64/chkstk.S
diff --git a/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake b/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
deleted file mode 100644
index c9ebc4d27c..0000000000
--- a/rust/patches/patch-src_llvm_cmake_modules_AddLLVM.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_llvm_cmake_modules_AddLLVM.cmake,v 1.1 2016/09/06 10:36:49 jperkin Exp $
-
-"-z discard-unused" is only supported by Oracle Solaris ld.
-
---- src/llvm/cmake/modules/AddLLVM.cmake.orig	2016-08-16 01:55:49.000000000 +0000
-+++ src/llvm/cmake/modules/AddLLVM.cmake
-@@ -175,8 +175,6 @@ function(add_link_opts target_name)
-         set_property(TARGET ${target_name} APPEND_STRING PROPERTY
-                      LINK_FLAGS " -Wl,-dead_strip")
-       elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
--        set_property(TARGET ${target_name} APPEND_STRING PROPERTY
--                     LINK_FLAGS " -Wl,-z -Wl,discard-unused=sections")
-       elseif(NOT WIN32 AND NOT LLVM_LINKER_IS_GOLD)
-         # Object files are compiled with -ffunction-data-sections.
-         # Versions of bfd ld < 2.23.1 have a bug in --gc-sections that breaks
diff --git a/rust/patches/patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp b/rust/patches/patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp
deleted file mode 100644
index 2f403d5ee4..0000000000
--- a/rust/patches/patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_llvm_lib_CodeGen_MachineDominanceFrontier.cpp,v 1.1 2016/09/06 10:36:49 jperkin Exp $
-
-Avoid relocation error.
-
---- src/llvm/lib/CodeGen/MachineDominanceFrontier.cpp.orig	2016-08-16 01:55:50.000000000 +0000
-+++ src/llvm/lib/CodeGen/MachineDominanceFrontier.cpp
-@@ -16,7 +16,6 @@
- using namespace llvm;
- 
- namespace llvm {
--template class DominanceFrontierBase<MachineBasicBlock>;
- template class ForwardDominanceFrontierBase<MachineBasicBlock>;
- }
- 
diff --git a/rustc/DESCR b/rustc/DESCR
deleted file mode 100644
index 63987afb7b..0000000000
--- a/rustc/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Rust is a curly-brace, block-structured expression language. It
-visually resembles the C language family, but differs significantly
-in syntactic and semantic details. Its design is oriented toward
-concerns of "programming in the large", that is, of creating and
-maintaining boundaries - both abstract and operational - that
-preserve large-system integrity, availability and concurrency.
-
-It supports a mixture of imperative procedural, concurrent actor,
-object-oriented and pure functional styles. Rust also supports
-generic programming and metaprogramming, in both static and dynamic
-styles.
diff --git a/rustc/Makefile b/rustc/Makefile
deleted file mode 100644
index f0b23db8e4..0000000000
--- a/rustc/Makefile
+++ /dev/null
@@ -1,215 +0,0 @@
-# $NetBSD$
-
-RUST_VERSION=	1.15.1
-DISTNAME=	rustc-${RUST_VERSION}-src
-PKGNAME=	rustc-${RUST_VERSION}
-CATEGORIES=	lang
-MASTER_SITES=	https://static.rust-lang.org/dist/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://www.rust-lang.org/
-COMMENT=	Safe, concurrent, practical language
-LICENSE=	mit OR apache-2.0
-
-DIST_SUBDIR=	${PKGNAME_NOREV}
-
-#BUILD_DEPENDS+=	curl-[0-9]*:../../www/curl
-
-PYTHON_VERSIONS_ACCEPTED=	27 # as of 1.15.1
-PYTHON_FOR_BUILD_ONLY=		yes
-
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS=		--prefix=${PREFIX} \
-			--mandir=${PREFIX}/${PKGMANDIR}
-#CONFIGURE_ARGS+=	--llvm-root=${BUILDLINK_PREFIX.libLLVM}
-#CONFIGURE_ARGS+=	--python=python
-CONFIGURE_ARGS+=	--disable-jemalloc  # XXX NetBSD only?
-#CONFIGURE_ARGS+=	--disable-codegen-tests # otherwise needs LLVM's FileCheck executable, which libLLVM doesn't install
-
-USE_LANGUAGES=	c c++
-GCC_REQD=	4.7 4.8
-USE_TOOLS+=	bash gmake gsed perl tar
-
-CHECK_PORTABILITY_SKIP+=	src/grammar/check.sh
-
-# for guidance: http://www.ntecs.de/blog/2014/07/29/rust-ported-to-dragonflybsd/
-# XXX problem with libtool wrapper
-# XXX needs python during build
-
-REPLACE_BASH+=	src/rust-installer/gen-install-script.sh
-REPLACE_BASH+=	src/rust-installer/gen-installer.sh
-
-#
-# Lots of per-platform specific documentation, e.g. for each system call,
-# making it difficult to PLIST.  If it ends up being important we'll just have
-# to go with lots of PLIST.${OPSYS}
-#
-CONFIGURE_ARGS+=	--disable-docs
-
-TEST_TARGET=	check
-
-#
-# Rust requires a binary stage0 kit to build itself, currently supported
-# only on a limited number of platforms.  Details of the arch name and
-# sha1 for supported platforms are kept in src/snapshots.txt
-#
-.include "../../mk/bsd.prefs.mk"
-NOT_FOR_PLATFORM=	*-*-alpha *-*-vax # not targeted by LLVM
-NOT_FOR_PLATFORM+=	*-*-sparc* # not targeted by Rust in this version
-NOT_FOR_PLATFORM+=	Interix-*-* # not supported via pkgsrc, needs MinGW
-
-RUST_STAGE0_VERSION:=	1.14.0
-RUST_STAGE0_DATE:=	2016-12-18
-RUST_CARGO0_DISTHASH:=	fbeea902d2c9a5be6d99cc35681565d8f7832592
-
-DISTFILES:=		${DEFAULT_DISTFILES}
-
-# Tier 1:
-.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		i686-apple-darwin
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		x86_64-apple-darwin
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		i686-unknown-linux-gnu
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		x86_64-unknown-linux-gnu
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-# Tier 2 (XXX currently incomplete):
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		x86_64-unknown-netbsd
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || \
-	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-RUST_ARCH:=		x86_64-unknown-freebsd
-RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-SITES.${RUST_CARGO0}=	\
-	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-.endif
-
-# Tier 3
-#.if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || \
-#	make(makesum) || make(mirror-distfiles) || make(upload-distfiles)
-#RUST_ARCH:=		x86_64-sun-solaris
-#RUST_STAGE0:=		rustc-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-#DISTFILES:=		${DISTFILES} ${RUST_STAGE0} ${RUST_STD0} ${RUST_CARGO0}
-#RUST_STD0:=		rust-std-${RUST_STAGE0_VERSION}-${RUST_ARCH}.tar.gz
-#RUST_CARGO0:=		cargo-nightly-${RUST_ARCH}.tar.gz
-#SITES.${RUST_CARGO0}=	\
-#	https://s3.amazonaws.com/rust-lang-ci/cargo-builds/${RUST_CARGO0_DISTHASH}/
-#.endif
-
-.if empty(RUST_STAGE0) || empty(RUST_STD0) || empty(RUST_CARGO0)
-PKG_FAIL_REASON:=	"Not currently aware of Stage 0 bootstrap kit for ${MACHINE_PLATFORM}"
-.endif
-
-PLIST_SRC=		PLIST
-.if ${OPSYS} == "Darwin"
-PLIST_SRC+=		PLIST.lldb
-.else
-PLIST_SRC+=		PLIST.gdb
-.endif
-
-OPSYSVARS+=		SOEXT
-SOEXT.Darwin=		dylib
-SOEXT.*=		so
-
-PLIST_VARS+=		jemalloc
-
-CONFIGURE_ARGS+=	--build=${RUST_ARCH}
-
-#MAKE_ENV+=	RUSTC_FLAGS=-C\ link-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib
-MAKE_ENV+=	RUSTFLAGS=-C\ link-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib/rustlib/${RUST_ARCH}/lib
-
-EXTRACT_ONLY=		${DEFAULT_DISTFILES}
-
-PLIST_SUBST+=		RUST_ARCH=${RUST_ARCH:Q}
-PLIST_SUBST+=		SOEXT=${SOEXT:Q}
-PRINT_PLIST_AWK+=	{ gsub(/${RUST_ARCH}/, "$${RUST_ARCH}") }
-PRINT_PLIST_AWK+=	{ gsub(/\.${SOEXT}/, ".$${SOEXT}") }
-GENERATE_PLIST+=	cd ${DESTDIR}${PREFIX} && ${FIND} lib lib/rustlib/${RUST_ARCH}/lib \( -type f -or -type l \) -and -name 'lib*-*.*' | ${SORT} -dr;
-
-post-extract:
-	${MKDIR} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}
-	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_STAGE0} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}/
-	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_STD0} ${WRKSRC}/build/cache/${RUST_STAGE0_DATE}/
-	${MKDIR} ${WRKSRC}/build/cache/${RUST_CARGO0_DISTHASH}
-	${CP} -a ${DISTDIR}/${DIST_SUBDIR}/${RUST_CARGO0} ${WRKSRC}/build/cache/${RUST_CARGO0_DISTHASH}/
-
-.if ${OPSYS} == "SunOS"
-BUILD_DEPENDS+=		grep>=0:../../textproc/grep
-BUILD_DEPENDS+=		coreutils>=0:../../sysutils/coreutils
-TOOLS_PATH.grep=	${PREFIX}/bin/ggrep
-#TOOLS_CREATE+=		md5sum
-#TOOLS_PATH.md5sum=	${PREFIX}/bin/gmd5sum
-
-SUBST_CLASSES+=		ranlib
-SUBST_STAGE.ranlib=	pre-configure
-SUBST_FILES.ranlib=	mk/rt.mk
-SUBST_SED.ranlib=	-e 's,RANLIB=.* \\,RANLIB="true" \\,g'
-.endif
-
-INSTALL_TARGET=		dist
-
-post-install:
-	cd ${WRKDIR} && \
-	${TAR} -pzxf ${WRKSRC}/build/dist/rust-std-${RUST_VERSION}-${RUST_ARCH}.tar.gz && \
-	cd rust-std-${RUST_VERSION}-${RUST_ARCH} && \
-	./install.sh --disable-ldconfig --disable-verify --destdir=${DESTDIR} --prefix=${PREFIX} --mandir=${PKGMANDIR}
-	cd ${WRKDIR} && \
-	${TAR} -pzxf ${WRKSRC}/build/dist/rustc-${RUST_VERSION}-${RUST_ARCH}.tar.gz && \
-	cd ${WRKDIR}/rustc-${RUST_VERSION}-${RUST_ARCH} && \
-	./install.sh --disable-ldconfig --disable-verify --destdir=${DESTDIR} --prefix=${PREFIX} --mandir=${PKGMANDIR}
-	${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
-
-
-#.include "../../lang/libLLVM/buildlink3.mk"
-#.include "../../lang/llvm/buildlink3.mk"
-#.include "../../lang/libunwind/buildlink3.mk"
-.include "../../lang/python/tool.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rustc/PLIST b/rustc/PLIST
deleted file mode 100644
index eec2fc45e0..0000000000
--- a/rustc/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD$
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-lib/rustlib/manifest-rust-std-${RUST_ARCH}
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-share/doc/rust/COPYRIGHT
-share/doc/rust/LICENSE-APACHE
-share/doc/rust/LICENSE-MIT
-share/doc/rust/README.md
diff --git a/rustc/PLIST.gdb b/rustc/PLIST.gdb
deleted file mode 100644
index 967f07c4b5..0000000000
--- a/rustc/PLIST.gdb
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD$
-bin/rust-gdb
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
diff --git a/rustc/PLIST.lldb b/rustc/PLIST.lldb
deleted file mode 100644
index e6cb226d7d..0000000000
--- a/rustc/PLIST.lldb
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD$
-bin/rust-lldb
-lib/rustlib/etc/lldb_rust_formatters.py
diff --git a/rustc/TODO b/rustc/TODO
deleted file mode 100644
index 7aa9940eee..0000000000
--- a/rustc/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-# rustc to-do
- * use --enable-rustbuild
- * only use one of lang/llvm or lang/libLLVM
diff --git a/rustc/distinfo b/rustc/distinfo
deleted file mode 100644
index 27037017e8..0000000000
--- a/rustc/distinfo
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD$
-
-SHA1 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 45110e696578d99927d8e85f7bd6c38b0c34de6a
-RMD160 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = cb84e34472ff1363f9146059b6caaa48e70bd7a0
-SHA512 (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 4fed5f24431a6db5ebf4eff9bd5f3aa764803d952259e903253d5c5932d1ede1a7f763575b5f54a84d6f8ea1141f9fdcc21c4dad29b393c7b99e10c558a63a21
-Size (rustc-1.15.1/cargo-nightly-i686-apple-darwin.tar.gz) = 3103231 bytes
-SHA1 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 1cb208933e3a14f5082449345cfa383f37a67e7e
-RMD160 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 0bcb593a7b8ae01d6ee14d75ac0e2c7a13d50b87
-SHA512 (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 4db3a1586c4103fdedbb2a56f1039b9bdc72e9f5ca3b4482aed526771262b7c048f4481d10b0325904060c60a3e1de17352aba9314177572800961b5f3d20e9b
-Size (rustc-1.15.1/cargo-nightly-i686-unknown-linux-gnu.tar.gz) = 4168730 bytes
-SHA1 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 2719ec3ed2592ae3bbde972e8ab05c68df9f0cbc
-RMD160 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 3b2d283a8a2711894936a929a4c04835dd9ccd6a
-SHA512 (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 8f2f43c19378b952900ef9b4448e1cd1c2e5da2514de9a126137a5eb3af7dfeda276a3af462be829e1c82383fe9c4d0372dc78bd0a668b8dc17d76bddc779e30
-Size (rustc-1.15.1/cargo-nightly-x86_64-apple-darwin.tar.gz) = 3344960 bytes
-SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 68eb22638c8dfb43b5f6fffdcb2d5ae7af6d0a3e
-RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 0a82b9266435ce349f53ac8f886a3d527c725843
-SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 38c84e921bebffb0573a03e9031443d331ae69a6b9d6d97277b05a5b1d160f0548b5a56e15d688a88f5c7708c749bd564fc3d6483791a1d4a44eb9af33de1232
-Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-freebsd.tar.gz) = 4584208 bytes
-SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 0ed542f43acdee18b4eeb4de297869cbf16686d6
-RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = b6db3aa800bea4f2380f519483b406e84407a5a0
-SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 1e558f7d351d42f29ec39b9a0bf6b6ec550e944c46f6b88f475128039a7750378f40a669d99a21bcbf83cc0072e924187b47ab160cd7af2501076c4a88993f22
-Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz) = 4180436 bytes
-SHA1 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 845c5249ece8b4de95c1b568b50876a4715dde53
-RMD160 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = abd6aef6574a2cc62bfc3e3182010cc8ef4efcc2
-SHA512 (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 9522581702074be1372e03347d14189b46a8829fc941a1f145b42c8474569f2518dc5a0357cdfb893689e21f79cfbebf5eda7f9e61757b1a43c3964f63c327a6
-Size (rustc-1.15.1/cargo-nightly-x86_64-unknown-netbsd.tar.gz) = 3992899 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 06002c859520adf7bd3b0f905b360a469604d7e3
-RMD160 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 8c9b3353e70efdf01339dd81a94a3f0e579aa227
-SHA512 (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = c9d1efd75d2d7fffbe6a0ff10f3516947d90d212e64e20e06e433251c590d630757e0ad466297fdcee141490b84a81d1e317a1de89d51afd97230834352787a1
-Size (rustc-1.15.1/rust-std-1.14.0-i686-apple-darwin.tar.gz) = 42979079 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = ab30ddc769c771356f0392ba8c015fd3959b2c8a
-RMD160 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 0e388a899439fd1d07fdaa1304a719abcf5dbed4
-SHA512 (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 0ace7025c0b89af7cc74c3bd08065f4c02d4f00544197b6bafd63478536c9f2b849ed85b7177708e601abb46fcc55a180abfe8c758ba9493c65308fb598aedd8
-Size (rustc-1.15.1/rust-std-1.14.0-i686-unknown-linux-gnu.tar.gz) = 61245054 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 18275167c9487454eeb8073cd0dcd6ae01df2ca0
-RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = bed0e9dc68de37593bc0c581e5c320225ab726aa
-SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 8cb0b75382112efd12b15cdeb4052a2a04087efd0410ce433c8aaa6f6beecbfb9f081c22b288a97812ad211e01117032cc0e6c87e63670276b5e8462e3e193e0
-Size (rustc-1.15.1/rust-std-1.14.0-x86_64-apple-darwin.tar.gz) = 43320505 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 62a3e4d16d7fd1299b3311ad63e2ad176f6e8693
-RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 9f436d31d3f37d2fab6737a006be4057cc4a580d
-SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = df6931d95104c8ed4797548d4baa2ecc9490dea14bc48a7b4d07a7006cc76b14b3cf464c7c7daecc02b6ed43e503b7000b8f70130b552eaf1e26eb5b15ea3a3d
-Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-freebsd.tar.gz) = 65211300 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 91dbf4880e5c24227b0ca3a1de3bb901acb07658
-RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = c9ccedd285b034f5ca5ac97e5b38ac0dcca2f360
-SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = a30bcc90c7fbc40acb92223b8d9e224ee2407d15d28d70164f8f9ecd3e3612647115b382b2ec0deffaf44ff451db697c26b2def38e4043ef77f8b60a2cf7d185
-Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 59591949 bytes
-SHA1 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = e7828e5d1810b3cf56677a68960d9cb9c55468ae
-RMD160 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = 7eda1fcd8e3e4cf1c2e9d749f5b511cff9035c60
-SHA512 (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = e48b0b926aecbd9683dd54510c3842b4099c28edba136b89b18835cdae252bd8fd7b62dc2f2ef9728bf32fe05e73de665b9810ea539ba678fff91e5607b648b5
-Size (rustc-1.15.1/rust-std-1.14.0-x86_64-unknown-netbsd.tar.gz) = 64118638 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = de2e88096fc6e60f499a92b1c96f8463f001c708
-RMD160 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = 46c0a5d281eba6266411b2a68844242f5a877392
-SHA512 (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = e79b1a0e7ff8ac91bcec3c236afd0f009742d51f66ba215253fcc61ae276d4ae3f9128f16f484f07ce5b415d99f545d2dcb4000e8356306b05f8833f33289b6a
-Size (rustc-1.15.1/rustc-1.14.0-i686-apple-darwin.tar.gz) = 32785980 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 7b53c23ba64cea031067009ed3be3ff3fb264190
-RMD160 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 8d7b41d99bbb145d818887a1504069029e938d67
-SHA512 (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 4a951439d8c001b8ff2f6aa2f505e23130209494026fdacea019aef05bebb2f0d3404df047ccedbe9f4140cb5163404db22a5b0977752c495fc45f739d1252fb
-Size (rustc-1.15.1/rustc-1.14.0-i686-unknown-linux-gnu.tar.gz) = 51391277 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 3c82993aa1f578d5edd2939c3b145a06b686d3fe
-RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 844fad941197594cb3dcd1f74b79429fc3c82221
-SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = a938dadffe6d6ae44eeda97cb32b32ddef28ce8a9607a1840d1f58b301f819a5d3a53dfb70c1a892b9d98df8556d5d0638ed366ecb30fbf644c6a0cc8f977c1c
-Size (rustc-1.15.1/rustc-1.14.0-x86_64-apple-darwin.tar.gz) = 32979416 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 177d293f259fdf9002f9182d209a0765974697e3
-RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 3ee5aa62496bdbbd966b407304954c9983500dda
-SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 0e530d68ad98bc4b8b6d78d3817c4aeaa8c68f38e3dd5368d9dc700ee731b6ae6ae50ee757d06af91c44144c517b8262fbb55126d23c16fec34c2a7e0c84a8a9
-Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-freebsd.tar.gz) = 51459091 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 4f144f1b3da969a3d118ea334e70995736832cfc
-RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = bdf4315a56adef3ccb3ed2957bb557f8673f74e7
-SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = da33a8c509d3a554bed3173f8cdd6fc3639646e5b12eae80654d83290160227238c6f9ff9c0247d63a90f48eeafc8dc31a4a02575ba43fa6d5f75ae58a347c32
-Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-linux-gnu.tar.gz) = 49370951 bytes
-SHA1 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 20ab1bb2174e77728e10c022f185977dc5634906
-RMD160 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = f4e311a87cbb87ae7b6cbe937fba90ca5628437c
-SHA512 (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 0bc35435f0ee7f93ac05527bd3d4927ce90bb7bea444ce4040eb5e2f4b0c0216acf4f2f9520741e1eac0fb23c916546685e0ed90a9b0bd54a5a209abdfe1ff33
-Size (rustc-1.15.1/rustc-1.14.0-x86_64-unknown-netbsd.tar.gz) = 50325084 bytes
-SHA1 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = a5f4b21eeb0fb8ff0e156883aca16759ffb45f05
-RMD160 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = d98f20326938e780e016d08425dbc7f314d3e7c8
-SHA512 (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = 10d533b17cf7f92b9dff14b399b5dd0ac8b68284eea072c85ede78a4e4c2c4fce8c781777124c64798057aceb6444535e02e067fd67ba3633c3e828fb4d2d339
-Size (rustc-1.15.1/rustc-1.15.1-src.tar.gz) = 28100203 bytes
-SHA1 (patch-configure) = 229a8e8de52fc4f8a50380cc94066871a4ee83ab
-SHA1 (patch-src_bootstrap_native.rs) = ba543f26b31bd8b039a18e3ff13db3521ef010ee
-SHA1 (patch-src_libbacktrace_configure) = 2a985e27e64fd97f81f89524ab529eabd854d46b
-SHA1 (patch-src_libcompiler__builtins_build.rs) = 5b9b2dd3c41e8651a1f2eaf6317308519893a283
-SHA1 (patch-src_rust-installer_gen-install-script.sh) = 4b432b4c7d235f3e7f9b9ad06a2eef8e4ae82c14
-SHA1 (patch-src_rust-installer_gen-installer.sh) = 60c77d618f6178317c5542806b11c999f05c33d9
-SHA1 (patch-src_rust-installer_install-template.sh) = b43d5b99c7472edfea7bab9ba2fd943aa49ac2e9
-SHA1 (patch-src_rust-installer_test.sh) = f9e201b2c6113a588d8216247e85b44b1372e50a
diff --git a/rustc/patches/patch-configure b/rustc/patches/patch-configure
deleted file mode 100644
index 5621b67143..0000000000
--- a/rustc/patches/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Use pkgsrc libLLVM.
-
---- configure.orig	2016-07-04 02:50:20.000000000 +0000
-+++ configure
-@@ -968,11 +968,11 @@ then
-     putvar CFG_DISABLE_JEMALLOC
- fi
- 
--if [ -n "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/bin/llvm-config" ]
-+if [ -n "$CFG_LLVM_ROOT" -a -z "$CFG_DISABLE_LLVM_VERSION_CHECK" -a -e "$CFG_LLVM_ROOT/libexec/libLLVM/llvm-config" ]
- then
-     step_msg "using custom LLVM at $CFG_LLVM_ROOT"
- 
--    LLVM_CONFIG="$CFG_LLVM_ROOT/bin/llvm-config"
-+    LLVM_CONFIG="$CFG_LLVM_ROOT/libexec/libLLVM/llvm-config"
-     LLVM_VERSION=$($LLVM_CONFIG --version)
- 
-     case $LLVM_VERSION in
-@@ -1500,7 +1500,7 @@ do
-         do_reconfigure=0
-         # Check that LLVm FileCheck is available. Needed for the tests
-         if [ -z "$CFG_DISABLE_CODEGEN_TESTS" ]; then
--            need_cmd $LLVM_INST_DIR/bin/FileCheck
-+            need_cmd $LLVM_INST_DIR/libexec/libLLVM/FileCheck
-         fi
-     fi
- 
diff --git a/rustc/patches/patch-src_bootstrap_native.rs b/rustc/patches/patch-src_bootstrap_native.rs
deleted file mode 100644
index 41b1528667..0000000000
--- a/rustc/patches/patch-src_bootstrap_native.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-¯\(°_o)/¯
-
---- src/bootstrap/native.rs.orig	2017-02-09 01:37:48.000000000 +0000
-+++ src/bootstrap/native.rs
-@@ -124,6 +124,8 @@ pub fn llvm(build: &Build, target: &str)
-         cfg.define("CMAKE_CXX_FLAGS", build.cflags(target).join(" "));
-     }
- 
-+    cfg.define("CMAKE_INSTALL_RPATH", "");
-+
-     // FIXME: we don't actually need to build all LLVM tools and all LLVM
-     //        libraries here, e.g. we just want a few components and a few
-     //        tools. Figure out how to filter them down and only build the right
diff --git a/rustc/patches/patch-src_libbacktrace_configure b/rustc/patches/patch-src_libbacktrace_configure
deleted file mode 100644
index 8835ab7df3..0000000000
--- a/rustc/patches/patch-src_libbacktrace_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-avoid undaignosed libtool breakage
---- src/libbacktrace/configure.orig	2017-02-09 01:37:48.000000000 +0000
-+++ src/libbacktrace/configure
-@@ -7783,7 +7783,7 @@ fi
- LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='libtool'
- 
- 
- 
diff --git a/rustc/patches/patch-src_libcompiler__builtins_build.rs b/rustc/patches/patch-src_libcompiler__builtins_build.rs
deleted file mode 100644
index 9ff59d5f10..0000000000
--- a/rustc/patches/patch-src_libcompiler__builtins_build.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-Don't build gcc_personality_v0.c on NetBSD.
-
---- src/libcompiler_builtins/build.rs.orig	2017-02-09 01:37:48.000000000 +0000
-+++ src/libcompiler_builtins/build.rs
-@@ -251,7 +251,7 @@ fn main() {
-             sources.extend(&["x86_64/floatdidf.c", "x86_64/floatdisf.c", "x86_64/floatdixf.c"]);
-         }
-     } else {
--        if !target.contains("freebsd") {
-+        if !target.contains("freebsd") && !target.contains("netbsd") {
-             sources.extend(&["gcc_personality_v0.c"]);
-         }
- 
diff --git a/rustc/patches/patch-src_rust-installer_gen-install-script.sh b/rustc/patches/patch-src_rust-installer_gen-install-script.sh
deleted file mode 100644
index d6d645dd8d..0000000000
--- a/rustc/patches/patch-src_rust-installer_gen-install-script.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-Do not use /bin/echo, on e.g. SunOS it does not support -n.
-
---- src/rust-installer/gen-install-script.sh.orig	2016-05-31 21:13:01.000000000 +0000
-+++ src/rust-installer/gen-install-script.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/pkg/bin/bash
- # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
- # file at the top-level directory of this distribution and at
- # http://rust-lang.org/COPYRIGHT.
-@@ -11,7 +11,7 @@
- 
- set -u
- 
--if [ -x /bin/echo ]; then
-+if [ -x /bin/donotuseecho ]; then
-     ECHO='/bin/echo'
- else
-     ECHO='echo'
diff --git a/rustc/patches/patch-src_rust-installer_gen-installer.sh b/rustc/patches/patch-src_rust-installer_gen-installer.sh
deleted file mode 100644
index 1ab16a2d39..0000000000
--- a/rustc/patches/patch-src_rust-installer_gen-installer.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-Do not use /bin/echo, on e.g. SunOS it does not support -n.
-Avoid CDPATH issues.
-
---- src/rust-installer/gen-installer.sh.orig	2017-02-09 01:39:01.000000000 +0000
-+++ src/rust-installer/gen-installer.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/pkg/bin/bash
- # Copyright 2014 The Rust Project Developers. See the COPYRIGHT
- # file at the top-level directory of this distribution and at
- # http://rust-lang.org/COPYRIGHT.
-@@ -281,7 +281,7 @@ cp -r "$CFG_IMAGE_DIR/"* "$CFG_WORK_DIR/
- need_ok "couldn't copy source image"
- 
- # Create the manifest
--manifest=`(cd "$CFG_WORK_DIR/$CFG_PACKAGE_NAME/$CFG_COMPONENT_NAME" && find . -type f | sed 's/^\.\///') | sort`
-+manifest=`(unset CDPATH && cd "$CFG_WORK_DIR/$CFG_PACKAGE_NAME/$CFG_COMPONENT_NAME" >/dev/null && find . -type f | sed 's/^\.\///') | sort`
- 
- # Remove files in bulk dirs
- bulk_dirs=`echo "$CFG_BULK_DIRS" | tr "," " "`
-@@ -317,7 +317,7 @@ echo "$rust_installer_version" > "$versi
- 
- # Copy the overlay
- if [ -n "$CFG_NON_INSTALLED_OVERLAY" ]; then
--    overlay_files=`(cd "$CFG_NON_INSTALLED_OVERLAY" && find . -type f)`
-+    overlay_files=`(unset CDPATH && cd "$CFG_NON_INSTALLED_OVERLAY" >/dev/null && find . -type f)`
-     for f in $overlay_files; do
- 	if [ -e "$CFG_WORK_DIR/$CFG_PACKAGE_NAME/$f" ]; then err "overlay $f exists"; fi
- 
diff --git a/rustc/patches/patch-src_rust-installer_install-template.sh b/rustc/patches/patch-src_rust-installer_install-template.sh
deleted file mode 100644
index 294788b04c..0000000000
--- a/rustc/patches/patch-src_rust-installer_install-template.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Support SunOS.
-
---- src/rust-installer/install-template.sh.orig	2016-03-03 01:04:59.000000000 +0000
-+++ src/rust-installer/install-template.sh
-@@ -324,6 +324,10 @@ get_host_triple() {
-     local _ostype
-     case $_uname_value in
- 
-+	SunOS)
-+            _ostype=sun-solaris
-+            ;;
-+
- 	Linux)
-             _ostype=unknown-linux-gnu
-             ;;
diff --git a/rustc/patches/patch-src_rust-installer_test.sh b/rustc/patches/patch-src_rust-installer_test.sh
deleted file mode 100644
index 4a6c567d41..0000000000
--- a/rustc/patches/patch-src_rust-installer_test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Do not use /bin/echo, on e.g. SunOS it does not support -n.
-
---- src/rust-installer/test.sh.orig	2016-03-03 01:04:59.000000000 +0000
-+++ src/rust-installer/test.sh
-@@ -2,7 +2,7 @@
- 
- set -e -u
- 
--if [ -x /bin/echo ]; then
-+if [ -x /bin/donotuseecho ]; then
-     ECHO='/bin/echo'
- else
-     ECHO='echo'


Home | Main Index | Thread Index | Old Index