Diff
Modified: trunk/dports/science/cdo/Portfile (117246 => 117247)
--- trunk/dports/science/cdo/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/cdo/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -37,7 +37,7 @@
configure.cppflags-append -I/usr/include/malloc \
-I${prefix}/include/udunits2
-# Test if hdf5-18 is installed with +openmpi or +mpich2
+# Test if hdf5-18 is installed with +openmpi or +mpich
if {[file exists ${prefix}/bin/h5pcc]} {
default_variants +mpi
}
Modified: trunk/dports/science/hdf5-18/Portfile (117246 => 117247)
--- trunk/dports/science/hdf5-18/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/hdf5-18/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -162,5 +162,3 @@
livecheck.type regex
livecheck.url http://www.hdfgroup.org/HDF5/release/obtain5.html
livecheck.regex 5-(\[0-9.\]+)
-
-variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/lammpi/Portfile (117246 => 117247)
--- trunk/dports/science/lammpi/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/lammpi/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -3,7 +3,7 @@
PortSystem 1.0
name lammpi
-conflicts mpich2
+conflicts mpich
version 7.1.4
categories science
license Restrictive/Distributable
Modified: trunk/dports/science/mpich/Portfile (117246 => 117247)
--- trunk/dports/science/mpich/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/mpich/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -28,12 +28,8 @@
Quadrics) and proprietary high-end computing systems (Blue\
Gene, Cray) and (2) to enable cutting-edge research in MPI\
through an easy-to-extend modular framework for other\
- derived implementations.\
- \
- \n\nThe mpich port follows the latest mpich 3.x line, and is \
- the successor to the mpich2 port. Starting with the major \
- release in November 2012, the project is renamed back to \
- MPICH (from MPICH2) with a version number of 3.0.
+ derived implementations.
+
homepage http://www.mpich.org/
# Force local builds to avoid missing compilers (possible if grabbed from
@@ -115,9 +111,7 @@
master_sites ${homepage}static/tarballs/${version}/
-conflicts-append mpich2 \
- mpich2-devel \
- lammpi
+conflicts-append lammpi
depends_lib-append port:libxml2 port:mpi-doc
Modified: trunk/dports/science/mpich-devel/Portfile (117246 => 117247)
--- trunk/dports/science/mpich-devel/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/mpich-devel/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -29,12 +29,8 @@
Quadrics) and proprietary high-end computing systems (Blue\
Gene, Cray) and (2) to enable cutting-edge research in MPI\
through an easy-to-extend modular framework for other\
- derived implementations.\
- \
- \n\nThe mpich port follows the latest mpich 3.x line, and\
- is the successor to the mpich2 port. Starting with the\
- major release in November 2012, the project is renamed\
- back to MPICH (from MPICH2) with a version number of 3.0.
+ derived implementations.
+
homepage http://www.mpich.org/
# Force local builds to avoid missing compilers (possible if grabbed from
@@ -116,9 +112,7 @@
master_sites ${homepage}static/tarballs/${version}/
-conflicts-append mpich2 \
- mpich2-devel \
- lammpi
+conflicts-append lammpi
depends_lib-append port:libxml2 port:mpi-doc
Modified: trunk/dports/science/nco/Portfile (117246 => 117247)
--- trunk/dports/science/nco/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/nco/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -89,4 +89,3 @@
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex {Current NCO version is ([0-9]+\.[0-9]+\.[0-9]+)}
-variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/openmpi/Portfile (117246 => 117247)
--- trunk/dports/science/openmpi/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/openmpi/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -110,7 +110,7 @@
destroot.dir ${build.dir}
-conflicts mpich2 mpich3 lammpi mpich3-devel
+conflicts lammpi
if {${subport} != ${name}} {
set cname [lindex [split ${subport} -] end]
Modified: trunk/dports/science/openmpi-devel/Portfile (117246 => 117247)
--- trunk/dports/science/openmpi-devel/Portfile 2014-02-20 16:07:19 UTC (rev 117246)
+++ trunk/dports/science/openmpi-devel/Portfile 2014-02-20 16:34:06 UTC (rev 117247)
@@ -111,7 +111,7 @@
destroot.dir ${build.dir}
-conflicts mpich2 mpich3 lammpi mpich3-devel
+conflicts lammpi
if {${subport} != ${name}} {
set cname [lindex [split ${subport} -] end]