Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv16334
Modified Files:
ccp4.info
Log Message:
ccp4 now ok for 10.5 as well as 10.4, promoted from unstable sci
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ccp4.info 14 Oct 2007 00:00:07 -0000 1.3
+++ ccp4.info 30 Dec 2007 04:20:20 -0000 1.4
@@ -1,7 +1,6 @@
Package: ccp4
Version: 6.0.2
Revision: 7
-Distribution: 10.4
GCC: 4
Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz
Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16
@@ -183,16 +182,27 @@
export rpath=%p/lib/ccp4-%v
export RPATH=%p/lib/ccp4-%v
- # The cctbx sub-package requires us to use the system's own Python
- export
PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH
- export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
- export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
+if [[ $(sw_vers -productVersion) < 10.5 ]]; then
+# # The cctbx sub-package requires us to use the system's own Python
+ export
PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH
+ export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
+ export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
+fi
# gfortran is actually used by default, but to ensure the right thing
happens, specify it.
+
+ # Disable building of pdb_extract and phaser in 10.5. CCP4 6.1 will fix
this.
+
+if [[ $(sw_vers -productVersion) < 10.5 ]]; then
FC="%p/lib/gcc4.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib"
./configure --with-shared-libs --with-fftw=%p --with-x Darwin
+else
+ FC="%p/lib/gcc4.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib"
./configure --disable-pdb_extract --disable-cctbx --disable-phaser
--with-shared-libs --with-fftw=%p --with-x Darwin
+fi
# fix some post-configure bugs by getting rid of -lg2c
perl -pi.bak -e 's|-lg2c||g' x-windows/**/*akefile*
+
+
if [[ $(uname -p) != powerpc ]];then
perl -pi.bak -e 's|%p/lib/gcc4.2/bin/||g' lib/clipper/**/Makefile*
@@ -204,7 +214,13 @@
fi
( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran
-L%p/lib/gcc4.2/lib |g' *akefile* ) || exit 1
-
+if [[ $(sw_vers -productVersion) < 10.5 ]]; then
+ :
+else
+ perl -pi.bak -e 's|-lcrt1.10.5.o||g' **/*akefile
+ perl -pi.bak -e 's|-lcrt1.o||g' **/*akefile
+fi
+
#################
make
make install
@@ -412,29 +428,44 @@
################################################################################
Description: Macromolecular crystallography package
DescDetail: <<
- These are the ccp4 programs compiled with gfortran instead of g77.
-
- The (currently default) g77 version does not work on intel. The hope
- is that this will. (With gfortran-4.2, everything compiles.) Thanks
- to Jack Howarth for many helpful improvements.
-
- CCP4 macromolecular crystallography suite has approximately
- 200 programs and utilities. This version included Clipper
- libraries, and ccif and phaser. If you need cctbx, please
- install the cctbx fink package separately.
+ The CCP4 macromolecular crystallography suite has approximately
+ 200 programs and utilities. This version includes the Clipper
+ libraries. Current phaser and cctbx programs are available as
+ separate fink packages.
Type "ccp4help" for a summary listing of all ccp4 programs.
Type "ccp4help foo" for a detailed description of program "foo."
- Invoke optional ccp4i gui for the first run using: sudo ccp4i
- Thereafter, invoke without sudo.
+ Invoke optional ccp4i gui for the first run using "sudo ccp4i"
+ on 10.4, or "sudo -s" followed by "ccp4i" on 10.5 to permit
+ global configuration. Thereafter, you can invoke ccp4i without sudo.
- This version compiles with the Apple Lapack/Blas framework
+ This version compiles with the Apple Lapack/Blas framework.
License agreement is part of configure file -- print out form and mail
in,
additional comments at http://xanana.ucsc.edu/xtal/ccp4.html
+
CCP4 files will be installed under /sw/share/xtal/ccp4-6.0.2
This revision includes all available CCP4 patches as of June 28, 2007.
and new bash and zsh command completions specific to ccp4.
+
+ A new version of phaser (2.1.1) is available separately in fink as
+ a package called, imaginatively, phaser.
+
+ A new version of cctbx is available in fink from the cctbx package.
+
+ A new version of pointless is available as a separate fink package
+ of that name.
+
+ The ccp4-associated chooch package is available separately via fink.
+
+ The latest version of mosflm is available in two forms from fink; the
+ standard large form, and a special small display useful for 13 inch
+ laptop displays.
+
+ The ccp4-associated molecular graphics display program coot is also
+ available as a fink package.
+
+ Thanks to Jack Howarth for many helpful improvements.
<<
DocFiles: <<
README CHANGES COPYING PROBLEMS INSTALL INSTALL.html INSTALL.ps
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
