Modified: trunk/dports/science/cdo/Portfile (105453 => 105454)

--- trunk/dports/science/cdo/Portfile	2013-04-20 19:54:45 UTC (rev 105453)
+++ trunk/dports/science/cdo/Portfile	2013-04-21 00:25:50 UTC (rev 105454)
@@ -5,6 +5,7 @@
 
 name                        cdo
 version                     1.5.9
+revision                    1
 platforms                   darwin
 maintainers                 takeshi
 license                     GPL-2
@@ -24,13 +25,17 @@
 fetch.ignore_sslcert        yes
 
 depends_lib                 port:netcdf \
+                            port:udunits2 \
                             port:proj47
 
 configure.args              --with-netcdf=${prefix} \
                             --disable-dependency-tracking \
                             --with-proj=${prefix}/lib/proj47 \
                             --with-hdf5=${prefix} \
+                            --with-udunits2=${prefix} \
                             --with-zlib=${prefix}
+configure.cppflags-append   -I/usr/include/malloc \
+                            -I${prefix}/include/udunits2
 
 # Test if hdf5-18 is installed with +openmpi or +mpich2
 if {[file exists ${prefix}/bin/h5pcc]} {
@@ -45,7 +50,15 @@
     }
 }
 
-variant grib2 description {enable experimental grib2 support} {
+if {[variant_isset magicspp]} {
+    default_variants    +grib_api
+}
+
+variant grib2 description {obsoleted by grib_api varint} {
+    default_variants +grib_api
+}
+
+variant grib_api description {enable grib2 support} {
     depends_lib-append      port:grib_api
     configure.args-append   --with-jasper=${prefix} \
                             --with-grib_api=${prefix}
@@ -56,6 +69,22 @@
     configure.cc            ${prefix}/bin/h5pcc
 }
 
+variant szip description {compile with szip support} {
+    depends_lib-append      port:szip
+    configure.args-append   --with-szlib=${prefix}
+}
+
+variant magicspp description {compile with ECMWF magics support} {
+    depends_lib-append      port:libxml2 \
+                            port:magicspp
+    configure.args-append   --with-libxml2=${prefix} \
+                            --with-magics=${prefix}
+}
+
+variant cdi description {build, install and link to a CDI library} {
+    configure.args-append   --enable-cdi-lib
+}
+
 livecheck.type              regex
 livecheck.url               ${homepage}
 livecheck.regex             {Version ([0-9]+\.[0-9]+\.[0-9]+\.*[0-9]*)}