Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv32334/10.4/unstable/main/finkinfo/sci
Modified Files:
bundle-octave.info linear-algebra-oct-1.0.6.info
linear-algebra-oct.info nurbs-oct-1.0.0.info nurbs-oct.info
Added Files:
odepkg-oct-0.6.4.info odepkg-oct.info
Log Message:
nurbs-oct wants gcc-4.2 or later, so fix that.
linear-algebra appears to use LAPACK, so add -atlas varianting
New ocs and odepkg packages.
Index: linear-algebra-oct-1.0.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/linear-algebra-oct-1.0.6.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linear-algebra-oct-1.0.6.info 27 Sep 2011 01:59:35 -0000 1.1
+++ linear-algebra-oct-1.0.6.info 27 Sep 2011 23:58:40 -0000 1.2
@@ -1,8 +1,8 @@
Info2: <<
-Package: linear-algebra-oct%type_pkg[oct]
+Package: linear-algebra%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 1.0.6
-Type: oct (3.0.5), forge (linear-algebra)
-Revision: 1
+Type: oct (3.0.5), forge (linear-algebra), -atlas (boolean)
+Revision: 2
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/linear-algebra/index.html
@@ -86,15 +86,21 @@
# not use the conditional, of course.
BuildDepends: <<
- octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
+ octave%type_pkg[oct]%type_pkg[-atlas]-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ ( %type_pkg[oct] != 305 ) hdf5.7,
+ ( %type_raw[-atlas] = -atlas ) atlas
<<
Depends: <<
octave%type_pkg[oct] | octave%type_pkg[oct]-atlas
+ ( %type_raw[-atlas] = -atlas ) atlas-shlibs
+<<
+Conflicts: <<
+octave-forge
+linear-algebra-oct%type_pkg[oct]-atlas
+linear-algebra-oct%type_pkg[oct]
<<
-Conflicts: octave-forge
Source-MD5: cb07f1a877c6de3795cb33e27c9a037f
Index: nurbs-oct-1.0.0.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/nurbs-oct-1.0.0.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nurbs-oct-1.0.0.info 27 Sep 2011 02:53:02 -0000 1.1
+++ nurbs-oct-1.0.0.info 27 Sep 2011 23:58:40 -0000 1.2
@@ -75,7 +75,8 @@
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ ( %type_pkg[oct] != 305 ) hdf5.7,
+ gcc4.2
<<
Depends: <<
octave%type_pkg[oct] | octave%type_pkg[oct]-atlas
@@ -85,7 +86,7 @@
Source-MD5: a7a1f569c547e2519b92c42ff90c24ef
DescPackaging: <<
-Common for all octave-forge packages.
+Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
Index: linear-algebra-oct.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/linear-algebra-oct.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- linear-algebra-oct.info 27 Sep 2011 01:59:35 -0000 1.1
+++ linear-algebra-oct.info 27 Sep 2011 23:58:40 -0000 1.2
@@ -1,8 +1,8 @@
Info2: <<
-Package: linear-algebra-oct%type_pkg[oct]
+Package: linear-algebra%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 2.0.0
-Type: oct (3.2.4), forge (linear-algebra)
-Revision: 1
+Type: oct (3.2.4), forge (linear-algebra), -atlas (boolean)
+Revision: 2
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/linear-algebra/index.html
@@ -86,15 +86,21 @@
# not use the conditional, of course.
BuildDepends: <<
- octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
+ octave%type_pkg[oct]%type_pkg[-atlas]-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ ( %type_pkg[oct] != 305 ) hdf5.7,
+ ( %type_raw[-atlas] = -atlas ) atlas
<<
Depends: <<
octave%type_pkg[oct] | octave%type_pkg[oct]-atlas
+ ( %type_raw[-atlas] = -atlas ) atlas-shlibs
+<<
+Conflicts: <<
+octave-forge
+linear-algebra-oct%type_pkg[oct]-atlas
+linear-algebra-oct%type_pkg[oct]
<<
-Conflicts: octave-forge
Source-MD5: 518fda3ea4408e04af13ac2d7a9ee3a7
--- NEW FILE: odepkg-oct-0.6.4.info ---
Info2: <<
Package: odepkg%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 0.6.4
Type: oct (3.0.5), forge (odepkg), -atlas (boolean)
Revision: 2
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/odepkg/index.html
Description: ODE solver for Octave
DescDetail: <<
A package for solving ordinary differential equations and more.
<<
License: GPL
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
# fftw3,
# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
# ( %type_pkg[oct] != 305 ) hdf5.7
#
# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]%type_pkg[-atlas]-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
( %type_pkg[oct] != 305 ) hdf5.7,
gcc46-compiler,
( %type_raw[-atlas] = -atlas ) atlas
<<
Depends: <<
octave%type_pkg[oct]%type_pkg[-atlas],
gcc46-shlibs,
( %type_raw[-atlas] = -atlas ) atlas-shlibs
<<
Conflicts: <<
octave-forge,
odepkg-atlas-oct%type_pkg[oct]
odepkg-oct%type_pkg[oct]
<<
Source-MD5: 85e87eb48f7d3de9c7a9925990f29a96
DescPackaging: <<
Common for all octave-forge packages.
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
#### Insert required changes here ####
#TarFilesRename: odepkg:odepkg-@VERSION@
#@CHANGES@
######################################
# Do not change anything from this point down, unless absolutely necessary,
# since the foo-oct%type_pkg[oct] packages are designed to be built/installed
# in the same way.
# default source
#Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
# this will redirect like a fiend, and then you can replace it with a one-hop:
Source:
mirror:sourceforge:octave/Octave%%20Forge%%20Packages/R2008-08-31/%type_raw[forge]-%v.tar.gz
# replacing "Individual Package Releases" with the relevant directory
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
CompileScript: OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
InstallScript: <<
#!/bin/sh -ev
%p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh
%type_raw[forge]-%v %i %b
mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
# copy template scripts
cp %p/share/octave/%type_raw[oct]/scripts/octave-forge-prerm
%p/share/octave/%type_raw[oct]/scripts/octave-forge-postinst
%i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
sed -i -e 's/@PKGNAME@/%type_raw[forge]-%v/' octave-forge-postinst
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
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
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
<<
Index: nurbs-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/nurbs-oct.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nurbs-oct.info 27 Sep 2011 02:53:02 -0000 1.1
+++ nurbs-oct.info 27 Sep 2011 23:58:40 -0000 1.2
@@ -98,7 +98,8 @@
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
- ( %type_pkg[oct] != 305 ) hdf5.7
+ ( %type_pkg[oct] != 305 ) hdf5.7,
+ gcc4.2
<<
Depends: <<
octave%type_pkg[oct] | octave%type_pkg[oct]-atlas
@@ -108,7 +109,10 @@
Source-MD5: 8f1326d15ed8bc4d855659188fbda774
DescPackaging: <<
-Common for all octave-forge packages.
+This package:
+Wants omp.h, which is included with gcc4.2 but not 4.0.
+
+Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
@@ -121,6 +125,8 @@
#### Insert required changes here ####
TarFilesRename: nurbs:nurbs-1.3.5
+SetCC: gcc-4.2
+SetCXX: g++-4.2
######################################
--- NEW FILE: odepkg-oct.info ---
Info2: <<
Package: odepkg%type_pkg[-atlas]-oct%type_pkg[oct]
Version: 0.8.0
Type: oct (3.2.4), forge (odepkg), -atlas (boolean)
Revision: 1
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/odepkg/index.html
Description: ODE solver for Octave
DescDetail: <<
A package for solving ordinary differential equations and more.
<<
License: GPL
# All octave-forge packages have to have the following BuildDepends:
# octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
# fftw3,
# ( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
# ( %type_pkg[oct] != 305 ) hdf5.7
#
# Packages which serve only Octave-3.0.5 or only Octave > 3.0.5 need
# not use the conditional, of course.
BuildDepends: <<
octave%type_pkg[oct]%type_pkg[-atlas]-dev,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
( %type_pkg[oct] != 305 ) hdf5.7,
gcc46-compiler,
( %type_raw[-atlas] = -atlas ) atlas
<<
Depends: <<
octave%type_pkg[oct]%type_pkg[-atlas],
gcc46-shlibs,
( %type_raw[-atlas] = -atlas ) atlas-shlibs
<<
Conflicts: <<
octave-forge,
odepkg-atlas-oct%type_pkg[oct]
odepkg-oct%type_pkg[oct]
<<
Source-MD5: 002b1ce81488d8b5a654229e00aad45c
DescPackaging: <<
Common for all octave-forge packages.
We read in postinst and prerm template scripts installed by octaveN and modify
them to use the name of this package because Octave's package manager can't
cope with non-literal arguments.
The Type: forge (pkgname) is used to minimize what needs to be changed when
using this .info file as a template.
<<
#### Insert required changes here ####
#TarFilesRename: odepkg:odepkg-@VERSION@
#@CHANGES@
######################################
# Do not change anything from this point down, unless absolutely necessary,
# since the foo-oct%type_pkg[oct] packages are designed to be built/installed
# in the same way.
# default source
#Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
# this will redirect like a fiend, and then you can replace it with a one-hop:
Source:
mirror:sourceforge:octave/Octave%%20Forge%%20Packages/Individual%%20Package%%20Releases/%type_raw[forge]-%v.tar.gz
# replacing "Individual Package Releases" with the relevant directory
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
CompileScript: OCTAVE=%p/bin/octave-%type_raw[oct]
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
InstallScript: <<
#!/bin/sh -ev
%p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh
%type_raw[forge]-%v %i %b
mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
# copy template scripts
cp %p/share/octave/%type_raw[oct]/scripts/octave-forge-prerm
%p/share/octave/%type_raw[oct]/scripts/octave-forge-postinst
%i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%v
sed -i -e 's/@PKGNAME@/%type_raw[forge]-%v/' octave-forge-postinst
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
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
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
<<
Index: bundle-octave.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/bundle-octave.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bundle-octave.info 27 Sep 2011 02:53:02 -0000 1.10
+++ bundle-octave.info 27 Sep 2011 23:58:40 -0000 1.11
@@ -1,7 +1,7 @@
Info2: <<
Package: bundle-octave%type_pkg[oct]%type_pkg[-atlas]
-Version: 20110926
-Revision: 3
+Version: 20110927
+Revision: 1
Type: bundle, oct (3.0.5 3.2.4), -atlas (boolean)
Depends: <<
octave%type_pkg[oct]%type_pkg[-atlas],
@@ -41,7 +41,7 @@
io-oct%type_pkg[oct],
irsa-oct%type_pkg[oct],
java-oct%type_pkg[oct],
-linear-algebra-oct%type_pkg[oct],
+linear-algebra%type_pkg[-atlas]-oct%type_pkg[oct],
mapping-oct%type_pkg[oct],
multicore-oct%type_pkg[oct],
miscellaneous-oct%type_pkg[oct],
@@ -51,6 +51,8 @@
nlwing2-oct%type_pkg[oct],
nnet-oct%type_pkg[oct],
nurbs-oct%type_pkg[oct],
+ocs-oct%type_pkg[oct],
+odepkg%type_pkg[atlas]-oct%type_pkg[oct]
( %type_pkg[oct] != 324 ) octcdf-oct%type_pkg[oct],
optim-oct%type_pkg[oct],
outliers-oct%type_pkg[oct],
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
