[69159] trunk/dports/science

26 Jun 2010

Revision: 69159
          http://trac.macports.org/changeset/69159
Author:   takeshi@macports.org
Date:     2010-06-26 01:36:25 -0700 (Sat, 26 Jun 2010)
Log Message:
-----------
netcdf, netcdf-devel, cdo, ncarg, nco wgrib2: committing multiple ports. merged netcdf and netcdf-devel

Modified Paths:
--------------
    trunk/dports/science/cdo/Portfile
    trunk/dports/science/ncarg/Portfile
    trunk/dports/science/nco/Portfile
    trunk/dports/science/netcdf/Portfile
    trunk/dports/science/wgrib2/Portfile

Removed Paths:
-------------
    trunk/dports/science/netcdf-devel/

Modified: trunk/dports/science/cdo/Portfile
===================================================================

--- trunk/dports/science/cdo/Portfile	2010-06-26 03:09:55 UTC (rev 69158)
+++ trunk/dports/science/cdo/Portfile	2010-06-26 08:36:25 UTC (rev 69159)
@@ -5,6 +5,7 @@
 
 name                        cdo
 version                     1.4.4
+revision                    1
 platforms                   darwin
 maintainers                 takeshi
 license                     GPLv2
@@ -23,18 +24,10 @@
 
 fetch.ignore_sslcert        yes
 
-depends_lib                 port:netcdf-devel \
-                            port:hdf5-18 \
-                            port:proj \
-                            port:szip
+depends_lib                 port:netcdf \
+                            port:proj
 
-configure.cppflags-delete   -I${prefix}/include
-configure.cppflags-append   -I${prefix}/lib/netcdf-devel/include \
-                            -I${prefix}/include
-configure.ldflags-delete    -L${prefix}/lib
-configure.ldflags-append    -L${prefix}/lib/netcdf-devel/lib \
-                            -L${prefix}/lib
-configure.args              --with-netcdf=${prefix}/lib/netcdf-devel \
+configure.args              --with-netcdf=${prefix} \
                             --disable-dependency-tracking \
                             --with-proj=${prefix} \
                             --with-hdf5=${prefix} \

Modified: trunk/dports/science/ncarg/Portfile
===================================================================
--- trunk/dports/science/ncarg/Portfile	2010-06-26 03:09:55 UTC (rev 69158)
+++ trunk/dports/science/ncarg/Portfile	2010-06-26 08:36:25 UTC (rev 69159)
@@ -5,6 +5,7 @@
 
 name                        ncarg
 version                     5.2.0
+revision                    1
 categories                  science
 maintainers                 takeshi
 description                 language for scientific data processing and visualization
@@ -74,11 +75,12 @@
         reinplace "s|gcc$|${configure.cc}|" ${worksrcpath}/config/${f}
         reinplace "/CcOptions/d" ${worksrcpath}/config/${f}
         reinplace "s|-lXext$|-lXext\\
-#define CcOptions -fPIC -ansi -D_DARWIN_C_SOURCE -DH5_USE_16_API ${configure.cc_archflags}\\
+#define CcOptions -fPIC -ansi -D_DARWIN_C_SOURCE -DH5_USE_16_API \\
 #define COptimizeFlag ${configure.cflags}\\
 #define FOptimizeFlag ${configure.fflags}\\
 #define ManRoot ${destroot}${prefix}/share/man\\
-#define NetCDF4lib -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lmfhdf -ldf -lcurl -lidn -lssl -lcrypto|" ${worksrcpath}/config/${f}
+#define NetCDF4lib -lnetcdf\\
+#define HDFEOS5lib -lhe5_hdfeos -lGctp -lhdf5|" ${worksrcpath}/config/${f}
         reinplace "s|-L/usr/X11R6/lib -L/sw/lib|-L${prefix}/lib|" ${worksrcpath}/config/${f}
         reinplace "s|-I/usr/X11R6/include -I/sw/include|-I${prefix}/include|" ${worksrcpath}/config/${f}
     }
@@ -93,6 +95,7 @@
     }
     reinplace "s|\$\(NCARGGKSCAIROLIB\) \$\(NCARGCLIB\)|\$(NCARGGKSCAIROLIB) \$(NCARGGKSLIB) \$(NCARGCLIB)|" ${worksrcpath}/config/Project
 }
+#define NetCDF4lib -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lmfhdf -ldf -lcurl -lidn -lssl -lcrypto|" ${worksrcpath}/config/${f}
 
 pre-configure {
     system "cd ${worksrcpath}/config; \
@@ -119,8 +122,8 @@
 y
 y
 y
-${prefix}/lib/jpeg6b/lib ${prefix}/lib/netcdf-devel/lib ${prefix}/lib/hdfeos5/lib ${prefix}/lib
-${prefix}/include/freetype2 ${prefix}/include/udunits2 ${prefix}/lib/jpeg6b/include ${prefix}/lib/netcdf-devel/include ${prefix}/lib/hdfeos5/include ${prefix}/include
+${prefix}/lib/jpeg6b/lib ${prefix}/lib/ ${prefix}/lib/hdfeos5/lib ${prefix}/lib
+${prefix}/include/freetype2 ${prefix}/include/udunits2 ${prefix}/lib/jpeg6b/include ${prefix}/lib/hdfeos5/include ${prefix}/include
 
 
 EOF"
@@ -131,6 +134,7 @@
 }
 
 build.target                Build
+build.args-append           EXTRA_CCOPTIONS=\"${configure.cc_archflags}\"
 
 variant g95 conflicts gcc43 gcc44 description {compile with g95} {
     depends_build-append    port:g95

Modified: trunk/dports/science/nco/Portfile
===================================================================
--- trunk/dports/science/nco/Portfile	2010-06-26 03:09:55 UTC (rev 69158)
+++ trunk/dports/science/nco/Portfile	2010-06-26 08:36:25 UTC (rev 69159)
@@ -5,6 +5,7 @@
 
 name                        nco
 version                     4.0.1
+revision                    1
 platforms                   darwin
 maintainers                 takeshi
 categories                  science
@@ -27,7 +28,7 @@
                             port:gettext \
                             port:libiconv \
                             port:libxml2 \
-                            port:netcdf-devel \
+                            port:netcdf \
                             port:openssl \
                             port:udunits2 \
                             port:zlib \
@@ -44,15 +45,10 @@
 }
 
 configure.env               HAVE_ANTLR=yes ANTLR_ROOT=${prefix} \
-                            PATH_TO_NCGEN=${prefix}/lib/netcdf-devel/bin/ncgen
-configure.cppflags-delete   -I${prefix}/include
+                            PATH_TO_NCGEN=${prefix}/bin/ncgen
 configure.cppflags-append   -I/usr/include/malloc \
-                            -I${prefix}/lib/netcdf-devel/include \
                             -I${prefix}/include/udunits2 \
                             -I${prefix}/include
-configure.ldflags-delete    -L${prefix}/lib
-configure.ldflags-append    -L${prefix}/lib/netcdf-devel/lib \
-                            -L${prefix}/lib
 configure.args              --disable-dependency-tracking \
                             --mandir=${prefix}/share/man  \
                             --enable-udunits2 \

Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile	2010-06-26 03:09:55 UTC (rev 69158)
+++ trunk/dports/science/netcdf/Portfile	2010-06-26 08:36:25 UTC (rev 69159)
@@ -6,6 +6,7 @@
 name                        netcdf
 epoch                       1
 version                     4.1.1
+revision                    1
 maintainers                 takeshi openmaintainer
 platforms                   darwin
 categories                  science
@@ -38,7 +39,8 @@
                             --disable-netcdf-4 \
                             --disable-dap \
                             --without-udunits \
-                            --without-libcf
+                            --without-libcf \
+                            --with-szlib=${prefix}
 
 test.run                    yes
 test.target                 check
@@ -52,6 +54,8 @@
 
 depends_build               bin:tex:texlive
 
+default_variants +netcdf4 +dap
+
 variant gcc43 conflicts g95 gcc44 description {Enable Fortran support with gfortran 4.3} {
     depends_lib-append      port:gcc43
     configure.args-delete   --disable-fortran-compiler-check --disable-f77 --disable-f90
@@ -89,15 +93,26 @@
     configure.cxx           mpicxx
 }
 
+variant netcdf4 description {enable support for netcdf-4 API} {
+    configure.args-delete   --disable-netcdf-4 \
+                            --without-libcf
+    configure.args-append   --enable-netcdf-4 \
+                            --with-hdf5=${prefix} \
+                            --with-libcf
+}
+
+variant hdf4 description {enable support for hdf4} {
+    configure.args-append --enable-hdf4 \
+                          --with-hdf4=${prefix} \
+                          --disable-hdf4-file-tests
+}
+ 
 variant dap description {enable dap} {
     depends_lib-append      port:curl
     configure.args-delete   --disable-dap
     configure.args-append   --enable-dap
 }
 
-#variant netcdf4 has been removed.
-#use netcdf-devel to use netcdf4 features
-
 variant static description {build static libraries} {
     configure.args-delete  --enable-shared
 }

Modified: trunk/dports/science/wgrib2/Portfile
===================================================================
--- trunk/dports/science/wgrib2/Portfile	2010-06-26 03:09:55 UTC (rev 69158)
+++ trunk/dports/science/wgrib2/Portfile	2010-06-26 08:36:25 UTC (rev 69159)
@@ -5,7 +5,7 @@
 
 name                wgrib2
 version             1.8.3
-revision            1
+revision            2
 platforms           darwin
 maintainers         takeshi
 categories          science
@@ -26,7 +26,7 @@
 
 depends_lib         port:jasper \
                     port:libpng \
-                    port:netcdf-devel \
+                    port:netcdf \
                     port:hdf5-18
 
 use_configure       no
@@ -49,9 +49,9 @@
     system "cd ${worksrcpath}/../wgrib2; \
             make -f makefile ${name} \
             CC=\"${configure.cc}\" \
-            CFLAGS=\"-I../g2clib-${version_g2clib} -I${prefix}/lib/netcdf-devel/include ${cppflags} ${cflags} \
+            CFLAGS=\"-I../g2clib-${version_g2clib} -I${prefix}/include ${cppflags} ${cflags} \
                            -DUSE_NETCDF4 -UUSE_NETCDF3\"  \
-            LDFLAGS=\"-L../g2clib-${version_g2clib} -L${prefix}/lib/netcdf-devel/lib ${ldflags} \
+            LDFLAGS=\"-L../g2clib-${version_g2clib} -L${prefix}/lib ${ldflags} \
                            -lgrib2c -ljasper -lpng -lnetcdf -lhdf5_hl -lhdf5 -lz -lsz -lcurl -lidn -lssl -lcrypto\" "
 }

    

[69159] trunk/dports/science

takeshi＠macports.org