Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9987

Modified Files:
        ccp4-onlylibs-dev.info 
Log Message:
ccp4-onlylibs-dev fixed properly for 10.4

Index: ccp4-onlylibs-dev.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4-onlylibs-dev.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ccp4-onlylibs-dev.info      23 Feb 2006 17:57:57 -0000      1.4
+++ ccp4-onlylibs-dev.info      24 Feb 2006 03:41:14 -0000      1.5
@@ -1,7 +1,8 @@
 Package: ccp4-onlylibs-dev
 # Use version numbering to sync with the current CCP4 release:
 Version: 5.99.5
-Revision: 100
+Revision: 1004
+GCC: 4.0
 #Source: ftp://ftp.ccp4.ac.uk/prerelease/%n.tar.gz
 #Source-MD5: cf085751833aecc7ccef9e67de7e9fcc   
 Source: http://chemistry.ucsc.edu/~wgscott/xtal/%n/%n-%v.tar.gz
@@ -10,10 +11,11 @@
 SourceDirectory: %n
 Source2: http://chemistry.ucsc.edu/~wgscott/xtal/%n/%n-extras-0.1.tgz
 Source2-MD5: ea307964e3786bef0868ea56aaaa0471
-GCC: 3.3
-# This is temporary until software author corrects g++4 bug 
+Source3:  http://chemistry.ucsc.edu/~wgscott/xtal/clipper_%v-src.tgz 
+Source3-MD5: 1c7a91218a4a27af1c2506f39df4692a
 Depends:  
 BuildDepends: g77 (>= 3.4.0-2), f2c, fort77 
+BuildDependsOnly: true
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 ###############################################################################
@@ -44,11 +46,12 @@
 CompileScript: <<
 #!/bin/zsh -ef
 umask 0022
+cp -R ../src/* lib/clipper/src/.
 export TEMPXTAL=$PWD:h
 source include/ccp4.setup-zsh
 export DYLD_LIBRARY_PATH=$CLIB
 #
-FLIBS="-L%p/lib -lg2c" LDFLAGS="-L/usr/lib -lg2c -lSystemStubs -L%p/lib" 
FC="%p/bin/g77" CXX="/usr/bin/g++-3.3" CC="/usr/bin/gcc" ./configure --onlylibs 
Darwin
+FC="g77"  ./configure --onlylibs Darwin
 #
 #  fix some post-configure bugs
 #
@@ -60,21 +63,6 @@
 command ls -1 lib/*.a
 sleep 10
 #
-# Check to make sure all the libraries we need were built:
-# (Sort real errors from the bogus ones we suppressed.)
-
-if (( $(command ls -1 lib/*.a | command wc -l) == 15 ));then 
-    print "Build appears to have succeeded."
-else
-    print "*****************************"
-    print "      Build has failed:"
-    print "*****************************"
-    sleep 3
-    cat ../make.log  ../makeinst.log
-    return 1
-fi
-
-#
 make realclean
 <<
 ###############################################################################
@@ -97,29 +85,56 @@
  rm -f lib/*.la.bak
 #
 # Now install:
+ mkdir -p %i/bin
  mkdir -p %i/share/xtal/%n-%v
+ cp bin/* %i/bin/.
  cp -R * %i/share/xtal/%n-%v/.
  ranlib %i/share/xtal/%n-%v/lib/**/*.a
 <<
 ###############################################################################
+SplitOff: <<
+Package: clipper-bin
+BuildDependsOnly: True
+Conflicts: ccp4-dev
+Replaces: ccp4-dev
+Files: <<   
+bin/*
+<<
+Description: Clipper executables including cpirate
+<<
+###############################################################################
+###############################################################################
 Description: CCP4 Libraries
 DescDetail: <<
 This package installs CCP4 libraries, only.  If you need all 
-of CCP4, install the self-contained CCP4 package instead of this.
+of CCP4, install the self-contained CCP4 package instead of, or
+in addition to, this. The splitoff package clipper-bin builds
+and installs statically-linked clipper executable programs such
+as cpirate. CCP4 itself will also install these, but cpirate in
+CCP4 suffers from a run-time error.  Installation of clipper-bin
+will put working copies in %p/bin, and thus at the head of the path.
 The licensing for the CCP4 library loosely conforms to the LGPL,
-unlike the more restrictive CCP4 license.
+unlike the more restrictive CCP4 license. The clipper libraries
+and programs explicitly adhere to the LGPL.
 
 This version compiles with the Apple Lapack/Blas framework
+but uses its own static lib build of fftw to avoid a run-time
+error that appears in cpirate and coot fft calculations.
 
 CCP4lib files will be installed under 
-%p/share/xtal/ccp4-onlylibs-dev-5.99.5.
+%p/share/xtal/ccp4-onlylibs-dev-5.99.5. This is essentially
+identical in content to the corresponding files in CCP4 6.0.
 
 Programs requiring these libraries to build or run need to
 source the appropriate
 %p/share/xtal/ccp4-onlylibs-dev-5.99.5/include/ccp4.setup
-file for the shell, as is done in the coot.info file.
+file for the shell, as is done in the coot.info file. Unless
+you are building something external to fink, there is no need
+to source that file.
 
 The primary use for this package, currently, is for compiling COOT.
+The primary use for the clipper-bin split-off package is to provide
+stand-alone, functioning versions of cpirate and colleagues.
 <<
 DocFiles: conditions.txt 
 Homepage: http://www.ccp4.ac.uk  



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to