Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11388
Modified Files:
coot.info
Log Message:
more zsh CompileScript removal for 10.6 32-bit compatibility
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- coot.info 8 Sep 2009 14:07:32 -0000 1.128
+++ coot.info 8 Sep 2009 22:39:52 -0000 1.129
@@ -1,6 +1,6 @@
Package: coot
Version: 0.6-pre-1-revision-2283
-Revision: 1
+Revision: 2
SourceDirectory: %n-0.6-pre-1
GCC: 4.0
Source: http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v.tar.gz
@@ -160,7 +160,7 @@
<<
###############################################################################
CompileScript: <<
-#!/bin/zsh -efv
+#!/bin/bash -efv
alias python=%p/bin/python2.6
export PYTHON=%p/bin/python2.6
export python=%p/bin/python2.6
@@ -172,15 +172,13 @@
FLIBS="-L%p/lib/gcc4.4/lib -L%p/lib" \
CPPFLAGS="-I%p/include/libglade-2.0/glade -I%p/include/libglade-2.0
-I%p/include/python2.6 -I%p/include/mmdb -I%p/include/ssm
-I%p/include/gpp4/ccp4 -I%p/include/clipper -I%p/include -I/usr/X11R6/include" \
LDFLAGS="-Wl,-dylib_file,%p/lib/python2.6/config/libpython2.6.dylib:%p/lib/libsfftw.2.0.7.dylib:%p/lib/libsrfftw.2.0.7.dylib:%p/lib/pango-ft219/lib/libpango-1.0.dylib:%p/lib/pango-ft219/lib/libpangocairo-1.0.dylib:%p/lib/pango-ft219/lib/libpangoft2-1.0.dylib:%p/lib/pango-ft219/lib/libpangox-1.0.dylib:%p/lib/pango-ft219/lib/libpangoxft-1.0.dylib
-L%p/lib/pango-ft219/lib -L%p/lib -L%p/lib/gcc4.4/lib -L/usr/lib -lSystemStubs
-flat_namespace
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
- CXX="/usr/bin/g++" \
- CC="/usr/bin/gcc" \
DYLD_LIBRARY_PATH="" \
./configure %c
#
# Force coot to link to single-precision fftw libraries. The double-precision
libraries
# cause coot to crash.
-perl -pi -e 's|lrfftw |lsrfftw |g' **/Makefile
-perl -pi -e 's|lfftw |lsfftw |g' **/Makefile
+/bin/zsh -c 'perl -pi -e "s|lrfftw |lsrfftw |g"
**/Makefile'
+/bin/zsh -c 'perl -pi -e "s|lfftw |lsfftw |g"
**/Makefile'
perl -pi -e 's|include <rfftw.h>|include <srfftw.h>|g'
surface/CXXFFTSolventMap.h
#
if [[ $(sw_vers -productVersion) < 10.5 ]]; then
@@ -190,8 +188,9 @@
fi
#
+
#remake the src/coot_wrap_python.cc and src/coot_wrap_guile.cc files
- /bin/rm -f **/coot_wrap_**.cc
+ /bin/zsh -c '/bin/rm -f **/coot_wrap_**.cc'
cd src
touch c-interface-database.hh
make coot_wrap_guile.cc
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
