Ticket #46570: patch-portgroup-perl5.diff

_resources/port1.0/group/perl5-1.0.tcl

@@ -77 +77 @@
 
 # Set perl variant options and defaults
 options perl5.default_variant perl5.variant perl5.set_default_variant perl5.conflict_variants perl5.require_variant
+# The default variant derived from perl5.default_branch if not set in Portfile.
 default perl5.default_variant {[string map {. _} perl${perl5.default_branch}]}
-default perl5.variant {[string map {. _} perl${perl5.major}]}
+# The name of the selected variant or empty if there is not one.
+default perl5.variant {}
+# Control whether to set a default perl variant or not.
 default perl5.set_default_variant {true}
+# Control whether to conflict the perl variants or not. Probably almost always true.
 default perl5.conflict_variants {true}
+# Control whether a perl variant is required and if true produce an error if a perl variant is not set.
 default perl5.require_variant {false}
 # Get variant names from branches
 proc perl5.get_variant_names {branches} {
@@ -108 +113 @@
         }
     }
 # Set default perl variant
-    if {${perl5.default_variant} eq ${perl5.variant} && ${perl5.set_default_variant}} {
-        default_variants-append +${perl5.variant}
+    if {${perl5.variant} eq {} && ${perl5.set_default_variant}} {
+        default_variants-append +${perl5.default_variant}
+        if {[variant_isset ${perl5.default_variant}]} {
+            perl5.variant ${perl5.default_variant}
+        }
     }
 # Require perl variant
     if {![variant_isset ${perl5.variant}] && ${perl5.require_variant}} {