Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory
vz-cvs-3.sog:/tmp/cvs-serv12235/10.4/unstable/main/finkinfo/10.4-EOL/sci
Modified Files:
mkoctfile-gcc.info octave-3.2.4.info
Log Message:
Updated mkoctfile-gcc for all.
Scrub "flag-sort" from octave-bug-N scripts.
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/octave-3.2.4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- octave-3.2.4.info 11 Sep 2011 21:40:10 -0000 1.3
+++ octave-3.2.4.info 12 Sep 2011 18:17:41 -0000 1.4
@@ -5,8 +5,6 @@
Revision: 12
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
-# disable atlas on 10.7 distro file until atlas is available
-
Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
@@ -16,7 +14,8 @@
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev, freetype219,
(%type_raw[-atlas] = atlas) atlas,
- qrupdate%type_pkg[-atlas] (>=1.1.1-3)
+ (%type_raw[-atlas] = atlas) qrupdate-atlas (>=1.1.1-3)
+ (%type_raw[-atlas] != atlas) qrupdate (>=1.1.1-3)
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
@@ -152,9 +151,10 @@
# install the octave-forge helper scripts
cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts
chmod a+x %i/share/%{Ni}/%v/scripts/*
- # oct-conf.h needs to use Fink's compiler wrappers, too
+ # oct-conf.h and octave-bug need to use Fink's compiler wrappers, too
sed -i.bak -e 's|flag-sort -r gcc|@WHICH_CC@|g' \
- -e 's|flag-sort -r g++|@WHICH_CXX@|g'
%i/include/%{Ni}-%v/%{Ni}/oct-conf.h
+ -e 's|flag-sort -r g++|@WHICH_CXX@|g' \
+ %i/include/%{Ni}-%v/%{Ni}/oct-conf.h %i/bin/%{Ni}-bug-%v
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
@@ -241,7 +241,8 @@
fink_cxx=`export $finkpath; which g++`
sed -i.bak -e "s|@WHICH_CC@|$fink_cc|g" \
-e "s|@WHICH_CXX@|$fink_cxx|g" \
- %p/bin/mkoctfile-%type_raw[oct]
%p/include/%{Ni}-%v/%{Ni}/oct-conf.h
+ %p/bin/mkoctfile-%type_raw[oct] \
+ %p/include/%{Ni}-%v/%{Ni}/oct-conf.h
<<
DescDetail: <<
This package contains files needed to build against Octave, including
@@ -295,6 +296,14 @@
bin/%{Ni}-bug-%v
var/%{Ni}/%v
<<
+ PostInstScript: <<
+ finkpath=`fink dumpinfo -ePATH %N`
+ fink_cc=`export $finkpath; which gcc`
+ fink_cxx=`export $finkpath; which g++`
+ sed -i.bak -e "s|@WHICH_CC@|$fink_cc|g" \
+ -e "s|@WHICH_CXX@|$fink_cxx|g" \
+ %p/bin/%{Ni}-bug-%v
+ <<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
core functionality of the Octave interpreter. Note that the GNU info
file,
Index: mkoctfile-gcc.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci/mkoctfile-gcc.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mkoctfile-gcc.info 8 Sep 2011 15:29:53 -0000 1.1
+++ mkoctfile-gcc.info 12 Sep 2011 18:17:41 -0000 1.2
@@ -1,9 +1,9 @@
Info2: <<
-Package: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]
-Type: gcc (4.6), oct(3.0.5 3.2.4), nosource
+Package: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]%type_pkg[-atlas]
+Type: gcc (4.6), oct(3.0.5 3.2.4), -atlas(boolean), nosource
-Version: 1.0.0
-Revision: 2
+Version: 1.0.1
+Revision: 1
Description: Octave build tools using gcc%type_pkg[gcc]
DescDetail: <<
@@ -26,8 +26,10 @@
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
License: BSD
-BuildDepends: octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev
+BuildDepends: octave%type_pkg[oct]%type_pkg[-atlas]-dev
Depends: gcc%type_pkg[gcc]-compiler
+Conflicts: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc],
mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]-atlas
+Replaces: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc],
mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]-atlas
CompileScript: echo "no compile needed"
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
