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

[jmr at macports.org]

Revision: 82558
          http://trac.macports.org/changeset/82558
Author:   jmr at macports.org
Date:     2011-08-15 12:52:45 -0700 (Mon, 15 Aug 2011)
Log Message:
-----------
perl5 portgroup: set perl5.default_branch based on the version of ${prefix}/bin/perl if available

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

Modified: trunk/dports/_resources/port1.0/group/perl5-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/perl5-1.0.tcl	2011-08-15 19:47:19 UTC (rev 82557)
+++ trunk/dports/_resources/port1.0/group/perl5-1.0.tcl	2011-08-15 19:52:45 UTC (rev 82558)
@@ -39,7 +39,6 @@
 #   subport will be created for each. e.g. p5.12-foo, p5.10-foo, ...
 # perl5.default_branch: the branch used when you request p5-foo
 options perl5.default_branch perl5.branches
-default perl5.default_branch 5.12
 default perl5.branches {"5.8 5.10 5.12 5.14"}
 
 proc perl5.extract_config {var {default ""}} {
@@ -71,13 +70,24 @@
 
 # perl5 group setup procedure
 proc perl5.setup {module vers {cpandir ""}} {
-    global perl5.branches perl5.bin perl5.lib perl5.module perl5.moduleversion perl5.cpandir
-    global prefix subport name 
+    global perl5.branches perl5.default_branch perl5.bin perl5.lib \
+           perl5.module perl5.moduleversion perl5.cpandir \
+           prefix subport name
 
     # define perl5.module
     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
     # check if optional CPAN dir specified to perl5.setup
     if {[string length ${cpandir}] == 0} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110815/b26eee0f/attachment-0001.html>