CVS commit: pkgsrc/lang/rust-bin

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Jun 13 12:25:02 UTC 2021

Modified Files:
        pkgsrc/lang/rust-bin: Makefile
        pkgsrc/lang/rust-bin/files: install.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/rust-bin/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/rust-bin/files/install.sh

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

Modified files:

Index: pkgsrc/lang/rust-bin/Makefile
diff -u pkgsrc/lang/rust-bin/Makefile:1.22 pkgsrc/lang/rust-bin/Makefile:1.23
--- pkgsrc/lang/rust-bin/Makefile:1.22  Sat Jun 12 20:43:41 2021
+++ pkgsrc/lang/rust-bin/Makefile       Sun Jun 13 12:25:02 2021
@@ -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}

Index: pkgsrc/lang/rust-bin/files/install.sh
diff -u pkgsrc/lang/rust-bin/files/install.sh:1.1 pkgsrc/lang/rust-bin/files/install.sh:1.2
--- pkgsrc/lang/rust-bin/files/install.sh:1.1   Sat Jun 12 20:43:41 2021
+++ pkgsrc/lang/rust-bin/files/install.sh       Sun Jun 13 12:25:02 2021
@@ -569,18 +569,18 @@ install_components() {
                    _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
                    ;;