Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5547/10.4/stable/main/finkinfo/sci
Modified Files:
bundle-octave.info ocs-oct.info odepkg-oct.info
Log Message:
Backport from 10.7
Index: odepkg-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/odepkg-oct.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- odepkg-oct.info 28 Feb 2012 15:50:37 -0000 1.5
+++ odepkg-oct.info 2 Apr 2012 00:18:30 -0000 1.6
@@ -1,8 +1,9 @@
Info2: <<
Package: odepkg%type_pkg[-atlas]-oct%type_pkg[oct]
-Version: 0.8.0
-Type: oct (3.2.4 3.4.3), forge (odepkg), -atlas (boolean)
-Revision: 4
+Version: 0.8.1.9916
+# SVN checkout
+Type: oct (3.2.4 3.4.3 3.6.0 3.6.1), forge (odepkg), -atlas (boolean), v
(0.8.2)
+Revision: 1
Architecture: <<
(%type_raw[-atlas] != -atlas) powerpc,
(%type_raw[-atlas] != -atlas) i386
@@ -13,6 +14,62 @@
Description: ODE solver for Octave
DescDetail: <<
A package for solving ordinary differential equations and more.
+
+The following additional functions are provided:
+
+OdePkg Tutorial:
+ odepkg
+OdePkg ODE Solver Functions:
+ ode23
+ ode45
+ ode54
+ ode78
+OdePkg DAE Solver Functions:
+ ode2r
+ ode5r
+ odebda
+ odebwe
+ oders
+ odesx
+OdePkg IDE Solver Functions:
+ odebdi
+ odekdi
+OdePkg DDE Solver Functions:
+ ode23d
+ ode45d
+ ode54d
+ ode78d
+OdePkg Options Functions:
+ odeset
+ odeget
+OdePkg Output Functions:
+ odeplot
+ odeprint
+ odephas2
+ odephas3
+OdePkg Example Functions:
+ odeexamples
+ odepkg_examples_dae
+ odepkg_examples_dde
+ odepkg_examples_ide
+ odepkg_examples_ode
+OdePkg Testsuite Functions:
+ odepkg_testsuite_calcscd
+ odepkg_testsuite_calcmescd
+ odepkg_testsuite_chemakzo
+ odepkg_testsuite_hires
+ odepkg_testsuite_implakzo
+ odepkg_testsuite_implrober
+ odepkg_testsuite_impltrans
+ odepkg_testsuite_oregonator
+ odepkg_testsuite_pollution
+ odepkg_testsuite_robertson
+ odepkg_testsuite_transistor
+OdePkg Internal Functions:
+ odepkg_event_handle
+ odepkg_structure_check
+OdePkg Other Functions:
+ bvp4c
<<
License: GPL2+
@@ -31,7 +88,8 @@
(%type_raw[-atlas] != -atlas) liboctave%type_pkg[oct]-veclib-dev,
fftw3,
gcc46-compiler,
- hdf5.7
+ hdf5.7,
+ fink (>=0.30.0-1)
<<
Depends: <<
(%type_raw[-atlas] = -atlas) atlas-shlibs,
@@ -52,7 +110,13 @@
Source-MD5: 002b1ce81488d8b5a654229e00aad45c
DescPackaging: <<
-Common for all octave-forge packages.
+This package:
+Patch to bring release version (0.8.0), up to the svn version (0.8.2) to allow
+building with Octave-3.6.x.
+Patch the patched source again to ensure that the FFLAGS that we build Octave
with
+are passed along--important since the non-atlas variant uses Accelerate.
+
+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
@@ -64,13 +128,19 @@
#### Insert required changes here ####
+PatchFile: %{ni}.patch
+PatchFile-MD5: 0177164dd735aa4cda3a89f7a7e5e0c4
+SourceDirectory: %type_pkg[forge]-0.8.0
+PatchFile2: %{ni}-stage2.patch
+PatchFile2-MD5: 91f3c0dde1ed1421f3746a8ebb9218ef
+
######################################
# 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.
-Source:
mirror:sourceforge:octave/Octave%%20Forge%%20Packages/Individual%%20Package%%20Releases/%type_raw[forge]-%v.tar.gz
+Source: mirror:sourceforge:octave/%type_raw[forge]-0.8.0.tar.gz
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
@@ -79,28 +149,34 @@
CompileScript: <<
#!/bin/sh -ev
+if [ $UID -ne 0 ]
+then
+ echo "%n cannot be built with --build-as-nobody"
+ exit 1
+fi
+srcdir=%type_pkg[forge]
export OCTAVE=%p/bin/octave-%type_raw[oct]
-# repack tarball, since octave-3.4.3 appears not to want to install
+# 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]-%v
+ tar -cf $srcdir-%v.tar $srcdir-0.8.0
cd %b
- pkgsrc=%type_raw[forge].tar
-else pkgsrc=%type_raw[forge]-%v
+ pkgsrc=$srcdir-%v.tar
+else pkgsrc=$srcdir-0.8.0
fi
%p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh $pkgsrc
<<
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
+ %p/share/octave/%type_raw[oct]/scripts/octave-forge-install.sh
%type_raw[forge]-%type_raw[v] %i %b
+ mkdir -p %i/share/octave/%type_raw[oct]/%type_raw[forge]-%type_raw[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
+ 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]-%type_raw[v]
+ cd %i/share/octave/%type_raw[oct]/%type_raw[forge]-%type_raw[v]
+ sed -i -e 's/@PKGNAME@/%type_raw[forge]-%type_raw[v]/'
octave-forge-postinst
sed -i -e 's/@PKGNAME@/%type_raw[forge]/' octave-forge-prerm
chmod a+x octave-forge*
<<
@@ -108,11 +184,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
+
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%type_raw[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
+ mv
%p/share/octave/%type_raw[oct]/packages/%type_raw[forge]-%type_raw[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:
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%type_raw[v]/octave-forge-prerm
<<
\ No newline at end of file
Index: bundle-octave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/bundle-octave.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bundle-octave.info 21 Mar 2012 14:04:33 -0000 1.7
+++ bundle-octave.info 2 Apr 2012 00:18:30 -0000 1.8
@@ -1,6 +1,6 @@
Info2: <<
Package: bundle-octave%type_pkg[oct]%type_pkg[-atlas]
-Version: 20120321
+Version: 20120401
Revision: 1
Type: bundle, oct (3.0.5 3.2.4 3.4.3 3.6.0 3.6.1), -atlas (boolean)
Depends: <<
@@ -57,9 +57,9 @@
nlwing2-oct%type_pkg[oct],
nnet-oct%type_pkg[oct],
nurbs-oct%type_pkg[oct],
-( %type_pkg[oct] <= 343 ) ocs-oct%type_pkg[oct],
odebvp-oct%type_pkg[oct],
-( %type_pkg[oct] <= 343 ) odepkg%type_pkg[-atlas]-oct%type_pkg[oct],
+odepkg%type_pkg[-atlas]-oct%type_pkg[oct],
+ocs-oct%type_pkg[oct],
( %type_pkg[oct] = 305 ) octcdf-oct%type_pkg[oct],
( %type_pkg[oct] >= 343 ) octcdf-nc4-oct%type_pkg[oct] | ( %type_pkg[oct] >=
343 ) octcdf-ncdap-oct%type_pkg[oct],
octclip-oct%type_pkg[oct],
Index: ocs-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/ocs-oct.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ocs-oct.info 28 Feb 2012 15:50:37 -0000 1.6
+++ ocs-oct.info 2 Apr 2012 00:18:30 -0000 1.7
@@ -1,7 +1,7 @@
Info2: <<
Package: ocs-oct%type_pkg[oct]
Version: 0.1.3
-Type: oct (3.0.5 3.2.4 3.4.3), forge (ocs)
+Type: oct (3.0.5 3.2.4 3.4.3 3.6.0 3.6.1), forge (ocs)
Revision: 1
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
