[117465] trunk/dports/science

[eborisch at macports.org]

Revision: 117465
          https://trac.macports.org/changeset/117465
Author:   eborisch at macports.org
Date:     2014-02-27 15:05:03 -0800 (Thu, 27 Feb 2014)
Log Message:
-----------
mpich[-devel]: Support livecheck on stub; move conflicts / depends into sub-ports.

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

Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile	2014-02-27 22:51:36 UTC (rev 117464)
+++ trunk/dports/science/mpich/Portfile	2014-02-27 23:05:03 UTC (rev 117465)
@@ -41,6 +41,10 @@
     rmd160  8d682dd615f38b927197c94d8255625be3a24a54 \
     sha256  fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
 
+livecheck.type      regex
+livecheck.regex     mpich-(\[0-9.p\]+)${extract.suffix}
+livecheck.url       ${homepage}downloads/index.php?s=downloads
+
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
                     --disable-fc \
@@ -81,8 +85,7 @@
 # subport ${name}-dragonegg34 {}
 # subport ${name}-dragonegg35 {}
 
-# Compiler variant set
-#   name     depends_lib    configure.compiler  Description
+# Sup-ports names and corresponding configure.compiler value
 array set clist {
     clang   {clang}
     clang31 {macports-clang-3.1}
@@ -107,10 +110,6 @@
 
 master_sites        ${homepage}static/tarballs/${version}/
 
-conflicts-append    lammpi
-
-depends_lib-append  port:libxml2 port:mpi-doc
-
 # Linker for Apple clang version 421.11.66 segfaults
 # See https://trac.macports.org/ticket/36654#comment:9
 compiler.blacklist-append   {clang >= 421.11.66 < 425.0.24}
@@ -130,12 +129,16 @@
     if {${cname} == "default"} {
         set cname                   mp
     }
+
     if {[lsearch -exact {mp llvm clang} ${cname}] != -1} {
         # Force local builds with Xcode-provided compilers (avoid issues with
         # different Xcode versions on buildbot and user machines)
         archive_sites
     }
-    depends_run                 port:mpi_select
+
+    conflicts-append            lammpi
+    depends_lib-append          port:libxml2
+    depends_run                 port:mpi_select port:mpi-doc
     select.group                mpi
     select.file                 ${filespath}/${name}-${cname}
 
@@ -276,10 +279,6 @@
         configure.args-append   --enable-fast=all \
                                 MPICHLIB_CFLAGS='-fomit-frame-pointer -O2'
     }
-
-    livecheck.type      regex
-    livecheck.regex     mpich-(\[0-9.p\]+)${extract.suffix}
-    livecheck.url       ${homepage}downloads/index.php?s=downloads
 } else {
     depends_lib-append      port:mpich-default
     distfiles

Modified: trunk/dports/science/mpich-devel/Portfile
===================================================================
--- trunk/dports/science/mpich-devel/Portfile	2014-02-27 22:51:36 UTC (rev 117464)
+++ trunk/dports/science/mpich-devel/Portfile	2014-02-27 23:05:03 UTC (rev 117465)
@@ -44,6 +44,10 @@
     rmd160  8d682dd615f38b927197c94d8255625be3a24a54 \
     sha256  fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
 
+livecheck.type      regex
+livecheck.regex     mpich-(\[0-9.pbrc\]+)${extract.suffix}
+livecheck.url       ${homepage}downloads/index.php?s=downloads
+
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
                     --disable-fc \
@@ -84,8 +88,7 @@
 # subport ${name}-dragonegg34 {}
 # subport ${name}-dragonegg35 {}
 
-# Compiler variant set
-#   name     depends_lib    configure.compiler  Description
+# Sup-ports names and corresponding configure.compiler value
 array set clist {
     clang   {clang}
     clang31 {macports-clang-3.1}
@@ -110,10 +113,6 @@
 
 master_sites        ${homepage}static/tarballs/${version}/
 
-conflicts-append    lammpi
-
-depends_lib-append  port:libxml2 port:mpi-doc
-
 # Linker for Apple clang version 421.11.66 segfaults
 # See https://trac.macports.org/ticket/36654#comment:9
 compiler.blacklist-append   {clang >= 421.11.66 < 425.0.24}
@@ -133,12 +132,16 @@
     if {${cname} == "default"} {
         set cname                   mp
     }
+    
     if {[lsearch -exact {mp llvm clang} ${cname}] != -1} {
         # Force local builds with Xcode-provided compilers (avoid issues with
         # different Xcode versions on buildbot and user machines)
         archive_sites
     }
-    depends_run                 port:mpi_select
+    
+    conflicts-append            lammpi
+    depends_lib-append          port:libxml2
+    depends_run                 port:mpi_select port:mpi-doc
     select.group                mpi
     select.file                 ${filespath}/${name}-${cname}
 
@@ -285,10 +288,6 @@
         configure.args-append   --enable-fast=all \
             MPICHLIB_CFLAGS='-fomit-frame-pointer -O2'
     }
-
-    livecheck.type      regex
-    livecheck.regex     mpich-(\[0-9.pbrc\]+)${extract.suffix}
-    livecheck.url       ${homepage}downloads/index.php?s=downloads
 } else {
     depends_lib-append  port:mpich-devel-default
     distfiles
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140227/b7a146a4/attachment.html>