Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22547
Modified Files:
ccp4.info ccp4.patch
Log Message:
version update and 64-bit compatible
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ccp4.info 26 May 2009 14:14:30 -0000 1.49
+++ ccp4.info 18 Jul 2009 05:07:50 -0000 1.50
@@ -1,41 +1,20 @@
Package: ccp4
-Version: 6.1.1
-Revision: 9
+Version: 6.1.2
+Revision: 1
GCC: 1
+#
Source: ftp://ftp.%n.ac.uk/%n/%v/%n-%v-core-src.tar.gz
-Source-MD5: 1d865d97c34de6e6f368ba03c3001a9b
+Source-MD5: c7ad8074668ccb7ae805e850079ce721
SourceDirectory: %n-%v
#
Source2: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
Source2-MD5: 21568dd2475505929573a3fd452c538f
#
Source3: ftp://ftp.%n.ac.uk/%n/%v/phaser-2.1.4-cctbx-src.tar.gz
-Source3-MD5: eb6371d4a7339fe81e71a9170fea614d
-#
-Source4: ftp://ftp.%n.ac.uk/%n/%v/updates/%n-%v-src-patch-04_03_09.tar.gz
-Source4-MD5: 08ed8ebf484a9daced366671c74953dd
-#
-# Patches as of 11 May 2009 that are not in Source4
-#
-# 16/03/09
-Source5: ftp://ftp.%n.ac.uk/%n/%v/updates/scala.f
-Source5-MD5: 09583b9d3e61e66aa2af247ca0b9e5e0
-Source6: ftp://ftp.%n.ac.uk/%n/%v/updates/version.fh
-Source6-MD5: 570650d30f574f3a4f570dea5f58176d
-# 06/03/2009
-Source7: ftp://ftp.%n.ac.uk/%n/%v/updates/refmac5.tcl
-Source7-MD5: e66892743c7ae0a3c9f4af9b2969821e
-# 08/03/2009
-Source8: ftp://ftp.%n.ac.uk/%n/%v/updates/scalepack2mtz.com
-Source8-MD5: 4f6fda2a5c0e4f522d10402c1b2a5f6a
-Source9: ftp://ftp.%n.ac.uk/%n/%v/updates/dtrek2mtz.com
-Source9-MD5: fce3065015a7ba8613f066e6825e8b41
-Source10: ftp://ftp.%n.ac.uk/%n/%v/updates/pname2.com
-Source10-MD5: 248647ed1b8d9acdb1f9455b9c371095
-# 11/03/2009 (revised 23/03/2009)
-Source11: ftp://ftp.%n.ac.uk/%n/%v/updates/import_scaled.script
-Source11-MD5: 574df5f9e0441f99a2a07eaf36b7164a
+Source3-MD5: 4467bb6a0647304c33dd14843959e15d
#
+PatchFile: ccp4.patch
+PatchFile-MD5: d0e9f09975acdc95bdc83839b124d2ea
#
DescPort: <<
CCP4 is designed to compile with gfortran on OS X >= 10.4 by default.
@@ -74,8 +53,11 @@
Clipper libraries are not behaving properly when linked to fink fftw
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.
+
+ 64-bit version appears to require ccp4\'s own blas/lapak to avoid
+ run-time errors.
<<
-Depends: x11, tcltk, blt, gcc44-shlibs, %N-shlibs (= %v-%r), itcl, itk,
iwidgets, tdom, tkimg, tktreectrl
+Depends: x11, tcltk, blt, gcc44-shlibs, %N-shlibs (= %v-%r)
BuildDepends: gcc44, f2c, fort77, tcltk-dev, x11-dev, xmkmf (>= 1.0.2-3), fink
(>= 0.24.12)
BuildConflicts: gpp4-dev, gpp4, ssm, ssm-dev, mmdb, mmdb-dev, clipper,
clipper-bin, clipper-dev, ccp4-onlylibs-dev, python
Replaces: phaser (<= 2.1.4-1), pointless (<= 1.2.18-1), mosflm (<= 7.0.3-3),
mosflm-small (<= 7.0.3-3), refmac (<= 5.5.0070-1), bundle-ccp4-intel,
clipper-bin, ccp4-gfortran, ccp4-gfortran-dev, bundle-ccp4-powerpc
@@ -94,8 +76,6 @@
NoSetLDFLAGS: true
#
################################################################################
-PatchFile: %n.patch
-PatchFile-MD5: 021bf72010e187c16b332b65fdb22ff2
PatchScript: <<
#!/bin/zsh -efv
#
@@ -104,16 +84,10 @@
# Now apply the primary patch
sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
- # Make sure it worked
- if [[ $(grep "setenv CCP4_MASTER" include/ccp4.setup-dist | awk '{print
$3}') != "/xtal" ]];then
- print "Patch failed!!!!!!!!!"
- return 42
- fi
-
# setup script for tcsh, zsh and bash users
export TEMPXTAL=$PWD:h
#
- perl -pi.bak -e 's|/xtal|\$TEMPXTAL|g' include/ccp4.setup* #
build prefix (changed in install)
+ perl -pi.bak -e 's|/xtal|\$TEMPXTAL|g' include/ccp4.setup-csh #
build prefix (changed in install)
perl -pi.bak -e 's|/prefix|%p|g' include/ccp4.setup* #
location of tcktk, blt
perl -pi.bak -e 's|/usr/local/bin|%p/bin|g' include/ccp4.setup* # same
perl -pi.bak -e 's|limit stacksize 65536|limit stacksize unlimited|g'
include/ccp4.setup* # same
@@ -133,14 +107,6 @@
perl -pi.bak -e 's|\$rpath|%p/lib/ccp4-%v|g' **/configure
#
#
- # Now apply patches in Source5 and up:
- cp ../scala.f src/scala_/.
- cp ../version.fh src/scala_/.
- cp ../refmac5.tcl ccp4i/tasks/.
- cp ../scalepack2mtz.com ccp4i/templates/.
- cp ../dtrek2mtz.com ccp4i/templates/.
- cp ../pname2.com ccp4i/templates/.
- cp ../import_scaled.script ccp4i/scripts/.
<<
################################################################################
CompileScript: <<
@@ -183,8 +149,11 @@
export IMAKEINCLUDE=-I%p/lib/X11/config
# === CONFIGURE ===>
-# FC="%p/lib/gcc4.4/bin/gfortran" F_LIBS="-L%p/lib/gcc4.4/lib" ./configure
--with-shared-libs --with-x --with-fftw=%p Darwin
-FC="%p/lib/gcc4.4/bin/gfortran" F_LIBS="-L%p/lib/gcc4.4/lib " ./configure
--with-shared-libs --with-x Darwin
+# CXX="%p/lib/gcc4.4/bin/g++" \
+# CC="%p/lib/gcc4.4/bin/gcc" \
+FC="%p/lib/gcc4.4/bin/gfortran" \
+F_LIBS="-L%p/lib/gcc4.4/lib " \
+./configure --with-netlib-lapack --with-shared-libs --with-x Darwin
#
# fix some post-configure bugs by getting rid of -lg2c
perl -pi.bak -e 's|-lg2c||g' x-windows/**/*akefile*
@@ -201,7 +170,6 @@
perl -pi.mod -e 's|-O2|-O3|g' src/pointless/Makefile
grep -v "gcc4.4" src/pointless/Makefile.mod >| src/pointless/Makefile
-
#################
make
make install
@@ -369,7 +337,7 @@
mv
%i/share/xtal/ccp4-%v/src/phaser/phaser-2.1.4/build/mac-osx/lib/libboost_python.dylib
%i/lib/ccp4-%v
install_name_tool -id %p/lib/ccp4-%v/libboost_python.dylib
%i/lib/ccp4-%v/libboost_python.dylib
mv
%i/share/xtal/ccp4-%v/x-windows/libjwc/libjwc_c/.libs/libjwc_c.0.1.1.dylib
%i/lib/ccp4-%v
- install_name_tool -id %p/lib/ccp4-6.1.1/libjwc_c.0.dylib
%i/lib/ccp4-%v/libjwc_c.0.1.1.dylib
+ install_name_tool -id %p/lib/ccp4-6.1.2/libjwc_c.0.dylib
%i/lib/ccp4-%v/libjwc_c.0.1.1.dylib
mv
%i/share/xtal/ccp4-%v/x-windows/xdl_view/src/.libs/libxdl_view.2.0.0.dylib
%i/lib/ccp4-%v
install_name_tool -id %p/lib/ccp4-%v/libxdl_view.2.dylib
%i/lib/ccp4-%v/libxdl_view.2.0.0.dylib
mv
%i/share/xtal/ccp4-%v/x-windows/xdl_view/src/.libs/libxdl_viewextra.0.0.0.dylib
%i/lib/ccp4-%v
@@ -405,33 +373,33 @@
Package: %N-shlibs
Description: CCP4 dynamic libraries
Files:<<
- lib/ccp4-%v/*.*.dylib
- lib/ccp4-%v/libccif.dylib
+ lib/ccp4-%v/*.*.dylib
+ lib/ccp4-%v/libccif.dylib
lib/ccp4-%v/libccp4c.dylib
lib/ccp4-%v/libmmdb.dylib
lib/ccp4-%v/libboost_python.dylib
<<
Shlibs: <<
- %p/lib/ccp4-%v/libDiffractionImage.0.dylib 1.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/lib_DiffractionImage.0.dylib 1.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libccif.dylib 0.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libccp4c.dylib 0.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-ccp4.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-cif.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-cns.0.dylib 1.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-contrib.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-core.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-minimol.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-mmdb.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libclipper-phs.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libjwc_c.0.dylib 2.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libmmdb.dylib 0.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libssm.0.dylib 1.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libxdl_view.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libxdl_viewextra.0.dylib 1.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libfftw.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/librfftw.2.dylib 3.0.0 %n
(>= 6.1.1-1)
- %p/lib/ccp4-%v/libboost_python.dylib 0.0.0 %n
(>= 6.1.1-6)
+ %p/lib/ccp4-%v/libDiffractionImage.0.dylib 1.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/lib_DiffractionImage.0.dylib 1.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libccif.dylib 0.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libccp4c.dylib 0.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-ccp4.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-cif.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-cns.0.dylib 1.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-contrib.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-core.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-minimol.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-mmdb.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libclipper-phs.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libjwc_c.0.dylib 2.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libmmdb.dylib 0.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libssm.0.dylib 1.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libxdl_view.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libxdl_viewextra.0.dylib 1.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libfftw.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/librfftw.2.dylib 3.0.0 %n
(>= 6.1.2-1)
+ %p/lib/ccp4-%v/libboost_python.dylib 0.0.0 %n
(>= 6.1.2-6)
<<
DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
<<
@@ -469,8 +437,8 @@
License agreement is part of configure file -- print out form and mail in,
additional comments at http://sage.ucsc.edu/xtal/ccp4.html
- CCP4 files will be installed under /sw/share/xtal/ccp4-6.0.99
- This revision includes all available CCP4 patches as of June 28, 2007.
+ CCP4 files will be installed under /sw/share/xtal/ccp4-6.1.2
+ This revision includes all available CCP4 patches,
and new bash and zsh command completions specific to ccp4.
The ccp4-associated molecular graphics display program coot is also
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ccp4.patch 24 Apr 2009 18:33:30 -0000 1.18
+++ ccp4.patch 18 Jul 2009 05:07:50 -0000 1.19
@@ -1,20 +1,20 @@
-diff -ruN ccp4-6.1.1-orig/ccp4i/etc/configure.def.dist
ccp4-6.1.1/ccp4i/etc/configure.def.dist
---- ccp4-6.1.1-orig/ccp4i/etc/configure.def.dist 2009-01-09
07:45:08.000000000 -0800
-+++ ccp4-6.1.1/ccp4i/etc/configure.def.dist 2009-02-04 16:35:36.000000000
-0800
+diff -ruN ccp4-6.1.2-dist/ccp4i/etc/configure.def.dist
ccp4-6.1.2/ccp4i/etc/configure.def.dist
+--- ccp4-6.1.2-dist/ccp4i/etc/configure.def.dist 2009-06-15
02:37:22.000000000 -0700
++++ ccp4-6.1.2/ccp4i/etc/configure.def.dist 2009-07-15 17:33:55.000000000
-0700
@@ -61,8 +61,8 @@
MESSAGE _text ""
BLT_LIBRARY _text ""
MENU_LENGTH _positiveint 25
-HYPERTEXT_VIEWER _text firefox
[...1251 lines suppressed...]
-@@ -3989,7 +3989,9 @@
- CFLAGS="${COPTIM} ${XCFLAGS}"
- FFTW_LIBS="-L${prefix}/lib -lrfftw -lfftw"
- FFTW_CXXFLAGS="-I${prefix}/lib/fftw/fftw -I${prefix}/lib/fftw/rfftw
-I${prefix}/include"
-+ FLIBS="-...@prefix@/lib/gcc4.4/lib -lgfortran"
- export CFLAGS
-+ export FLIBS
- # must use --enable-float
- xopts="--enable-float"
- if test "$shared_lib" = yes; then
---- ccp4-6.1.1.orig/src/rapper/gc7.0/Makefile.in 2009-04-18
13:05:47.000000000 -0400
-+++ ccp4-6.1.1/src/rapper/gc7.0/Makefile.in 2009-04-18 13:09:25.000000000
-0400
+ ;;
+ esac
+diff -ruN ccp4-6.1.2-dist/src/rapper/gc7.0/Makefile.in
ccp4-6.1.2/src/rapper/gc7.0/Makefile.in
+--- ccp4-6.1.2-dist/src/rapper/gc7.0/Makefile.in 2008-01-24
05:52:42.000000000 -0800
++++ ccp4-6.1.2/src/rapper/gc7.0/Makefile.in 2009-07-15 17:41:41.000000000
-0700
@@ -295,7 +295,7 @@
CYGPATH_W = @CYGPATH_W@
DARWIN_THREADS_FALSE = @DARWIN_THREADS_FALSE@
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
