Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv27797

Modified Files:
        cdat.info 
Log Message:
somewhat-fix the build: all but one .pyc fixed (one .py hard-codes build config 
and build config is weird), move sample datasets to legal directory, switch to 
py26 (py27 blocked by needing pyfort-pyXX); still lots of modules do not build 
and "old" vs upstream


Index: cdat.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/cdat.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cdat.info   13 Feb 2012 19:24:58 -0000      1.16
+++ cdat.info   12 Aug 2012 17:56:25 -0000      1.17
@@ -1,39 +1,48 @@
 Package: cdat
 Version: 4.0
-Revision: 1015
+Revision: 1016
 Architecture: i386
 Maintainer: None <fink-de...@lists.sourceforge.net>
-BuildDepends: x11-dev, tcltk-dev, netcdf (>= 3.6.0-1002), xgks, g77, libdap9 , 
libnc-dap3 (>= 1:3.7.3-1), f2py-py25, fink (>= 0.24.12)
-Depends: x11, netcdf-shlibs (>= 3.6.0-1002), numeric-py25, pmw-py25, gplot (>= 
4.3-2), netpbm-bin, gifsicle, ghostscript, scientificpython-py25, pyfort-py25, 
pyfort-py25-bin, python25 (>= 1:2.5.4-1), libdap9-shlibs, libnc-dap3-shlibs (>= 
1:3.7.3-1), ioapi, python-mx-py25
+BuildDepends: x11-dev, tcltk-dev, netcdf (>= 3.6.0-1002), xgks, g77, libdap9 , 
libnc-dap3 (>= 1:3.7.3-1), f2py-py26, fink (>= 0.24.12)
+Depends: x11, netcdf-shlibs (>= 3.6.0-1002), numeric-py26, pmw-py26, gplot (>= 
4.3-2), netpbm-bin, gifsicle, ghostscript, scientificpython-py26, pyfort-py26, 
pyfort-py26-bin, python26, libdap9-shlibs, libnc-dap3-shlibs (>= 1:3.7.3-1), 
ioapi, python-mx-py26
 Source: mirror:sourceforge:%n/CDAT-%v.rc1-%n.tar.gz
 Source-MD5: f068050b07a0b0c90959ed89d4a4951f
 SourceDirectory: CDAT-%v.rc1
 PatchFile: %n.patch
 PatchFile-MD5: e2211c41e742ade3496674a6e7eeb84b
-PatchScript: sed 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
+PatchScript: <<
+       sed 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
+       perl -pi -e 's/as,/as_,/g' contrib/spherepack/Lib/sphere.py
+<<
 CompileScript: echo "no compile script"
+UseMaxBuildJobs: false
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 InstallScript: <<
  #!/bin/sh -ex
  export CC=/usr/bin/cc 
  export PYTHONHOME=%i
- export 
PYTHONPATH=%i/lib/python2.5/site-packages:%p/lib/python2.5:%p/lib/python2.5/lib-dynload:%p/lib/python2.5/site-packages
+ export 
PYTHONPATH=%i/lib/python2.6/site-packages:%p/lib/python2.6:%p/lib/python2.6/lib-dynload:%p/lib/python2.6/site-packages
  export FC=%p/bin/g77
- mkdir -p %i/lib/python2.5
+ mkdir -p %i/lib/python2.6
  mkdir -p %i/bin
  mkdir -p %i/include
- ln -s %p/bin/python2.5 %i/bin/python
- ln -s %p/bin/pyfort2.5 %i/bin/pyfort
- ln -s %p/lib/python2.5/config %i/lib/python2.5/config
- ln -s %p/include/python2.5 %i/include/python2.5
- %p/bin/python2.5 install.py --configuration=myconfig --with-opendap=%p 
--enable-ioapi --disable-hdf --force
- /bin/rm -f %i/lib/python2.5/config
+ ln -s %p/bin/python2.6 %i/bin/python
+ ln -s %p/bin/pyfort2.6 %i/bin/pyfort
+ ln -s %p/lib/python2.6/config %i/lib/python2.6/config
+ ln -s %p/include/python2.6 %i/include/python2.6
+ %p/bin/python2.6 install.py --configuration=myconfig --with-opendap=%p 
--enable-ioapi --disable-hdf --force
+ /bin/rm -f %i/lib/python2.6/config
  /bin/rm -f %i/bin/python
  /bin/rm -f %i/bin/pyfort
- /bin/rm -f %i/include/python2.5
- /bin/rm -rf %i/man
+ /bin/rm -f %i/include/python2.6
+#/bin/rm -rf %i/man
  /bin/rm -f %i/lib/libcdms.a
+
+  %p/bin/python2.6 %p/lib/python2.6/compileall.py -f -d %p/lib/python2.6 
%i/lib/python2.6
+
+  mkdir -p %i/share/doc
+  mv %i/sample_data %i/share/doc/%n
 <<
 DocFiles: README.txt HELP.txt ReleaseNotes.txt Legal.htm DeveloperHowTo.html 
Changes_3.3_to_4.pdf
 Description: Climate Data Analysis Tools


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to