Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28983
Modified Files:
ccp4.info
Log Message:
upstream patches and PatchFile added, now works on 10.4 and 10.5 ppc and intel
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ccp4.info 13 Dec 2008 00:22:06 -0000 1.40
+++ ccp4.info 3 Jan 2009 20:10:07 -0000 1.41
@@ -1,17 +1,26 @@
Package: ccp4
Version: 6.1.0
-Revision: 1
-#Distribution: 10.5
+Revision: 3
GCC: 1
Source: ftp://ftp.%n.ac.uk/%n/6.1/%n-%v-core-src.tar.gz
Source-MD5: 51b76244da561880adbcfa9fbe08aeb0
SourceDirectory: %n-%v
+#
Source2: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
Source2-MD5: 21568dd2475505929573a3fd452c538f
-# Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.1/ccp4-6.1.0-phaser-src.tar.gz
+#
Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.1/phaser-2.1.4-cctbx-src.tar.gz
Source3-MD5: 3395e1ad9cfedfa89f24eaffa888955f
#
+Source4: ftp://ftp.ccp4.ac.uk/ccp4/6.1/updates/sftools_select.def
+Source4-MD5: be064d0b215d92c05ed08f833951716f
+#
+Source5: ftp://ftp.ccp4.ac.uk/ccp4/6.1/updates/fileviewer.tcl
+Source5-MD5: a612f068bbb75e04c9b6164437baf757
+#
+Source6: ftp://ftp.ccp4.ac.uk/ccp4/6.1/updates/refmac5.tcl
+Source6-MD5: 6231f7a207fe54050e6eb498f8d8e32d
+#
DescPort: <<
CCP4 is designed to compile with gfortran on OS X >= 10.4 by default.
Jack Howarth has provided multiple improvements in the patch file to
@@ -50,8 +59,8 @@
so we return to the option of having ccp4 build its own private fftw.
Yes, I hate it too, but now all the examples pass the run-all test.
<<
-Depends: x11, tcltk, blt, gcc43-shlibs, %N-shlibs (= %v-%r)
-BuildDepends: gcc43, f2c, fort77, tcltk-dev
+Depends: x11, tcltk, blt, gcc43-shlibs, %N-shlibs (= %v-%r), itcl, itk,
iwidgets, tdom, tkimg, tktreectrl
+BuildDepends: gcc43, f2c, fort77, tcltk-dev, fink (>= 0.24.12)
BuildConflicts: gpp4-dev, gpp4, ssm, ssm-dev, mmdb, mmdb-dev, clipper,
clipper-bin, clipper-dev, ccp4-onlylibs-dev
Replaces: phaser (<= 2.1.4-1), pointless (<= 1.2.18-1), mosflm (<= 7.0.3-3),
mosflm-small (<= 7.0.3-3), refmac (<= 5.4-4), ccp4-shlibs (<= 6.0.2-9999), ccp4
(<= 6.0.2-9999), ccp4-dev (<= 6.0.2-9999), bundle-ccp4-intel, clipper-bin,
ccp4-gfortran, ccp4-gfortran-dev, bundle-ccp4-powerpc
Conflicts: <<
@@ -72,13 +81,15 @@
NoSetLDFLAGS: true
#
################################################################################
+PatchFile: %n.patch
+PatchFile-MD5: b5e86dc803abbb857dbaf9bea09a870a
PatchScript: <<
#!/bin/zsh -efv
#
umask 0022
# Now apply the primary patch
- sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
# setup script for tcsh, zsh and bash users
export TEMPXTAL=$PWD:h
#
@@ -100,6 +111,13 @@
chmod a+x etc/x*
# Fix the dylib install path in configure
perl -pi.bak -e 's|\$rpath|%p/lib/ccp4-%v|g' **/configure
+ #
+ # Now apply CCP4 post-release patches:
+ # Bugzilla number : #3569 December 19, 2008
+ cp ../sftools_select.def ccp4i/tasks/.
+ cp ../fileviewer.tcl ccp4i/src/.
+ cp ../refmac5.tcl ccp4i/tasks/.
+ #
<<
################################################################################
CompileScript: <<
@@ -235,6 +253,9 @@
# Change environment scripts to match final installation
perl -pi -e 's|\$TEMPXTAL|%p/share/xtal|g' include/ccp4.setup* #
install prefix
#
+ # Bugzilla number : #3593
+ perl -pi -e "s|$PWD|%p/share/xtal/%n-%v|g" share/pisa/pisa.cfg
+ #
#
cp ../XCCPJiffy-custom.gz XCCPJiffy.gz ; gunzip XCCPJiffy.gz; chmod a+x
XCCPJiffy
perl -pi -e 's|5.0.1|%v|g' XCCPJiffy
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
