Changeset 79614

Timestamp:

06/20/11 08:30:12 (4 years ago)

Author:

eborisch@…

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.

Location:

trunk/dports/science/mpich2

Files:

• Portfile (modified) (5 diffs)
• files/patch-Makefile.in (deleted)

trunk/dports/science/mpich2/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 name                mpich2
-version             1.3.2p1
-revision            1
+version             1.4
 categories          science parallel net
 platforms           darwin
@@ -18 +17 @@
     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
 
@@ -40 +42 @@
                     "F90FLAGS='' F90=''" \
                     --with-pm=hydra \
-                    --enable-shared
+                    --enable-shared \
+                    --enable-base-cache
 
 universal_variant   no
@@ -46 +49 @@
 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"
+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
+}
+
+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
+}
+
+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
+}
+
+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 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-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 {
-    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 {
-    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 {
-    depends_lib-append      port:gcc42
-    configure.compiler      macports-gcc-4.2
-    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
 }
 
@@ -93 +90 @@
 }
 
-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}
-    }
 }