<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/0e465824df2c3f6ac14ca61698f45f4e8283ebda">https://github.com/macports/mpbb/commit/0e465824df2c3f6ac14ca61698f45f4e8283ebda</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 0e46582  Remove port-tclsh workaround
</span>0e46582 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 0e465824df2c3f6ac14ca61698f45f4e8283ebda
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 29 22:45:18 2025 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Remove port-tclsh workaround
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Reverts e30835a.
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/72359
</span>---
 functions                 | 2 +-
 mpbb-cleanup              | 8 ++++----
 mpbb-gather-archives      | 2 +-
 mpbb-install-dependencies | 3 +--
 mpbb-install-port         | 4 ++--
 mpbb-list-subports        | 2 +-
 mpbb-mirror-distfiles     | 2 +-
 mpbb-print-info           | 2 +-
 8 files changed, 12 insertions(+), 13 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 cc87e17..cf00a6a 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=$("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/canonical-variants.tcl" "$@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    canonical_variants=$("${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 f7caa72..d2a2599 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;'>@@ -86,7 +86,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;'>-            "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/uninstall-unneeded-ports.tcl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/uninstall-unneeded-ports.tcl"
</span>         fi
         if [ ! -L "${option_prefix}/var/macports/distfiles" ]; then
             echo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ cleanup() {
</span>         if [[ ! -f "$timestamp" || $(($(date +%s) - $(stat -f %m "$timestamp"))) -gt 604800 ]]; then
             echo
             echo "----> Deleting unneeded failcache entries"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/failcache-cleanup.tcl" --failcache_dir "${option_failcache_dir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/failcache-cleanup.tcl" --failcache_dir "${option_failcache_dir}"
</span>             touch "$timestamp"
         fi
     fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ cleanup() {
</span>         ports="$(find "${option_prefix}/var/macports/${dir}" -name '.*' -prune -o -depth 2 -type d -print | sed 's,^.*/,,' | sort -fu)"
         for port in ${ports}; do
             echo "Deleting ${dir} for ${port}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/noisy-delete.tcl" "${option_prefix}/var/macports/${dir}"/*/"${port}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/noisy-delete.tcl" "${option_prefix}/var/macports/${dir}"/*/"${port}"
</span>         done
         rm -rf "${option_prefix}/var/macports/${dir}"/*
         echo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,7 @@ cleanup() {
</span>         echo "----> Trying to free more disk space"
         # $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;'>-        "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/reclaim-space.tcl" "$disk_free_after" "$DISK_FREE_THRESHOLD"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/reclaim-space.tcl" "$disk_free_after" "$DISK_FREE_THRESHOLD"
</span>         # $option_prefix is set in mpbb
         # shellcheck disable=SC2154
         disk_free_after=$(disk_free "$option_prefix")
<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 86634b8..cf0a420 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=$(readlink "${option_prefix}/bin/port-tclsh")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    tclsh="${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 4593bf7..a69f634 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,10 +28,9 @@ 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:#ffe0e0;'>-    # 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;'>-    "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/dependencies.tcl" --failcache_dir "${option_failcache_dir}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "${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 86e0d53..bcf5f8e 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;'>-    local imagepath=$("$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/archive-path.tcl" "$@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    local imagepath=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" "$@")
</span>     if [[ -f "$imagepath" || -d "${imagepath%.*}" ]]; then
         echo "$* already installed, nothing to do"
         # log: summary for the portwatcher
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ install-port() {
</span>         echo "Fetch of '$port' failed."
         if [ -n "$option_mirrordb_url" ]; then
             echo "Waiting for '$port' to be mirrored."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if "$(readlink "${option_prefix}/bin/port-tclsh")" "${thisdir}/tools/wait-for-mirror.tcl" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if "${option_prefix}/bin/port-tclsh" "${thisdir}/tools/wait-for-mirror.tcl" \
</span>                     "$option_mirrordb_url" "$option_mirrordb_credentials" "$port"; then
                 echo "Mirroring of '$port' done. Retrying fetch."
                 if ! "${option_prefix}/bin/port" -d fetch "$@"; then
<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 e8b408a..ffa07ee 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=$(readlink "${option_prefix}/bin/port-tclsh")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    tclsh="${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 99d9b5f..c0b529d 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;'>-    "$(readlink "${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;'>+    "${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 bd8d4b8..e967131 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=$("$(readlink "${option_prefix}/bin/port-tclsh")" tools/canonical-variants.tcl "$port"); then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if portvariants=$("${option_prefix}/bin/port-tclsh" tools/canonical-variants.tcl "$port"); then
</span>             printf "portvariants=%s\n" "$portvariants"
         fi
 
</pre><pre style='margin:0'>

</pre>