Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv28309
Modified Files:
octave-3.0.5.info octave305-docs.info
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: octave-3.0.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/octave-3.0.5.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave-3.0.5.info 19 Oct 2011 18:27:25 -0000 1.1
+++ octave-3.0.5.info 4 Nov 2011 22:46:38 -0000 1.2
@@ -2,8 +2,8 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.0.5), gcc (4.6)
Version: 3.0.5
-Revision: 228
-# Distribution: 10.4
+Revision: 601
+# Distribution: 10.6
Maintainer: Alexander Hansen <[email protected]>
Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.bz2
@@ -11,25 +11,33 @@
BuildDepends: <<
glpk-dev, hdf5.7-oldapi, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4,
- pcre, gcc46-compiler, suitesparse-metis, metis, qhull6-dev, fink (>=
0.28), fink-package-precedence, sed,
+ pcre, gcc46-compiler, suitesparse-metis, metis, qhull6-dev, fink (>=
0.30.0-1), fink-package-precedence, sed,
(%type_raw[-atlas] = atlas) atlas, flag-sort
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
-GCC: 4.0
+Provides: <<
+
octave-interpreter,
+(%type_raw[-atlas] = -atlas) octave-interpreter-atlas,
+(%type_raw[-atlas] != -atlas) octave-interpreter-veclib
+<<
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}, (%type_raw[-atlas] != -atlas)
%{Ni}-atlas,
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
-UseMaxBuildJobs: false
+
+# UseMaxBuildJobs: false
+GCC: 4.0
PatchFile: %{ni}-glpk.patch
PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
-PatchFile2: %{ni}.patch
-PatchFile2-MD5: 94f6e470ee04b0e2837709966fc31420
+PatchFile2: %{ni}-manpages.patch
+PatchFile2-MD5: 647cff8601e837e8b8e46d15867b14f0
+PatchFile3: %{ni}.patch
+PatchFile3-MD5: adc4d6257e51ca5d8a45472c8ee036ca
PatchScript: <<
#!/bin/sh -ev
#fix for use of glpk private internals
@@ -39,11 +47,14 @@
cp doc/interpreter/%{Ni}-bug.1 doc/interpreter/%{Ni}-bug-%v.1
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
- #Fink-specific changes
+ # fix executable names in versioned manpages
sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
- sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
+ #Fink-specific structural changes
+ sed -e 's/@OCTVERSION@/%v/g' -e 's|@FINKPREFIX@|%p|g' %{PatchFile3} |
patch -p1
+ # Put in the Fink tree.
+ sed -i.orig -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
# fix lib name for qhull6
- perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
+ perl -pi.orig -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
# wrong include dir for qhull6
for f in `grep -l -r "qhull_a\.h" src`
do sed -i.orig -e '/include/s|qhull/|lib&|' $f
@@ -101,19 +112,20 @@
InstallScript: <<
#!/bin/sh -ev
- export MAKEFLAGS=-j1
make install DESTDIR=%d
+ # Install versioned manpages
+ cp doc/interpreter/*-%v.1 %i/share/man/man1
# Install Fink-specific octaverc which points at our oct-versioned
# package directory.
- cp %b/%{Ni}rc %i/share/%{Ni}/%v/m/startup
+ cp %{Ni}rc %i/share/%{Ni}/%v/m/startup
mkdir -p %i/var/%{Ni}/%v/
# install examples
mkdir -p %i/share/%{Ni}/%v/doc/examples
cp -R examples %i/share/%{Ni}/%v/doc/examples
- pushd %i/bin
# clear out hardcoded Fink sed.
+ pushd %i/bin
for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
- do
+ do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
@@ -147,7 +159,7 @@
RuntimeVars: <<
GNUTERM: aqua
<<
-DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+DocFiles: BUGS COPYING ChangeLog* NEWS* PROJECTS README ROADMAP
SENDING-PATCHES THANKS
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
@@ -165,6 +177,12 @@
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Depends: fftw3-shlibs, gcc%type_pkg[gcc]-shlibs, hdf5.7-oldapi-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Provides: <<
+
+ liboctave%type_pkg[oct],
+ (%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas,
+ (%type_raw[-atlas] != -atlas) liboctave%type_pkg[oct]-veclib
+ <<
Files: <<
lib/%{Ni}-%v
<<
@@ -179,15 +197,10 @@
such as the various octave-forge packages.
<<
DescUsage: <<
- To use mkoctfile to build dynamically loadable modules, you will need
- to install the hdf5-oldapi and fftw3 packages, as well as
- %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
- It cannot Depend on them since they are BuildDependsOnly.
-
- Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
- installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
- on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
- hdf5-oldapi and fftw3.
+Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
+installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
+on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need to
BuildDepend on
+hdf5-oldapi and fftw3.
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
@@ -200,7 +213,7 @@
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}343-dev,
%{Ni}343-atlas-dev,
mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Replaces: <<
@@ -208,17 +221,24 @@
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
+ %{Ni}324-dev, %{Ni}324-dev, %{Ni}324-atlas-dev, %{Ni}343-dev,
%{Ni}343-atlas-dev,
mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
<<
+ Provides: <<
+
+ liboctave%type_pkg[oct]-dev,
+ (%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
+ (%type_raw[-atlas] != -atlas) liboctave%type_pkg[oct]-veclib-dev
+ <<
+
BuildDependsOnly: true
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
bin/octave-config*
- share/man/man1/mkoctfile.1
- share/man/man1/octave-config.1
+ share/man/man1/mkoctfile*.1
+ share/man/man1/octave-config*.1
<<
DescDetail: <<
@@ -227,14 +247,8 @@
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
- to install the hdf5-oldapi and fftw3 packages, as well as
- %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
- It cannot Depend on them since they are BuildDependsOnly.
-
- Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
- installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
- on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
- hdf5-oldapi and fftw3.
+ to install the hdf5-oldapi and fftw3 packages.
+ %n cannot Depend on them since they are BuildDependsOnly.
<<
DescPackaging: <<
We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
@@ -266,12 +280,20 @@
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
+ Provides: <<
+
octave%type_pkg[oct]-interpreter,
+ (%type_raw[-atlas] = -atlas) octave%type_pkg[oct]-interpreter-atlas,
+ (%type_raw[-atlas] != -atlas) octave%type_pkg[oct]-interpreter-veclib
+ <<
+
Files: <<
share/%{Ni}/%v
lib/%{Ni}/%v
bin/%{Ni}-%v
bin/%{Ni}-bug-%v
var/%{Ni}/%v
+ share/man/man1/%{Ni}-%v.1
+ share/man/man1/%{Ni}-bug-%v.1
<<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
@@ -337,17 +359,6 @@
or other languages.
<<
DescUsage: <<
-To use mkoctfile to build dynamically loadable modules, you will need
-to install the hdf5-oldapi and fftw3 packages, as well as
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
-It cannot Depend on them since they are BuildDependsOnly.
-
-Any package that either links to the libraries in
-%{Ni}%type_pkg[-atlas]-shlibs or installs an extension should Depend on
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend on
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need to
-BuildDepend on hdf5-oldapi and fftw3.
-
By default the plotting output (via gnuplot) is directed to AquaTerm.
This can be overidden in your startup scripts, e.g.
@@ -420,6 +431,10 @@
Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
of Xcode's.
+
+As of revision 601:
+
+Actually _install_ the manpages for the versioned executables.
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave305-docs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/octave305-docs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave305-docs.info 28 Oct 2011 20:44:53 -0000 1.1
+++ octave305-docs.info 4 Nov 2011 22:46:38 -0000 1.2
@@ -1,17 +1,16 @@
Package: octave305-docs
Version: 3.0.5
-Revision: 1
+Revision: 2
Maintainer: Alexander Hansen <[email protected]>
BuildDependsOnly: false
Source: ftp://ftp.octave.org/pub/octave/octave-%v.tar.bz2
Source-MD5: bfba44eeda8fa6e29c2bbcd2604c34eb
-Recommends: octave305 | octave305-atlas
+Recommends: octave305-interpreter
Conflicts: octave-docs (<< 3.0.5-999)
Replaces: octave-docs (<< 3.0.5-999)
CompileScript: <<
- #!/bin/sh -ev
-echo "No compile needed"
+true
<<
InstallScript: <<
#!/bin/sh -ev
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
