Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv16322/10.7/stable/main/finkinfo/sci
Modified Files:
octave-3.0.5.info octave-3.2.4.info
Log Message:
!0.5 got a bad CC in mkoctfile, so we need to fix the PostInstScript
accordingly.
Index: octave-3.0.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- octave-3.0.5.info 29 Aug 2011 20:56:36 -0000 1.4
+++ octave-3.0.5.info 1 Sep 2011 23:53:42 -0000 1.5
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.0.5)
Version: 3.0.5
-Revision: 8
+Revision: 9
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -174,9 +174,9 @@
PostInstScript: <<
os_version=`sw_vers -productVersion | cut -d. -f2`
case $os_version in
- 7) sed -i -e 's|@WRAPPER@|clang|' %p/bin/mkoctfile-%v ;;
- 6) sed -i -e 's|@WRAPPER@|10.6|' %p/bin/mkoctfile-%v ;;
- 5) sed -i -e 's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v
;;
+ 7) sed -i.bak -e 's|@WRAPPER@|clang|'
%p/bin/mkoctfile-%v ;;
+ 6) sed -i.bak -e 's|@WRAPPER@|10.6|'
%p/bin/mkoctfile-%v ;;
+ 5) sed -i.bak -e 's|CC.*gcc|CC="/usr/bin/gcc|'-e
's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v ;;
esac
<<
DescDetail: <<
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- octave-3.2.4.info 1 Sep 2011 01:09:01 -0000 1.2
+++ octave-3.2.4.info 1 Sep 2011 23:53:42 -0000 1.3
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
-Revision: 1
+Revision: 2
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -21,6 +21,7 @@
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
+
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)
@@ -200,9 +201,9 @@
PostInstScript: <<
os_version=`sw_vers -productVersion | cut -d. -f2`
case $os_version in
- 7) sed -i -e 's|@WRAPPER@|clang|' %p/bin/mkoctfile-%v ;;
- 6) sed -i -e 's|@WRAPPER@|10.6|' %p/bin/mkoctfile-%v ;;
- 5) sed -i -e 's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v
;;
+ 7) sed -i.bak -e 's|@WRAPPER@|clang|'
%p/bin/mkoctfile-%v ;;
+ 6) sed -i.bak -e 's|@WRAPPER@|10.6|'
%p/bin/mkoctfile-%v ;;
+ 5) sed -i.bak -e 's|CC.*gcc|CC="/usr/bin/gcc|'-e
's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v ;;
esac
<<
DescDetail: <<
------------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
