Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19203
Modified Files:
ccp4.info
Log Message:
fix for compiling on 10.4 ppc changes nothing for 10.5
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ccp4.info 24 Apr 2009 18:33:30 -0000 1.46
+++ ccp4.info 8 May 2009 22:48:44 -0000 1.47
@@ -1,6 +1,6 @@
Package: ccp4
Version: 6.1.1
-Revision: 6
+Revision: 7
GCC: 1
Source: ftp://ftp.%n.ac.uk/%n/%v/%n-%v-core-src.tar.gz
Source-MD5: 1d865d97c34de6e6f368ba03c3001a9b
@@ -276,15 +276,7 @@
# Fix path in libfoo.la libtool files:
#
perl -pi.bak -e
's|/src/fink.build/ccp4-%v-%r/ccp4-%v/lib|/lib/ccp4-%v|g' lib/**/*.la
- if [ `uname -r|sed 's,\..*,,'` = 8 ] ; then
- perl -pi.bak -e
's|/src/fink.build/ccp4-%v-%r/ccp4-%v/src|/share/xtal/ccp4-%v/src|g'
lib/python2.4/site-packages/libxml2mod.la
- fi
- if [ `uname -r|sed 's,\..*,,'` = 9 ] ; then
- perl -pi.bak -e
's|/src/fink.build/ccp4-%v-%r/ccp4-%v/src|/share/xtal/ccp4-%v/src|g'
lib/python2.5/site-packages/libxml2mod.la
- fi
- if [ `uname -r|sed 's,\..*,,'` = 10 ] ; then
- perl -pi.bak -e
's|/src/fink.build/ccp4-%v-%r/ccp4-%v/src|/share/xtal/ccp4-%v/src|g'
lib/python2.6/site-packages/libxml2mod.la
- fi
+ perl -pi.bak -e
's|/src/fink.build/ccp4-%v-%r/ccp4-%v/src|/share/xtal/ccp4-%v/src|g'
lib/python*/site-packages/libxml2mod.la
rm -f lib/**/*.la.bak
#
# Now install:
@@ -335,15 +327,7 @@
perl -pi -e 's|%p/share/%p/share|%p/share|g'
%i/share/xtal/ccp4-%v/include/ccp4.setup* # fix
# remove build path from .la files
- if [ `uname -r|sed 's,\..*,,'` = 8 ] ; then
- perl -pi -e "s, \-L[^ ']*/%n-%v-%r/%n-%v/src/rapper/libxml2/.libs, \-L
%p/lib,g" `find %i/lib/%n-%v/python2.4/site-packages -name '*.la'`
- fi
- if [ `uname -r|sed 's,\..*,,'` = 9 ] ; then
- perl -pi -e "s, \-L[^ ']*/%n-%v-%r/%n-%v/src/rapper/libxml2/.libs, \-L
%p/lib,g" `find %i/lib/%n-%v/python2.5/site-packages -name '*.la'`
- fi
- if [ `uname -r|sed 's,\..*,,'` = 10 ] ; then
- perl -pi -e "s, \-L[^ ']*/%n-%v-%r/%n-%v/src/rapper/libxml2/.libs, \-L
%p/lib,g" `find %i/lib/%n-%v/python2.6/site-packages -name '*.la'`
- fi
+ perl -pi -e "s, \-L[^ ']*/%n-%v-%r/%n-%v/src/rapper/libxml2/.libs, \-L
%p/lib,g" %i/lib/%n-%v/python*/site-packages/**/*.la
# don't package these .la files
/usr/bin/find %i/share/xtal/%n-%v/src/rapper -name '*.la' -delete
@@ -365,19 +349,23 @@
<<
################################################################################
PreRmScript: <<
- /usr/bin/find %p/share/xtal/%n-%v/src/phaser/phaser-2.1.4 -name '*.pyo'
-delete
+#!/bin/zsh -f
+ rm -rf %p/share/xtal/%n-%v/src/phaser/phaser-2.1.4 **/*.pyo
<<
################################################################################
PostInstScript: <<
- if [ `uname -r|sed 's,\..*,,'` = 8 ] ; then
- /usr/bin/python -O /usr/lib/python2.4/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
- fi
- if [ `uname -r|sed 's,\..*,,'` = 9 ] ; then
- /usr/bin/python -O /usr/lib/python2.5/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
- fi
- if [ `uname -r|sed 's,\..*,,'` = 10 ] ; then
- /usr/bin/python -O /usr/lib/python2.6/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
- fi
+#!/bin/zsh -f
+
+PyVers=$( /usr/bin/python --version 2>&1 | awk '{print $NF}' )
+
+if [[ $PyVers:r == 2.6 ]]; then
+ /usr/bin/python -O /usr/lib/python2.6/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
+elif [[ $PyVers:r == 2.5 ]]; then
+ /usr/bin/python -O /usr/lib/python2.5/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
+elif [[ $PyVers:r == 2.4 ]]; then
+ /usr/bin/python -O /usr/lib/python2.4/compileall.py -q
%p/share/xtal/%n-%v/src/phaser/phaser-2.1.4
+fi
+
# Make the user read the license conditions
more %p/share/xtal/ccp4-%v/conditions.txt
<<
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
