[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fink-commits
Subject:    [cvs] dists/10.4/stable/main/finkinfo/sci netcdf-oct.info,1.3,1.4
From:       Alexander Hansen <alexkhansen () users ! sourceforge ! net>
Date:       2014-02-25 16:08:55
Message-ID: E1WIKZ0-0001ED-GG () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20281/10.4/stable/main/finkinfo/sci

Modified Files:
	netcdf-oct.info 
Log Message:
New upstream.  Fix building with netcdf-4.3.1.1.


Index: netcdf-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/netcdf-oct.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- netcdf-oct.info	9 Sep 2013 20:19:31 -0000	1.3
+++ netcdf-oct.info	25 Feb 2014 16:08:53 -0000	1.4
@@ -1,6 +1,6 @@
 Info2: <<
 Package: netcdf-oct%type_pkg[oct]
-Version: 1.0.1
+Version: 1.0.2
 Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3 3.6.4), forge (netcdf), gcc (4.6)
 Revision: 1
 
@@ -96,7 +96,7 @@
 Conflicts: octave-forge
 
 Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
-Source-MD5: 18506d23276dabb544c7d11dcd9f9d16
+Source-MD5: 1468fae155923101d96d5fb0c8009acf
 SourceDirectory: %type_pkg[forge]
 
 NoSetCPPFLAGS: true
@@ -110,6 +110,10 @@
 # Source directory, either %type_raw[forge] or %type_raw[forge]-%v
 pkgsrc=%type_raw[forge]
 
+pushd src
+awk -f netcdf_constants.awk %p/include/netcdf.h  > netcdf_constants.h
+popd
+
 ##### Invariant stuff begins here #####
 %p/share/fink-octave-scripts/octave-forge-patch.sh %type_raw[forge] %v %type_raw[oct] %b %i $pkgsrc
 ./octave-forge-compile.sh
@@ -121,10 +125,8 @@
 
 DescPackaging: <<
 This package:
-This package can use netCDF4 (netcdf7 or netcdf-c7 in Fink), or if that isn't 
-found, libnc-dap (libnc-dap3 in Fink).  We allow for both possibilities and 
-specify a BuildConflicts: netcdf7, netcdf-c7 for the -ncdap variant to remove
-nc-config and thereby allow fallback to libnc-dap.
+Manually regenerate netcdf_constants.h since the default build process doesn't appear
+to do so, and the file as shipped in the tarball is incompatible with netcdf-4.3.1.1.
 
 The -oct343 variant carries dependencies on gcc4N* due to Octave-3.4.3 broadcasting
 what it was built with.


------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
[prev in list] [next in list] [prev in thread] [next in thread]