[86243] trunk/dports/python

[adfernandes at macports.org]

Revision: 86243
          http://trac.macports.org/changeset/86243
Author:   adfernandes at macports.org
Date:     2011-10-23 13:04:20 -0700 (Sun, 23 Oct 2011)
Log Message:
-----------
py-mpi4py : consolidated into subport system, made openmpi the default with mpich2 as a variant, #31675

Modified Paths:
--------------
    trunk/dports/python/py-mpi4py/Portfile

Added Paths:
-----------
    trunk/dports/python/py-mpi4py/

Removed Paths:
-------------
    trunk/dports/python/py26-mpi4py/
    trunk/dports/python/py27-mpi4py/

Modified: trunk/dports/python/py-mpi4py/Portfile
===================================================================
--- trunk/dports/python/py27-mpi4py/Portfile	2011-10-23 17:56:28 UTC (rev 86238)
+++ trunk/dports/python/py-mpi4py/Portfile	2011-10-23 20:04:20 UTC (rev 86243)
@@ -2,12 +2,14 @@
 # $Id$
 
 PortSystem      1.0
-PortGroup       python27 1.0
+PortGroup       python 1.0
 
-name            py27-mpi4py
+name            py-mpi4py
 version         1.2.2
 revision        1
 categories      python
+python.versions 25 26 27
+python.default_version 27
 description     MPI for Python - Python bindings for MPI
 long_description \
     MPI for Python (mpi4py) provides bindings of the Message Passing Interface \
@@ -31,25 +33,22 @@
                 rmd160  434d411aa4e954706f2ca8bdde115dc654b58f21
 platforms       darwin
 
-depends_lib-append port:mpich2
+depends_lib-append port:openmpi
+build.args-append  "--mpicc=${prefix}/bin/openmpicc"
 
-# mpich2 and openmpi are not universal
+# openmpi and mpich2 are not universal
 universal_variant no
 
-if { ${os.major} < 9 } {
-    default_variants +openmpi 
+if {  ${os.major} < 9 && [variant_isset mpich2] } {
+    error "Mac OS 10.4 and earlier require openmpi"
 }
 
-if {  ${os.major} < 9 &&  ![variant_isset openmpi] } {
-    error "Mac OS 10.4 and earlier require the openmpi variant"
+variant mpich2 description {builds with the mpich2 port} {
+    depends_lib-append  port:mpich2
+    depends_lib-delete  port:openmpi
+    build.args-delete   "--mpicc=${prefix}/bin/openmpicc"
 }
 
-variant openmpi description {builds with the openmpi port} {
-    depends_lib-append  port:openmpi
-    depends_lib-delete  port:mpich2
-    build.target        build "--mpicc=${prefix}/bin/openmpicc"
-}
-
 variant interpreter description {builds an mpi enabled python interpreter} {
     patchfiles-append   patch-conf-mpidistutils.py.diff
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111023/6c26d6cf/attachment-0001.html>