[106993] trunk/dports/science/openmpi/Portfile

[larryv at macports.org]

Revision: 106993
          https://trac.macports.org/changeset/106993
Author:   larryv at macports.org
Date:     2013-06-13 07:39:39 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
openmpi: Conflict with mpich* and use wrapper names in variant descriptions (maintainer timeout, #38319).

Modified Paths:
--------------
    trunk/dports/science/openmpi/Portfile

Modified: trunk/dports/science/openmpi/Portfile
===================================================================
--- trunk/dports/science/openmpi/Portfile	2013-06-13 14:13:41 UTC (rev 106992)
+++ trunk/dports/science/openmpi/Portfile	2013-06-13 14:39:39 UTC (rev 106993)
@@ -63,6 +63,8 @@
 	}
 }
 
+conflicts       mpich mpich2 mpich3 lammpi mpich-devel mpich3-devel
+
 variant threads description {enable threads for MPI applications} {
 	configure.args-append --enable-mpi-thread-multiple
 }
@@ -72,7 +74,7 @@
 	configure.args-append --enable-debug --enable-memchecker --with-valgrind=${prefix}
 }
 
-variant gcc43 description {build mpif77 and mpif90 using gcc43} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 {
+variant gcc43 description {build openmpif77 and openmpif90 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,7 +83,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant gcc44 description {build mpif77 and mpif90 using gcc44} conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 {
+variant gcc44 description {build openmpif77 and openmpif90 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,7 +92,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant gcc45 description {build mpif77 and mpif90 using gcc45} conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 {
+variant gcc45 description {build openmpif77 and openmpif90 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,7 +101,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant gcc46 description {build mpif77 and mpif90 using gcc46} conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 {
+variant gcc46 description {build openmpif77 and openmpif90 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,7 +110,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant gcc47 description {build mpif77 and mpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 {
+variant gcc47 description {build openmpif77 and openmpif90 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,7 +119,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant gcc48 description {build mpif77 and mpif90 using gcc48} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 {
+variant gcc48 description {build openmpif77 and openmpif90 using gcc48} 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
@@ -126,7 +128,7 @@
 	lappend wrappers mpif77 mpif90
 }
 
-variant g95 description {build mpif77 and mpif90 using g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 {
+variant g95 description {build openmpif77 and openmpif90 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130613/72a255ea/attachment.html>