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

Modified Files:
        control-oct.info 
Log Message:
kill comma chaos

Index: control-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/control-oct.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- control-oct.info    19 Jan 2012 15:15:09 -0000      1.9
+++ control-oct.info    19 Jan 2012 22:53:54 -0000      1.10
@@ -1,8 +1,8 @@
 Info2: <<
-Package: control-oct%type_pkg[oct]
+Package: control%type_pkg[-atlas]-oct%type_pkg[oct]
 Version: 2.2.4
-Type: oct (3.4.3, 3.6.0), forge (control)
-Revision: 2
+Type: oct (3.4.3 3.6.0), forge (control), -atlas (boolean)
+Revision: 3
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/control/index.html 
@@ -137,14 +137,27 @@
 # not use the conditional, of course.
 
 BuildDepends: <<
-  liboctave%type_pkg[oct]-v2-dev, 
+  (%type_raw[-atlas] = -atlas) atlas,
+  (%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
+  (%type_raw[-atlas] != -atlas)        liboctave%type_pkg[oct]-veclib-dev, 
+  liboctave%type_pkg[oct]-v2-dev,
   fftw3,
   hdf5.7
 <<
 Depends: <<
-  octave%type_pkg[oct]-interpreter
+  (%type_raw[-atlas] = -atlas)  atlas-shlibs,
+  (%type_raw[-atlas] = -atlas) octave%type_pkg[oct]-interpreter-atlas, 
+  (%type_raw[-atlas] != -atlas)        octave%type_pkg[oct]-interpreter-veclib
+<<
+Conflicts: <<
+       octave-forge,
+       %type_raw[forge]-atlas-oct%type_pkg[oct],
+       %type_raw[forge]-oct%type_pkg[oct]
+<<
+Replaces: <<
+       %type_raw[forge]-atlas-oct%type_pkg[oct],
+       %type_raw[forge]-oct%type_pkg[oct]
 <<
-Conflicts: octave-forge
 
 Source-MD5: 61ac55e71bc2062b97e6e2e3948297e2
 
@@ -169,14 +182,10 @@
 export OCTAVE=%p/bin/octave-%type_raw[oct] 
 # repack tarball, since octave-3.4.3 appears not to want to install
 # from directories
-if [ %type_pkg[oct] -ge 343 ]
-then
-       cd ..
-       tar -cf %type_raw[forge].tar %type_raw[forge]
-       cd %b
-       pkgsrc=%type_raw[forge].tar
-else pkgsrc=%type_raw[forge]
-fi
+cd ..
+tar -cf %type_raw[forge].tar %type_raw[forge]
+cd %b
+pkgsrc=%type_raw[forge].tar
 %p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh $pkgsrc
 <<
 


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to