[pkgsrc/trunk]: pkgsrc/lang/rust-bin Update the NetBSD binaries to ones not i...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/rust-bin Update the NetBSD binaries to ones not i...
From: he <he%pkgsrc.org@localhost>
Date: Sat, 12 Jun 2021 21:37:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/31ec20ed3739
branches:  trunk
changeset: 454511:31ec20ed3739
user:      he <he%pkgsrc.org@localhost>
date:      Sat Jun 12 20:43:41 2021 +0000

description:
Update the NetBSD binaries to ones not including the "docs" part.

Also, pull over the patched install.sh script from the main package,
for quite a lot faster installation, also for the benefit of the
upstream-delivered binaries. (Fix submitted upstream.)

Use the nb1 version suffix on the NetBSD binaries (one-time job for
1.52.1, to be removed on next go-around), but they still extract to
the non-nb1 work directory, so some adjustment needed for that.

Bump PKGREVISION.

diffstat:

 lang/rust-bin/Makefile                 |   37 +-
 lang/rust-bin/distinfo                 |   46 +-
 lang/rust-bin/files/install.sh         |  971 +++++++++++++++++++++++++++++++++
 lang/rust-bin/patches/patch-install.sh |   24 -
 4 files changed, 1020 insertions(+), 58 deletions(-)

diffs (truncated from 1150 to 300 lines):

diff -r 5ed64e7423a4 -r 31ec20ed3739 lang/rust-bin/Makefile
--- a/lang/rust-bin/Makefile    Sat Jun 12 17:31:19 2021 +0000
+++ b/lang/rust-bin/Makefile    Sat Jun 12 20:43:41 2021 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2021/06/12 09:10:53 nia Exp $
+# $NetBSD: Makefile,v 1.22 2021/06/12 20:43:41 he Exp $
 
 DISTNAME=      rust-1.52.1
 PKGNAME=       ${DISTNAME:S/rust/rust-bin/1}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  https://static.rust-lang.org/dist/
 DIST_SUBDIR=   ${PKGNAME_NOREV}
@@ -91,42 +92,52 @@
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    aarch64-unknown-netbsd
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    armv7-unknown-netbsd-eabihf
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    i586-unknown-netbsd
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    powerpc-unknown-netbsd90
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .  if !empty(OS_VERSION:M8.*)
 RUST_ARCH:=    powerpc-unknown-netbsd
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .  endif
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi)
 RUST_ARCH:=    sparc64-unknown-netbsd
-DISTFILES:=    ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz
-SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \
+DN:=           ${DISTNAME}nb${PKGREVISION}
+DISTFILES:=    ${DISTFILES} ${DN}-${RUST_ARCH}.tar.gz
+SITES.${DN}-${RUST_ARCH}.tar.gz= \
                ${NETBSD_REPO}
 .endif
 
+# Binary still extracts to plain non-nb'ed directory
+WRKSRC:=       ${WRKSRC:C/nb[0-9]*//}
+
 do-install:
+       cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
        cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \
        --destdir=${DESTDIR} --prefix=${PREFIX}
        ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp
diff -r 5ed64e7423a4 -r 31ec20ed3739 lang/rust-bin/distinfo
--- a/lang/rust-bin/distinfo    Sat Jun 12 17:31:19 2021 +0000
+++ b/lang/rust-bin/distinfo    Sat Jun 12 20:43:41 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/06/12 09:10:53 nia Exp $
+$NetBSD: distinfo,v 1.10 2021/06/12 20:43:41 he Exp $
 
 SHA1 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-linux-gnu.tar.gz) = ed140baee577a96b162a163f07f13b37229eda8e
 RMD160 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-linux-gnu.tar.gz) = 84eeea0d870663d092ca5666fc21237ce8fa8628
@@ -8,30 +8,10 @@
 RMD160 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-linux-musl.tar.gz) = e3c6ea628f544c9039d7861d2c284f01552d08ed
 SHA512 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-linux-musl.tar.gz) = 
53fb5d85664ca65ad021706fe1a072e91689ceacb23c2531ac404b146fcbc195546bd9a4c7b660d3cd21f4aea0d7ff04c9946ec0aa2febaa53ea314589f85ea8
 Size (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-linux-musl.tar.gz) = 327097199 bytes
-SHA1 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-netbsd.tar.gz) = bf0893cf5ce90431f317585078e630b3d3d2d8ca
-RMD160 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-netbsd.tar.gz) = 2111acc0a157b61225d67ebdf28d843fcd1fe31d
-SHA512 (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-netbsd.tar.gz) = 8ae86a711756cfb5ea58095e7aa2b0ca9e5548da62b703f8e30847b4543035a461594a14a8b791b21d06f5109d6ceea128f6262221350e0fa24a9f62e66cf719
-Size (rust-bin-1.52.1/rust-1.52.1-aarch64-unknown-netbsd.tar.gz) = 292520308 bytes
-SHA1 (rust-bin-1.52.1/rust-1.52.1-armv7-unknown-netbsd-eabihf.tar.gz) = 54fc1e53a1876006d10f9b6e5d136e3e7506a727
-RMD160 (rust-bin-1.52.1/rust-1.52.1-armv7-unknown-netbsd-eabihf.tar.gz) = 27c190370f1000ccd7171c9d049d71279ebc7947
-SHA512 (rust-bin-1.52.1/rust-1.52.1-armv7-unknown-netbsd-eabihf.tar.gz) = 
858161a6814f42807af54a746a29ed72f8a7c8dc835c129e95f36e395dfbd0adaf23a8a80749b46d147cca063d1344206675eca060bac391ba04d5c87b5cdd1b
-Size (rust-bin-1.52.1/rust-1.52.1-armv7-unknown-netbsd-eabihf.tar.gz) = 262615033 bytes
-SHA1 (rust-bin-1.52.1/rust-1.52.1-i586-unknown-netbsd.tar.gz) = e881f30abeac680e2ab4003bf10644f42ab209d6
-RMD160 (rust-bin-1.52.1/rust-1.52.1-i586-unknown-netbsd.tar.gz) = ea6d0aeaba69e5b4ec9fb7f734baf026d8cfebf2
-SHA512 (rust-bin-1.52.1/rust-1.52.1-i586-unknown-netbsd.tar.gz) = 835028d58b64140619d72561e989f13dba20fc1c89dcb67bdf0b013952832e92904b2a5e8f48104dd835b5f3037565828dc1708c26ba43c403bedcd0fea6fb7e
-Size (rust-bin-1.52.1/rust-1.52.1-i586-unknown-netbsd.tar.gz) = 310872131 bytes
 SHA1 (rust-bin-1.52.1/rust-1.52.1-i686-unknown-linux-gnu.tar.gz) = 9f02af06cfd735305be5c29d584e555bc57172e7
 RMD160 (rust-bin-1.52.1/rust-1.52.1-i686-unknown-linux-gnu.tar.gz) = 64d94d3bfffeb6617ff2f64d60143e56ae584450
 SHA512 (rust-bin-1.52.1/rust-1.52.1-i686-unknown-linux-gnu.tar.gz) = 335336cbf935cdfd3da3823f5523fbea54dc5658f7235fc0f14cb22947de435dc29d78bc80a8eb599caa66c6593494796743d8fb0ec58bbcbbfea2d1e8c7f16a
 Size (rust-bin-1.52.1/rust-1.52.1-i686-unknown-linux-gnu.tar.gz) = 353110704 bytes
-SHA1 (rust-bin-1.52.1/rust-1.52.1-powerpc-unknown-netbsd90.tar.gz) = b45d3192e275297c844117b9d615f2ac55730640
-RMD160 (rust-bin-1.52.1/rust-1.52.1-powerpc-unknown-netbsd90.tar.gz) = 787f30b61573ef4ef1255c6b552b200a5cafa2a4
-SHA512 (rust-bin-1.52.1/rust-1.52.1-powerpc-unknown-netbsd90.tar.gz) = f765b3b4dde602aa1032f58fa505cf8900a3d1b7d90c9347d2129efa6ea9311a499adc0dc2578723b9234d6f27aa2c9acdb4aff65208a6ced0580a97c7874efb
-Size (rust-bin-1.52.1/rust-1.52.1-powerpc-unknown-netbsd90.tar.gz) = 329947399 bytes
-SHA1 (rust-bin-1.52.1/rust-1.52.1-sparc64-unknown-netbsd.tar.gz) = 97f71cbebf4f6828323d541c1d89ab68632b7678
-RMD160 (rust-bin-1.52.1/rust-1.52.1-sparc64-unknown-netbsd.tar.gz) = 2983cc880b7fa14cef2cd9dc70ca2cfd16119be5
-SHA512 (rust-bin-1.52.1/rust-1.52.1-sparc64-unknown-netbsd.tar.gz) = e3804bfa6a082ac209eb75f3a43925f24e31be22e0c4e15992639dbc9d2b6f23b42755c5e76f8cd35531463a217f58fdf63463fe57ba464fcefecb4b6f9b4c0b
-Size (rust-bin-1.52.1/rust-1.52.1-sparc64-unknown-netbsd.tar.gz) = 305837361 bytes
 SHA1 (rust-bin-1.52.1/rust-1.52.1-x86_64-apple-darwin.tar.gz) = da14a9222e1c83319c21811c2e29b4957a808ff4
 RMD160 (rust-bin-1.52.1/rust-1.52.1-x86_64-apple-darwin.tar.gz) = eb4c0205e6ecde8046a56098e94854d0f38dd68e
 SHA512 (rust-bin-1.52.1/rust-1.52.1-x86_64-apple-darwin.tar.gz) = aade41eab3a6cb975d2a9f2420757dfe656b35c5590f1e11bd4f16cd22e2981fde9656178d7050993aa0c153e792aa7a97d4778727c1f387432c72120b24169e
@@ -52,4 +32,28 @@
 RMD160 (rust-bin-1.52.1/rust-1.52.1-x86_64-unknown-netbsd.tar.gz) = 3d40e80290be1bd84881c5fb450a75b5c036fc89
 SHA512 (rust-bin-1.52.1/rust-1.52.1-x86_64-unknown-netbsd.tar.gz) = 249177e68fdda71d546250e497585785a6ccbec84ed459076e4ab00abe6ad851e399baa7a125f63ea9a232abc597b6454b731bae433d64fcbf755757712dbd18
 Size (rust-bin-1.52.1/rust-1.52.1-x86_64-unknown-netbsd.tar.gz) = 263726416 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-aarch64-unknown-netbsd.tar.gz) = c7b918498f7d45bd55cf49e7856321f8523b632e
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-aarch64-unknown-netbsd.tar.gz) = 86efe4b8676e1ccfc188d4229640a1a0cd726496
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-aarch64-unknown-netbsd.tar.gz) = 
e0205156c81bbc8b96c6618b9caa6b1352b8373bd9c985076b7255658cf0c42d1a68c39053c63aa6616ad775b544a7aaab740b948080176ddabbe04c2ed5849a
+Size (rust-bin-1.52.1/rust-1.52.1nb1-aarch64-unknown-netbsd.tar.gz) = 239658624 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-armv7-unknown-netbsd-eabihf.tar.gz) = a620cb984e18539561fef38d871860f3d927bae1
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-armv7-unknown-netbsd-eabihf.tar.gz) = 3c1c2cf9c38454c330e3d4edef5c6caefa154976
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-armv7-unknown-netbsd-eabihf.tar.gz) = 
9281b41d2c10abf9fd4a19eee50c9d08bee5974ee4c9759b706e9087f5e5e124a27ba290ce0784d6095939501a318a0c8c8e2b9b73167e23ab7457adc0a93e3d
+Size (rust-bin-1.52.1/rust-1.52.1nb1-armv7-unknown-netbsd-eabihf.tar.gz) = 209595846 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-i586-unknown-netbsd.tar.gz) = 89aa576964b0a9b6574bb9dab855c69f9448fd67
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-i586-unknown-netbsd.tar.gz) = 50909e13bd907678c01095a5021c8ae12d686143
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-i586-unknown-netbsd.tar.gz) = 847d100ac7a60c2ddbcc02917d181b0fae80dd93d34cbfce879c99d3bc8b9501d35bbd36f65b5ddc4e67696b6e60f814e53abf7af6159262084caf9660cbd799
+Size (rust-bin-1.52.1/rust-1.52.1nb1-i586-unknown-netbsd.tar.gz) = 258075867 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd.tar.gz) = f811b465bfc35b5a1078f876bab7b5f654f22465
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd.tar.gz) = f580a4d9e36ca875a39ce643848b39c239ff41a1
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd.tar.gz) = 
f22a52bc0812da42678c3bf22a194acefdf9ae677700a47bd4c75ca14f83f930d417865d9cef08b5830d05c9ca59e0ae7c4e72270de9fc7a259b43c1370ec801
+Size (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd.tar.gz) = 271857078 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd90.tar.gz) = 3f2e87796d505ed9b7a85e773cd03496ef1e9823
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd90.tar.gz) = e60ea885d1f8eb61d63243e32f24673406f6c42e
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd90.tar.gz) = 
480a2075e2cb75aade32d82689c2c4e3b47c0afb9dbb5d48b134187beaad356c4f40936f83800ad5c16f54058b85c7ff17bed3ae8e6b8c027fe2e3e3cb3a61fc
+Size (rust-bin-1.52.1/rust-1.52.1nb1-powerpc-unknown-netbsd90.tar.gz) = 277174470 bytes
+SHA1 (rust-bin-1.52.1/rust-1.52.1nb1-sparc64-unknown-netbsd.tar.gz) = ffd0edec58f7a02ebb195fb28ebf590e24a67236
+RMD160 (rust-bin-1.52.1/rust-1.52.1nb1-sparc64-unknown-netbsd.tar.gz) = 7f6aaf7c8207b061bdf258cede8e9a1cc9b82647
+SHA512 (rust-bin-1.52.1/rust-1.52.1nb1-sparc64-unknown-netbsd.tar.gz) = 
5602c5a00b4cacb254fea76fcd346f0c4ff4aec6b317e760870252048e444440e501c219278e6b37da71a26cce2a598c97be9b99e9bf3b30cae177004c79b355
+Size (rust-bin-1.52.1/rust-1.52.1nb1-sparc64-unknown-netbsd.tar.gz) = 253026549 bytes
 SHA1 (patch-install.sh) = 4dc4edcbda3c9d2b60ea51b5f83cadd5992ba786
diff -r 5ed64e7423a4 -r 31ec20ed3739 lang/rust-bin/files/install.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/rust-bin/files/install.sh    Sat Jun 12 20:43:41 2021 +0000
@@ -0,0 +1,971 @@
+#!/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.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+# No undefined variables
+set -u
+
+init_logging() {
+    local _abs_libdir="$1"
+    local _logfile="$_abs_libdir/$TEMPLATE_REL_MANIFEST_DIR/install.log"
+    LOGFILE="$_logfile"
+}
+
+log_line() {
+    local _line="$1"
+
+}
+
+msg() {
+    local _line="install: ${1-}"
+    echo "$_line"
+    log_line "$_line"
+}
+
+verbose_msg() {
+    if [ -n "${CFG_VERBOSE-}" ]; then
+       msg "${1-}"
+    else
+       log_line "install: ${1-}"
+    fi
+}
+
+step_msg() {
+    msg
+    msg "$1"
+    msg
+}
+
+verbose_step_msg() {
+    if [ -n "${CFG_VERBOSE-}" ]; then
+       msg
+       msg "$1"
+       msg
+    else
+       log_line ""
+       log_line "install: $1"
+       log_line ""
+    fi
+}
+
+warn() {
+    local _line="install: WARNING: $1"
+    echo "$_line" >&2
+    log_line "$_line"
+}
+
+err() {
+    local _line="install: error: $1"
+    echo "$_line" >&2
+    log_line "$_line"
+    exit 1
+}
+
+# A non-user error that is likely to result in a corrupted install
+critical_err() {
+    local _line="install: error: $1. see logs at '${LOGFILE-}'"
+    echo "$_line" >&2
+    log_line "$_line"
+    exit 1
+}
+
+need_ok() {
+    if [ $? -ne 0 ]
+    then
+        err "$1"
+    fi
+}
+
+critical_need_ok() {
+    if [ $? -ne 0 ]
+    then
+        critical_err "$1"
+    fi
+}
+
+want_ok() {
+    if [ $? -ne 0 ]; then
+       warn "$1"
+    fi
+}
+
+assert_nz() {
+    if [ -z "$1" ]; then err "assert_nz $2"; fi
+}
+
+need_cmd() {
+    if command -v $1 >/dev/null 2>&1
+    then verbose_msg "found $1"
+    else err "need $1"
+    fi
+}
+
+run() {
+    local _line="\$ $*"
+    "$@"
+    local _retval=$?
+    log_line "$_line"
+    return $_retval
+}
+
+write_to_file() {
+    local _msg="$1"
+    local _file="$2"
+    local _line="$ echo \"$_msg\" > \"$_file\""
+    echo "$_msg" > "$_file"
+    local _retval=$?
+    log_line "$_line"
+    return $_retval
+}
+
+append_to_file() {
+    local _msg="$1"
+    local _file="$2"
+    local _line="$ echo \"$_msg\" >> \"$_file\""
+    echo "$_msg" >> "$_file"
+    local _retval=$?
+    log_line "$_line"
+    return $_retval
+}
+
+make_dir_recursive() {
+    local _dir="$1"
+    local _line="$ umask 022 && mkdir -p \"$_dir\""
+    umask 022 && mkdir -p "$_dir"
+    local _retval=$?
+    log_line "$_line"
+    return $_retval
+}
+
+putvar() {
+    local t
+    local tlen
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of lang/rust-bin to 1.52.1nb1.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/R-cpp11 (lang/R-cpp) Updated 0.2.4 to 0.2.7
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of lang/rust-bin to 1.52.1nb1.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/R-cpp11 (lang/R-cpp) Updated 0.2.4 to 0.2.7
Indexes:
Home | Main Index | Thread Index | Old Index