Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8374
Modified Files:
ccp4.info ccp4.patch
Log Message:
ccp4 version upgrade
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ccp4.info 24 May 2006 00:40:59 -0000 1.9
+++ ccp4.info 1 Jun 2006 06:05:22 -0000 1.10
@@ -1,13 +1,13 @@
Package: ccp4
-Version: 6.0
-Revision: 1008
+Version: 6.0.1
+Revision: 1001
GCC: 4
#Architecture: i386 # Works on both platforms now
-Source: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/ccp4-%v.0-core-src.tar.gz
-Source2: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/phaser-1.3.2-cctbx-src.tar.gz
-Source-MD5: 00fe64b4600c9602aef56af0135f3016
-Source2-MD5: e4eee45ca8a299242a1089e35e63c7a0
+Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/packed/ccp4-%v-core-src.tar.gz
+Source-MD5: bd3ff43388b58841de79bcc23ebf81e3
SourceDirectory: ccp4-%v
+Source2: ftp://ftp.ccp4.ac.uk/ccp4/6.0.0/packed/phaser-1.3.2-cctbx-src.tar.gz
+Source2-MD5: e4eee45ca8a299242a1089e35e63c7a0
Source3: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
Source3-MD5: 21568dd2475505929573a3fd452c538f
Source4:
http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/ccp4_i686-apple-darwin8.6.1_libtool.gz
@@ -20,11 +20,18 @@
NoSetLDFLAGS: true
#
################################################################################
-Patch: ccp4.patch
+#Patch: ccp4.patch
PatchScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
+#
umask 0022
+# This is temporary until they put the phaser tarball in the right directory.
+cp -r ../ccp4-6.0/lib/cctbx lib/cctbx
+cp -r ../ccp4-6.0/lib/src/* lib/src/.
+cp -r ../ccp4-6.0/src/phaser src/phaser
#
+# Now do the patch
+sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
# setup script for tcsh, zsh and bash users
export TEMPXTAL=$PWD:h
#
@@ -48,7 +55,7 @@
<<
################################################################################
CompileScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
umask 0022
# These are required for the build environment
export TEMPXTAL=$PWD:h
@@ -83,6 +90,7 @@
chmod a+x lib/clipper/libtool
fi
+( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran
-L%p/lib/gcc4/lib |g' *akefile* )
#################
make -i
make -i install
@@ -110,6 +118,9 @@
sleep 10
#
cp xloggraph $CBIN/xloggraph.exe
+if [[ -x $CBIN/xloggraph ]];then
+ rm -f $CBIN/xloggraph
+fi
cd ../..
#
# Cleanup:
@@ -117,9 +128,9 @@
# make realclean
/bin/rm -f **/*.o
/bin/rm -f **/*.bak
-/bin/rm -R src
-/bin/rm -R x-windows
-/bin/rm -R unsupported
+#/bin/rm -R src
+#/bin/rm -R x-windows
+#/bin/rm -R unsupported
/bin/rm -R testcomp*
/bin/rm -R BINARY*
cd $CLIB
@@ -132,7 +143,8 @@
<<
################################################################################
InstallScript: <<
-#!/bin/zsh -ef
+#!/bin/zsh -efv
+
umask 0022
export TEMPXTAL=$PWD:h
source include/ccp4.setup-zsh
@@ -218,8 +230,8 @@
BuildDependsOnly: true
Description: CCP4 static libraries and libtool files
Files:<<
-lib/ccp4-6.0/*.a
-lib/ccp4-6.0/*.la
+lib/ccp4-%v/*.a
+lib/ccp4-%v/*.la
<<
DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
<<
@@ -244,7 +256,7 @@
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://chemistry.ucsc.edu/~wgscott/xtal/ccp4.html
-CCP4 files will be installed under /sw/share/xtal/ccp4-6.0
+CCP4 files will be installed under /sw/share/xtal/ccp4-6.0.1
This revision includes all available CCP4 patches as of Feb 26, 2006.
and new bash and zsh command completions specific to ccp4.
<<
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ccp4.patch 23 Mar 2006 06:22:09 -0000 1.5
+++ ccp4.patch 1 Jun 2006 06:05:22 -0000 1.6
@@ -1,6 +1,6 @@
-diff -ruN ccp4-6.0-orig/ccp4i/etc/configure.def.dist
ccp4-6.0/ccp4i/etc/configure.def.dist
---- ccp4-6.0-orig/ccp4i/etc/configure.def.dist 2005-09-09 02:39:28.000000000
-0700
-+++ ccp4-6.0/ccp4i/etc/configure.def.dist 2006-02-20 19:31:23.000000000
-0800
+diff -ruN ccp4-6.0.1-orig/ccp4i/etc/configure.def.dist
ccp4-6.0.1/ccp4i/etc/configure.def.dist
+--- ccp4-6.0.1-orig/ccp4i/etc/configure.def.dist 2006-05-25
08:29:47.000000000 -0700
++++ ccp4-6.0.1/ccp4i/etc/configure.def.dist 2006-05-25 14:18:27.000000000
-0700
@@ -54,8 +54,8 @@
MESSAGE _text ""
BLT_LIBRARY _text ""
@@ -8,13 +8,13 @@
-HYPERTEXT_VIEWER _text netscape
[...1056 lines suppressed...]
- c istat = 0 OK, = -1 failure (too few atoms)
- c
-@@ -1365,7 +1378,7 @@
- c
- call eign3(a, vmat, resid)
- c resid eigenvalues of residual matrix, in descending order
--c = sums of weighted squared residuals along principle directions
-+c = sums of weighted squared residuals along principal directions
- c vmat(i,j) eigenvector matrix
- c column vmat(.,3) is the plane normal
- c
-@@ -1699,7 +1712,7 @@
- C (Leading spaces ignored; further space terminates
- C the number string interpreted)
- C FP (W) Returns the value as a floating point value (0.0 if
--C synatx error)
-+C syntax error)
- C IV (W) Returns the value as an integer (the nearest integer
- C if value contained a decimal point) (0 if syntax
error)
- C
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
