[120558] trunk/dports/science/cdo/Portfile

[takeshi at macports.org]

Revision: 120558
          https://trac.macports.org/changeset/120558
Author:   takeshi at macports.org
Date:     2014-06-01 02:37:04 -0700 (Sun, 01 Jun 2014)
Log Message:
-----------
cdo: updated for 1.6.3. fixes #41516

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

Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile	2014-06-01 09:35:56 UTC (rev 120557)
+++ trunk/dports/science/cdo/Portfile	2014-06-01 09:37:04 UTC (rev 120558)
@@ -2,20 +2,20 @@
 # $Id$
 
 PortSystem                  1.0
+PortGroup                   mpi 1.0
 
 name                        cdo
-version                     1.6.2
-revision                    2
+version                     1.6.3
 platforms                   darwin
 maintainers                 takeshi
 license                     GPL-2
 categories                  science
 description                 Climate Data Operators
 homepage                    https://code.zmaw.de/projects/cdo
-master_sites                https://code.zmaw.de/attachments/download/6764
-checksums           md5     a17b23e09a2cae95504bfb2a4338e632 \
-                    sha1    8558ea71396ae7f6ca5afc607d29e659f9574fdc \
-                    rmd160  94c16852d00f3bfcde91f9b4aafd2ccf74c77ba6
+master_sites                https://code.zmaw.de/attachments/download/7220
+checksums           md5     52ec6b511f402fb115fdb985ff12487b \
+                    sha1    9aa9f2227247eee6e5a0d949f5189f9a0ce4f2f1 \
+                    rmd160  be5e12f78246d1f87295a90ba846e21322fc249e
 long_description \
     CDO is a collection of command line Operators               \
     to manipulate and analyse Climate Data files.               \
@@ -37,14 +37,18 @@
 configure.cppflags-append   -I/usr/include/malloc \
                             -I${prefix}/include/udunits2
 
-# Test if hdf5-18 is installed with +openmpi or +mpich
-if {[file exists ${prefix}/bin/h5pcc]} {
-    default_variants +mpi
+if {[mpi_variant_isset]} {
+    if {![file exists ${prefix}/bin/h5pcc]} {
+        ui_error "${prefix}/bin/h5pcc not found. Install hdf5-18 with an mpi variant"
+        return -code error
+    }
+    depends_build-append    port:yaxt
+    configure.cc            ${prefix}/bin/h5pcc
 }
 
 post-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}/doc
-    eval xinstall -m 644 [glob ${worksrcpath}/doc/*.pdf] ${destroot}${prefix}/share/doc/${name}/doc
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
+    eval xinstall -m 644 [glob ${worksrcpath}/doc/*.pdf] ${destroot}${prefix}/share/doc/${name}
     foreach f {AUTHORS  ChangeLog NEWS OPERATORS README} {
         eval xinstall -m 644 [glob ${worksrcpath}/${f}] ${destroot}${prefix}/share/doc/${name}
     }
@@ -65,10 +69,6 @@
     configure.ldflags-append    -lpng -lopenjpeg
 }
 
-variant mpi description conflicts cdi {compile with h5pcc} {
-    configure.cc            ${prefix}/bin/h5pcc
-}
-
 variant szip description {compile with szip support} {
     depends_lib-append      port:szip
     configure.args-append   --with-szlib=${prefix}
@@ -81,7 +81,7 @@
                             --with-magics=${prefix}
 }
 
-variant cdi description conflicts mpi {build, install and link to a CDI library} {
+variant cdi description {build, install and link to a CDI library} {
     configure.args-append   --enable-cdi-lib
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140601/8bb2a266/attachment.html>