<!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>[122260] trunk/dports/science/mpich/Portfile</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/122260">122260</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-07-18 15:56:13 -0700 (Fri, 18 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>mpich[-devel]: Combine nightly version number in with version for -devel; Fix livecheck; update -devel to latest (3.1.1-112); skip unnecessary reinplaces on -devel. (Last commit on this Portfile missed log message: fix broken logic 'not -devel'.)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencempichPortfile">trunk/dports/science/mpich/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencempichPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/mpich/Portfile (122259 => 122260)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/mpich/Portfile        2014-07-18 22:35:50 UTC (rev 122259)
+++ trunk/dports/science/mpich/Portfile        2014-07-18 22:56:13 UTC (rev 122260)
</span><span class="lines">@@ -39,8 +39,9 @@
</span><span class="cx"> # see, https://trac.macports.org/ticket/20240
</span><span class="cx"> universal_variant   no
</span><span class="cx"> 
</span><del>-checksums           rmd160  d4a6d0992b45a4ad7000e8a40eb953f7af9feb82 \
-                    sha256  455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d
</del><ins>+checksums \
+    rmd160  d4a6d0992b45a4ad7000e8a40eb953f7af9feb82 \
+    sha256  455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d
</ins><span class="cx"> 
</span><span class="cx"> livecheck.type      regex
</span><span class="cx"> livecheck.regex     mpich-(\[0-9.p\]+)${extract.suffix}
</span><span class="lines">@@ -48,20 +49,21 @@
</span><span class="cx"> 
</span><span class="cx"> if {[string first &quot;-devel&quot; $subport] &gt; 0} {
</span><span class="cx">     name                mpich-devel
</span><del>-    version             3.1.1
-    revision            81
</del><ins>+    version             3.1.1-112
+    revision            0
+    set tag             gcb1fa5f8
</ins><span class="cx">     # To see 3.1 as newer than 3.1rcX
</span><span class="cx">     epoch               1
</span><del>-    distname            mpich-master-v${version}-${revision}-g2e7707fb
</del><ins>+    distname            mpich-master-v${version}-${tag}
</ins><span class="cx"> 
</span><span class="cx">     master_sites        ${homepage}static/downloads/nightly/master/mpich
</span><span class="cx"> 
</span><del>-    checksums           rmd160  9f827c23419f6566e6c8725be76e01311d496f4b \
-                        sha256  5243aec22051c5a425cd47e6972c4debaae9d39bde6877d3312ebad859eb6f52
</del><ins>+    checksums \
+        rmd160  3b6a42fcc62374ce4c390f40b9b910a398cc71cb \
+        sha256  95a6157769e31ca078d988861245a6cf9434e210972dce86b95445f573d15790
</ins><span class="cx"> 
</span><del>-    livecheck.version   ${revision}
</del><span class="cx">     livecheck.regex \
</span><del>-        mpich-master-v\[0-9.\]+-(\[0-9\]+)-\[0-9a-z\]+${extract.suffix}
</del><ins>+        mpich-master-v(\[0-9.\]+-\[0-9\]+)-\[0-9a-z\]+${extract.suffix}
</ins><span class="cx">     livecheck.url       ${master_sites}
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -144,7 +146,6 @@
</span><span class="cx">     depends_run                 port:mpi_select port:mpi-doc
</span><span class="cx">     select.group                mpi
</span><span class="cx">     select.file                 ${filespath}/${name}-${cname}
</span><del>-    livecheck.type              none
</del><span class="cx"> 
</span><span class="cx">     if {[string first &quot;-default&quot; $subport] &lt; 0} {
</span><span class="cx">         configure.compiler      [lindex $clist($cname) 0]
</span><span class="lines">@@ -181,32 +182,35 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         # 3.1.1 added weird variables to be replaced
</span><del>-        foreach bin {cc cxx fort} {
-            reinplace -W ${destroot}${prefix}/bin \
-                &quot;s,__PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix},&quot; \
-                mpi$bin-${name}-${cname}
</del><ins>+        if {[string first &quot;-devel&quot; $subport] == -1} {
+            foreach bin {cc cxx fort} {
+                set MATCH TO_BE_FILLED_AT_INSTALL_TIME__
+                reinplace -W ${destroot}${prefix}/bin \
+                    &quot;s,__PREFIX_${MATCH},${prefix},&quot; \
+                    mpi$bin-${name}-${cname}
</ins><span class="cx"> 
</span><del>-            reinplace -W ${destroot}${prefix}/bin \
-                &quot;s,__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/bin,&quot; \
-                mpi$bin-${name}-${cname}
</del><ins>+                reinplace -W ${destroot}${prefix}/bin \
+                    &quot;s,__EXEC_PREFIX_${MATCH},${prefix}/bin,&quot; \
+                    mpi$bin-${name}-${cname}
</ins><span class="cx"> 
</span><del>-            reinplace -W ${destroot}${prefix}/bin \
-                &quot;s,__SYSCONFDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/etc/${name}-${cname},&quot; \
-                mpi$bin-${name}-${cname}
</del><ins>+                reinplace -W ${destroot}${prefix}/bin \
+                    &quot;s,__SYSCONFDIR_${MATCH},${prefix}/etc/${name}-${cname},&quot; \
+                    mpi$bin-${name}-${cname}
</ins><span class="cx"> 
</span><del>-            reinplace -W ${destroot}${prefix}/bin \
-                &quot;s,__INCLUDEDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/include/${name}-${cname},&quot; \
-                mpi$bin-${name}-${cname}
</del><ins>+                reinplace -W ${destroot}${prefix}/bin \
+                    &quot;s,__INCLUDEDIR_${MATCH},${prefix}/include/${name}-${cname},&quot; \
+                    mpi$bin-${name}-${cname}
</ins><span class="cx"> 
</span><del>-            reinplace -W ${destroot}${prefix}/bin \
-                &quot;s,__LIBDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/lib/${name}-${cname},&quot; \
-                mpi$bin-${name}-${cname}
-        }
</del><ins>+                reinplace -W ${destroot}${prefix}/bin \
+                    &quot;s,__LIBDIR_${MATCH},${prefix}/lib/${name}-${cname},&quot; \
+                    mpi$bin-${name}-${cname}
+            }
</ins><span class="cx"> 
</span><del>-        if {[string first &quot;-devel&quot; $subport] == -1} {
</del><span class="cx">             # 3.1.1 doesn't seem to provide mpif77 nor mpif90 wrappers anymore
</span><del>-            ln -s ${prefix}/bin/mpifort-${name}-${cname} ${destroot}${prefix}/bin/mpif77-${name}-${cname}
-            ln -s ${prefix}/bin/mpifort-${name}-${cname} ${destroot}${prefix}/bin/mpif90-${name}-${cname}
</del><ins>+            ln -s ${prefix}/bin/mpifort-${name}-${cname} \
+                ${destroot}${prefix}/bin/mpif77-${name}-${cname}
+            ln -s ${prefix}/bin/mpifort-${name}-${cname} \
+            ${destroot}${prefix}/bin/mpif90-${name}-${cname}
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>