diff options
author | he <he@pkgsrc.org> | 2021-06-13 12:19:16 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2021-06-13 12:19:16 +0000 |
commit | 188ae36407c898650148e47ee30f5db34f5d139c (patch) | |
tree | 4e7fdc3e4abdecbeba57ec2e0b5e08b765f17d2e /lang/rust | |
parent | b70a6333e5a4a7ca3984a8c43fd6268b169667d1 (diff) | |
download | pkgsrc-188ae36407c898650148e47ee30f5db34f5d139c.tar.gz |
rust: apply patch from the old lang/rust-bin package.
This synchronizes lang/rust with wip/rust.
Bump PKGREVISION.
Diffstat (limited to 'lang/rust')
-rw-r--r-- | lang/rust/Makefile | 3 | ||||
-rw-r--r-- | lang/rust/distinfo | 4 | ||||
-rw-r--r-- | lang/rust/patches/patch-src_tools_rust-installer_install-template.sh | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 13405197033..99b0670d1dc 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.240 2021/06/01 18:15:30 adam Exp $ +# $NetBSD: Makefile,v 1.241 2021/06/13 12:19:16 he Exp $ DISTNAME= rustc-1.52.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 21df453411b..eab3f69c924 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.135 2021/06/09 13:42:30 adam Exp $ +$NetBSD: distinfo,v 1.136 2021/06/13 12:19:16 he Exp $ SHA1 (rust-1.51.0-aarch64-apple-darwin.tar.gz) = 4780de680bb5641ee9e0554bf554c9774b77a3df RMD160 (rust-1.51.0-aarch64-apple-darwin.tar.gz) = 8bb65e59163f56afb82443c917cf2f0f34d1122b @@ -152,7 +152,7 @@ SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7 SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34 -SHA1 (patch-src_tools_rust-installer_install-template.sh) = 0eb45efc0928000649026d4317fe5f95b5f6dd4a +SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2533c2ae0d45d48b5ebea5d36842b4a1b9009af SHA1 (patch-vendor_cc-1.0.60_src_lib.rs) = 42ddba7dfbec922e5ef948b97ff8c70bae1b0113 SHA1 (patch-vendor_cc_src_lib.rs) = 27d8b8b6d9a607362152069a206298854f517460 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b diff --git a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh index da1c76d0588..bc2902bce1c 100644 --- a/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh +++ b/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh @@ -1,4 +1,4 @@ -$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.5 2021/06/09 13:42:30 adam Exp $ +$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.6 2021/06/13 12:19:16 he Exp $ No logging to 'install.log'. Do not create 'uninstall.sh'. @@ -90,7 +90,7 @@ should do just fine. + case "$_file" in + etc/*) + local _f=${_file#"etc/"} -+ _file_install_path="$CFG_SYSCONFDIR/$_f" ++ _file_install_path="$CFG_DESTDIR_PREFIX/share/doc/cargo/$_f" + ;; + bin/*) + local _f=${_file#"bin/"} @@ -102,7 +102,7 @@ should do just fine. + ;; + share/man/*) + local _f=${_file#"share/man/"} -+ _file_install_path="$CFG_MANDIR/$_f" ++ _file_install_path="$CFG_DESTDIR_PREFIX/$PKGMANDIR/$_f" + ;; + share/doc/*) # HACK: Try to support overriding --docdir. Paths with the form |