Ticket #48473: Portfile.diff

Portfile

@@ -3 +3 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
+PortGroup           mpi 1.0
+
 name                py-h5py
-
 version             2.5.0
+revision            1
 # h5py needs to be re-built after hdf5 upgrades
-revision            1
+
 platforms           darwin
 license             BSD
-maintainers         macports.org:eborisch \
-                    openmaintainer
+maintainers         eborisch openmaintainer
+
 description         Read and write HDF5 files from Python
 
 long_description  \
@@ -26 +28 @@
 
 homepage            http://www.h5py.org
 master_sites        https://pypi.python.org/packages/source/h/h5py
+distname            h5py-${version}
 
 checksums \
     rmd160  94484badd1103c00421582a055b7b0f3368ad653 \
@@ -38 +41 @@
 subport             py27-h5py-devel {set DEV_VERSION 27}
 subport             py33-h5py-devel {set DEV_VERSION 33}
 subport             py34-h5py-devel {set DEV_VERSION 34}
+
 python.versions     26 27 33 34
 
 if {${DEV_VERSION}} {
@@ -54 +58 @@
 }
 
 python.default_version 27
-distname            h5py-${version}
 
 if {${name} ne ${subport}} {
+    depends_build-append    port:py${python.version}-cython
+
     depends_lib-append      port:py${python.version}-numpy \
                             port:py${python.version}-six \
                             port:py${python.version}-pkgconfig \
                             port:hdf5
-    depends_build-append    port:py${python.version}-cython
-    
+
+
+    # TODO: set compiler appropriately to build against parallel HDF5 
+    #       (when MPI not requested), ticket #45911
+    #configure.cc mpicc
+    #configure.cc h5pcc
+
     post-destroot {
         system -W ${destroot}${prefix} "mkdir -p share/doc/${subport}"
         copy ${worksrcpath}/lzf/LICENSE.txt \
             ${destroot}${prefix}/share/doc/${subport}
     }
-}
 
-livecheck.type      regex
-livecheck.url       https://pypi.python.org/pypi/h5py
-livecheck.regex     {h5py/(\d+(?:\.\d+)*)}
+    # Add MPI support
+    mpi.setup
+    if {[mpi_variant_isset]} {
+        depends_lib-append  port:py${python.version}-mpi4py
+        mpi.enforce_variant hdf5 \
+                            py${python.version}-mpi4py
 
+        use_configure   yes
+        configure.cmd   ${build.cmd} configure
+        configure.args  --mpi
+        configure.pre_args
+    }
+
+    livecheck.type      none
+} else {
+    livecheck.type      regex
+    livecheck.url       https://pypi.python.org/pypi/h5py
+    livecheck.regex     {h5py/(\d+(?:\.\d+)*)}
+}