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

</pre>
<p><a href="https://github.com/macports/macports-base/commit/24f341e99e03d26a503309bb45cd6b84c1a9e961">https://github.com/macports/macports-base/commit/24f341e99e03d26a503309bb45cd6b84c1a9e961</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 24f341e99e03d26a503309bb45cd6b84c1a9e961
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Feb 17 22:11:26 2024 +1100

<span style='display:block; white-space:pre;color:#404040;'>    portconfigure: use dict for configure_map, arch_demotions
</span>---
 src/port1.0/portconfigure.tcl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ffe0f4b3..3f1e4d011 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,31 +205,31 @@ proc portconfigure::add_build_dep { type dep } {
</span> proc portconfigure::set_configure_type {option action args} {
     global autoreconf.cmd automake.cmd autoconf.cmd xmkmf.cmd
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    array set configure_map {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        autoconf    {port:autoconf port:automake port:libtool}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        xmkmf       port:imake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set configure_map [dict create \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        autoconf    [list port:autoconf port:automake port:libtool] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xmkmf       port:imake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ]
</span> 
     if {$action eq "set"} {
         switch $option {
             autoreconf.cmd  -
             automake.cmd    -
             autoconf.cmd {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_build-delete {*}$configure_map(autoconf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                depends_build-delete {*}[dict get $configure_map autoconf]
</span>             }
             xmkmf.cmd {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                depends_build-delete {*}$configure_map(xmkmf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                depends_build-delete {*}[dict get $configure_map xmkmf]
</span>             }
             use_xmkmf {
                 if {[tbool args]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    depends_build-append {*}$configure_map(xmkmf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    depends_build-append {*}[dict get $configure_map xmkmf]
</span>                 }
             }
             default {
                 # strip "use_"
                 set type [string range $option 4 end]
                 if {[tbool args]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    add_build_dep $type $configure_map(autoconf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    add_build_dep $type [dict get $configure_map autoconf]
</span>                 }
             }
         }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -473,7 +473,7 @@ proc portconfigure::choose_supported_archs {archs} {
</span>     # supported by the SDK if needed, e.g. 64-bit to 32-bit. That means
     # e.g. if build_arch is x86_64 it's still possible to build a port
     # that sets supported_archs to "i386 ppc" if the SDK allows it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    array set arch_demotions [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set arch_demotions [dict create \
</span>                                 arm64 x86_64 \
                                 x86_64 i386 \
                                 ppc64 ppc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,8 +481,8 @@ proc portconfigure::choose_supported_archs {archs} {
</span>     foreach arch $archs {
         if {$arch in $intersection_archs} {
             set add_arch $arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        } elseif {[info exists arch_demotions($arch)] && $arch_demotions($arch) in $intersection_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set add_arch $arch_demotions($arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } elseif {[dict exists $arch_demotions $arch] && [dict get $arch_demotions $arch] in $intersection_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set add_arch [dict get $arch_demotions $arch]
</span>         } else {
             continue
         }
</pre><pre style='margin:0'>

</pre>