Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv12235/10.4/unstable/main/finkinfo/sci
Modified Files:
octave-3.0.5.info octave-3.2.4.info
Log Message:
Updated mkoctfile-gcc for all.
Scrub "flag-sort" from octave-bug-N scripts.
Index: octave-3.0.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- octave-3.0.5.info 7 Sep 2011 13:54:07 -0000 1.17
+++ octave-3.0.5.info 12 Sep 2011 18:17:42 -0000 1.18
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.0.5)
Version: 3.0.5
-Revision: 16
+Revision: 17
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -100,9 +100,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: <<
@@ -184,7 +185,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
@@ -238,6 +240,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: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- octave-3.2.4.info 7 Sep 2011 13:54:07 -0000 1.16
+++ octave-3.2.4.info 12 Sep 2011 18:17:42 -0000 1.17
@@ -2,11 +2,9 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.2.4)
Version: 3.2.4
-Revision: 11
+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
@@ -58,7 +56,7 @@
-e '/ibasea/s| ibasea =.*||' \
liboctave/oct-sort.cc
# should this accompany -D_THREAD_SAFE? in CFLAGS,CXXFLAGS
- sed -i.orig '/#include.*Range\.h/i\
+ sed -i.orig -e '/#include.*Range\.h/i\
#define _REENTRANT' liboctave/lo-specfun.cc
# need size_t from <cstddef>
sed -i.orig -e '/#define octave_oct_alloc_h/a\
@@ -132,9 +130,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: <<
@@ -221,7 +220,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
@@ -275,6 +275,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,
------------------------------------------------------------------------------
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
