Ticket #25970: allow-specifying-case-insensitive-variants.diff

src/port/port.tcl

@@ -3682 +3682 @@
                     }
 
                     # XXX Keep these varmodifiers in sync with action_info, or create a wrapper for it
-                    if {[info exists variations($v)]} {
-                        set varmodifier "  $variations($v)"
-                    } elseif {[info exists global_variations($v)]} {
+                    set user_supplied_vname [lsearch -inline -nocase -exact [array names variations] $v]
+                    set user_supplied_global_vname [lsearch -inline -nocase -exact [array names global_variations] $v]
+                    if {[info exists variations($user_supplied_vname)]} {
+                        set varmodifier "  $variations($user_supplied_vname)"
+                    } elseif {[info exists global_variations($user_supplied_global_vname)]} {
                         # selected by variants.conf, prefixed with (+)/(-)
-                        set varmodifier "($global_variations($v))"
+                        set varmodifier "($global_variations($user_supplied_global_vname))"
                     } elseif {[info exists variant(is_default)]} {
                         set varmodifier "\[$variant(is_default)\]"
                     }

src/port1.0/portutil.tcl

@@ -660 +660 @@
 proc variant_isset {name} {
     global variations
 
-    if {[info exists variations($name)] && $variations($name) eq "+"} {
+    set canonical_name [lsearch -exact -nocase -inline [array names variations] $name]
+    if {$canonical_name eq ""} {
+        return 0
+    }
+    if {$variations($canonical_name) eq "+"} {
         return 1
     }
     return 0
@@ -1964 +1968 @@
     global all_variants PortInfo requested_variations portvariants negated_variants
     set dlist $all_variants
     upvar $variations upvariations
-    set chosen [choose_variants $dlist upvariations]
-    set negated [lindex $chosen 1]
-    set chosen [lindex $chosen 0]
-    set portname [option subport]
 
     # Check to make sure the requested variations are available with this
     # port, if one is not, warn the user and remove the variant from the
@@ -1975 +1975 @@
     # Save the originally requested set in requested_variations.
     array set requested_variations [array get upvariations]
     foreach key [array names upvariations *] {
-        if {![info exists PortInfo(variants)] ||
-            $key ni $PortInfo(variants)} {
+        set canonical_variant_key ""
+        if {[info exists PortInfo(variants)]} {
+            set canonical_variant_key [lsearch -inline -nocase -exact $PortInfo(variants) $key]
+        }
+        if {$canonical_variant_key eq ""} {
             ui_debug "Requested variant $upvariations($key)$key is not provided by port $portname."
             array unset upvariations $key
+        } else {
+            set varspec $upvariations($key)
+            array unset upvariations $key
+            set upvariations($canonical_variant_key) $varspec
+            puts "Replacing $key variant with $canonical_variant_key"
         }
     }
 
+    set chosen [choose_variants $dlist upvariations]
+    set negated [lindex $chosen 1]
+    set chosen [lindex $chosen 0]
+    set portname [option subport]
+
     # now that we've selected variants, change all provides [a b c] to [a-b-c]
     # this will eliminate ambiguity between item a, b, and a-b while fulfilling requirements.
     #foreach obj $dlist {