[122260] trunk/dports/science/mpich/Portfile

[eborisch at macports.org]

Revision: 122260
          https://trac.macports.org/changeset/122260
Author:   eborisch at macports.org
Date:     2014-07-18 15:56:13 -0700 (Fri, 18 Jul 2014)
Log Message:
-----------
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'.)

Modified Paths:
--------------
    trunk/dports/science/mpich/Portfile

Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- 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)
@@ -39,8 +39,9 @@
 # see, https://trac.macports.org/ticket/20240
 universal_variant   no
 
-checksums           rmd160  d4a6d0992b45a4ad7000e8a40eb953f7af9feb82 \
-                    sha256  455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d
+checksums \
+    rmd160  d4a6d0992b45a4ad7000e8a40eb953f7af9feb82 \
+    sha256  455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d
 
 livecheck.type      regex
 livecheck.regex     mpich-(\[0-9.p\]+)${extract.suffix}
@@ -48,20 +49,21 @@
 
 if {[string first "-devel" $subport] > 0} {
     name                mpich-devel
-    version             3.1.1
-    revision            81
+    version             3.1.1-112
+    revision            0
+    set tag             gcb1fa5f8
     # To see 3.1 as newer than 3.1rcX
     epoch               1
-    distname            mpich-master-v${version}-${revision}-g2e7707fb
+    distname            mpich-master-v${version}-${tag}
 
     master_sites        ${homepage}static/downloads/nightly/master/mpich
 
-    checksums           rmd160  9f827c23419f6566e6c8725be76e01311d496f4b \
-                        sha256  5243aec22051c5a425cd47e6972c4debaae9d39bde6877d3312ebad859eb6f52
+    checksums \
+        rmd160  3b6a42fcc62374ce4c390f40b9b910a398cc71cb \
+        sha256  95a6157769e31ca078d988861245a6cf9434e210972dce86b95445f573d15790
 
-    livecheck.version   ${revision}
     livecheck.regex \
-        mpich-master-v\[0-9.\]+-(\[0-9\]+)-\[0-9a-z\]+${extract.suffix}
+        mpich-master-v(\[0-9.\]+-\[0-9\]+)-\[0-9a-z\]+${extract.suffix}
     livecheck.url       ${master_sites}
 }
 
@@ -144,7 +146,6 @@
     depends_run                 port:mpi_select port:mpi-doc
     select.group                mpi
     select.file                 ${filespath}/${name}-${cname}
-    livecheck.type              none
 
     if {[string first "-default" $subport] < 0} {
         configure.compiler      [lindex $clist($cname) 0]
@@ -181,32 +182,35 @@
         }
 
         # 3.1.1 added weird variables to be replaced
-        foreach bin {cc cxx fort} {
-            reinplace -W ${destroot}${prefix}/bin \
-                "s,__PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}," \
-                mpi$bin-${name}-${cname}
+        if {[string first "-devel" $subport] == -1} {
+            foreach bin {cc cxx fort} {
+                set MATCH TO_BE_FILLED_AT_INSTALL_TIME__
+                reinplace -W ${destroot}${prefix}/bin \
+                    "s,__PREFIX_${MATCH},${prefix}," \
+                    mpi$bin-${name}-${cname}
 
-            reinplace -W ${destroot}${prefix}/bin \
-                "s,__EXEC_PREFIX_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/bin," \
-                mpi$bin-${name}-${cname}
+                reinplace -W ${destroot}${prefix}/bin \
+                    "s,__EXEC_PREFIX_${MATCH},${prefix}/bin," \
+                    mpi$bin-${name}-${cname}
 
-            reinplace -W ${destroot}${prefix}/bin \
-                "s,__SYSCONFDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/etc/${name}-${cname}," \
-                mpi$bin-${name}-${cname}
+                reinplace -W ${destroot}${prefix}/bin \
+                    "s,__SYSCONFDIR_${MATCH},${prefix}/etc/${name}-${cname}," \
+                    mpi$bin-${name}-${cname}
 
-            reinplace -W ${destroot}${prefix}/bin \
-                "s,__INCLUDEDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/include/${name}-${cname}," \
-                mpi$bin-${name}-${cname}
+                reinplace -W ${destroot}${prefix}/bin \
+                    "s,__INCLUDEDIR_${MATCH},${prefix}/include/${name}-${cname}," \
+                    mpi$bin-${name}-${cname}
 
-            reinplace -W ${destroot}${prefix}/bin \
-                "s,__LIBDIR_TO_BE_FILLED_AT_INSTALL_TIME__,${prefix}/lib/${name}-${cname}," \
-                mpi$bin-${name}-${cname}
-        }
+                reinplace -W ${destroot}${prefix}/bin \
+                    "s,__LIBDIR_${MATCH},${prefix}/lib/${name}-${cname}," \
+                    mpi$bin-${name}-${cname}
+            }
 
-        if {[string first "-devel" $subport] == -1} {
             # 3.1.1 doesn't seem to provide mpif77 nor mpif90 wrappers anymore
-            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}
+            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}
         }
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140718/379fc77d/attachment.html>