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

Modified Files:
        arpack-oct.info control-oct-2.2.4.info linear-algebra-oct.info 
        linear-algebra-oct305.info linear-algebra-oct324.info 
        nan-oct-2.5.2.info nan-oct.info octgpr-oct.info 
        odepkg-oct.info odepkg-oct305.info optim-oct.info 
        optiminterp-oct.info 
Log Message:
New upstream control package
Switch to lapack342
add option for "xvfb-run" for headless machines


Index: odepkg-oct305.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/odepkg-oct305.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- odepkg-oct305.info  30 Jun 2012 18:59:06 -0000      1.9
+++ odepkg-oct305.info  4 Nov 2012 15:15:35 -0000       1.10
@@ -1,8 +1,8 @@
 Info2: <<
-Package: odepkg%type_pkg[-lapack]-oct305
+Package: odepkg%type_pkg[-blas]-oct305
 Version: 0.6.4
-Type: forge (odepkg), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 6
+Type: forge (odepkg), -blas (-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 7
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/odepkg/index.html 
@@ -13,16 +13,16 @@
 License: GPL2+
 
 BuildDepends: <<
-  octave305%type_pkg[-lapack]-dev (>=3.0.5-3018), 
+  octave305%type_pkg[-blas]-dev (>=3.0.5-3018), 
   fftw3,
   hdf5.7-oldapi,
-  ( %type_raw[-lapack] = -atlas )      atlas (>=3.9.11-13),
-  ( %type_raw[-lapack] = -ref )                lapack341
+  ( %type_raw[-blas] = -atlas )        atlas (>=3.9.11-13),
+  ( %type_raw[-blas] = -ref )          lapack%type_pkg[lapack]
 <<
 Depends: <<
-  octave305%type_pkg[-lapack] (>=3.0.5-3018), 
-  ( %type_raw[-lapack] = -atlas ) atlas-shlibs (>=3.9.11-13),
-  ( %type_raw[-lapack] = -ref )   lapack341-shlibs,
+  octave305%type_pkg[-blas] (>=3.0.5-3018), 
+  ( %type_raw[-blas] = -atlas ) atlas-shlibs (>=3.9.11-13),
+  ( %type_raw[-blas] = -ref )   lapack%type_pkg[lapack]-shlibs,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -90,11 +90,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/3.0.5/octave_packages ] && [ -f 
%p/var/octave/3.0.5/octave_packages ] 
        then 
-               %p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/3.0.5/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/3.0.5/octave_packages
        fi
 <<
 
-PreRmScript: %p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: optiminterp-oct.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/optiminterp-oct.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- optiminterp-oct.info        8 Sep 2012 20:28:43 -0000       1.12
+++ optiminterp-oct.info        4 Nov 2012 15:15:35 -0000       1.13
@@ -1,8 +1,8 @@
 Info2: <<
-Package: optiminterp%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: optiminterp%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 0.3.3
-Type: oct (3.0.5 3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (optiminterp), 
-lapack (-atlas -ref .), gcc (4.7)
-Revision: 7
+Type: oct (3.0.5 3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (optiminterp), 
-blas (-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 8
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/optiminterp/index.html 
@@ -27,22 +27,22 @@
 License: GPL2+
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fftw3,
   ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
   ( %type_pkg[oct] != 305 ) hdf5.7 
 <<
 Depends: <<
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -131,11 +131,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: linear-algebra-oct324.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/linear-algebra-oct324.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- linear-algebra-oct324.info  30 Jun 2012 18:59:06 -0000      1.3
+++ linear-algebra-oct324.info  4 Nov 2012 15:15:35 -0000       1.4
@@ -1,8 +1,8 @@
 Info2: <<
-Package: linear-algebra%type_pkg[-lapack]-oct324
+Package: linear-algebra%type_pkg[-blas]-oct324
 Version: 2.1.0
-Type: forge (linear-algebra), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 5
+Type: forge (linear-algebra), -blas (-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 6
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/linear-algebra/index.html 
@@ -83,21 +83,21 @@
 License: GPL3+
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave324-ptatlas-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave324-ref-dev, 
-  (%type_raw[-lapack] = .)             liboctave324-accelerate-dev, 
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave324-ptatlas-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave324-ref-dev, 
+  (%type_raw[-blas] = .)               liboctave324-accelerate-dev, 
   liboctave324-gcc%type_pkg[gcc]-dev,
   fftw3,
   hdf5.7 
  <<
 Depends: <<
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        octave324-interpreter-ptatlas, 
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave324-interpreter-ref, 
-  (%type_raw[-lapack] = .)             octave324-interpreter-accelerate,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave324-interpreter-ptatlas, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave324-interpreter-ref, 
+  (%type_raw[-blas] = .)               octave324-interpreter-accelerate,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -176,11 +176,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/3.2.4/octave_packages ] && [ -f 
%p/var/octave/3.2.4/octave_packages ] 
        then 
-               %p/share/octave/3.2.4/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/3.2.4/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/3.2.4/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/3.2.4/octave_packages
        fi
 <<
 
-PreRmScript: %p/share/octave/3.2.4/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/3.2.4/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: arpack-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/arpack-oct.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- arpack-oct.info     30 Jun 2012 18:59:06 -0000      1.15
+++ arpack-oct.info     4 Nov 2012 15:15:35 -0000       1.16
@@ -1,8 +1,8 @@
 Info2: <<
-Package: arpack%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: arpack%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 1.0.8
-Type: oct (3.0.5), forge (arpack), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 11
+Type: oct (3.0.5), forge (arpack), -blas (-atlas -ref .), gcc (4.7) lapack 
(3.4.2)
+Revision: 12
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/
@@ -13,23 +13,23 @@
 License: GPL2
 
 BuildDepends: <<
-  arpack-ng%type_pkg[-lapack] (>= 3.0.1-2),
-  (%type_raw[-lapack] = -atlas)        atlas,
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341, 
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev, 
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
+  arpack-ng%type_pkg[-blas] (>= 3.0.1-2),
+  (%type_raw[-blas] = -atlas)  atlas,
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack], 
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev, 
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
   fftw3,
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   hdf5.7-oldapi
  <<
 Depends: <<
-  arpack-ng%type_pkg[-lapack]-shlibs (>= 3.0.1-2) | 
arpack-ng-mpi%type_pkg[-lapack]-shlibs (>= 3.0.1-2),
-  (%type_raw[-lapack] = -atlas)        atlas-shlibs,
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
+  arpack-ng%type_pkg[-blas]-shlibs (>= 3.0.1-2) | 
arpack-ng-mpi%type_pkg[-blas]-shlibs (>= 3.0.1-2),
+  (%type_raw[-blas] = -atlas)  atlas-shlibs,
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -89,13 +89,13 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%]/%type_raw[forge]-%v/octave-forge-postinstoctave_packages
 ] 
tave_packages"‘ˆ\+ò‰\+PZg!ÿÀZg!ÿó˜ˆ\+€º‰\+褩\+’ˆ¥\+ÀZg!ÿ€ Ç\+ÐOg!ÿ Ng!ÿ뭈\+6
 
èè!è!PZg!ÿÀZg!ÿxD¥\+ÐPg!ÿ"‘ˆ\+®ˆ\+PZg!ÿðˆ\+Zg!ÿÀ?
   \+ó˜ˆ\+0 \+Ø4 \+¨9 
\+€º‰\+xD¥\+ÐPg!ÿ Og!ÿ뭈\+à!à!PZg!ÿÀZg!ÿÈ
…\+°Qg!ÿ"‘ˆ\+®ˆ\+PZg!ÿðˆ\+Zg!ÿ€Zg!ÿxZg!ÿ«©\+Œp˜ÀZg!ÿó˜ˆ\+€º‰\+°Qg!ÿ€Pg!ÿ뭈\+GHIJKMNOPPZg!ÿÀZg!ÿHÅ[\+PSg!ÿ"‘ˆ\+®ˆ\+PZg!ÿ0?
        \+ó˜ˆ\+P¥\+ ù8\+0 \+Ø4 \+¨9 
\+€º‰\+HÅ[\+PSg!ÿQg!ÿ뭈\+8Å[\+PSg!ÿÀQg!ÿ뭈\+(Å[\+PSg!ÿðQg!ÿ뭈\+Å[\+PSg!ÿ
 Rg!ÿ뭈\+   ¨>       \+ó˜ˆ\+¨9 
\+ Lg!ÿŠH9\+旈\+Ø4 
\+ÀRg!ÿyH9\+旈\+0 
\+ðRg!ÿZH9\+旈\+Øô8\+P¥\+ ù8\+0 \+ØT¥\+Ø4 
\+¨9 
\+€º‰\+«©\+Í\+ÀZg!ÿp‹8\+ Tg!ÿpSg!ÿ뭈\+5678:<=>?@BDPZg!ÿÀZg!ÿàÍ\+ÀZg!ÿó˜ˆ\+褩\+
 Sg!ÿÍ\+旈\+褩\+Õ_@fÆS 
Qöl±íÁãÐ\+ÀZg!ÿàÍ\+°Ug!ÿ€Tg!ÿ뭈\+u]ÞÓ
       4Q ÷U^Qʉ§¶uª¹ñìò*ēv´b
\+\g!ÿF`l\+F`l\+?µ\+À[g!ÿPZg!ÿàVg!ÿZg!ÿ€Zg!ÿxZg!ÿ@]g!ÿB`l\+\g!ÿØT¥\+ Y¥\+€º‰\+ÿÿÿÿÿÿÿÿB`l\+ÈZg!ÿ뭈type_raw[forge]-%v/octave_packages
 %p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 
 DescPackaging: <<
 Common for all octave-forge packages:

Index: linear-algebra-oct305.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/linear-algebra-oct305.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- linear-algebra-oct305.info  30 Jun 2012 18:59:06 -0000      1.7
+++ linear-algebra-oct305.info  4 Nov 2012 15:15:35 -0000       1.8
@@ -1,8 +1,8 @@
 Info2: <<
-Package: linear-algebra%type_pkg[-lapack]-oct305
+Package: linear-algebra%type_pkg[-blas]-oct305
 Version: 1.0.6
-Type: forge (linear-algebra), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 6
+Type: forge (linear-algebra), -blas (-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 7
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/linear-algebra/index.html 
@@ -27,16 +27,16 @@
 License: GPL2
 
 BuildDepends: <<
-  octave305%type_pkg[-lapack]-dev (>=3.0.5-3018), 
+  octave305%type_pkg[-blas]-dev (>=3.0.5-3018), 
   fftw3,
   hdf5.7-oldapi,
-  ( %type_raw[-lapack] = -atlas )      atlas (>=3.9.11-13),
-  ( %type_raw[-lapack] = -ref )                lapack341
+  ( %type_raw[-blas] = -atlas )        atlas (>=3.9.11-13),
+  ( %type_raw[-blas] = -ref )          lapack%type_pkg[lapack]
 <<
 Depends: <<
-  octave305%type_pkg[-lapack] (>=3.0.5-3018), 
-  ( %type_raw[-lapack] = -atlas ) atlas-shlibs (>=3.9.11-13),
-  ( %type_raw[-lapack] = -ref )   lapack341-shlibs,
+  octave305%type_pkg[-blas] (>=3.0.5-3018), 
+  ( %type_raw[-blas] = -atlas ) atlas-shlibs (>=3.9.11-13),
+  ( %type_raw[-blas] = -ref )   lapack%type_pkg[lapack]-shlibs,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -105,11 +105,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/3.0.5/octave_packages ] && [ -f 
%p/var/octave/3.0.5/octave_packages ] 
        then 
-               %p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/3.0.5/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/3.0.5/octave_packages
        fi
 <<
 
-PreRmScript: %p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/3.0.5/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: optim-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/optim-oct.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- optim-oct.info      16 Sep 2012 20:16:10 -0000      1.23
+++ optim-oct.info      4 Nov 2012 15:15:35 -0000       1.24
@@ -1,8 +1,8 @@
 Info2: <<
-Package: optim%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: optim%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 1.2.1
-Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (optim), -lapack 
(-atlas -ref .), gcc (4.7)
-Revision: 1
+Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (optim), -blas (-atlas 
-ref .), gcc (4.7) lapack (3.4.2)
+Revision: 2
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/optim/index.html 
@@ -83,11 +83,11 @@
 Source-MD5: f60f0f0f227c6fa7712e681aa06e8778
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fftw3,
   hdf5.7,
@@ -98,11 +98,11 @@
   struct-oct%type_pkg[oct] (>= 1.0.10-1)
 <<
 Depends: << 
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -168,13 +168,13 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 
 DescPackaging: <<
 This package:
@@ -192,4 +192,4 @@
 The Type: forge (pkgname) is used to minimize what needs to be changed when
 using this .info file as a template.
 <<
-<<
\ No newline at end of file
+<<

Index: control-oct-2.2.4.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/control-oct-2.2.4.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- control-oct-2.2.4.info      30 Jun 2012 18:59:06 -0000      1.5
+++ control-oct-2.2.4.info      4 Nov 2012 15:15:35 -0000       1.6
@@ -1,8 +1,8 @@
 Info2: <<
-Package: control%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: control%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 2.2.4
-Type: oct (3.4.3), forge (control), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 8
+Type: oct (3.4.3), forge (control), -blas (-atlas -ref .), gcc (4.7) lapack 
(3.4.2)
+Revision: 9
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/control/index.html 
@@ -137,21 +137,21 @@
 # not use the conditional, of course.
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas,
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = -ref)  lapack341, 
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev, 
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -atlas)  atlas,
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack], 
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev, 
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fftw3,
   hdf5.7
 <<
 Depends: <<
-  (%type_raw[-lapack] = -atlas) atlas-shlibs,
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -atlas) atlas-shlibs,
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
   gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -216,13 +216,13 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 
 DescPackaging: <<
 For this package:
@@ -239,4 +239,4 @@
 The Type: forge (pkgname) is used to minimize what needs to be changed when
 using this .info file as a template.
 <<
-<<
\ No newline at end of file
+<<

Index: nan-oct-2.5.2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nan-oct-2.5.2.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nan-oct-2.5.2.info  18 Jul 2012 14:37:27 -0000      1.5
+++ nan-oct-2.5.2.info  4 Nov 2012 15:15:35 -0000       1.6
@@ -1,8 +1,8 @@
 Info2: <<
-Package: nan%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: nan%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 2.5.2
-Type: oct (3.0.5), forge (nan), -lapack (-atlas -ref .), gcc (4.7)
-Revision: 6
+Type: oct (3.0.5), forge (nan), -blas (-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 7
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/nan/index.html 
@@ -89,21 +89,21 @@
 # not use the conditional, of course.
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fftw3, 
   hdf5.7-oldapi
   <<
 Depends: << 
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   gcc%type_pkg[gcc]-shlibs
   <<
 Conflicts: <<
@@ -199,13 +199,13 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 
 DescPackaging: <<
 This package:
@@ -221,4 +221,4 @@
 The Type: forge (pkgname) is used to minimize what needs to be changed when
 using this .info file as a template.
 <<
-<<
\ No newline at end of file
+<<

Index: linear-algebra-oct.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/linear-algebra-oct.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- linear-algebra-oct.info     16 Sep 2012 20:06:17 -0000      1.24
+++ linear-algebra-oct.info     4 Nov 2012 15:15:35 -0000       1.25
@@ -1,8 +1,8 @@
 Info2: <<
-Package: linear-algebra%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: linear-algebra%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 2.2.0
-Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (linear-algebra), -lapack 
(-atlas -ref .), gcc (4.7)
-Revision: 3
+Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (linear-algebra), -blas 
(-atlas -ref .), gcc (4.7) lapack (3.4.2)
+Revision: 4
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/linear-algebra/index.html 
@@ -83,22 +83,22 @@
 License: OSI-Approved
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev, 
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev, 
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fftw3,
   hdf5.7,
   fink (>=0.32)
 <<
 Depends: <<
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref, 
-  (%type_raw[-lapack] = .)     octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref, 
+  (%type_raw[-blas] = .)       octave%type_pkg[oct]-interpreter-accelerate,
   ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
 <<
 RuntimeDepends: <<
@@ -179,11 +179,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 <<

Index: octgpr-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octgpr-oct.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- octgpr-oct.info     8 Sep 2012 20:28:43 -0000       1.12
+++ octgpr-oct.info     4 Nov 2012 15:15:35 -0000       1.13
@@ -1,8 +1,8 @@
 Info2: <<
-Package: octgpr%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: octgpr%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 1.2.0
-Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (octgpr), -lapack (-atlas 
-ref .), gcc (4.7)
-Revision: 7
+Type: oct (3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (octgpr), -blas (-atlas -ref 
.), gcc (4.7) lapack (3.4.2)
+Revision: 8
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/octgpr/index.html 
@@ -26,21 +26,21 @@
 License: GPL3
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   ( %type_pkg[oct] << 360 ) liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev, 
   fftw3,
   hdf5.7 
  <<
 Depends: <<
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   ( %type_pkg[oct] << 360 ) gcc%type_pkg[gcc]-shlibs
 <<
 Conflicts: <<
@@ -94,7 +94,7 @@
        exit 1
 fi
 export OCTAVE=%p/bin/octave-%type_raw[oct] 
-if [ "%type_raw[-lapack]" = "-atlas" ]
+if [ "%type_raw[-blas]" = "-atlas" ]
        then
        # override mkoctfile's BLAS_LIBS for atlas case since it seems not 
        # to be in the right format for _this_ package
@@ -123,11 +123,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: odepkg-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/odepkg-oct.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- odepkg-oct.info     8 Sep 2012 20:28:43 -0000       1.19
+++ odepkg-oct.info     4 Nov 2012 15:15:35 -0000       1.20
@@ -1,8 +1,8 @@
 Info2: <<
-Package: odepkg%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: odepkg%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 0.8.2
-Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (odepkg), -lapack 
(-atlas -ref .), gcc (4.7)
-Revision: 5
+Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (odepkg), -blas (-atlas 
-ref .), gcc (4.7) lapack (3.4.2)
+Revision: 6
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/odepkg/index.html 
@@ -69,21 +69,21 @@
 License: GPL2+
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fftw3, 
   hdf5.7
 <<
 Depends: << 
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   gcc%type_pkg[gcc]-shlibs
   <<
 Conflicts: <<
@@ -129,7 +129,7 @@
 # mkoctfile doesn't actually do multiple variables with a -p
 # The line is OK on non-atlas octaves, though, since we really
 # just want one "-Wl,-framework,Accelerate".
-if [ "%type_raw[-lapack]" != "." ] ; then
+if [ "%type_raw[-blas]" != "." ] ; then
        perl -pi -e 's /(LAPACK_LIBS := \$\(shell mkoctfile \-p BLAS_LIBS)( 
LAPACK_LIBS\))/\1) \$(shell mkoctfile -p \2/' src/Makefile
 fi
 # clean up redundant LAPACK_LIBS
@@ -187,11 +187,11 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
-<<
\ No newline at end of file
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+<<

Index: nan-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nan-oct.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- nan-oct.info        8 Sep 2012 20:28:43 -0000       1.24
+++ nan-oct.info        4 Nov 2012 15:15:35 -0000       1.25
@@ -1,8 +1,8 @@
 Info2: <<
-Package: nan%type_pkg[-lapack]-oct%type_pkg[oct]
+Package: nan%type_pkg[-blas]-oct%type_pkg[oct]
 Version: 2.5.5
-Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (nan), -lapack (-atlas 
-ref .), gcc (4.7)
-Revision: 6
+Type: oct (3.2.4 3.4.3 3.6.0 3.6.1 3.6.2 3.6.3), forge (nan), -blas (-atlas 
-ref .), gcc (4.7) lapack (3.4.2)
+Revision: 7
 Maintainer: Alexander Hansen <[email protected]>
 # unfortunately, Homepage won't do types
 Homepage: http://octave.sourceforge.net/nan/index.html 
@@ -85,21 +85,21 @@
 # not use the conditional, of course.
 
 BuildDepends: <<
-  (%type_raw[-lapack] = -atlas)        atlas (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        liboctave%type_pkg[oct]-ptatlas-dev,
-  (%type_raw[-lapack] = .)             liboctave%type_pkg[oct]-accelerate-dev, 
-  (%type_raw[-lapack] = -ref)  lapack341,
-  (%type_raw[-lapack] = -ref)  liboctave%type_pkg[oct]-ref-dev,
+  (%type_raw[-blas] = -atlas)  atlas (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  liboctave%type_pkg[oct]-ptatlas-dev,
+  (%type_raw[-blas] = .)               liboctave%type_pkg[oct]-accelerate-dev, 
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack],
+  (%type_raw[-blas] = -ref)    liboctave%type_pkg[oct]-ref-dev,
   liboctave%type_pkg[oct]-gcc%type_pkg[gcc]-dev,
   fftw3, 
   hdf5.7
   <<
 Depends: << 
-  (%type_raw[-lapack] = -atlas) atlas-shlibs (>=3.9.11-13),
-  (%type_raw[-lapack] = -atlas)        
octave%type_pkg[oct]-interpreter-ptatlas, 
-  (%type_raw[-lapack] = .)             
octave%type_pkg[oct]-interpreter-accelerate,
-  (%type_raw[-lapack] = -ref)  lapack341-shlibs,
-  (%type_raw[-lapack] = -ref)  octave%type_pkg[oct]-interpreter-ref,
+  (%type_raw[-blas] = -atlas) atlas-shlibs (>=3.9.11-13),
+  (%type_raw[-blas] = -atlas)  octave%type_pkg[oct]-interpreter-ptatlas, 
+  (%type_raw[-blas] = .)               
octave%type_pkg[oct]-interpreter-accelerate,
+  (%type_raw[-blas] = -ref)    lapack%type_pkg[lapack]-shlibs,
+  (%type_raw[-blas] = -ref)    octave%type_pkg[oct]-interpreter-ref,
   gcc%type_pkg[gcc]-shlibs
   <<
 Conflicts: <<
@@ -195,13 +195,13 @@
 PostInstScript:  <<
        if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f 
%p/var/octave/%type_raw[oct]/octave_packages ] 
        then 
-               
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
+               `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
        else
                mv 
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%v/octave_packages 
%p/var/octave/%type_raw[oct]/octave_packages
        fi
 <<
 
-PreRmScript: 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
+PreRmScript: `which xvfb-run` 
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-prerm
 
 DescPackaging: <<
 This package:
@@ -217,4 +217,4 @@
 The Type: forge (pkgname) is used to minimize what needs to be changed when
 using this .info file as a template.
 <<
-<<
\ No newline at end of file
+<<


------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to