Ticket #37785: mpich2_to_mpich-with-extra-variant.diff

File mpich2_to_mpich-with-extra-variant.diff, 31.9 KB (added by eborisch (Eric A. Borisch), 11 years ago)
  • devel/valgrind/Portfile

     
    55name            valgrind
    66conflicts       valgrind-devel
    77version         3.8.1
     8revision        1
    89categories      devel
    910platforms       darwin
    1011supported_archs i386 x86_64
     
    6970    }
    7071}
    7172
    72 variant mpich2 description {Use mpich2 for MPI support} conflicts universal {
    73     depends_lib-append port:mpich2
     73variant mpich description {Use mpich for MPI support} conflicts universal {
     74    depends_lib-append path:bin/mpicc:mpich
    7475    configure.args-delete --without-mpicc
    7576    configure.args-append --with-mpicc=${prefix}/bin/mpicc
    7677}
     
    8485livecheck.type  regex
    8586livecheck.url ${homepage}
    8687livecheck.regex ${name}-(\\d(?:\\.\\d)+)
     88
     89variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • devel/valgrind-devel/Portfile

     
    77svn.revision    13189
    88set vex_revision 2601
    99version         3.9.0-r${svn.revision}
     10revision        1
    1011categories      devel
    1112platforms       darwin
    1213supported_archs i386 x86_64
     
    6263    }
    6364}
    6465
    65 variant mpich2 description {Use mpich2 for MPI support} conflicts universal {
    66     depends_lib-append port:mpich2
     66variant mpich description {Use mpich for MPI support} conflicts universal {
     67    depends_lib-append path:bin/mpicc:mpich
    6768    configure.args-delete --without-mpicc
    6869    configure.args-append --with-mpicc=${prefix}/bin/mpicc
    6970}
     
    7576}
    7677
    7778livecheck.type none
     79
     80variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • graphics/vtk-devel/Portfile

     
    55
    66name            vtk-devel
    77version         5.4.2
    8 revision        1
     8revision        2
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010
    1111categories      graphics math science devel
     
    760760variant mpi description "use message passing interface (mpich2) for parallel support" {
    761761    set nCPU [expr [exec sysctl -n hw.logicalcpu_max]]
    762762    depends_lib-append \
    763         port:mpich2
     763        path:bin/mpicc:mpich
    764764    configure.args-append \
    765765        -DVTK_USE_MPI:BOOL=ON \
    766766        -DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx \
  • lang/omnixmp/Portfile

     
    4949    default_variants    +gcc45
    5050}
    5151
    52 if {![variant_isset mpich2] && ![variant_isset mpich]} {
     52if {![variant_isset mpich]} {
    5353    default_variants-append +openmpi
    5454}
    5555
     
    7575    configure.compiler  macports-gcc-4.7
    7676}
    7777
    78 variant openmpi conflicts mpich2 mpich description {build with OpenMPI} {
     78variant openmpi conflicts mpich description {build with OpenMPI} {
    7979    depends_lib-append      port:openmpi
    8080    configure.args-append   --with-mpicc=${prefix}/lib/openmpi/bin/mpicc
    8181    configure.args-append   --with-mpif90=${prefix}/lib/openmpi/bin/mpif90
    8282}
    8383
    84 variant mpich2 conflicts openmpi mpich description {build with MPICH2} {
    85     depends_lib-append      port:mpich2
    86     configure.args-append   --with-mpicc=${prefix}/bin/mpicc
    87     configure.args-append   --with-mpif90=${prefix}/bin/mpif90
    88 }
     84variant mpich2 requires mpich description {Variant remaned as +mpich} {}
    8985
    90 variant mpich conflicts openmpi mpich2 description {build with MPICH3} {
     86variant mpich conflicts openmpi description {build with MPICH} {
    9187    depends_lib-append      port:mpich
    9288    configure.args-append   --with-mpicc=${prefix}/bin/mpicc
    9389    configure.args-append   --with-mpif90=${prefix}/bin/mpif90
  • math/arpack/Portfile

     
    55
    66name          arpack
    77version       3.1.2
     8revision      1
    89categories    math
    910license       BSD
    1011platforms     darwin
     
    4647    set universal_archs_supported "ppc ppc64"
    4748}
    4849
    49 variant openmpi description {build with OpenMPI} conflicts mpich2 {
     50variant openmpi description {build with OpenMPI} conflicts mpich {
    5051    depends_lib-append port:openmpi
    5152    configure.env-append MPIF77=${prefix}/bin/openmpif77
    5253}
    5354
    54 variant mpich2 description {build with MPICH2} conflicts openmpi {
    55     depends_lib-append port:mpich2
     55variant mpich description {build with MPICH} conflicts openmpi {
     56    depends_lib-append path:bin/mpicc:mpich
    5657    configure.env-append MPIF77=${prefix}/bin/mpif77
    5758}
    5859
    59 if {![variant_isset mpich2]} {
     60if {![variant_isset mpich]} {
    6061    default_variants +openmpi
    6162}
    6263
     
    9899variant accelerate conflicts atlas description {build with Accelerate framework} {
    99100    configure.args-append --with-lapack=/usr/lib/liblapack.dylib
    100101    patchfiles-append patch-ARPACK-cdot-and-zdot.diff
    101     if {[variant_isset openmpi] || [variant_isset mpich2]} {
     102    if {[variant_isset openmpi] || [variant_isset mpich]} {
    102103        patchfiles-append patch-PARPACK-cdot-and-zdot.diff
    103104    }
    104105}
     
    121122livecheck.type  regex
    122123livecheck.url   http://forge.scilab.org/index.php/p/arpack-ng/downloads/
    123124livecheck.regex ${name}-ng (\[0-9.\]+\[0-9\])
     125
     126variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • math/fftw/Portfile

     
    44
    55name            fftw
    66version         2.1.5
    7 revision        4
     7revision        5
    88categories      math devel
    99license         GPL-2+
    1010maintainers     nomaintainer
     
    7171}
    7272
    7373variant mpi description {Include FFTW MPI library} {
    74     depends_lib-append port:mpich2
     74    depends_lib-append path:bin/mpicc:mpich
    7575    configure.args-append --enable-mpi
    7676}
  • math/fftw-3/Portfile

     
    55
    66name            fftw-3
    77version         3.3.3
     8revision        1
    89categories      math
    910license         GPL-2+
    1011platforms       darwin
     
    115116        file delete ${destroot}${prefix}/share/info/fftw3.info-4
    116117        file delete ${destroot}${prefix}/share/info/fftw3.info-5
    117118
    118         if {[variant_isset mpich2] || [variant_isset openmpi]} {
     119        if {[variant_isset mpich] || [variant_isset openmpi]} {
    119120          file delete ${destroot}${prefix}/include/fftw3-mpi.f03
    120121          file delete ${destroot}${prefix}/include/fftw3-mpi.h
    121122          file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
     
    162163        file delete ${destroot}${prefix}/share/info/fftw3.info-4
    163164        file delete ${destroot}${prefix}/share/info/fftw3.info-5
    164165
    165         if {[variant_isset mpich2] || [variant_isset openmpi]} {
     166        if {[variant_isset mpich] || [variant_isset openmpi]} {
    166167          file delete ${destroot}${prefix}/include/fftw3-mpi.f03
    167168          file delete ${destroot}${prefix}/include/fftw3-mpi.h
    168169          file delete ${destroot}${prefix}/include/fftw3l-mpi.f03
     
    251252    }
    252253}
    253254
    254 variant openmpi description {compile FFTW MPI library with OpenMPI} conflicts mpich2 {
     255variant openmpi description {compile FFTW MPI library with OpenMPI} conflicts mpich {
    255256    depends_lib-append      port:openmpi
    256257    configure.env           MPICC=${prefix}/lib/openmpi/bin/mpicc
    257258    configure.args-append   --enable-mpi
    258259}
    259260
    260 variant mpich2 description {compile FFTW MPI library with MPICH2} conflicts openmpi {
    261     depends_lib-append      path:bin/mpicc:mpich2
     261variant mpich description {compile FFTW MPI library with MPICH} conflicts openmpi {
     262    depends_lib-append      path:bin/mpicc:mpich
    262263    configure.env           MPICC=${prefix}/bin/mpicc
    263264    configure.args-append   --enable-mpi
    264265}
    265266
     267variant mpich2 requires mpich description {Variant renamed as +mpich} {}
     268
    266269if {${name} == ${subport}} {
    267270    livecheck.type  regex
    268271    livecheck.url   ${homepage}
  • math/fftw-single/Portfile

     
    44
    55name            fftw-single
    66version         2.1.5
    7 revision        3
     7revision        4
    88categories      math devel
    99license         GPL-2+
    1010maintainers     nomaintainer
     
    7474}
    7575
    7676variant mpi description {Include FFTW MPI library} {
    77     depends_lib-append port:mpich2
     77    depends_lib-append path:bin/mpicc:mpich
    7878    configure.args-append --enable-mpi
    7979}
    8080
  • math/petsc/Portfile

     
    66
    77name            petsc
    88version     3.3-p5
    9 revision    1
     9revision    2
    1010categories  math science
    1111maintainers     mmoll
    1212description     Portable, Extensible Toolkit for Scientific Computation
     
    6464
    6565conflicts_build     petsc
    6666
    67 variant openmpi description {Build using the OpenMPI compiler} conflicts mpich2 {
     67variant openmpi description {Build using the OpenMPI compiler} conflicts mpich {
    6868    depends_lib-append port:openmpi
    6969    configure.args-append \
    7070        --with-cc=${prefix}/bin/openmpicc \
     
    7373        --with-mpiexec=${prefix}/bin/openmpiexec
    7474}
    7575
    76 variant mpich2 description {Build using the MPICH2 compiler} conflicts openmpi {
    77     depends_lib-append port:mpich2
     76variant mpich description {Build using the MPICH compiler} conflicts openmpi {
     77    depends_lib-append path:bin/mpicc:mpich
    7878    configure.args-append \
    7979        --with-cc=${prefix}/bin/mpicc \
    8080        --with-cxx=${prefix}/bin/mpicxx \
     
    9393        --with-blas-lapack-lib=${prefix}/lib/libtatlas.dylib
    9494}
    9595
    96 if {![variant_isset mpich2]} {
     96if {![variant_isset mpich]} {
    9797    default_variants +openmpi
    9898}
    9999if {![variant_isset atlas]} {
     
    105105livecheck.type  regex
    106106livecheck.url   http://www.mcs.anl.gov/petsc/petsc-2/download/index.html
    107107livecheck.regex petsc-lite-(\[0-9.\]+(-p\[0-9\]+))\\.tar\\.gz
     108
     109variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • math/plda/Portfile

     
    55
    66name                plda
    77version             3.1
    8 revision            1
     8revision            2
    99categories          math textproc
    1010maintainers         hum openmaintainer
    1111
     
    3333                    CFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
    3434
    3535variant mpi description {Add parallel lda} {
    36     depends_lib         port:mpich2
     36    depends_lib         path:bin/mpicc:mpich
    3737    build.target        lda infer mpi_lda
    3838    post-destroot {
    3939        xinstall -m 755 ${worksrcpath}/mpi_lda ${destroot}${prefix}/bin/mpi_plda
  • python/py-mpi4py/Portfile

     
    66
    77name            py-mpi4py
    88version         1.3
    9 revision        2
     9revision        3
    1010license         BSD
    1111description     MPI for Python - Python bindings for MPI
    1212long_description \
     
    3737    depends_lib-append port:openmpi
    3838    build.args-append  "--mpicc=${prefix}/bin/openmpicc"
    3939
    40     # openmpi and mpich2 are not universal
     40    # openmpi and mpich are not universal
    4141    universal_variant no
    4242
    4343    if { ${os.platform} != "darwin" || ${os.major} > 8 } {
    4444
    45         variant mpich2 description {builds with the mpich2 port} {
     45        variant mpich description {builds with the mpich port} {
    4646            build.args-delete   "--mpicc=${prefix}/bin/openmpicc"
    4747            depends_lib-delete  port:openmpi
    48             depends_lib-append  port:mpich2
     48            depends_lib-append  path:bin/mpicc:mpich
    4949        }
    5050
     51        variant mpich2 requires mpich description {Variant renamed as +mpich} {}
    5152    }
    5253
    5354    variant interpreter description {builds an mpi enabled python interpreter} {
  • science/hdf5/Portfile

     
    55
    66name                hdf5
    77version             1.6.9
    8 revision            3
     8revision            4
    99categories          science
    1010license             NCSA
    1111maintainers         nomaintainer
     
    108108    }
    109109}
    110110
    111 variant mpich2 description {Parallel HDF5 with mpich2 (disables C++)} {
    112     depends_lib-append          port:mpich2
     111variant mpich description {Parallel HDF5 with mpich (disables C++)} {
     112    depends_lib-append          path:bin/mpicc:mpich
    113113    configure.args-delete       --enable-cxx
    114114    configure.cc                ${prefix}/bin/mpicc
    115115    if { [variant_isset fortran] } {
    116116       configure.fc             ${prefix}/bin/mpif90
    117117    }
    118118}
     119
     120variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/hdf5-18/Portfile

     
    88set realname        hdf5
    99name                ${realname}-18
    1010version             1.8.10
     11revision            1
    1112categories          science
    1213maintainers         mmoll openmaintainer
    1314
     
    8283
    8384variant cxx description {
    8485    Enable c++ interfance.
    85   +cxx is EXPERIMENTAL with +mpich2, +openmpi, or +threadsafe
     86  +cxx is EXPERIMENTAL with +mpich, +openmpi, or +threadsafe
    8687} {
    8788    configure.args-delete       --disable-cxx
    8889    configure.args-append       --enable-cxx
    8990}
    9091
    9192variant fortran description {
    92     Enable fortran bindings. If combined with +openmpi or +mpich2, the\
     93    Enable fortran bindings. If combined with +openmpi or +mpich, the\
    9394    respective MPI package must have been built with fortran support.
    94   Must be combined with +gcc44, +gcc45, +gcc46, +gcc47, +mpich2, or +openmpi
     95  Must be combined with +gcc44, +gcc45, +gcc46, +gcc47, +mpich, or +openmpi
    9596  +fortran is EXPERIMENTAL with +threadsafe
    9697} {
    9798    configure.args-delete       --disable-fortran
     
    99100}
    100101
    101102if {[ variant_isset fortran ] &&
    102     !([variant_isset mpich2 ]  ||
     103    !([variant_isset mpich ]  ||
    103104      [variant_isset openmpi ] ||
    104105      [variant_isset gcc44]    ||
    105106      [variant_isset gcc45]    ||
    106107      [variant_isset gcc46]    ||
    107108      [variant_isset gcc47]) } {
    108     ui_error "+fortran requires +mpich2, +openmpi, or +gccNN"
     109    ui_error "+fortran requires +mpich, +openmpi, or +gccNN"
    109110    return -code error
    110111}
    111112
    112113variant threadsafe description {
    113114    Enable threadsafety.
    114   +threadsafe is EXPERIMENTAL with +cxx, +fortran, +mpich2 or +openmpi
     115  +threadsafe is EXPERIMENTAL with +cxx, +fortran, +mpich or +openmpi
    115116} {
    116117    configure.args-delete       --disable-threadsafe
    117118    configure.args-append       --enable-threadsafe --with-pthread
     
    119120
    120121if {[ variant_isset threadsafe ] && ([ variant_isset cxx] ||
    121122                                     [ variant_isset fortran]) ||
    122     ([ variant_isset mpich2 ] || [ variant_isset openmpi ]) &&
     123    ([ variant_isset mpich ] || [ variant_isset openmpi ]) &&
    123124    ([ variant_isset cxx ]    || [ variant_isset threadsafe ])  } {
    124125   
    125126    # Tell hdf5-18 to configure in this experimental configuration
     
    149150variant openmpi description {
    150151    Enable Parallel HDF5 with openmpi. Uses compiler selected with openmpi.
    151152  +openmpi is EXPERIMENTAL with +cxx or +threadsafe.
    152 } conflicts universal mpich2 gcc44 gcc45 gcc46 gcc47 {
     153} conflicts universal mpich gcc44 gcc45 gcc46 gcc47 {
    153154    depends_lib-append          port:openmpi
    154155    configure.cc                ${prefix}/bin/openmpicc
    155156    configure.cxx               ${prefix}/bin/openmpicxx
    156157    configure.fc                ${prefix}/bin/openmpif90
    157158}
    158159
    159 # mpich2 port does not support universal
    160 variant mpich2 description {
    161     Enable Parallel HDF5 with mpich2. Uses compiler selected with mpich2.
    162   +mpich2 is EXPERIMENTAL with +cxx or +threadsafe.
     160# mpich port does not support universal
     161variant mpich description {
     162    Enable Parallel HDF5 with mpich. Uses compiler selected with mpich.
     163  +mpich is EXPERIMENTAL with +cxx or +threadsafe.
    163164} conflicts universal openmpi gcc44 gcc45 gcc46 gcc47 {
    164     depends_lib-append          path:bin/mpicc:mpich2
     165    depends_lib-append          path:bin/mpicc:mpich
    165166    configure.cc                ${prefix}/bin/mpicc
    166167    configure.cxx               ${prefix}/bin/mpicxx
    167168    configure.fc                ${prefix}/bin/mpif90
    168169}
    169170
    170 if {[ variant_isset mpich2 ] || [ variant_isset openmpi ]} {
     171if {[ variant_isset mpich ] || [ variant_isset openmpi ]} {
    171172    # These are compiler wrappers that already have MP's flags built in.
    172173    configure.cflags
    173174    configure.cxxflags
     
    183184
    184185variant gcc44 description {
    185186    Build with MacPorts' gcc44 compiler.
    186 } conflicts universal gcc45 gcc46 gcc47 openmpi mpich2 {
     187} conflicts universal gcc45 gcc46 gcc47 openmpi mpich {
    187188    depends_lib-append          port:gcc44
    188189    configure.compiler          macports-gcc-4.4
    189190}
    190191
    191192variant gcc45 description {
    192193    Build with MacPorts' gcc45 compiler.
    193 } conflicts universal gcc44 gcc46 gcc47 openmpi mpich2 {
     194} conflicts universal gcc44 gcc46 gcc47 openmpi mpich {
    194195    depends_lib-append          port:gcc45
    195196    configure.compiler          macports-gcc-4.5
    196197}
    197198
    198199variant gcc46 description {
    199200    Build with MacPorts' gcc46 compiler.
    200 } conflicts universal gcc44 gcc45 gcc47 openmpi mpich2 {
     201} conflicts universal gcc44 gcc45 gcc47 openmpi mpich {
    201202    depends_lib-append          port:gcc46
    202203    configure.compiler          macports-gcc-4.6
    203204}
    204205
    205206variant gcc47 description {
    206207    Build with MacPorts' gcc47 compiler.
    207 } conflicts universal gcc44 gcc45 gcc46 openmpi mpich2 {
     208} conflicts universal gcc44 gcc45 gcc46 openmpi mpich {
    208209    depends_lib-append          port:gcc47
    209210    configure.compiler          macports-gcc-4.7
    210211}
     
    213214livecheck.type      regex
    214215livecheck.url       http://www.hdfgroup.org/HDF5/release/obtain5.html
    215216livecheck.regex     5-(\[0-9.\]+)
     217
     218variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/lalinference/Portfile

     
    1 # $Id: Portfile 100320 2012-12-08 07:07:50Z ram@macports.org $
     1# $Id$
    22
    33PortSystem    1.0
    44PortGroup     active_variants 1.1
  • science/lalstochastic/Portfile

     
    1 # $Id: Portfile 99902 2012-11-21 03:33:00Z ram@macports.org $
     1# $Id$
    22
    33PortSystem    1.0
    44
  • science/mpich2/Portfile

     
    44PortSystem          1.0
    55
    66name                mpich2
    7 set pkgname         mpich2
    87version             1.5
    9 revision            6
     8revision            7
    109epoch               20121008
    11 
     10categories          science parallel net
     11homepage            http://www.mpich.org
    1212license             BSD
    13 categories          science parallel net
    14 platforms           darwin
    15 maintainers         eborisch \
    16                     openmaintainer
    1713
    18 description         Message Passing Interface (MPI) Library
     14replaced_by         mpich
    1915
    20 long_description    MPICH2 is an implementation of the Message-Passing \
    21                     Interface (MPI). The goals of MPICH2 are to provide an \
    22                     MPI implementation for important platforms, including \
    23                     clusters, SMPs, and massively parallel processors. It \
    24                     also provides a vehicle for MPI implementation research \
    25                     and for developing new and better parallel programming \
    26                     environments.
     16PortGroup           obsolete 1.0
    2717
    28 homepage            http://www.mpich.org/
    29 master_sites        ${homepage}static/tarballs/${version}/
    30 distname            ${pkgname}-${version}
    31 
    32 checksums   \
    33     rmd160  69572f5c435aec1ef37af197f7509cfc073ce53a \
    34     sha256  7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66
    35 
    36 subport mpich2-devel {
    37 # Currently mpich2-devel == mpich2
    38     conflicts           mpich2
    39 }
    40 
    41 universal_variant   no
    42 
    43 depends_lib-append  port:libxml2
    44 conflicts-append    lammpi \
    45                     openmpi
    46  
    47 configure.args      --disable-dependency-tracking \
    48                     --disable-f77 \
    49                     --disable-fc \
    50                     --disable-silent-rules \
    51                     --enable-base-cache \
    52                     --enable-cache \
    53                     --enable-cxx \
    54                     --enable-fast=O2 \
    55                     --enable-shared \
    56                     --enable-smpcoll \
    57                     --with-device=ch3:nemesis \
    58                     --with-mpe \
    59                     --with-pm=hydra \
    60                     --with-thread-package=posix \
    61                     "F90FLAGS='' F90=''"
    62 
    63 platform darwin {
    64     configure.args-append   --enable-timer-type=mach_absolute_time
    65 }
    66 
    67 # We're making compiler wrappers here... don't default to -O2 for wrappers.
    68 # Actual library code is compiled with -O2 via --enable-fast=O2 configure arg
    69 configure.cflags-delete     -O2
    70 configure.cxxflags-delete   -O2
    71 configure.fflags-delete     -O2
    72 configure.fcflags-delete    -O2
    73 
    74 post-destroot {
    75     # Move examples directories to preferred location
    76     move ${destroot}${prefix}/share/examples \
    77       ${destroot}${prefix}/share/doc/${pkgname}/examples
    78 
    79     # Remove un-needed (in MacPorts) binaries
    80     file delete ${destroot}${prefix}/sbin/mpeuninstall
    81     file delete ${destroot}${prefix}/sbin/mpecheckinstall
    82 
    83     # That's what man pages are for
    84     delete ${destroot}${prefix}/share/doc/www4
    85 }
    86 
    87 # As MPICH creates compiler wrappers, there are lots of
    88 # variants for what compiler the user would like to wrap.
    89 
    90 variant gcc47 description {
    91     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47 port
    92 } conflicts gcc43 gcc44 gcc45 gcc46 llvm clang clang31 {
    93     depends_lib-append      port:gcc47
    94     configure.compiler      macports-gcc-4.7
    95 }
    96 
    97 variant gcc46 description {
    98     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46 port
    99 } conflicts gcc43 gcc44 gcc45 gcc47 llvm clang clang31 {
    100     depends_lib-append      port:gcc46
    101     configure.compiler      macports-gcc-4.6
    102 }
    103 
    104 variant gcc45 description {
    105     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45 port
    106 } conflicts gcc43 gcc44 gcc46 gcc47 llvm clang clang31 {
    107     depends_lib-append      port:gcc45
    108     configure.compiler      macports-gcc-4.5
    109 }
    110 
    111 variant gcc44 description {
    112     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44 port
    113 } conflicts gcc43 gcc45 gcc46 gcc47 llvm clang clang31 {
    114     depends_lib-append      port:gcc44
    115     configure.compiler      macports-gcc-4.4
    116 }
    117 
    118 variant gcc43 description {
    119     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43 port
    120 } conflicts gcc44 gcc45 gcc46 gcc47 llvm clang clang31 {
    121     depends_lib-append      port:gcc43
    122     configure.compiler      macports-gcc-4.3
    123 }
    124 
    125 if {[ variant_isset gcc43 ] ||
    126     [ variant_isset gcc44 ] ||
    127     [ variant_isset gcc45 ] ||
    128     [ variant_isset gcc46 ] ||
    129     [ variant_isset gcc47 ]} {
    130     configure.args-append   --enable-f77 --enable-fc
    131     configure.args-delete   --disable-f77 --disable-fc
    132 }
    133 
    134 variant llvm description {
    135     Use Apple-supplied llvm-gcc
    136 } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang clang31 {
    137     configure.compiler      llvm-gcc-4.2
    138 }
    139 
    140 variant clang description {
    141     Use Apple-supplied clang
    142 } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
    143     configure.compiler      clang
    144 }
    145 
    146 variant clang31 description {
    147     Use clang 3.1 from MacPorts
    148 } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
    149     depends_lib-append      port:clang-3.1
    150     configure.compiler      clang
    151     configure.cc            ${prefix}/bin/clang-mp-3.1
    152     configure.cxx           ${prefix}/bin/clang++-mp-3.1
    153 }
    154 
    155 variant gforker description {
    156     Use gforker process manager instead of the default hydra
    157 } {
    158     configure.args-append   --with-pm=gforker
    159     configure.args-delete   --with-pm=hydra
    160 }
    161 
    162 variant tuned description {Build with more optimizations} {
    163     configure.args-delete       --enable-fast=O2
    164     configure.args-append       --enable-fast=all \
    165                                 MPICH2LIB_CFLAGS='-fomit-frame-pointer -O2'
    166 }
    167 
    168 if {${configure.compiler} == "clang"} {
    169     configure.env-append    ac_cv_tls=none
    170 }
    171 
    172 livecheck.type      regex
    173 livecheck.regex     ${pkgname}-(\[0-9.pbrc\]+)${extract.suffix}
    174 livecheck.url       ${homepage}downloads/index.php?s=downloads
  • science/nco/Portfile

     
    55
    66name                        nco
    77version                     4.2.3
    8 revision                    1
     8revision                    2
    99platforms                   darwin
    1010maintainers                 takeshi
    1111license                     GPL-3
     
    5454                            --enable-dap-netcdf           \
    5555                            --enable-netcdf4
    5656
    57 if {![variant_isset openmpi]&&![variant_isset mpich2]} {
     57if {![variant_isset openmpi]&&![variant_isset mpich]} {
    5858    post-configure {
    5959        foreach d {nco nco++ nco_c++} {
    6060            reinplace "s|= -I${prefix}/include|= |" ${worksrcpath}/src/${d}/Makefile
     
    7171    }
    7272}
    7373
    74 variant mpich2 description {enable MPI with mpich2} {
    75     depends_lib-append      port:mpich2
     74variant mpich description {enable MPI with mpich} {
     75    depends_lib-append      path:bin/mpicc:mpich
    7676    configure.args-append   --enable-mpi
    7777}
    7878
     
    8484livecheck.type  regex
    8585livecheck.url   ${homepage}
    8686livecheck.regex  {Current NCO version is ([0-9]+\.[0-9]+\.[0-9]+)}
     87
     88variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/netcdf/Portfile

     
    66name                        netcdf
    77epoch                       2
    88version                     4.2.1.1
    9 revision                    1
     9revision                    2
    1010maintainers                 takeshi openmaintainer
    1111platforms                   darwin
    1212categories                  science
     
    5757
    5858default_variants +netcdf4 +dap
    5959
    60 variant openmpi conflicts mpich2 description {compile with openmpi} {
     60variant openmpi conflicts mpich description {compile with openmpi} {
    6161    depends_lib-append      port:openmpi
    6262    configure.cc            openmpicc
    6363}
    6464
    65 variant mpich2 conflicts openmpi description {compile with mpich2} {
    66     depends_lib-append      port:mpich2
     65variant mpich conflicts openmpi description {compile with mpich} {
     66    depends_lib-append      path:bin/mpicc:mpich
    6767    configure.cc            mpicc
    6868    configure.cc_archflags  ""
    6969    configure.ld_archflags  ""
     
    9494livecheck.type      regex
    9595livecheck.url       http://www.unidata.ucar.edu/downloads/${name}/
    9696livecheck.regex     {The netCDF C library and utilities, version ([0-9]+\.[0-9]+\.[0-9]+[\.]*[0-9]*)}
     97
     98variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/netcdf-cxx/Portfile

     
    55
    66name                        netcdf-cxx
    77version                     4.2
    8 revision                    1
     8revision                    2
    99distname                    ${name}-${version}
    1010maintainers                 takeshi openmaintainer
    1111platforms                   darwin
     
    5050
    5151destroot.destdir            prefix=${destroot}${prefix}
    5252
    53 variant openmpi conflicts mpich2 description {compile with openmpi} {
     53variant openmpi conflicts mpich description {compile with openmpi} {
    5454    depends_lib-append      port:openmpi
    5555    configure.cc            openmpicc
    5656    configure.cxx           openmpicxx
    5757}
    5858
    59 variant mpich2 conflicts openmpi description {compile with mpich2} {
    60     depends_lib-append      port:mpich2
     59variant mpich conflicts openmpi description {compile with mpich} {
     60    depends_lib-append      path:bin/mpicc:mpich
    6161    configure.cc            mpicc
    6262    configure.cxx           mpicxx
    6363}
     64
     65variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/netcdf-cxx4/Portfile

     
    55
    66name                        netcdf-cxx4
    77version                     4.2
     8revision                    1
    89distname                    ${name}-${version}
    910maintainers                 takeshi openmaintainer
    1011platforms                   darwin
     
    4748
    4849destroot.destdir            prefix=${destroot}${prefix}
    4950
    50 variant openmpi conflicts mpich2 description {compile with openmpi} {
     51variant openmpi conflicts mpich description {compile with openmpi} {
    5152    depends_lib-append      port:openmpi
    5253    configure.cc            openmpicc
    5354    configure.cxx           openmpicxx
    5455}
    5556
    56 variant mpich2 conflicts openmpi description {compile with mpich2} {
    57     depends_lib-append      port:mpich2
     57variant mpich conflicts openmpi description {compile with mpich} {
     58    depends_lib-append      path:bin/mpicc:mpich
    5859    configure.cc            mpicc
    5960    configure.cxx           mpicxx
    6061}
     62
     63variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/netcdf-fortran/Portfile

     
    66
    77name                        netcdf-fortran
    88version                     4.2
    9 revision                    5
     9revision                    6
    1010maintainers                 takeshi openmaintainer
    1111platforms                   darwin
    1212categories                  science
     
    127127    configure.f77           ${configure.fc}
    128128}
    129129
    130 variant openmpi conflicts mpich2 description {compile with openmpi} {
     130variant openmpi conflicts mpich description {compile with openmpi} {
    131131    depends_lib-append      port:openmpi
    132132    configure.fc            openmpif77
    133133    configure.cc            openmpicc
    134134}
    135135
    136 variant mpich2 conflicts openmpi description {compile with mpich2} {
    137     depends_lib-append      port:mpich2
     136variant mpich conflicts openmpi description {compile with mpich} {
     137    depends_lib-append      path:bin/mpicc:mpich
    138138    configure.fc            mpif90
    139139    configure.cc            mpicc
    140140}
     141
     142variant mpich2 requires mpich description {Variant renamed as +mpich} {}
  • science/ocaml-mpi/Portfile

     
    44
    55name                ocaml-mpi
    66version             1.01
    7 revision            2
     7revision            3
    88categories          science devel ml
    99maintainers         mww
    1010license             LGPL-2
     
    2121                    sha1    4f836f02f7e8852ba72d4293aea43cf7a3438b0f \
    2222                    rmd160  c0a08090073c54e130cd2712c7d1cfbeb8d17793
    2323
    24 depends_lib         port:ocaml port:ocaml-findlib port:mpich2
     24depends_lib         port:ocaml port:ocaml-findlib path:bin/mpicc:mpich
    2525
    2626patchfiles          Makefile.diff
    2727