Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15238
Modified Files:
ccp4.info ccp4.patch
Log Message:
ccp4 version upgrade
Index: ccp4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ccp4.info 12 Feb 2006 05:42:41 -0000 1.9
+++ ccp4.info 23 Feb 2006 19:38:06 -0000 1.10
@@ -1,20 +1,22 @@
Package: ccp4
-Version: 5.99.5
-Revision: 2
-Source: ftp://ftp.%n.ac.uk/%n/%v/packed/%n-core.tar.gz
-Source2: ftp://ftp.%n.ac.uk/%n/%v/packed/phaser-cctbx.tar.gz
-Source-MD5: 1dc37afc2597bceaabd971ba20d86ac3
-Source2-MD5: ac745815cdff2c4c719e9171f029b3ba
+Version: 6.0
+Revision: 1
+GCC: 3.3
+Source: ftp://ftp.%n.ac.uk/%n/%v.0/packed/%n-%v.0-core-src.tar.gz
+Source2: ftp://ftp.%n.ac.uk/%n/%v.0/packed/phaser-1.3.2-cctbx-src.tar.gz
+Source-MD5: 00fe64b4600c9602aef56af0135f3016
+Source2-MD5: e4eee45ca8a299242a1089e35e63c7a0
SourceDirectory: %n-%v
Source3: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
Source3-MD5: 21568dd2475505929573a3fd452c538f
-Depends: x11, tcltk, blt, ccp4-shlibs (>= %v-%r)
-BuildDepends: g77 (>= 3.4.0-2), f2c, fort77, tcltk-dev
-Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<=
5.1999-3), ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.0.2-299 )
-Conflicts: ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.0.2-299 )
+Depends: x11, tcltk, blt, ccp4-shlibs (>= %v-%r), fftw-shlibs | fftw-mpi-shlibs
+BuildDepends: g77 (>= 3.4.0-2), f2c, fort77, tcltk-dev, fftw | fftw-mpi
+Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<=
5.1999-3), ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.99.5-9999)
+Conflicts: ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.99.5-9999 )
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
#
+################################################################################
Patch: %n.patch
PatchScript: <<
#!/bin/zsh -ef
@@ -33,41 +35,44 @@
#
# Set up XCCPJiffy wrapper scripts in $CCP4/etc
# These are small wrapper scripts for xplot84driver and xloggraph generated by
the patch
-chmod a+x etc/x*
+ chmod a+x etc/x*
+# Try to fix the dylib install path in configure
+perl -pi.bak -e 's|\$rpath|%p/lib/%n-%v|g' **/configure
<<
+################################################################################
CompileScript: <<
#!/bin/zsh -ef
umask 0022
+# These are required for the build environment
export TEMPXTAL=$PWD:h
source include/%n.setup-zsh
export DYLD_LIBRARY_PATH=$CLIB
+export rpath=%p/lib/%n-%v
+export RPATH=%p/lib/%n-%v
+ # The cctbx sub-package requires us to use the system's own Python
export
PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH
export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
-./configure --with-x --with-shared-libs --with-fftw=%p Darwin
-# fix some post-configure bugs
- perl -pi.bak -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' **/*akefile
- perl -pi.bak -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' x-windows/XCCPJIFFY/Imakefile
- perl -pi.bak -e 's|\-lccp4c |\-lccp4c \-lSystemStubs |g' **/*akefile
- perl -pi.bak -e 's|\-lcc_dynamic||g' **/*akefile
- perl -pi.bak -e 's|\-lgfortran||g' x-windows/XCCPJIFFY/*akefile*
+# Force configure to use fink's g77 Fortran compiler. gfortran is not good
enough yet
+CXX="g++-3.3" FC="g77" ./configure --with-x --with-shared-libs --with-fftw=%p
Darwin
+# fix some post-configure bugs by getting rid of -lg2c
+perl -pi.bak -e 's|-lg2c||g' **/*akefile*
#
-export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
make -i
-export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
make -i install
#
-echo "recompile xplot84driver and xccpjiffy2idraw"
-# Manually recompile xplot84driver and xccpjiffy2idraw
-# Manually link xloggraph with g77 (fails in make)
+# Make wrappers for xplot84driver and xloggraph, so rename the executables
cd x-windows/XCCPJIFFY
-make xplot84driver
-make xccpjiffy2idraw
cp xplot84driver $CBIN/xplot84driver.exe
rm -f $CBIN/xplot84driver
-cp xccpjiffy2idraw $CBIN/.
#
-# make xloggraph >/dev/null 2>&1
+# Manually link xloggraph with g77 (fails in make)
+echo ""
+echo "**********************************************************************"
+echo "Re-linking xloggraph with g77. Ignore previous error messages."
+echo "**********************************************************************"
+echo ""
+#
g77 -fno-second-underscore -o xloggraph -L/usr/lib msg_box.o ZDr2d.o
EditString.o hardcopy_ctrl.o xloggraph.o log_file.o tom_fortran_interface.o
bits_and_pieces.o graphics.o -g -Os -I/usr/include/X11R6 -L/usr/X11R6/lib -lXaw
-lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm -lgcc -lSystemStubs
#
sleep 10
@@ -77,7 +82,10 @@
#
# make realclean
/bin/rm -f **/*.o
+echo "Compile Phase Completed!"
+echo "There are $(command ls -1 $CBIN | wc -l) programs in $CBIN; there should
be 200"
<<
+################################################################################
InstallScript: <<
#!/bin/zsh -ef
umask 0022
@@ -94,13 +102,20 @@
perl -pi.bak -e 's|5.0.1|%v|g' XCCPJiffy
mv -f XCCPJiffy lib/X11/app-defaults/XCCPJiffy
#
- perl -pi.bak -e 's|/src/ccp4lib-5.99.5-2/ccp4-5.99.5||g' bin/clipper-config
+ perl -pi.bak -e 's|/src/fink.build/%n-%v-%r|/share/xtal|g' bin/clipper-config
rm -f bin/clipper-config.bak
perl -pi.bak -e 's|lclipper |lclipper-core |g' bin/clipper-config
rm -f bin/clipper-config.bak
perl -pi.bak -e 's|lib/lib -lrfftw -lfftw |lib/ccp4-%v -lsrfftw -lsfftw |g'
bin/clipper-config
rm -f bin/clipper-config.bak
#
+# Fix path in libfoo.la libtool files:
+#
+ perl -pi.bak -e 's|/src/fink.build/%n-%v-%r/%n-%v/lib|/lib/%n-%v|g'
lib/**/*.la
+ rm -f lib/**/*.la.bak
+#
+# Now install:
+#
mkdir -p %i/lib
cp -R lib %i/lib/%n-%v
mkdir -p %i/bin
@@ -117,8 +132,8 @@
# back to build directory
cd ..
#
- /bin/rm -rf lib
-# /bin/mv lib lib-save
+/bin/rm -rf lib
+#/bin/mv lib lib-save
cp -R * %i/share/xtal/%n-%v/.
ln -s %p/lib/%n-%v %i/share/xtal/%n-%v/lib
@@ -150,8 +165,8 @@
PostInstScript: <<
# This chances the paths for the shell and python scripts to those of the
# final install point rather than the build or debian root directory.
-cd %p/lib/%n-%v/cctbx/cctbx_build
-/System/Library/Frameworks/Python.framework/Versions/Current/bin/python
../cctbx_sources/libtbx/configure.py mmtbx
+# cd %p/lib/%n-%v/cctbx/cctbx_build
+# /System/Library/Frameworks/Python.framework/Versions/Current/bin/python
../cctbx_sources/libtbx/configure.py mmtbx
more %p/share/xtal/%n-%v/conditions.txt
<<
SplitOff: <<
@@ -159,83 +174,85 @@
Depends: fftw-shlibs | fftw-mpi-shlibs
Replaces: ccp4lib, ccp4lib-shlibs
Files: <<
-lib/ccp4-5.99.5/libccif.dylib
-lib/ccp4-5.99.5/libccp4c.dylib
-lib/ccp4-5.99.5/libclipper-ccp4.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-ccp4.0.dylib
-lib/ccp4-5.99.5/libclipper-ccp4.dylib
-lib/ccp4-5.99.5/libclipper-cif.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-cif.0.dylib
-lib/ccp4-5.99.5/libclipper-cif.dylib
-lib/ccp4-5.99.5/libclipper-contrib.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-contrib.0.dylib
-lib/ccp4-5.99.5/libclipper-contrib.dylib
-lib/ccp4-5.99.5/libclipper-core.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-core.0.dylib
-lib/ccp4-5.99.5/libclipper-core.dylib
-lib/ccp4-5.99.5/libclipper-minimol.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-minimol.0.dylib
-lib/ccp4-5.99.5/libclipper-minimol.dylib
-lib/ccp4-5.99.5/libclipper-mmdb.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-mmdb.0.dylib
-lib/ccp4-5.99.5/libclipper-mmdb.dylib
-lib/ccp4-5.99.5/libclipper-phs.0.0.0.dylib
-lib/ccp4-5.99.5/libclipper-phs.0.dylib
-lib/ccp4-5.99.5/libclipper-phs.dylib
-lib/ccp4-5.99.5/libjwc_c.0.1.1.dylib
-lib/ccp4-5.99.5/libjwc_c.0.dylib
-lib/ccp4-5.99.5/libjwc_c.dylib
-lib/ccp4-5.99.5/libmmdb.dylib
-lib/ccp4-5.99.5/libssm.0.0.0.dylib
-lib/ccp4-5.99.5/libssm.0.dylib
-lib/ccp4-5.99.5/libssm.dylib
-lib/ccp4-5.99.5/libxdl_view.2.0.0.dylib
-lib/ccp4-5.99.5/libxdl_view.2.dylib
-lib/ccp4-5.99.5/libxdl_view.dylib
-lib/ccp4-5.99.5/libxdl_viewextra.0.0.0.dylib
-lib/ccp4-5.99.5/libxdl_viewextra.0.dylib
-lib/ccp4-5.99.5/libxdl_viewextra.dylib
+lib/ccp4-6.0/libccif.dylib
+lib/ccp4-6.0/libccp4c.dylib
+lib/ccp4-6.0/libclipper-ccp4.0.0.0.dylib
+lib/ccp4-6.0/libclipper-ccp4.0.dylib
+lib/ccp4-6.0/libclipper-ccp4.dylib
+lib/ccp4-6.0/libclipper-cif.0.0.0.dylib
+lib/ccp4-6.0/libclipper-cif.0.dylib
+lib/ccp4-6.0/libclipper-cif.dylib
+lib/ccp4-6.0/libclipper-contrib.0.0.0.dylib
+lib/ccp4-6.0/libclipper-contrib.0.dylib
+lib/ccp4-6.0/libclipper-contrib.dylib
+lib/ccp4-6.0/libclipper-core.0.0.0.dylib
+lib/ccp4-6.0/libclipper-core.0.dylib
+lib/ccp4-6.0/libclipper-core.dylib
+lib/ccp4-6.0/libclipper-minimol.0.0.0.dylib
+lib/ccp4-6.0/libclipper-minimol.0.dylib
+lib/ccp4-6.0/libclipper-minimol.dylib
+lib/ccp4-6.0/libclipper-mmdb.0.0.0.dylib
+lib/ccp4-6.0/libclipper-mmdb.0.dylib
+lib/ccp4-6.0/libclipper-mmdb.dylib
+lib/ccp4-6.0/libclipper-phs.0.0.0.dylib
+lib/ccp4-6.0/libclipper-phs.0.dylib
+lib/ccp4-6.0/libclipper-phs.dylib
+lib/ccp4-6.0/libjwc_c.0.1.1.dylib
+lib/ccp4-6.0/libjwc_c.0.dylib
+lib/ccp4-6.0/libjwc_c.dylib
+lib/ccp4-6.0/libssm.0.0.0.dylib
+lib/ccp4-6.0/libssm.0.dylib
+lib/ccp4-6.0/libssm.dylib
+lib/ccp4-6.0/libxdl_view.2.0.0.dylib
+lib/ccp4-6.0/libxdl_view.2.dylib
+lib/ccp4-6.0/libxdl_view.dylib
+lib/ccp4-6.0/libxdl_viewextra.0.0.0.dylib
+lib/ccp4-6.0/libxdl_viewextra.0.dylib
+lib/ccp4-6.0/libxdl_viewextra.dylib
+lib/ccp4-6.0/libmmdb.dylib
<<
- Shlibs: <<
- %p/lib/ccp4-5.99.5/libccif.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-2)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
- %p/lib/ccp4-5.99.5/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-2)
+#lib/ccp4-6.0/libmmdb.dylib
+Shlibs: <<
+ %p/lib/ccp4-6.0/libccif.dylib 0.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1)
+ %p/lib/ccp4-6.0/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1)
+ %p/lib/ccp4-6.0/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
+ %p/lib/ccp4-6.0/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
<<
DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
<<
+# %p/lib/ccp4-6.0/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1)
#
SplitOff2: <<
Package: %N-dev
@@ -249,7 +266,8 @@
DescDetail: <<
CCP4 macromolecular crystallography suite of approximately
200 programs and utilities. This version included Clipper
-libraries, cctbx and ccif and phaser.
+libraries, and ccif and phaser. If you need cctbx, please
+install the cctbx fink package separately.
Type "ccp4help" for a summary listing of all ccp4 programs.
Type "ccp4help foo" for a detailed description of program "foo."
@@ -260,7 +278,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-5.99.5
+CCP4 files will be installed under /sw/share/xtal/ccp4-6.0
This revision includes all available CCP4 patches as of December 1, 2005.
and new bash and zsh command completions specific to ccp4.
<<
Index: ccp4.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ccp4.patch 2 Dec 2005 05:02:44 -0000 1.6
+++ ccp4.patch 23 Feb 2006 19:38:06 -0000 1.7
@@ -1,6 +1,6 @@
-diff -ruN ccp4-5.99.5-orig/ccp4i/etc/configure.def.dist
ccp4-5.99.5/ccp4i/etc/configure.def.dist
---- ccp4-5.99.5-orig/ccp4i/etc/configure.def.dist 2005-11-30
15:21:50.000000000 -0800
-+++ ccp4-5.99.5/ccp4i/etc/configure.def.dist 2005-11-30 16:27:46.000000000
-0800
+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
@@ -54,8 +54,8 @@
MESSAGE _text ""
BLT_LIBRARY _text ""
@@ -12,9 +12,9 @@
O_MAPMAN _text mapman
[...32240 lines suppressed...]
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e
"s,^\(..*\),_&," < $export_symbols >
$output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag
-o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name
${wl}SW_PREFIX/lib/ccp4-5.99.5/$soname $verstring~nmedit -s
$output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e
"s,^\(..*\),_&," < $export_symbols >
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib
-bundle $libobjs $deplibs$compiler_flags~nmedit -s
$output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- xlf* )
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib
$libobjs $deplibs $compiler_flags ${wl}-dylib_install_name ${wl}`echo
$rpath/$soname` $verstring'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib
$libobjs $deplibs $compiler_flags ${wl}-dylib_install_name ${wl}`echo
SW_PREFIX/lib/ccp4-5.99.5/$soname` $verstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs
$deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it
doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e
"s,^\(..*\),_&," < $export_symbols >
$output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag
-o $lib $libobjs $deplibs $compiler_flags ${wl}-dylib_install_name
${wl}$rpath/$soname $verstring~nmedit -s
$output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e
"s,^\(..*\),_&," < $export_symbols >
$output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag
-o $lib $libobjs $deplibs $compiler_flags ${wl}-dylib_install_name
${wl}SW_PREFIX/lib/ccp4-5.99.5/$soname $verstring~nmedit -s
$output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e
"s,^\(..*\),_&," < $export_symbols >
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib
-bundle $libobjs $deplibs$compiler_flags~nmedit -s
$output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
+ if ("`uname`" == "Darwin") then
+- set
python_exe="/Library/Frameworks/Python.framework/Versions/2.3/bin/python"
++ set
python_exe="/System/Library/Frameworks/Python.framework/Versions/Current/bin/python"
+ if (! -x "$python_exe") then
+ set python_exe="/System$python_exe"
+ endif
-------------------------------------------------------
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
