<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.

</pre>
<p><a href="https://github.com/macports/mpbb/commit/e30835a20648027854888d686dbfa8ae2d34a79c">https://github.com/macports/mpbb/commit/e30835a20648027854888d686dbfa8ae2d34a79c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e30835a  mpb: resolve port-tclsh symlink before executing
</span>e30835a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e30835a20648027854888d686dbfa8ae2d34a79c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 25 03:16:52 2022 +1100

<span style='display:block; white-space:pre;color:#404040;'>    mpb: resolve port-tclsh symlink before executing
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    This avoids an undesirable modification of auto_path due to Tcl trying
</span><span style='display:block; white-space:pre;color:#404040;'>    to be helpful.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/64507
</span>---
 functions                 | 2 +-
 mpbb-cleanup              | 2 +-
 mpbb-gather-archives      | 2 +-
 mpbb-install-dependencies | 3 ++-
 mpbb-install-port         | 2 +-
 mpbb-list-subports        | 2 +-
 mpbb-mirror-distfiles     | 2 +-
 mpbb-print-info           | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/functions b/functions
</span><span style='display:block; white-space:pre;color:#808080;'>index d3fd13f..77ac5a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/functions
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/functions
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +139,7 @@ failcache_key() {
</span>     fi
 
     local canonical_variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    canonical_variants=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/canonical-variants.tcl" "$@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    canonical_variants=$("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/canonical-variants.tcl" "$@")
</span>     if [ $? -ne 0 ]; then
         err "tools/canonical-variants.tcl" "$@" "failed"
         return 4
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-cleanup b/mpbb-cleanup
</span><span style='display:block; white-space:pre;color:#808080;'>index 31df409..0e5b570 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-cleanup
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-cleanup
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ cleanup() {
</span>         echo "----> Uninstalling unneeded ports"
         # $thisdir is set by mpbb and points to the directory in which this script resides
         # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/uninstall-unneeded-ports.tcl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/uninstall-unneeded-ports.tcl"
</span>         if [ ! -L "${option_prefix}/var/macports/distfiles" ]; then
             echo
             echo "----> Deleting distfiles"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-gather-archives b/mpbb-gather-archives
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b06472..7c49776 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-gather-archives
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-gather-archives
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ gather-archives() {
</span> 
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    tclsh=${option_prefix}/bin/port-tclsh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    tclsh=$(readlink "${option_prefix}/bin/port-tclsh")
</span> 
     if [ -d "${option_staging_dir}" ]; then
         find "${option_staging_dir}" -type f -delete -print | sed -E -e "s|^.*/||" -e 's/^/Deleting previously staged archive: /'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-dependencies b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;color:#808080;'>index a69f634..4593bf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-dependencies
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +28,10 @@ install-dependencies() {
</span> 
     # Script attempts to get to a state where all dependencies (and
     # only dependencies) of the port are active
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Use of readlink is due to https://trac.macports.org/ticket/64507
</span>     # $option_prefix and $thisdir are set in mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" --failcache_dir "${option_failcache_dir}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/dependencies.tcl" --failcache_dir "${option_failcache_dir}" \
</span>         --logs_dir "${option_log_dir}" "$@"
     result=$?
     if [ $result -ne 0 ]; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-install-port b/mpbb-install-port
</span><span style='display:block; white-space:pre;color:#808080;'>index aac7f6e..18f083c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-install-port
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ install-port() {
</span> 
     # $option_prefix and $thisdir are set in mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" "$@") ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if [[ -f $("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/archive-path.tcl" "$@") ]]; then
</span>         echo "$* already installed, nothing to do"
         # log: summary for the portwatcher
         echo "Building '$port' ... [OK]" >> "$log_subports_progress"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-list-subports b/mpbb-list-subports
</span><span style='display:block; white-space:pre;color:#808080;'>index a170d0a..e8b408a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ print-subports() {
</span> 
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    tclsh=${option_prefix}/bin/port-tclsh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    tclsh=$(readlink "${option_prefix}/bin/port-tclsh")
</span>     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
     if [ "${include_deps}" = "yes" ]; then
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-mirror-distfiles b/mpbb-mirror-distfiles
</span><span style='display:block; white-space:pre;color:#808080;'>index c0b529d..99d9b5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-mirror-distfiles
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-mirror-distfiles
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +73,6 @@ mirror-distfiles() {
</span>     # Mirror the distfiles.
     # $option_prefix is set by mpbb
     # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/mirror-multi.tcl" -c "${option_work_dir}/mirrorcache" "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/mirror-multi.tcl" -c "${option_work_dir}/mirrorcache" "$@"
</span>     #"${option_prefix}/bin/port" -p mirror "$@" $("${option_prefix}/bin/port" -pq rdeps --index "$@" | sed -E -e '/^--$/d' -e 's/^[[:space:]]+//' | sort -u)
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-print-info b/mpbb-print-info
</span><span style='display:block; white-space:pre;color:#808080;'>index e967131..bd8d4b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-print-info
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-print-info
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ print-info() {
</span> 
         # $option_prefix is set in mpbb
         # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if portvariants=$("${option_prefix}/bin/port-tclsh" tools/canonical-variants.tcl "$port"); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if portvariants=$("$(readlink "${option_prefix}/bin/port-tclsh")" tools/canonical-variants.tcl "$port"); then
</span>             printf "portvariants=%s\n" "$portvariants"
         fi
 
</pre><pre style='margin:0'>

</pre>