From: William S. <wg...@us...> - 2007-03-01 01:52:36
|
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv831 Modified Files: ccp4.info Log Message: ccp4 patch upgrade, added anti-norton-antivirus conditional test Index: ccp4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ccp4.info 29 Jan 2007 01:10:58 -0000 1.21 +++ ccp4.info 1 Mar 2007 01:52:30 -0000 1.22 @@ -1,6 +1,6 @@ Package: ccp4 Version: 6.0.2 -Revision: 4 +Revision: 5 GCC: 4 Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16 @@ -21,6 +21,12 @@ Source7-MD5: 52ac21688c047287d4fcbbd1aaaea774 Source8: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/amore.f-r1.115-r1.116.diff Source8-MD5: 26a124b160c4215d6b20749f20932920 +Source9: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/crystal.C-r1.5-r1.6.diff +Source9-MD5: 5c62b4a7399aded0f0c896c4315cfff6 +Source10: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/export-r1_12.tcl +Source10-MD5: 984f7305ba151d961bef2ac25b1b9925 +Source11: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/export-r1_6.def +Source11-MD5: 3babc1ee652fed6d2bb976bde41450a8 # DescPort: << CCP4 is designed to compile with gfortran on OS X >= 10.4 by default. @@ -129,6 +135,9 @@ /usr/bin/patch src/scala_/scala.f ../scala.f-r1.101.2.3-r1.101.2.4.diff /usr/bin/patch ccp4i/src/util_windows.tcl ../util_windows.tcl-r1.27-r1.27.2.1.diff /usr/bin/patch src/amore.f ../amore.f-r1.115-r1.116.diff + /usr/bin/patch src/bp3_/crystal.C ../crystal.C-r1.5-r1.6.diff + cp ../export-r1_12.tcl $CCP4/ccp4i/tasks/export.tcl + cp ../export-r1_6.def $CCP4/ccp4i/tasks/export.def # << ################################################################################ @@ -136,6 +145,24 @@ #!/bin/zsh -efv umask 0022 + # The build will fail if Norton Auto-Protect is running. + # Check to see if it is, and abort the installation with a + # warning to the user. + if [[ $(ps axww | grep NortonAutoProtect | wc -l) -gt 1 ]];then + print "\e[1m******************************************************************************************************" + print "******************************************************************************************************" + print "******************************************************************************************************" + print "" + print "Norton AutoProtect must be suspended during CCP4 installation. Please do so now and then try again." + print "" + print "******************************************************************************************************" + print "******************************************************************************************************" + print "******************************************************************************************************\e[0m" + sleep 15 + return 1000 + fi + + # These are required for the build environment export TEMPXTAL=$PWD:h source include/ccp4.setup-zsh @@ -393,7 +420,7 @@ 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 Dec 19, 2006. + This revision includes all available CCP4 patches as of Feb 24, 2007. and new bash and zsh command completions specific to ccp4. << DocFiles: << |