Ticket #38875: patch-Portfile-openmpi.diff

Portfile

@@ -4 +4 @@
 PortSystem 1.0
 
 name                    openmpi
-version                 1.6.4
+version                 1.7.1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              science parallel net
 platforms               darwin
@@ -23 +23 @@
 master_sites            http://www.open-mpi.org/software/${subdir} \
                         http://www.open-mpi.de/software/${subdir} \
                         http://icl.cs.utk.edu/open-mpi/${subdir}
-# keep md5 & sha1 checksums as they are published on http://www.open-mpi.org/software/ompi/v1.6/
-checksums           md5     62119579ab92b2592cd96b6a9d2a8cc3 \
-                    sha1    38095d3453519177272f488d5058a98f7ebdbf10 \
-                    rmd160  6abcb4ef5de3da00c23bcad521b66e1774675890 \
-                    sha256  40cb113a27d76e1e915897661579f413564c032dc6e703073e6a03faba8093fa
+# keep md5 & sha1 checksums as they are published on http://www.open-mpi.org/software/ompi/v1.7/
+checksums           md5     f25b446a9dcbbd6a105a99d926d34441 \
+                    sha1    35d166e2a1d8b88c44d61eaabb5086e2425c8eb8 \
+                    rmd160  08333e1a7024fa8070868a85e94752eda591b970 \
+                    sha256  554583008fa34ecdfaca22e46917cc3457a69cba08c29ebbf53eef4f4b8be171
 
 use_bzip2               yes
 
@@ -72 +72 @@
         configure.args-append --enable-debug --enable-memchecker --with-valgrind=${prefix}
 }
 
-variant gcc43 description {build mpif77 and mpif90 using gcc43} conflicts gcc44 gcc45 gcc46 gcc47 g95 {
+variant gcc43 description {build mpif77 and mpif90 using gcc43} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/gfortran-mp-4.3
@@ -81 +81 @@
         lappend wrappers mpif77 mpif90
 }
 
-variant gcc44 description {build mpif77 and mpif90 using gcc44} conflicts gcc43 gcc45 gcc46 gcc47 g95 {
+variant gcc44 description {build mpif77 and mpif90 using gcc44} conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/gfortran-mp-4.4
@@ -90 +90 @@
         lappend wrappers mpif77 mpif90
 }
 
-variant gcc45 description {build mpif77 and mpif90 using gcc45} conflicts gcc43 gcc44 gcc46 gcc47 g95 {
+variant gcc45 description {build mpif77 and mpif90 using gcc45} conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/gfortran-mp-4.5
@@ -99 +99 @@
         lappend wrappers mpif77 mpif90
 }
 
-variant gcc46 description {build mpif77 and mpif90 using gcc46} conflicts gcc43 gcc44 gcc45 gcc47 g95 {
+variant gcc46 description {build mpif77 and mpif90 using gcc46} conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/gfortran-mp-4.6
@@ -108 +108 @@
         lappend wrappers mpif77 mpif90
 }
 
-variant gcc47 description {build mpif77 and mpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
+variant gcc47 description {build mpif77 and mpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/gfortran-mp-4.7
@@ -117 +117 @@
         lappend wrappers mpif77 mpif90
 }
 
-variant g95 description {build mpif77 and mpif90 using g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 {
+variant gcc48 description {build mpif77 and mpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 {
+        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
+        configure.args-append --enable-mpi-f77 --enable-mpi-f90
+        configure.f77         ${prefix}/bin/gfortran-mp-4.8
+        configure.fc          ${prefix}/bin/gfortran-mp-4.8
+        depends_lib-append    port:gcc48
+        lappend wrappers mpif77 mpif90
+}
+
+variant g95 description {build mpif77 and mpif90 using g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 {
         configure.args-delete --disable-mpi-f77 --disable-mpi-f90
         configure.args-append --enable-mpi-f77 --enable-mpi-f90
         configure.f77         ${prefix}/bin/g95
@@ -127 +136 @@
 }
 
 # dependents like netcdf need some form of fortran
-if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]  && ![variant_isset gcc46] && ![variant_isset g95]} {
+if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48] && ![variant_isset g95]} {
     default_variants +gcc47
 }