Update of /cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv3343/10.7/finkinfo/sci
Modified Files:
fltk-backend.info octave-3.2.4.info
Log Message:
Fix MD5.
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- octave-3.2.4.info 31 Aug 2011 17:47:10 -0000 1.6
+++ octave-3.2.4.info 31 Aug 2011 18:01:49 -0000 1.7
@@ -1,6 +1,6 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.2.4)
+Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
Revision: 0.9000
Maintainer: Alexander Hansen <[email protected]>
@@ -14,7 +14,7 @@
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, libftgl2, qhull6-dev, qrupdate,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
- graphicsmagick-dev, freetype219,
+ graphicsmagick-dev, freetype219,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
@@ -33,9 +33,7 @@
PatchFile2: %{ni}-%v.patch
PatchFile2-MD5: 28dea047c7b3e51539a35b76249c8f67
PatchFile3: %{ni}-10.7.patch
-PatchFile3-MD5: 77c28648a021b821f7106b5cfa8757af
-
-
+PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
@@ -69,6 +67,7 @@
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
# disable FLTK backend
patch -p1 < %{PatchFile2}
+ # fix lack of CGDisplayBitsPerPixel
patch -p1 < %{PatchFile3}
<<
@@ -375,7 +374,7 @@
from glpk. Import the functions needed so can still use it
even when glpk stops exporting its internals. See:
http://octave.1599824.n4.nabble.com/GLPK-interface-was-Re-Multithreaded-Atlas-td1654632.html
-
+
Set the GNUTERM environment variable to AquaTerm because autodetection
of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
AquaTerm seems to be a sensible default, particularly since gnuplot-nox is
also a
@@ -400,7 +399,7 @@
of the octave scripts during their build process and edit them to use the
package's name.
-Don't build the FLTK backend since we are allowing for Aqua and X11 variants
+We don't build the FLTK backend since we are allowing for Aqua and X11 variants
of that bundle in the fltk-backend-{aqua|x11}.
<<
Homepage: http://www.octave.org/
Index: fltk-backend.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.7/finkinfo/sci/fltk-backend.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fltk-backend.info 31 Aug 2011 17:47:10 -0000 1.1
+++ fltk-backend.info 31 Aug 2011 18:01:49 -0000 1.2
@@ -38,10 +38,10 @@
PatchFile: octave.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
-PatchFile2: octave-10.7.patch
-PatchFile2-MD5: adf5439f08870b6f7ba0d9be7e85bb22
-PatchFile3: fltk-backend-x11.patch
-PatchFile3-MD5: 6dd5be3b8d199fb76a72997ea50d05d4
+PatchFile3: octave-10.7.patch
+PatchFile3-MD5: adf5439f08870b6f7ba0d9be7e85bb22
+PatchFile2: fltk-backend-x11.patch
+PatchFile2-MD5: 6dd5be3b8d199fb76a72997ea50d05d4
PatchScript: <<
#!/bin/sh -ev
@@ -77,9 +77,9 @@
# Needed for 10.7 only, but may work on earlier OSes
if [ "%type_pkg[ui]" = "aqua" ]
then
- patch -p1 < %{PatchFile2}
- else
patch -p1 < %{PatchFile3}
+ else
+ patch -p1 < %{PatchFile2}
fi
<<
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
