Revision: 75745 http://trac.macports.org/changeset/75745 Author: jmr@macports.org Date: 2011-02-06 15:46:01 -0800 (Sun, 06 Feb 2011) Log Message: ----------- mpich2: add variants for python 2.5-2.7 and for gcc 4.5 Modified Paths: -------------- trunk/dports/science/mpich2/Portfile Modified: trunk/dports/science/mpich2/Portfile =================================================================== --- trunk/dports/science/mpich2/Portfile 2011-02-06 23:41:57 UTC (rev 75744) +++ trunk/dports/science/mpich2/Portfile 2011-02-06 23:46:01 UTC (rev 75745) @@ -25,8 +25,6 @@ patchfiles patch-Makefile.in patch-src-util-createshlib.in -depends_lib port:python25 - # the default include-dir conflicts with openmpi! configure.args --with-thread-package=posix \ --enable-timer-type=gettimeofday \ @@ -35,14 +33,13 @@ --docdir=${prefix}/share/doc/${name} \ --htmldir=${prefix}/share/doc/${name} \ --includedir=${prefix}/include/${name} \ - --with-python=${prefix}/bin/python2.5 \ --disable-f77 --disable-f90 universal_variant no use_parallel_build no -variant g95 description {Enable Fortran 77 and Fortran 90 bindings using g95} conflicts gcc42 gcc43 gcc44 { +variant g95 description {Enable Fortran 77 and Fortran 90 bindings using g95} conflicts gcc42 gcc43 gcc44 gcc45 { depends_lib-append port:g95 configure.f77 "${prefix}/bin/g95" configure.fflags "-i4" @@ -51,19 +48,25 @@ configure.args-append --enable-f77 --enable-f90 } -variant gcc44 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44} conflicts g95 gcc42 gcc43 { +variant gcc45 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45} conflicts g95 gcc42 gcc43 gcc44 { + depends_lib-append port:gcc45 + configure.compiler macports-gcc-4.5 + configure.args-append --enable-f77 --enable-f90 +} + +variant gcc44 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44} conflicts g95 gcc42 gcc43 gcc45 { depends_lib-append port:gcc44 configure.compiler macports-gcc-4.4 configure.args-append --enable-f77 --enable-f90 } -variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts g95 gcc42 gcc44 { +variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts g95 gcc42 gcc44 gcc45 { depends_lib-append port:gcc43 configure.compiler macports-gcc-4.3 configure.args-append --enable-f77 --enable-f90 } -variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts g95 gcc43 gcc44 { +variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts g95 gcc43 gcc44 gcc45 { depends_lib-append port:gcc42 configure.compiler macports-gcc-4.2 configure.args-append --enable-f77 --enable-f90 @@ -77,6 +80,22 @@ configure.args-append --enable-sharedlibs=osx-gcc } +variant python25 conflicts python26 python27 description {Use Python 2.5} { + depends_lib-append port:python25 + configure.args-append --with-python=${prefix}/bin/python2.5 +} +variant python26 conflicts python25 python27 description {Use Python 2.6} { + depends_lib-append port:python26 + configure.args-append --with-python=${prefix}/bin/python2.6 +} +variant python27 conflicts python25 python26 description {Use Python 2.7} { + depends_lib-append port:python27 + configure.args-append --with-python=${prefix}/bin/python2.7 +} +if {![variant_isset python25] && ![variant_isset python27]} { + default_variants +python26 +} + post-destroot { # Fix misplaced documentation directories foreach d {jumpshot-4 www4} {