Changeset 82654

Timestamp:

08/17/11 09:35:05 (4 years ago)

Author:

jmr@…

Message:

perl5 portgroup: fix perl5.default_branch for strange ports that use the portgroup but don't call perl5.setup

File:

• trunk/dports/_resources/port1.0/group/perl5-1.0.tcl (modified) (4 diffs)

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

@@ -41 +41 @@
 options perl5.default_branch perl5.branches
 default perl5.branches {"5.8 5.10 5.12 5.14"}
+default perl5.default_branch {[perl5_get_default_branch]}
+proc perl5_get_default_branch {} {
+    # use whatever ${prefix}/bin/perl5 was chosen, and if none, fall back to 5.12
+    if {![catch {set val [lindex [split [exec ${prefix}/bin/perl5 -V:version] {'}] 1]}]} {
+        return [join [lrange [split $val .] 0 1] .]
+    } else {
+        return 5.12
+    }
+}
 
 proc perl5.extract_config {var {default ""}} {
@@ -55 +64 @@
 options perl5.version perl5.major perl5.arch perl5.lib perl5.archlib perl5.bin
 default perl5.version {[perl5.extract_config version]}
+default perl5.major {${perl5.default_branch}}
 default perl5.arch {[perl5.extract_config archname ${os.platform}]}
 default perl5.bin {${prefix}/bin/perl${perl5.major}}
@@ -80 +90 @@
     set perl5.module ${module}
     set perl5.moduleversion $vers
-
-    # check if a default version was set, otherwise use whatever
-    # ${prefix}/bin/perl was chosen, and if none, fall back to 5.12
-    if {![info exists perl5.default_branch]} {
-        if {[catch {set val [lindex [split [exec ${prefix}/bin/perl -V:version] {'}] 1]}]} {
-            perl5.default_branch 5.12
-        } else {
-            perl5.default_branch [join [lrange [split $val .] 0 1] .]
-        }
-    }
 
     # define perl5.cpandir
@@ -137 +137 @@
         }
     } else {
-        perl5.major ${perl5.default_branch}
         depends_lib port:perl${perl5.default_branch}
     }