[117303] trunk/dports/science

21 Feb 2014

Revision: 117303
          https://trac.macports.org/changeset/117303
Author:   eborisch@macports.org
Date:     2014-02-21 08:39:00 -0800 (Fri, 21 Feb 2014)
Log Message:
-----------
mpich mpi-doc mpich-devel: Update to new released version: 3.1. Make mpich and mpich-devel stub ports (similar to python portgroup.) Use binary archives when possible, i.e., when wrapping a macports-provided compiler.

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

Modified: trunk/dports/science/mpi-doc/Portfile
===================================================================

--- trunk/dports/science/mpi-doc/Portfile	2014-02-21 16:24:38 UTC (rev 117302)
+++ trunk/dports/science/mpi-doc/Portfile	2014-02-21 16:39:00 UTC (rev 117303)
@@ -7,7 +7,7 @@
 
 # make sure to keep in sync with mpich
 name                mpi-doc
-version             3.0.4
+version             3.1
 
 license             BSD
 categories          science parallel net
@@ -23,8 +23,8 @@
 distname            mpich-${version}
 
 checksums \
-    rmd160  c14b3b335be863dd36c0a58630c969719d8ef217 \
-    sha256  cf638c85660300af48b6f776e5ecd35b5378d5905ec5d34c3da7a27da0acf0b3
+    rmd160  8d682dd615f38b927197c94d8255625be3a24a54 \
+    sha256  fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
 
 use_configure       no
 

Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile	2014-02-21 16:24:38 UTC (rev 117302)
+++ trunk/dports/science/mpich/Portfile	2014-02-21 16:39:00 UTC (rev 117303)
@@ -6,8 +6,8 @@
 PortGroup           select 1.0
 
 name                mpich
-version             3.0.4
-revision            10
+version             3.1
+revision            0
 
 license             BSD
 categories          science parallel net
@@ -32,18 +32,14 @@
 
 homepage            http://www.mpich.org/
 
-# Force local builds to avoid missing compilers (possible if grabbed from
-# buildbot with different Xcode)
-archive_sites
-
 # Since mpi is just a compiler wrapper, compiling it as universal needs to be
 # supported upstream since it'd be a constantly moving target, for reference
 # see, https://trac.macports.org/ticket/20240
 universal_variant   no
 
 checksums \
-    rmd160  c14b3b335be863dd36c0a58630c969719d8ef217 \
-    sha256  cf638c85660300af48b6f776e5ecd35b5378d5905ec5d34c3da7a27da0acf0b3
+    rmd160  8d682dd615f38b927197c94d8255625be3a24a54 \
+    sha256  fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
 
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
@@ -134,6 +130,11 @@
     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
     select.group                mpi
     select.file                 ${filespath}/${name}-${cname}
@@ -141,17 +142,11 @@
     if {${subport} != "${name}-default"} {
         configure.compiler      [lindex $clist($cname) 0]
         append long_description "\\n\\nTHIS SUBPORT WRAPS ${cname}'s C/C++"
-        depends_lib-append      port:${name}-default
     } else {
         append long_description \
 "\\n\\nTHIS SUBPORT WRAPS MACPORTS' DEFAULT COMPILER FOR C/C++"
     }
 
-    post-extract {
-        reinplace "s|hydra_pmi_proxy|hydra_pmi_proxy-${name}-${cname}|" \
-            src/pm/hydra/pm/pmiserv/pmiserv_utils.c
-    }
-
     configure.args-append   \
         --libdir=${prefix}/lib/${name}-${cname} \
         --sysconfdir=${prefix}/etc/${name}-${cname} \
@@ -162,11 +157,6 @@
         # This version doesn't supply doc/manpages
         delete ${destroot}${prefix}/share/man
         delete ${destroot}${prefix}/share/doc
-
-        if {![variant_isset gforker]} {
-            system -W ${destroot}${prefix}/bin \
-                "ln -s mpiexec.hydra-${name}-${cname} mpiexec-${name}-${cname}"
-        }
     }
 
     if { [string first gcc $cname] == 0 } {
@@ -252,7 +242,8 @@
             depends_build-append port:g95
 
             configure.args-delete   --disable-f77 --disable-fc
-            configure.args-append   --enable-f77 --enable-fc lt_cv_ld_force_load=no
+            configure.args-append \
+                --enable-f77 --enable-fc lt_cv_ld_force_load=no
             select.file             ${filespath}/${name}-${cname}-fortran
 
             configure.fc ${prefix}/bin/g95
@@ -290,6 +281,17 @@
     livecheck.regex     mpich-(\[0-9.p\]+)${extract.suffix}
     livecheck.url       ${homepage}downloads/index.php?s=downloads
 } else {
-    replaced_by         mpich-default
-    PortGroup           obsolete 1.0
+    depends_lib-append      port:mpich-default
+    fetch {}
+    checksum {}
+    extract {}
+    supported_archs         noarch
+    patch {}
+    build {}
+    configure {}
+    destroot {
+        set docdir          ${destroot}${prefix}/share/doc/${name}
+        xinstall -d ${docdir}
+        system "echo $name is a stub port > ${docdir}/README"
+    }
 }

Modified: trunk/dports/science/mpich-devel/Portfile
===================================================================
--- trunk/dports/science/mpich-devel/Portfile	2014-02-21 16:24:38 UTC (rev 117302)
+++ trunk/dports/science/mpich-devel/Portfile	2014-02-21 16:39:00 UTC (rev 117303)
@@ -6,7 +6,9 @@
 PortGroup           select 1.0
 
 name                mpich-devel
-version             3.1rc4
+version             3.1
+# To see 3.1 as newer than 3.1rcX
+epoch               1
 distname            mpich-${version}
 revision            0
 
@@ -33,18 +35,14 @@
 
 homepage            http://www.mpich.org/
 
-# Force local builds to avoid missing compilers (possible if grabbed from
-# buildbot with different Xcode)
-archive_sites
-
 # Since mpi is just a compiler wrapper, compiling it as universal needs to be
 # supported upstream since it'd be a constantly moving target, for reference
 # see, https://trac.macports.org/ticket/20240
 universal_variant   no
 
 checksums \
-    rmd160  c52806de935ba4353e1b80f72ca5d9f4f2c0d573 \
-    sha256  6edc4c1d650091e9b0f3a1bcee0357d5225e451de8f046b2f8aed2f4e66c9334
+    rmd160  8d682dd615f38b927197c94d8255625be3a24a54 \
+    sha256  fcf96dbddb504a64d33833dc455be3dda1e71c7b3df411dfcf9df066d7c32c39
 
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
@@ -135,6 +133,11 @@
     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
     select.group                mpi
     select.file                 ${filespath}/${name}-${cname}
@@ -161,7 +164,7 @@
             ${destroot}${prefix}/share/doc/mpich-devel-${cname}
         system -W ${destroot}${prefix}/share/doc/mpich-devel-${cname}/man \
             "/usr/bin/find . -type f -print0 | /usr/bin/xargs -0 -P ${build.jobs} /usr/bin/gzip -v"
-    }
+        }
 
     if { [string first gcc $cname] == 0 } {
         configure.args-delete   --disable-f77 --disable-fc
@@ -246,7 +249,8 @@
             depends_build-append port:g95
 
             configure.args-delete   --disable-f77 --disable-fc
-            configure.args-append   --enable-f77 --enable-fc
+            configure.args-append \
+                --enable-f77 --enable-fc lt_cv_ld_force_load=no
             select.file             ${filespath}/${name}-${cname}-fortran
 
             configure.fc ${prefix}/bin/g95
@@ -279,13 +283,24 @@
     variant tuned description {Build with more optimizations} {
         configure.args-delete   --enable-fast=O2
         configure.args-append   --enable-fast=all \
-            MPICHLIB_CFLAGS='-fomit-frame-pointer -O2 -march=native'
+            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 {
-    replaced_by         mpich-devel-default
-    PortGroup           obsolete 1.0
+    depends_lib-append  port:mpich-devel-default
+    fetch {}
+    checksum {}
+    extract {}
+    supported_archs noarch
+    patch {}
+    build {}
+    configure {}
+    destroot {
+        set docdir ${destroot}${prefix}/share/doc/${name}
+        xinstall -d ${docdir}
+        system "echo $name is a stub port > ${docdir}/README"
+    }
 }

    

eborisch＠macports.org

tags

participants (1)