Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15476/10.7/stable/main/finkinfo/sci

Modified Files:
        nco.info 
Log Message:
Fix DAP access in -netcdf variant.
Same packaging in stable and unstable, so bye-bye unstable.

Index: nco.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nco.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nco.info    18 Aug 2011 18:22:56 -0000      1.6
+++ nco.info    6 Jan 2012 03:32:06 -0000       1.7
@@ -1,6 +1,6 @@
 Package: nco%type_raw[-dap]
 Version: 4.0.8
-Revision: 4
+Revision: 5
 Type: -dap (-opendap -netcdf)
 Description: The NetCDF Operators
 License: GPL
@@ -38,7 +38,8 @@
 
 # Compile Phase:
 GCC: 4.0
-SetLDFLAGS: -Wl,-dead_strip_dylibs
+SetLDFLAGS: -L%p/opt/netcdf7/lib -Wl,-dead_strip_dylibs
+SetCPPFLAGS: -I%p/opt/netcdf7/include
 ConfigureParams: <<
        --enable-udunits2 --disable-udunits --enable-gsl \
        (%type_raw[-dap] = -opendap) --disable-dap-netcdf \
@@ -51,10 +52,11 @@
 <<
 CompileScript: << 
        #!/bin/sh -ev
-       if [[ "%type_raw[-dap]" == "-netcdf" ]] 
+       export UDUNITS2_PATH=%p
+       if [[ "%type_raw[-dap]" = "-netcdf" ]] 
        then export     NETCDF_INC=%p/opt/netcdf7/include \
                                NETCDF_LIB=%p/opt/netcdf7/lib \
-                               NETCDF4_ROOT=%p/opt/netcdf
+                               NETCDF4_ROOT=%p/opt/netcdf7
        fi
        %{default_script}
        fink-package-precedence 
--prohibit-bdep=nco-dap,nco-opendap,nco-netcdf,nco .


------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to