[108224] trunk/dports/science/netcdf/Portfile

[takeshi at macports.org]

Revision: 108224
          https://trac.macports.org/changeset/108224
Author:   takeshi at macports.org
Date:     2013-07-16 13:48:40 -0700 (Tue, 16 Jul 2013)
Log Message:
-----------
netcdf: force using +openmpi when hdf5-18 +openmpi is installed, closing #39529

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

Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile	2013-07-16 20:46:30 UTC (rev 108223)
+++ trunk/dports/science/netcdf/Portfile	2013-07-16 20:48:40 UTC (rev 108224)
@@ -29,14 +29,12 @@
 
 patchfiles          patch-configure.diff
 
-pre-configure {
-    if {[variant_isset openmpi]} {
-        set hdf5cc [exec grep "C Compiler" ${prefix}/lib/libhdf5.settings | awk {BEGIN{FS="/"}{print $NF}}]
-        if {${hdf5cc}!="openmpicc"} {
-            ui_error "Install hdf5-18 +openmpi"
-            return -code error "hdf5-18 +openmpi not installed"
-        }
-    }
+set hdf5cc [exec grep "C Compiler" ${prefix}/lib/libhdf5.settings | awk {BEGIN{FS="/"}{print $NF}}]
+if {${hdf5cc}=="openmpicc"} {
+    default_variants +openmpi
+} elseif {[variant_isset openmpi]} {
+    ui_error "Install hdf5-18 +openmpi"
+    return -code error "hdf5-18 +openmpi not installed"
 }
 
 configure.cppflags-append   -DNDEBUG
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130716/cc79c005/attachment.html>