Changeset 83075

Timestamp:

08/25/11 07:31:47 (4 years ago)

Author:

eborisch@…

Message:

mpich2: Upgrade to 1.4.1

File:

• trunk/dports/science/mpich2/Portfile (modified) (6 diffs)

trunk/dports/science/mpich2/Portfile

@@ -4 +4 @@
 PortSystem          1.0
 name                mpich2
-version             1.4
-revision            1
+version             1.4.1
 license             BSD
 categories          science parallel net
@@ -13 +12 @@
 description         Message Passing Interface (MPI) Library
 long_description \
-    MPICH2 is an implementation of the Message-Passing Interface (MPI). The \
-    goals of MPICH2 are to provide an MPI implementation for important \
-    platforms, including clusters, SMPs, and massively parallel processors. \
-    It also provides a vehicle for MPI implementation research and for \
-    developing new and better parallel programming environments.
+   MPICH2 is an implementation of the Message-Passing Interface (MPI). The \
+   goals of MPICH2 are to provide an MPI implementation for important \
+   platforms, including clusters, SMPs, and massively parallel processors. \
+   It also provides a vehicle for MPI implementation research and for \
+   developing new and better parallel programming environments.
 
 
@@ -23 +22 @@
 master_sites        ${homepage}downloads/tarballs/${version}/
 
-checksums           md5     cf7f8c12161b0af3f111e33c6d15f5c6 \
-                    sha1    011028456e268b013c55a00dfe51f4bc905c1c48 \
-                    rmd160  ecd60567d80ad08ecd06e8fe8cfaeb626941f768
+checksums           md5     5c423a39900113ab7b01d8b57a0fd8fa \
+                    sha1    dd26c462be95b214b4726740c64e4d3d3578b091 \
+                    rmd160  4f7746b116331e88abe275a65da6f1b7bf8390cb
 
 # Don't build if lammpi is around.
 pre-configure {
-    if {[file exists ${prefix}/etc/lammpi/lam-helpfile]} {
+if {[file exists ${prefix}/etc/lammpi/lam-helpfile]} {
       ui_error "Cannot co-exist with lammpi; please deactivate lammpi before configuring."
       return -code error
@@ -37 +36 @@
 pre-build {
     if {[file exists ${prefix}/etc/lammpi/lam-helpfile]} {
-      ui_error "Cannot co-exist with lammpi; please deactivate lammpi before building."
-      return -code error
-    }
+  ui_error "Cannot co-exist with lammpi; please deactivate lammpi before building."
+  return -code error
+}
 }
 
@@ -60 +59 @@
                     --with-pm=hydra \
                     --enable-shared \
+                    --enable-cache \
+                    --enable-smpcoll \
                     --enable-base-cache
 
@@ -67 +68 @@
 use_parallel_build  no
 conflicts           lammpi
+
+# Fixes for the beta DESTDIR support in 1.4.1. Should go away in 1.5 branch.
+post-patch {
+    reinplace -E "s|fix=\\\$\\\{DESTDIR\\\}|fix=|g" \
+        ${worksrcpath}/Makefile.in
+    reinplace -E "s|dir=\\\$\\\{DESTDIR\\\}|dir=|g" \
+        ${worksrcpath}/Makefile.in
+}
+
+post-destroot {
+    reinplace -E "s|${destroot}||g" ${destroot}/${prefix}/bin/mpicxx
+    reinplace -E "s|${destroot}||g" ${destroot}/${prefix}/bin/mpicc
+    reinplace -E "s|${destroot}||g" ${destroot}/${prefix}/etc/mpicxx.conf
+    reinplace -E "s|${destroot}||g" ${destroot}/${prefix}/etc/mpicc.conf
+
+    file delete ${destroot}/${prefix}/sbin/mpeuninstall
+}
 
 # As MPICH creates compiler wrappers, there are lots of