[79614] trunk/dports/science/mpich2
eborisch at macports.org
eborisch at macports.org
Mon Jun 20 08:30:13 PDT 2011
Revision: 79614
http://trac.macports.org/changeset/79614
Author: eborisch at macports.org
Date: 2011-06-20 08:30:12 -0700 (Mon, 20 Jun 2011)
Log Message:
-----------
mpich2: Upgrade to 1.4. Added llvm variant. Removed g95 variant. Removed python deps as no longer building MPD (using Hydra.) Post-destroot cleanup steps no longer needed with PACKAGE=mpich2 install option.
Modified Paths:
--------------
trunk/dports/science/mpich2/Portfile
Removed Paths:
-------------
trunk/dports/science/mpich2/files/patch-Makefile.in
Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile 2011-06-20 15:23:44 UTC (rev 79613)
+++ trunk/dports/science/mpich2/Portfile 2011-06-20 15:30:12 UTC (rev 79614)
@@ -3,8 +3,7 @@
PortSystem 1.0
name mpich2
-version 1.3.2p1
-revision 1
+version 1.4
categories science parallel net
platforms darwin
maintainers eborisch \
@@ -17,13 +16,16 @@
It also provides a vehicle for MPI implementation research and for \
developing new and better parallel programming environments.
+
homepage http://www.mcs.anl.gov/research/projects/mpich2/
master_sites ${homepage}downloads/tarballs/${version}/
-checksums md5 ae512ce9da2e8a3cc7c344712349eceb \
- sha1 1ab05a516c82d622747b137cec83ae549aa3bebe \
- rmd160 33a7f55f9f5521133b89d06c4d4388d4938ff8d4
+checksums md5 cf7f8c12161b0af3f111e33c6d15f5c6 \
+ sha1 011028456e268b013c55a00dfe51f4bc905c1c48 \
+ rmd160 ecd60567d80ad08ecd06e8fe8cfaeb626941f768
+# Puts all entries in <prefix>/share into appropriate mpich2 subdirs
+destroot.args PACKAGE=mpich2
patchfiles patch-src-util-createshlib.in
# the default include-dir conflicts with openmpi!
@@ -39,50 +41,45 @@
--with-device=ch3:nemesis \
"F90FLAGS='' F90=''" \
--with-pm=hydra \
- --enable-shared
+ --enable-shared \
+ --enable-base-cache
universal_variant no
use_parallel_build no
-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"
- configure.f90 "${prefix}/bin/g95"
- configure.f90flags "-i4"
- configure.args-append --enable-f77 --enable-fc
- configure.args-delete --disable-f77 --disable-fc
-}
-
-variant gcc45 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45} conflicts g95 gcc42 gcc43 gcc44 {
+variant gcc45 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45} conflicts gcc42 gcc43 gcc44 llvm {
depends_lib-append port:gcc45
configure.compiler macports-gcc-4.5
- configure.args-append --enable-f77 --enable-fc
- configure.args-delete --disable-f77 --disable-fc
}
-variant gcc44 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44} conflicts g95 gcc42 gcc43 gcc45 {
+variant gcc44 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44} conflicts gcc42 gcc43 gcc45 llvm {
depends_lib-append port:gcc44
configure.compiler macports-gcc-4.4
- configure.args-append --enable-f77 --enable-fc
- configure.args-delete --disable-f77 --disable-fc
}
-variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts g95 gcc42 gcc44 gcc45 {
+variant gcc43 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43} conflicts gcc42 gcc44 gcc45 llvm {
depends_lib-append port:gcc43
configure.compiler macports-gcc-4.3
- configure.args-append --enable-f77 --enable-fc
- configure.args-delete --disable-f77 --disable-fc
}
-variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts g95 gcc43 gcc44 gcc45 {
+variant gcc42 description {Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc42} conflicts gcc43 gcc44 gcc45 llvm {
depends_lib-append port:gcc42
configure.compiler macports-gcc-4.2
+}
+
+if {[ variant_isset gcc42 ] ||
+ [ variant_isset gcc43 ] ||
+ [ variant_isset gcc44 ] ||
+ [ variant_isset gcc45 ]} {
configure.args-append --enable-f77 --enable-fc
configure.args-delete --disable-f77 --disable-fc
}
+variant llvm description {Use llvm-gcc} conflicts gcc42 gcc43 gcc44 gcc45 {
+ configure.compiler llvm-gcc-4.2
+}
+
variant gforker description {Use gforker process manager instead of the default hydra} {
configure.args-append --with-pm=gforker
configure.args-delete --with-pm=hydra
@@ -92,44 +89,10 @@
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 python26]} {
- default_variants +python27
-}
-
variant default_mpi description {Install as defalt MPI -- conflict with OpenMPI} {
configure.args-delete --includedir=${prefix}/include/${name}
}
-post-destroot {
- # Fix misplaced documentation directories
- foreach d {jumpshot-4 www4} {
- move ${destroot}${prefix}/share/doc/${d} ${destroot}${prefix}/share/doc/${name}/${d}
- }
-
- # Fix misplaced examples directories
- xinstall -d ${destroot}${prefix}/share/examples/${name}
- foreach p {collchk graphics logging} {
- move ${destroot}${prefix}/share/examples_${p} ${destroot}${prefix}/share/examples/${name}/${p}
- }
-
- # Remove questionable scripts
- foreach f {mpecheckinstall mpeuninstall} {
- delete ${destroot}${prefix}/sbin/${f}
- }
-}
-
livecheck.type regex
livecheck.regex ${name}-(\[0-9.p\]+)${extract.suffix}
Deleted: trunk/dports/science/mpich2/files/patch-Makefile.in
===================================================================
--- trunk/dports/science/mpich2/files/patch-Makefile.in 2011-06-20 15:23:44 UTC (rev 79613)
+++ trunk/dports/science/mpich2/files/patch-Makefile.in 2011-06-20 15:30:12 UTC (rev 79614)
@@ -1,12 +0,0 @@
---- Makefile.in.orig 2010-02-22 16:21:23.000000000 -0600
-+++ Makefile.in 2010-06-23 02:31:12.000000000 -0500
-@@ -20,8 +20,8 @@
- master_top_srcdir = @master_top_srcdir@
- abs_builddir = @abs_builddir@
- srcdir = @srcdir@
--exec_prefix = @exec_prefix@
- prefix = @prefix@
-+exec_prefix = @exec_prefix@
- abs_srcdir = @abs_srcdir@
- libdir = @libdir@
- datarootdir = @datarootdir@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110620/ef752ec7/attachment.html>
More information about the macports-changes
mailing list