pkgsrc-WIP-changes archive

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

rust: apply patch to install.sh from the lang/rust-bin package. Bump PKGREVISION.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sun Jun 6 21:56:02 2021 +0200
Changeset:	8c12dc5043130dc25a1a9509ca70efa9f26974cb

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/patches/patch-src_tools_rust-installer_install-template.sh

Log Message:
rust: apply patch to install.sh from the lang/rust-bin package.
Bump PKGREVISION.

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

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

diffstat:
 rust/Makefile                                                   | 2 +-
 rust/distinfo                                                   | 2 +-
 rust/patches/patch-src_tools_rust-installer_install-template.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index d39ce59062..c01f707d32 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	rustc-1.52.1-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 
diff --git a/rust/distinfo b/rust/distinfo
index 7f385c6f24..3d1ef4fd82 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -128,7 +128,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) = 9f93da54d9a126390d1ec9d1430241f876c8ba3f
+SHA1 (patch-src_tools_rust-installer_install-template.sh) = fc185ca05e376da4548ec6ed1019a4f799f9b4f3
 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/rust/patches/patch-src_tools_rust-installer_install-template.sh b/rust/patches/patch-src_tools_rust-installer_install-template.sh
index f057f115dc..43e008289c 100644
--- a/rust/patches/patch-src_tools_rust-installer_install-template.sh
+++ b/rust/patches/patch-src_tools_rust-installer_install-template.sh
@@ -89,7 +89,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/"}
@@ -101,7 +101,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


Home | Main Index | Thread Index | Old Index