[121955] trunk/dports

sean at macports.org sean at macports.org
Fri Jul 11 22:25:40 PDT 2014


Revision: 121955
          https://trac.macports.org/changeset/121955
Author:   sean at macports.org
Date:     2014-07-11 22:25:40 -0700 (Fri, 11 Jul 2014)
Log Message:
-----------
mpi-1.0: move setup call in all ports to after setting of name

Modified Paths:
--------------
    trunk/dports/devel/boost/Portfile
    trunk/dports/devel/valgrind/Portfile
    trunk/dports/lang/berkeley_upc/Portfile
    trunk/dports/lang/omnixmp/Portfile
    trunk/dports/math/arpack/Portfile
    trunk/dports/math/dolfin/Portfile
    trunk/dports/math/fftw/Portfile
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/gnudatalanguage/Portfile
    trunk/dports/math/hypre/Portfile
    trunk/dports/math/ml/Portfile
    trunk/dports/math/mumps/Portfile
    trunk/dports/math/optpp/Portfile
    trunk/dports/math/parmetis/Portfile
    trunk/dports/math/petsc/Portfile
    trunk/dports/math/plda/Portfile
    trunk/dports/math/scalapack/Portfile
    trunk/dports/math/slepc/Portfile
    trunk/dports/math/sundials/Portfile
    trunk/dports/math/superlu_dist/Portfile
    trunk/dports/python/py-mpi4py/Portfile
    trunk/dports/python/py-petsc4py/Portfile
    trunk/dports/python/py-scientific/Portfile
    trunk/dports/python/py-tables/Portfile
    trunk/dports/science/cdo/Portfile
    trunk/dports/science/hdf5/Portfile
    trunk/dports/science/hdf5-18/Portfile
    trunk/dports/science/hdfeos5/Portfile
    trunk/dports/science/hpl/Portfile
    trunk/dports/science/netcdf/Portfile
    trunk/dports/science/netcdf-cxx/Portfile
    trunk/dports/science/netcdf-cxx4/Portfile
    trunk/dports/science/netcdf-fortran/Portfile
    trunk/dports/science/octopus/Portfile
    trunk/dports/science/raxml/Portfile
    trunk/dports/science/scotch/Portfile
    trunk/dports/science/yaxt/Portfile

Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/devel/boost/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,9 +5,6 @@
 PortGroup       compiler_blacklist_versions 1.0
 PortGroup       mpi 1.0
 
-mpi.choose
-mpi.setup
-
 name            boost
 version         1.55.0
 revision        6
@@ -31,6 +28,9 @@
 checksums       rmd160  de8ef647933a005119425326b59723aad4a6fd4f \
                 sha256  fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52
 
+mpi.choose
+mpi.setup
+
 depends_lib     port:zlib \
                 port:expat \
                 port:bzip2 \

Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/devel/valgrind/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,10 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.choose
-mpi.setup           -gcc44 -gcc45 -gcc46
-
 name                valgrind
 version             3.9.0
 revision            1
@@ -31,6 +27,10 @@
                     sha1    9415e28933de9d6687f993c4bb797e6bd49583f1 \
                     sha256  e6af71a06bc2534541b07743e1d58dc3caf744f38205ca3e5b5a0bdf372ed6f0
 
+compilers.choose    cc cxx
+mpi.choose
+mpi.setup           -gcc44 -gcc45 -gcc46
+
 # due to -mno-dynamic-no-pic in Makefile.all.am we need to regenerate the
 # configure scripts
 use_autoreconf      yes

Modified: trunk/dports/lang/berkeley_upc/Portfile
===================================================================
--- trunk/dports/lang/berkeley_upc/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/lang/berkeley_upc/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,10 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.choose
-mpi.setup
-
 name                berkeley_upc
 version             2.18.2
 categories          lang science parallel
@@ -25,6 +21,10 @@
                     sha1    ac16fc3f81c79a7b8ef01d6f1e18ddd19997d75f \
                     rmd160  757e76bb3a6796a8d495062f98358460e5ec0b50
 
+compilers.choose    cc cxx
+mpi.choose
+mpi.setup
+
 depends_lib         port:upc \
                     bin:perl:perl5
 

Modified: trunk/dports/lang/omnixmp/Portfile
===================================================================
--- trunk/dports/lang/omnixmp/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/lang/omnixmp/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,9 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.choose
-mpi.setup           require_fortran -clang -dragonegg -fortran
-
 name                omnixmp
 version             0.6.1
 revision            1
@@ -24,6 +21,9 @@
                     sha256  7f76040a3302dcaf84633d6a7aa076ffc9f2a2e32711d3fe69f2ff0d1899900f
 use_bzip2           yes
 
+mpi.choose
+mpi.setup           require_fortran -clang -dragonegg -fortran
+
 depends_build       port:apache-ant
 depends_lib         port:flex \
                     port:gmp \

Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/arpack/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,8 +5,6 @@
 PortGroup           muniversal 1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require_fortran
-
 name                arpack
 version             3.1.5
 categories          math
@@ -25,6 +23,8 @@
 checksums           rmd160  ef27775099bb5aecc99ccf8190c1136eaa907982 \
                     sha256  a269ce7806bc77ced31ef794d23c3e3aff8543b65550fd7e3e24660f2a79d515
 
+mpi.setup           require_fortran
+
 configure.args      home=${worksrcpath} --disable-mpi
 
 if {![fortran_variant_isset]} {

Modified: trunk/dports/math/dolfin/Portfile
===================================================================
--- trunk/dports/math/dolfin/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/dolfin/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,8 +6,6 @@
 PortGroup           cmake 1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require
-
 bitbucket.setup     fenics-project dolfin 1.4.0 dolfin-
 revision            1
 categories          math
@@ -20,6 +18,8 @@
 checksums           rmd160  42bcfc4a00ae5f2255f434cda1b2ea5996ee7a35 \
                     sha256  64f058466a312198ea2b9de191bd4fbecaa70eb1c88325d03e680edb606b46cd
 
+mpi.setup           require
+
 configure.args-append \
                     -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
                     -DPYTHON_INCLUDE_DIR:PATH=${frameworks_dir}/Python.framework/Headers \

Modified: trunk/dports/math/fftw/Portfile
===================================================================
--- trunk/dports/math/fftw/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/fftw/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,11 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-# don't change configure.cc, etc. since we'll take care of that manually with
-# MPICC env var
-mpi.choose
-mpi.setup           require_fortran
-
 name                fftw
 version             2.1.5
 revision            7
@@ -37,6 +32,11 @@
 checksums           rmd160  723308722d76c12710db6473979adf8d086b0909 \
                     sha256  f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 
+# don't change configure.cc, etc. since we'll take care of that manually with
+# MPICC env var
+mpi.choose
+mpi.setup           require_fortran
+
 configure.args      --enable-type-prefix --enable-threads \
                     --enable-fortran --infodir=${prefix}/share/info \
                     --enable-shared

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/fftw-3/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,11 +6,6 @@
 PortGroup       compiler_blacklist_versions 1.0
 PortGroup       mpi 1.0
 
-# don't change configure.cc, etc. since we'll take care of that manually with
-# MPICC env var
-mpi.choose
-mpi.setup
-
 name            fftw-3
 version         3.3.4
 revision        0
@@ -49,6 +44,11 @@
     rmd160  463b5120d42ec2a3bc1385689176c5e0296d0d4a \
     sha256  8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982
 
+# don't change configure.cc, etc. since we'll take care of that manually with
+# MPICC env var
+mpi.choose
+mpi.setup
+
 # blacklist older versions of clang which do not handle the --enable-avx option (#41622, #41673)
 compiler.blacklist-append {clang <= 211.10.1}
 

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/gnudatalanguage/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,14 +6,15 @@
 PortGroup                   conflicts_build 1.0
 PortGroup                   mpi 1.0
 
+name                        gnudatalanguage
+version                     0.9.4
+revision                    5
+epoch                       1
+
 compilers.choose            cc cxx
 mpi.choose
 mpi.setup                   -openmpi -openmpi_devel
 
-name                        gnudatalanguage
-version                     0.9.4
-revision                    5
-epoch                       1
 categories                  math science
 maintainers                 takeshi
 license                     GPL-2

Modified: trunk/dports/math/hypre/Portfile
===================================================================
--- trunk/dports/math/hypre/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/hypre/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 name                hypre
 version             2.9.0b
 categories          math
@@ -24,6 +22,8 @@
 universal_variant   no
 worksrcdir          ${distname}/src
 
+mpi.setup
+
 configure.args      --with-blas --with-lapack --without-superlu \
                     --without-fei --without-mli --without-babel
 

Modified: trunk/dports/math/ml/Portfile
===================================================================
--- trunk/dports/math/ml/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/ml/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require_fortran
-
 name                ml
 version             6.2
 revision            1
@@ -22,6 +20,8 @@
 checksums           rmd160  f7a56200e19d89c3aa21927d578384a226146199 \
                     sha256  cd04da3308430c1268560db808bea33e17d82a42324ebbd624ca451b4a6e03ba
 
+mpi.setup           require_fortran
+
 universal_variant   no
 use_parallel_build  no
 

Modified: trunk/dports/math/mumps/Portfile
===================================================================
--- trunk/dports/math/mumps/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/mumps/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,10 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require require_fortran
-
-mpi.enforce_variant scalapack
-
 name                mumps
 version             4.10.0
 categories          math
@@ -27,6 +23,10 @@
 checksums           rmd160  19ae1f4773ab1643237f791085d9721932a618fc \
                     sha256  d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933
 
+mpi.setup           require require_fortran
+
+mpi.enforce_variant scalapack
+
 patch.pre_args      -p1
 patchfiles-append   metis.patch \
                     metis-wgts.patch \

Modified: trunk/dports/math/optpp/Portfile
===================================================================
--- trunk/dports/math/optpp/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/optpp/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -3,10 +3,6 @@
 PortSystem 1.0
 PortGroup  mpi 1.0
 
-compilers.choose cc cxx
-mpi.choose
-mpi.setup
-
 name		optpp
 version		2.4
 categories	math
@@ -24,6 +20,10 @@
             sha1    089fb515f2f2e8632d603f2d1306d39aa355e9f0 \
             rmd160  1f554c4702dedc24150f198e1a1df35ad1bf9a19
 
+compilers.choose cc cxx
+mpi.choose
+mpi.setup
+
 patchfiles patch-acx_blas.m4.diff
 use_autoconf yes
 configure.ldflags	"-framework vecLib"

Modified: trunk/dports/math/parmetis/Portfile
===================================================================
--- trunk/dports/math/parmetis/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/parmetis/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,9 +5,6 @@
 PortGroup           cmake 1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.setup
-
 name                parmetis
 version             4.0.3
 revision            3
@@ -28,6 +25,9 @@
 checksums           rmd160  1e81baf2bafe79b7abed656bff2fa3745966a196 \
                     sha256  f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f
 
+compilers.choose    cc cxx
+mpi.setup
+
 depends_lib         port:metis
 
 patch.pre_args      -p1

Modified: trunk/dports/math/petsc/Portfile
===================================================================
--- trunk/dports/math/petsc/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/petsc/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,8 +5,6 @@
 PortGroup           bitbucket 1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 bitbucket.setup     petsc petsc 3.4.4 v
 revision            3
 categories          math science
@@ -23,6 +21,8 @@
 checksums           rmd160  07c202777747234fb25f7449a23e73df6e5968fa \
                     sha256  f361c06f2aa120e9a3e19b95d9120e02e76a923235046b6b67eddf40aeb0eacf
 
+mpi.setup
+
 use_parallel_build  no
 
 depends_build-append \

Modified: trunk/dports/math/plda/Portfile
===================================================================
--- trunk/dports/math/plda/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/plda/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,10 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.choose
-mpi.setup
-
 name                plda
 version             3.1
 revision            3
@@ -27,6 +23,10 @@
 checksums           rmd160  f1551328db9eabd99d0ed29d2352e94fcd0249d0 \
                     sha256  aae495f96fdbf048b71080dec4506f242044ce40930ad2fdf5ad71e4fedad682
 
+compilers.choose    cc cxx
+mpi.choose
+mpi.setup
+
 worksrcdir          ${name}
 
 variant universal   {}

Modified: trunk/dports/math/scalapack/Portfile
===================================================================
--- trunk/dports/math/scalapack/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/scalapack/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,8 +5,6 @@
 PortGroup           cmake 1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require
-
 name                scalapack
 version             2.0.2
 categories          math
@@ -27,6 +25,8 @@
 checksums           rmd160  cbe6b783aab96cc73f37156b10e28accffdf28e3 \
                     sha256  0c74aeae690fe5ee4db7926f49c5d0bb69ce09eea75beb915e00bba07530395c
 
+mpi.setup           require
+
 configure.args      -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib \
                     -DBUILD_SHARED_LIBS=ON \
                     -DBUILD_TESTING=OFF

Modified: trunk/dports/math/slepc/Portfile
===================================================================
--- trunk/dports/math/slepc/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/slepc/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,9 +6,6 @@
 PortGroup           conflicts_build 1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-mpi.enforce_variant petsc
-
 bitbucket.setup     slepc slepc 3.4.4 v
 categories          math science
 maintainers         sean
@@ -31,6 +28,9 @@
 checksums           rmd160  f7efe797897974d59a86dceacbefd29fefbeb550 \
                     sha256  d738843bb48c11bf3e3395988bdd302d10b2eb6da6981d7b4a119477e524f87b
 
+mpi.setup
+mpi.enforce_variant petsc
+
 depends_lib-append  port:petsc
 conflicts_build     slepc
 use_parallel_build  no

Modified: trunk/dports/math/sundials/Portfile
===================================================================
--- trunk/dports/math/sundials/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/sundials/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 name                sundials
 version             2.5.0
 revision            1
@@ -32,6 +30,8 @@
 checksums           rmd160  c489fcb114f6846c7d5aef2d0eb096cb96f3fbc9 \
                     sha256  9935760931fa6539edd0741acbcf4986770426fd5ea40e50ad4ebed0fc77b0d3
 
+mpi.setup
+
 patchfiles          sundials-2.5.0_destdir.patch
 patch.pre_args      -p1
 

Modified: trunk/dports/math/superlu_dist/Portfile
===================================================================
--- trunk/dports/math/superlu_dist/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/math/superlu_dist/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,9 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.setup           require
-
 name                superlu_dist
 version             3.3
 categories          math
@@ -26,6 +23,9 @@
 checksums           rmd160  36441437d9a8e22c9f635336d7a71b8d9aea97b5 \
                     sha256  d2fd8dc847ae63ed7980cff2ad4db8d117640ecdf0234c9711e0f6ee1398cac2
 
+compilers.choose    cc cxx
+mpi.setup           require
+
 depends_lib         port:parmetis
 
 patchfiles-append   duplicate.patch

Modified: trunk/dports/python/py-mpi4py/Portfile
===================================================================
--- trunk/dports/python/py-mpi4py/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/python/py-mpi4py/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,8 +6,6 @@
 PortGroup           bitbucket 1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require
-
 bitbucket.setup     mpi4py mpi4py 1.3.1
 name                py-mpi4py
 license             BSD
@@ -29,6 +27,8 @@
 checksums           rmd160  fb4592632272dc707126e333b2ed75575921dd74 \
                     sha256  d9776a591644c2aaae33440d7ee45b29270e51887a1242d6a707f2337a6fe8f5
 
+mpi.setup           require
+
 python.versions     25 26 27 31 32 33
 
 if {![mpi_variant_isset]} {

Modified: trunk/dports/python/py-petsc4py/Portfile
===================================================================
--- trunk/dports/python/py-petsc4py/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/python/py-petsc4py/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,8 +6,6 @@
 PortGroup           bitbucket 1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require
-
 bitbucket.setup     petsc petsc4py d8c869f40125
 name                py-petsc4py
 version             3.4
@@ -26,6 +24,8 @@
 checksums           rmd160  eaeb095f088dc232ba8ad89bc5df4f094d6b4cf7 \
                     sha256  f168f60471d2899e4c4708460c7548b6d27550b9bda1cabac8a461dd46b46d76
 
+mpi.setup           require
+
 python.versions     26 27
 
 build.env-append    PETSC_DIR=${prefix}/lib/petsc

Modified: trunk/dports/python/py-scientific/Portfile
===================================================================
--- trunk/dports/python/py-scientific/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/python/py-scientific/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,10 +5,6 @@
 PortGroup           python 1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.choose
-mpi.setup
-
 name                py-scientific
 version             2.9.3
 categories-append   science
@@ -30,6 +26,10 @@
 checksums           rmd160  9680f4dca583f49ffdfdecbe9c3cf0704d3c18c3 \
                     sha256  a4dfc55c2ec84a0795b0641e5571b79b25a5ef6d92bbb01e934c298ee34b5bc8
 
+compilers.choose    cc cxx
+mpi.choose
+mpi.setup
+
 if {${name} ne ${subport}} {
     depends_lib     port:netcdf \
                     port:py${python.version}-numpy

Modified: trunk/dports/python/py-tables/Portfile
===================================================================
--- trunk/dports/python/py-tables/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/python/py-tables/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,8 +5,6 @@
 PortGroup           python 1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 set realname        tables
 name                py-${realname}
 version             3.1.1
@@ -32,6 +30,8 @@
 
 distname            ${realname}-${version}
 
+mpi.setup
+
 if {${name} ne ${subport}} {
     build.target        build_ext
     build.args          --inplace \

Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/cdo/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem                  1.0
 PortGroup                   mpi 1.0
 
-mpi.setup
-
 name                        cdo
 version                     1.6.3
 revision                    1
@@ -27,6 +25,8 @@
 
 fetch.ignore_sslcert        yes
 
+mpi.setup
+
 depends_lib                 port:netcdf \
                             port:udunits2 \
                             port:proj47

Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/hdf5/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 name                hdf5
 version             1.6.9
 revision            4
@@ -25,6 +23,8 @@
                     sha1 0481ce8cf2e62b9b10418065901369d4e0dbb4dc \
                     rmd160 05ca8a3229bdd6e214d0e843afc065d0fe9f47c7
 
+mpi.setup
+
 depends_lib         port:zlib
 patchfiles          patch-commence.diff patch-c-commence.diff \
                     patch-fortran-commence.diff patch-H5f90i.diff \

Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/hdf5-18/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -6,8 +6,6 @@
 PortGroup           muniversal 1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 set realname        hdf5
 name                ${realname}-18
 version             1.8.13
@@ -34,6 +32,9 @@
 checksums           rmd160  59e690fcc8ce80c438c3d6977729e12a75b5d162 \
                     sha256  c2f5a412107aba6f99fd7a4a9db6ce5f5fc8171ec931472784e5839d26aa17ef
 distname            ${realname}-${version}
+
+mpi.setup
+
 use_bzip2           yes
 depends_lib         port:zlib
 use_parallel_build  yes

Modified: trunk/dports/science/hdfeos5/Portfile
===================================================================
--- trunk/dports/science/hdfeos5/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/hdfeos5/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,10 +5,6 @@
 PortGroup           active_variants 1.1
 PortGroup           mpi 1.0
 
-# prevent setting configure.cc by choosing cxx only
-mpi.choose          cxx
-mpi.setup
-
 name                hdfeos5
 version             1.15
 revision            1
@@ -31,6 +27,10 @@
                     sha1    35a288cd1bfdde92a4ef9d68f8ee55b536b0f8c3 \
                     rmd160  34df5cdb6bdc4d06a7658d38aae6fed0b5671557
 
+# prevent setting configure.cc by choosing cxx only
+mpi.choose          cxx
+mpi.setup
+
 depends_build       port:libtool
 depends_lib         port:hdf5-18
 worksrcdir          ${name}

Modified: trunk/dports/science/hpl/Portfile
===================================================================
--- trunk/dports/science/hpl/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/hpl/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup
-
 name                hpl
 version             2.1
 revision            1
@@ -27,6 +25,8 @@
 checksums           rmd160  4d4a981e16ca12d52c31d5f5c9557bed01616081 \
                     sha156  460f7f36cc97a1a1fcc60e43d5833e6efb0aa03c
 
+mpi.setup
+
 #variant threads?
 
 # patch enables parallel build

Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/netcdf/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,9 +5,6 @@
 PortGroup                   mpi 1.0
 PortGroup                   github 1.0
 
-compilers.choose            cc cpp
-mpi.setup
-
 # If hdf5-18 is built without a compiler variant (with /usr/bin/clang),
 # cxx is the only variant, which does not exist in netcdf.
 # configure fails if mpi.enforce_variant is used.
@@ -33,6 +30,9 @@
                     sha1    2a24a354059bad5b52dd1d61db4bcd36edd85d48 \
                     rmd160  61a1434ff1f2c8ddf2ad178bf3eb519f7ba1558d
 
+compilers.choose            cc cpp
+mpi.setup
+
 patchfiles          patch-configure.diff
 
 configure.cppflags-append   -DNDEBUG

Modified: trunk/dports/science/netcdf-cxx/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/netcdf-cxx/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,11 +4,6 @@
 PortSystem                  1.0
 PortGroup                   mpi 1.0
 
-compilers.choose            cc cpp cxx
-mpi.setup
-
-mpi.enforce_variant         hdf5-18
-
 name                        netcdf-cxx
 version                     4.2
 revision                    5
@@ -34,7 +29,12 @@
                     sha1    bab9b2d873acdddbdbf07ab35481cd0267a3363b \
                     rmd160  69e9348ced7da8b6ddf08dad4c3a92c4f18d0648
 
+compilers.choose            cc cpp cxx
+mpi.setup
 
+mpi.enforce_variant         hdf5-18
+
+
 depends_lib         port:netcdf
 
 configure.cppflags-append   -DNDEBUG

Modified: trunk/dports/science/netcdf-cxx4/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx4/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/netcdf-cxx4/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,11 +5,6 @@
 PortGroup                   github 1.0
 PortGroup                   mpi 1.0
 
-compilers.choose            cc cpp cxx
-mpi.setup
-
-mpi.enforce_variant         hdf5-18
-
 github.setup                Unidata netcdf-cxx4 4.2.1 v
 revision                    2
 distname                    ${name}-${version}
@@ -30,6 +25,11 @@
                     sha1    0092782f03ce9b0544a29cca9696a4df9791f1f7 \
                     rmd160  f556381012b9ab904b1bc11bfec01a1dec507c0f
 
+compilers.choose            cc cpp cxx
+mpi.setup
+
+mpi.enforce_variant         hdf5-18
+
 depends_lib         port:netcdf
 
 configure.cppflags-append   -DNDEBUG

Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/netcdf-fortran/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,9 +5,6 @@
 PortGroup                   muniversal 1.0
 PortGroup                   mpi 1.0
 
-compilers.choose            f77 f90 fc
-mpi.setup                   require_fortran
-
 # netcdf-fortran does not require the fortran interface of hdf5-18.
 # enforcing hdf5-18 varint does not allow installation of
 # hdf5-18+cxx (w/o a fortran variant) and netcdf-fortran.
@@ -36,6 +33,9 @@
                     sha1    f1887314455330f4057bc8eab432065f8f6f74ef \
                     rmd160  e10c342a5d6ab2740cd910122b0164d16730e194
 
+compilers.choose    f77 f90 fc
+mpi.setup           require_fortran
+
 depends_lib         port:netcdf
 
 # Fortran compilers can not cross-compile

Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/octopus/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,9 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require_fortran -clang -dragonegg -fortran
-compilers.enforce_fortran libxc fftw-3
-
 name                octopus
 version             4.1.2
 categories          science
@@ -27,6 +24,9 @@
 checksums           rmd160  0ce62e38bed99e436b83489375fe55e53e64a538 \
                     sha256  c43ac301ff035caee667292841c5d9f166da986634cf2623e3f5a8aa86fe7a69
 
+mpi.setup           require_fortran -clang -dragonegg -fortran
+compilers.enforce_fortran libxc fftw-3
+
 depends_lib         port:atlas port:libxc port:fftw-3 port:gsl
 
 configure.args      --with-libxc-prefix=${prefix} --with-blas=-lsatlas \

Modified: trunk/dports/science/raxml/Portfile
===================================================================
--- trunk/dports/science/raxml/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/raxml/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -5,9 +5,6 @@
 PortGroup           github 1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc
-mpi.setup
-
 github.setup        stamatak standard-RAxML 7.7.6 v
 checksums           sha256  7562b307bc50e38162f104271793a1c8f98f866c2342bea21afe6df6a982fd82 \
                     rmd160  da76d6623515b7d8f78a69aaf4eec713508789af
@@ -22,6 +19,9 @@
 homepage            http://www.exelixis-lab.org/
 platforms           darwin
 
+compilers.choose    cc
+mpi.setup
+
 use_configure       no
 
 #Strings used by the variant options

Modified: trunk/dports/science/scotch/Portfile
===================================================================
--- trunk/dports/science/scotch/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/scotch/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,9 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-compilers.choose    cc cxx
-mpi.setup           require
-
 name                scotch
 version             6.0.0
 
@@ -42,6 +39,9 @@
 checksums           rmd160  71c0c7d189a35e261a09f239696369e5f41b2508 \
                     sha256  8206127d038bda868dda5c5a7f60ef8224f2e368298fbb01bf13fa250e378dd4
 
+compilers.choose    cc cxx
+mpi.setup           require
+
 patchfiles          patch-libscotch-shared.diff \
                     patch-libscotchmetis-shared.diff
 

Modified: trunk/dports/science/yaxt/Portfile
===================================================================
--- trunk/dports/science/yaxt/Portfile	2014-07-12 05:25:17 UTC (rev 121954)
+++ trunk/dports/science/yaxt/Portfile	2014-07-12 05:25:40 UTC (rev 121955)
@@ -4,8 +4,6 @@
 PortSystem          1.0
 PortGroup           mpi 1.0
 
-mpi.setup           require
-
 name                yaxt
 version             0.2.2
 revision            2
@@ -23,6 +21,8 @@
 checksums           rmd160  3cf6d1251e48c175f511a5885c23ee06edacb3f7 \
                     sha256  6feb7185b397f7249f48ce10b7c60c457885eb7b67b7231dc08656c353e7e93b
 
+mpi.setup           require
+
 patchfiles          patch-src-Makefile.in.diff \
                     patch-Makefile.in.diff
 configure.cppflags-append   -I../src
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140711/b5619b18/attachment-0001.html>


More information about the macports-changes mailing list