[pkgsrc/trunk]: pkgsrc/lang/rust-bin lang/rust-bin: pull over patch to files/...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/708e052da811
branches:  trunk
changeset: 454582:708e052da811
user:      he <he%pkgsrc.org@localhost>
date:      Sun Jun 13 12:25:02 2021 +0000

description:
lang/rust-bin: pull over patch to files/install.sh from rust.

Better patch for src/tools/rust-installer/install-template.sh
- remove one path component after share/doc/ as the original code does
- do not change spacing for HACK: section

Bump PKGREVISION.

diffstat:

 lang/rust-bin/Makefile         |   4 ++--
 lang/rust-bin/files/install.sh |  22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (47 lines):

diff -r 5398fa507c6c -r 708e052da811 lang/rust-bin/Makefile
--- a/lang/rust-bin/Makefile    Sun Jun 13 12:24:05 2021 +0000
+++ b/lang/rust-bin/Makefile    Sun Jun 13 12:25:02 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2021/06/12 20:43:41 he Exp $
+# $NetBSD: Makefile,v 1.23 2021/06/13 12:25:02 he Exp $
 
 DISTNAME=      rust-1.52.1
 PKGNAME=       ${DISTNAME:S/rust/rust-bin/1}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
diff -r 5398fa507c6c -r 708e052da811 lang/rust-bin/files/install.sh
--- a/lang/rust-bin/files/install.sh    Sun Jun 13 12:24:05 2021 +0000
+++ b/lang/rust-bin/files/install.sh    Sun Jun 13 12:25:02 2021 +0000
@@ -569,18 +569,18 @@
                    _file_install_path="$CFG_DESTDIR_PREFIX/$PKGMANDIR/$_f"
                    ;;
                share/doc/*)
-        # HACK: Try to support overriding --docdir.  Paths with the form
-        # "share/doc/$product/" can be redirected to a single --docdir
-        # path. If the following detects that --docdir has been specified
-        # then it will replace everything preceeding the "$product" path
-        # component. The problem here is that the combined rust installer
-        # contains two "products": rust and cargo; so the contents of those
-        # directories will both be dumped into the same directory; and the
-        # contents of those directories are _not_ disjoint. Since this feature
-        # is almost entirely to support 'make install' anyway I don't expect
-        # this problem to be a big deal in practice.
+            # HACK: Try to support overriding --docdir.  Paths with the form
+            # "share/doc/$product/" can be redirected to a single --docdir
+            # path. If the following detects that --docdir has been specified
+            # then it will replace everything preceeding the "$product" path
+            # component. The problem here is that the combined rust installer
+            # contains two "products": rust and cargo; so the contents of those
+            # directories will both be dumped into the same directory; and the
+            # contents of those directories are _not_ disjoint. Since this feature
+            # is almost entirely to support 'make install' anyway I don't expect
+            # this problem to be a big deal in practice.
                    if [ "$CFG_DOCDIR" != "<default>" ]; then
-                       local _f=${_file#"share/doc/"}
+                       local _f=${_file#"share/doc/"*/}
                        _file_install_path="$CFG_DOCDIR/$_f"
                    fi
                    ;;