<!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>[143285] 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/143285">143285</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2015-12-09 13:54:37 -0800 (Wed, 09 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve perl variants.</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 (143284 => 143285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/perl5-1.0.tcl        2015-12-09 21:43:02 UTC (rev 143284)
+++ trunk/dports/_resources/port1.0/group/perl5-1.0.tcl        2015-12-09 21:54:37 UTC (rev 143285)
</span><span class="lines">@@ -77,10 +77,15 @@
</span><span class="cx">
</span><span class="cx"> # Set perl variant options and defaults
</span><span class="cx"> options perl5.default_variant perl5.variant perl5.set_default_variant perl5.conflict_variants perl5.require_variant
</span><ins>+# The default variant derived from perl5.default_branch if not set in Portfile.
</ins><span class="cx"> default perl5.default_variant {[string map {. _} perl${perl5.default_branch}]}
</span><del>-default perl5.variant {[string map {. _} perl${perl5.major}]}
</del><ins>+# 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.
</ins><span class="cx"> default perl5.set_default_variant {true}
</span><ins>+# Control whether to conflict the perl variants or not. Probably almost always true.
</ins><span class="cx"> default perl5.conflict_variants {true}
</span><ins>+# Control whether a perl variant is required and if true produce an error if a perl variant is not set.
</ins><span class="cx"> default perl5.require_variant {false}
</span><span class="cx"> # Get variant names from branches
</span><span class="cx"> proc perl5.get_variant_names {branches} {
</span><span class="lines">@@ -92,15 +97,15 @@
</span><span class="cx"> }
</span><span class="cx"> # Create perl variants
</span><span class="cx"> proc perl5.create_variants {branches} {
</span><del>- global name perl5.major perl5.default_variant perl5.variant perl5.set_default_variant perl5.conflict_variants perl5.require_variant
- set variants [perl5.get_variant_names ${branches}]
</del><ins>+ global name perl5.major perl5.default_variant perl5.variant perl5.set_default_variant perl5.conflict_variants perl5.require_variant perl5.variants
+ set perl5.variants [perl5.get_variant_names ${branches}]
</ins><span class="cx"> foreach branch ${branches} {
</span><span class="cx"> set index [lsearch ${branches} ${branch}]
</span><del>- set variant [lindex ${variants} ${index}]
</del><ins>+ set variant [lindex ${perl5.variants} ${index}]
</ins><span class="cx"> # Add conflicts
</span><span class="cx"> set conflicts {}
</span><span class="cx"> if {${perl5.conflict_variants}} {
</span><del>- set conflicts "conflicts {[lreplace ${variants} ${index} ${index}]}"
</del><ins>+ set conflicts "conflicts {[lreplace ${perl5.variants} ${index} ${index}]}"
</ins><span class="cx"> }
</span><span class="cx"> eval "variant ${variant} ${conflicts} description Use MacPorts perl${branch} {}"
</span><span class="cx"> if {[variant_isset ${variant}]} {
</span><span class="lines">@@ -108,23 +113,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> # Set default perl variant
</span><del>- if {${perl5.default_variant} eq ${perl5.variant} && ${perl5.set_default_variant}} {
- default_variants-append +${perl5.variant}
</del><ins>+ 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}
+ }
</ins><span class="cx"> }
</span><del>-# Require perl variant
- if {![variant_isset ${perl5.variant}] && ${perl5.require_variant}} {
- ui_error "${name} requires one of these variants: ${variants}"
- return -code error "absence of required perl variant"
- }
</del><span class="cx"> # Set perl version and deps
</span><span class="cx"> foreach branch ${branches} {
</span><span class="cx"> set index [lsearch ${branches} ${branch}]
</span><del>- set variant [lindex ${variants} ${index}]
</del><ins>+ set variant [lindex ${perl5.variants} ${index}]
</ins><span class="cx"> if {[variant_isset ${variant}]} {
</span><span class="cx"> perl5.major ${branch}
</span><span class="cx"> depends_lib-append port:perl${branch}
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+# Require perl variant
+ pre-fetch {
+ if {![variant_isset ${perl5.variant}] && ${perl5.require_variant}} {
+ ui_error "${name} requires one of these variants: ${perl5.variants}"
+ return -code error "absence of required perl variant"
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Set some variables.
</span></span></pre>
</div>
</div>
</body>
</html>