<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[116112] trunk/dports/_resources/port1.0/group/perl5-1.0.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/116112">116112</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-01-18 19:21:21 -0800 (Sat, 18 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl5 portgroup: default to 5.16 when perl5 is not installed, remove default perl5.branches value (it needs to be set in the portfile), ensure that perl5.default_branch is a supported value as listed in perl5.branches</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupperl510tcl">trunk/dports/_resources/port1.0/group/perl5-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupperl510tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/perl5-1.0.tcl (116111 => 116112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/perl5-1.0.tcl 2014-01-19 03:16:19 UTC (rev 116111)
+++ trunk/dports/_resources/port1.0/group/perl5-1.0.tcl 2014-01-19 03:21:21 UTC (rev 116112)
</span><span class="lines">@@ -35,20 +35,24 @@
</span><span class="cx"> # portfile configuration options
</span><span class="cx"> # perl5.branches: the major perl versions supported by this module. A
</span><span class="cx"> # subport will be created for each. e.g. p5.12-foo, p5.10-foo, ...
</span><ins>+# perl5.branches must be set in the portfile
</ins><span class="cx"> # perl5.default_branch: the branch used when you request p5-foo
</span><span class="cx"> options perl5.default_branch perl5.branches
</span><span class="cx"> default perl5.default_branch {[perl5_get_default_branch]}
</span><del>-# perl5.branches exists here for backward compatibility with old p5 portfiles.
-# You should still set it in the portfile.
-default perl5.branches {"5.8 5.10 5.12 5.14"}
</del><ins>+
</ins><span class="cx"> proc perl5_get_default_branch {} {
</span><del>- global prefix
- # use whatever ${prefix}/bin/perl5 was chosen, and if none, fall back to 5.12
</del><ins>+ global prefix perl5.branches
+ # use whatever ${prefix}/bin/perl5 was chosen, and if none, fall back to 5.16
</ins><span class="cx"> if {![catch {set val [lindex [split [exec ${prefix}/bin/perl5 -V:version] {'}] 1]}]} {
</span><del>- return [join [lrange [split $val .] 0 1] .]
</del><ins>+ set ret [join [lrange [split $val .] 0 1] .]
</ins><span class="cx"> } else {
</span><del>- return 5.12
</del><ins>+ set ret 5.16
</ins><span class="cx"> }
</span><ins>+ # if the above default is not supported by this module, use the latest it does support
+ if {[info exists perl5.branches] && [lsearch -exact ${perl5.branches} $ret] == -1} {
+ set ret [lindex ${perl5.branches} end]
+ }
+ return $ret
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc perl5.extract_config {var {default ""}} {
</span></span></pre>
</div>
</div>
</body>
</html>