Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18046
Modified Files:
ccp4.info ccp4.patch
Log Message:
ccp4 revision to modularize non-essential components
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ccp4.info 23 Feb 2006 19:37:21 -0000 1.4
+++ ccp4.info 27 Feb 2006 22:54:32 -0000 1.5
@@ -1,6 +1,6 @@
Package: ccp4
Version: 6.0
-Revision: 1001
+Revision: 1002
GCC: 4
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
@@ -9,7 +9,7 @@
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), fftw-shlibs | fftw-mpi-shlibs
+Depends: x11, tcltk, blt, ccp4-shlibs (>= %v-%r), fftw-shlibs |
fftw-mpi-shlibs, clipper-bin
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 )
@@ -119,7 +119,7 @@
mkdir -p %i/lib
cp -R lib %i/lib/%n-%v
mkdir -p %i/bin
- cp -R bin/clipper-config %i/bin/clipper-config
+#
mkdir -p %i/share/xtal/%n-%v/help
mkdir -p %i/share/man/man1
# set up man pages in a fink-compliant manner
@@ -162,13 +162,12 @@
ranlib %i/lib/%n-%v/**/*.a
#
<<
+################################################################################
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
+# Make the user read the license conditions
more %p/share/xtal/%n-%v/conditions.txt
<<
+################################################################################
SplitOff: <<
Package: %N-shlibs
Depends: fftw-shlibs | fftw-mpi-shlibs
@@ -176,6 +175,58 @@
Files: <<
lib/ccp4-6.0/libccif.dylib
lib/ccp4-6.0/libccp4c.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-6.0/libccif.dylib 0.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ <<
+ DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
+Description: Essential dynamic libraries for CCP4
+DescDetail: <<
+The package ccp4-shlibs contains all of the essential (non-clipper) libraries
+for ccp4. It excludes the clipper dynamic libraries, which may be buggy.
+<<
+<<
+# %p/lib/ccp4-6.0/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+#
+################################################################################
+SplitOff2: <<
+Package: %N-clipper-shlibs
+Description: Currently buggy clipper dynamic libraries
+DescDetail: <<
+CCP4-clipper-shlibs contains all of the non-essential clipper dynamic
+libraries that are built by ccp4. There appear to be problems with this
+specific to g++-4.0.1. Until these are addressed, use the static clipper
+libraries in fink's ccp4-onlylibs-dev package instead
+<<
+Depends: fftw-shlibs | fftw-mpi-shlibs
+Replaces: ccp4lib, ccp4lib-shlibs
+ Files: <<
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
@@ -197,72 +248,84 @@
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-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/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
6.0-1002)
+ %p/lib/ccp4-6.0/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1002)
<<
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: <<
+<<
+################################################################################
+SplitOff3: <<
+Package: %N-clipper-bin
+Description: Broken! Install clipper-bin instead.
+DescDetail:<<
+CCP4-clipper-bin contains all of the currently broken clipper executables, as
+there appear to be problems with these that are specific to g++-4.0.1 and
+the clipper dynamic libraries. Until these are addressed, use the statically
+linked binaries in fink's clipper-bin package instead.
+<<
+Files: <<
+share/xtal/ccp4-6.0/bin/clipper-config
+share/xtal/ccp4-6.0/bin/cecalc
+share/xtal/ccp4-6.0/bin/cfft
+share/xtal/ccp4-6.0/bin/chltofom
+share/xtal/ccp4-6.0/bin/cinvfft
+share/xtal/ccp4-6.0/bin/cmakereference
+share/xtal/ccp4-6.0/bin/cpatterson
+share/xtal/ccp4-6.0/bin/cphasecombine
+share/xtal/ccp4-6.0/bin/cphasematch
+share/xtal/ccp4-6.0/bin/cpirate
+share/xtal/ccp4-6.0/bin/csfcalc
+share/xtal/ccp4-6.0/bin/csigmaa
+share/xtal/ccp4-6.0/bin/superpose
+<<
+BuildDependsOnly: false
+DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
+<<
+################################################################################
+SplitOff4: <<
Package: %N-dev
-Conflicts: clipper-dev
-Replaces: clipper-dev
-Files: bin/clipper-config
-BuildDependsOnly: True
+BuildDependsOnly: true
+Description: CCP4 static libraries and libtool files
+Files:<<
+lib/ccp4-6.0/*.a
+lib/ccp4-6.0/*.la
+<<
DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
<<
+################################################################################
Description: Macromolecular crystallography package
DescDetail: <<
-CCP4 macromolecular crystallography suite of approximately
+The package ccp4 and ccp4-shlibs are installed by default,
+and the package clipper-bin that provides clipper statically
+linked executables will also be installed.
+
+Dynamically linked clipper executables and clipper dynamic
+libraries are not installed by default in the 10.4 g++4.0
+tree, as they appear to be problematic. These are contained in
+the ccp4-clipper-shlibs and ccp4-clipper-bin packages.
+
+CCP4 macromolecular crystallography suite has approximately
200 programs and utilities. This version included Clipper
libraries, and ccif and phaser. If you need cctbx, please
install the cctbx fink package separately.
@@ -277,7 +340,7 @@
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-6.0
-This revision includes all available CCP4 patches as of December 1, 2005.
+This revision includes all available CCP4 patches as of Feb 26, 2006.
and new bash and zsh command completions specific to ccp4.
<<
DocFiles: README CHANGES COPYING PROBLEMS INSTALL INSTALL.html INSTALL.ps
ccp4i_installation.html academic_software_licence.pdf
academic_software_licence.ps.gz academic_software_licence.rtf
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ccp4.patch 23 Feb 2006 19:37:21 -0000 1.3
+++ ccp4.patch 27 Feb 2006 22:54:32 -0000 1.4
@@ -700,13 +700,498 @@
+
diff -ruN ccp4-6.0-orig/lib/cctbx/cctbx_install_script.csh
ccp4-6.0/lib/cctbx/cctbx_install_script.csh
--- ccp4-6.0-orig/lib/cctbx/cctbx_install_script.csh 2005-11-08
09:06:57.000000000 -0800
-+++ ccp4-6.0/lib/cctbx/cctbx_install_script.csh 2006-02-21
08:13:32.000000000 -0800
-@@ -29,7 +29,7 @@
- set build_mode=release
++++ ccp4-6.0/lib/cctbx/cctbx_install_script.csh 2006-02-26
08:36:24.000000000 -0800
+@@ -1,232 +1,5 @@
+-#! /bin/csh -f
++#! /bin/sh -ef
- if ("`uname`" == "Darwin") then
+-set install_root="$cwd"
+-set bundle="cctbx"
+-set sources="$cwd/${bundle}_sources"
+-set build="$cwd/${bundle}_build"
+-set prefer_usr_bin_python=0
++echo "Skipping final build of cctbx"
++echo "Install fink's cctbx package if you need this"
+
+-unalias cat
+-unalias cd
+-unalias grep
+-unalias ls
+-unalias mkdir
+-
+-unsetenv PYTHONHOME
+-
+-if (-f "$sources/TAG") then
+- echo "Build tag:"
+- cat "$sources/TAG"
+-endif
+-
+-if (-d "$sources/boost") then
+- set have_sources=1
+-else
+- set have_sources=0
+-endif
+-
+-set python_exe=None
+-set build_mode=release
+-
+-if ("`uname`" == "Darwin") then
- set
python_exe="/Library/Frameworks/Python.framework/Versions/2.3/bin/python"
+- if (! -x "$python_exe") then
+- set python_exe="/System$python_exe"
+- endif
+- "$python_exe" -V
+- if ($status != 0) then
+- echo "Under Mac OS 10 Python 2.3 must be pre-installed."
+- echo "Please refer to the following web page for more information:"
+- echo "http://cci.lbl.gov/cctbx_build/mac_os_x_notes.html";
+- exit 1
+- endif
+-endif
+-
+-if ($have_sources == 0) then
+-
+- if (-d "$build/python") then
+- set python_exe="$build/python/bin/python"
+- endif
+- if ($prefer_usr_bin_python) then
+- if ("$python_exe" == None && -x /usr/bin/python) then
+- /usr/bin/python -V |& head -1
+- if ($status == 0) then
+- set python_exe=/usr/bin/python
+- endif
+- endif
+- endif
+- if ("$python_exe" == None) then
+- python -V |& head -1
+- if ($status == 0) then
+- set python_exe=python
+- endif
+- endif
+- if (! $prefer_usr_bin_python) then
+- if ("$python_exe" == None && -x /usr/bin/python) then
+- /usr/bin/python -V |& head -1
+- if ($status == 0) then
+- set python_exe=/usr/bin/python
+- endif
+- endif
+- endif
+-
+-else
+-
+- if ($#argv == 0) then
+- echo -n "Please enter the number of available CPU's [1]: "
+- set n_cpu_s=(`echo "$<"`)
+- if ($#n_cpu_s > 1) then
+- echo "Not a number! Please try again."
+- exit 1
+- else if ($#n_cpu_s == 0) then
+- set n_cpu_s=1
+- else
+- set n_cpu_s="$n_cpu_s[1]"
+- endif
+- else if ($#argv == 1) then
+- set n_cpu_s="$1"
+- else
+- echo "usage: $0 number_of_cpu_s"
+- exit 1
+- endif
+- echo "Number of available CPU's: $n_cpu_s"
+- if ("$n_cpu_s" == "0") exit 0
+-
+- if ("$python_exe" == None) then
+-
+- set python_sources=(`ls | grep Python-`)
+- if ($#python_sources == 0) then
+- set python_sources=None
+- else if ($#python_sources == 1) then
+- set python_sources="$python_sources[1]"
+- else
+- echo "ERROR: Multiple Python source code directories."
+- echo " Move or remove all but one directory."
+- exit 1
+- endif
+-
+- if ("$python_sources" == None) then
+-
+- echo "Trying to find a pre-installed Python:"
+- set python_exe=None
+- if (-x "$build/python/bin/python") then
+- "$build/python/bin/python" -V |& head -1
+- if ($status == 0) then
+- set python_exe="$build/python/bin/python"
+- endif
+- endif
+- if ("$python_exe" == None) then
+- python -V |& head -1
+- if ($status == 0) then
+- set python_exe=python
+- endif
+- endif
+- if ("$python_exe" == None) then
+- python2 -V |& head -1
+- if ($status == 0) then
+- set python_exe=python2
+- endif
+- endif
+- if ("$python_exe" == None && -x /usr/bin/python) then
+- /usr/bin/python -V |& head -1
+- if ($status == 0) then
+- set python_exe=/usr/bin/python
+- endif
+- endif
+- if ("$python_exe" != None) then
+- set python_version=(`"$python_exe" -V |& tr "." " "`)
+- if ("$python_version[2]") then
+- set minor=`echo "$python_version[3]" | cut -c-1`
+- if ($minor < 2 || ($minor == 2 && $#python_version == 3)) then
+- echo "A more recent Python version is required (2.2.1 or higher)."
+- set python_exe=None
+- endif
+- endif
+- endif
+- if ("$python_exe" == None) then
+- echo ""
+- echo "Cannot find a Python interpreter."
+- echo ""
+- echo "Please download an installer with Python included"
+- echo "or add a matching Python to the PATH environment variable."
+- echo ""
+- echo "Installation aborted."
+- exit 1
+- endif
+-
+- else
+-
+- echo "Installing $python_sources from sources"
+- mkdir -p "$build"
+- cd "$build"
+- cd ..
+- cd "$python_sources"
+- set py_install_log="../py_install_log"
+- echo "Configuring Python"
+- ./configure --prefix="$build/python" >& "$py_install_log"
+- echo "Compiling Python. This may take a while."
+- make >>& "$py_install_log"
+- echo "Installing Python"
+- make install >>& "$py_install_log"
+- echo "Done installing Python."
+- cd "$install_root"
+- set python_exe="$build/python/bin/python"
+- "$python_exe" -V
+- if ($status != 0) then
+- echo "ERROR: Python installation failed."
+- echo "Please check the log file for errors:"
+- echo " $py_install_log"
+- exit 1
+- endif
+-
+- endif
+-
+- endif
+-
+- mkdir -p "$build"
+-
+-endif
+-
+-echo ""
+-echo "Precompiling all .py files. This may take a minute or two."
+-"$python_exe" "$sources/libtbx/libtbx/command_line/py_compile_all.py"
+-
+-echo ""
+-cd "$build"
+-echo "Configuring $bundle build directory"
+-"$python_exe" "$sources/libtbx/configure.py" --build="$build_mode" mmtbx
clipper
+-source setpaths_all.csh
+-
+-if ($have_sources != 0) then
+- echo ""
+- echo "Installing $bundle modules. This may take a while."
+- libtbx.scons -j "$n_cpu_s" .
+-endif
+-
+-set test_py="$BOOST_ADAPTBX_DIST/tst_rational.py"
+-if (-f "$test_py") then
+- echo ""
+- echo "Running a selected test"
+- set cmd='libtbx.python "'"$test_py"'"'
+- echo "$cmd"
+- eval $cmd
+-endif
+-
+-cat << EOT
+-
+-***
+-*** csh and tcsh users:
+-*** To use this installation in a new shell or process run the command:
+-***
+-*** source "$LIBTBX_BUILD/setpaths.csh"
+-***
+-*** You may want to add this line to your .cshrc file.
+-***
+-*** sh and bash users:
+-*** To use this installation in a new shell or process run the command:
+-***
+-*** . "$LIBTBX_BUILD/setpaths.sh"
+-***
+-*** You may want to add this line to your .profile or .bashrc file.
+-***
+-EOT
+diff -ruN ccp4-6.0-orig/lib/cctbx/cctbx_install_script.csh-original
ccp4-6.0/lib/cctbx/cctbx_install_script.csh-original
+--- ccp4-6.0-orig/lib/cctbx/cctbx_install_script.csh-original 1969-12-31
16:00:00.000000000 -0800
++++ ccp4-6.0/lib/cctbx/cctbx_install_script.csh-original 2006-02-21
08:13:32.000000000 -0800
+@@ -0,0 +1,232 @@
++#! /bin/csh -f
++
++set install_root="$cwd"
++set bundle="cctbx"
++set sources="$cwd/${bundle}_sources"
++set build="$cwd/${bundle}_build"
++set prefer_usr_bin_python=0
++
++unalias cat
++unalias cd
++unalias grep
++unalias ls
++unalias mkdir
++
++unsetenv PYTHONHOME
++
++if (-f "$sources/TAG") then
++ echo "Build tag:"
++ cat "$sources/TAG"
++endif
++
++if (-d "$sources/boost") then
++ set have_sources=1
++else
++ set have_sources=0
++endif
++
++set python_exe=None
++set build_mode=release
++
++if ("`uname`" == "Darwin") then
+ set
python_exe="/System/Library/Frameworks/Python.framework/Versions/Current/bin/python"
- if (! -x "$python_exe") then
- set python_exe="/System$python_exe"
- endif
++ if (! -x "$python_exe") then
++ set python_exe="/System$python_exe"
++ endif
++ "$python_exe" -V
++ if ($status != 0) then
++ echo "Under Mac OS 10 Python 2.3 must be pre-installed."
++ echo "Please refer to the following web page for more information:"
++ echo "http://cci.lbl.gov/cctbx_build/mac_os_x_notes.html";
++ exit 1
++ endif
++endif
++
++if ($have_sources == 0) then
++
++ if (-d "$build/python") then
++ set python_exe="$build/python/bin/python"
++ endif
++ if ($prefer_usr_bin_python) then
++ if ("$python_exe" == None && -x /usr/bin/python) then
++ /usr/bin/python -V |& head -1
++ if ($status == 0) then
++ set python_exe=/usr/bin/python
++ endif
++ endif
++ endif
++ if ("$python_exe" == None) then
++ python -V |& head -1
++ if ($status == 0) then
++ set python_exe=python
++ endif
++ endif
++ if (! $prefer_usr_bin_python) then
++ if ("$python_exe" == None && -x /usr/bin/python) then
++ /usr/bin/python -V |& head -1
++ if ($status == 0) then
++ set python_exe=/usr/bin/python
++ endif
++ endif
++ endif
++
++else
++
++ if ($#argv == 0) then
++ echo -n "Please enter the number of available CPU's [1]: "
++ set n_cpu_s=(`echo "$<"`)
++ if ($#n_cpu_s > 1) then
++ echo "Not a number! Please try again."
++ exit 1
++ else if ($#n_cpu_s == 0) then
++ set n_cpu_s=1
++ else
++ set n_cpu_s="$n_cpu_s[1]"
++ endif
++ else if ($#argv == 1) then
++ set n_cpu_s="$1"
++ else
++ echo "usage: $0 number_of_cpu_s"
++ exit 1
++ endif
++ echo "Number of available CPU's: $n_cpu_s"
++ if ("$n_cpu_s" == "0") exit 0
++
++ if ("$python_exe" == None) then
++
++ set python_sources=(`ls | grep Python-`)
++ if ($#python_sources == 0) then
++ set python_sources=None
++ else if ($#python_sources == 1) then
++ set python_sources="$python_sources[1]"
++ else
++ echo "ERROR: Multiple Python source code directories."
++ echo " Move or remove all but one directory."
++ exit 1
++ endif
++
++ if ("$python_sources" == None) then
++
++ echo "Trying to find a pre-installed Python:"
++ set python_exe=None
++ if (-x "$build/python/bin/python") then
++ "$build/python/bin/python" -V |& head -1
++ if ($status == 0) then
++ set python_exe="$build/python/bin/python"
++ endif
++ endif
++ if ("$python_exe" == None) then
++ python -V |& head -1
++ if ($status == 0) then
++ set python_exe=python
++ endif
++ endif
++ if ("$python_exe" == None) then
++ python2 -V |& head -1
++ if ($status == 0) then
++ set python_exe=python2
++ endif
++ endif
++ if ("$python_exe" == None && -x /usr/bin/python) then
++ /usr/bin/python -V |& head -1
++ if ($status == 0) then
++ set python_exe=/usr/bin/python
++ endif
++ endif
++ if ("$python_exe" != None) then
++ set python_version=(`"$python_exe" -V |& tr "." " "`)
++ if ("$python_version[2]") then
++ set minor=`echo "$python_version[3]" | cut -c-1`
++ if ($minor < 2 || ($minor == 2 && $#python_version == 3)) then
++ echo "A more recent Python version is required (2.2.1 or higher)."
++ set python_exe=None
++ endif
++ endif
++ endif
++ if ("$python_exe" == None) then
++ echo ""
++ echo "Cannot find a Python interpreter."
++ echo ""
++ echo "Please download an installer with Python included"
++ echo "or add a matching Python to the PATH environment variable."
++ echo ""
++ echo "Installation aborted."
++ exit 1
++ endif
++
++ else
++
++ echo "Installing $python_sources from sources"
++ mkdir -p "$build"
++ cd "$build"
++ cd ..
++ cd "$python_sources"
++ set py_install_log="../py_install_log"
++ echo "Configuring Python"
++ ./configure --prefix="$build/python" >& "$py_install_log"
++ echo "Compiling Python. This may take a while."
++ make >>& "$py_install_log"
++ echo "Installing Python"
++ make install >>& "$py_install_log"
++ echo "Done installing Python."
++ cd "$install_root"
++ set python_exe="$build/python/bin/python"
++ "$python_exe" -V
++ if ($status != 0) then
++ echo "ERROR: Python installation failed."
++ echo "Please check the log file for errors:"
++ echo " $py_install_log"
++ exit 1
++ endif
++
++ endif
++
++ endif
++
++ mkdir -p "$build"
++
++endif
++
++echo ""
++echo "Precompiling all .py files. This may take a minute or two."
++"$python_exe" "$sources/libtbx/libtbx/command_line/py_compile_all.py"
++
++echo ""
++cd "$build"
++echo "Configuring $bundle build directory"
++"$python_exe" "$sources/libtbx/configure.py" --build="$build_mode" mmtbx
clipper
++source setpaths_all.csh
++
++if ($have_sources != 0) then
++ echo ""
++ echo "Installing $bundle modules. This may take a while."
++ libtbx.scons -j "$n_cpu_s" .
++endif
++
++set test_py="$BOOST_ADAPTBX_DIST/tst_rational.py"
++if (-f "$test_py") then
++ echo ""
++ echo "Running a selected test"
++ set cmd='libtbx.python "'"$test_py"'"'
++ echo "$cmd"
++ eval $cmd
++endif
++
++cat << EOT
++
++***
++*** csh and tcsh users:
++*** To use this installation in a new shell or process run the command:
++***
++*** source "$LIBTBX_BUILD/setpaths.csh"
++***
++*** You may want to add this line to your .cshrc file.
++***
++*** sh and bash users:
++*** To use this installation in a new shell or process run the command:
++***
++*** . "$LIBTBX_BUILD/setpaths.sh"
++***
++*** You may want to add this line to your .profile or .bashrc file.
++***
++EOT
+diff -ruN ccp4-6.0-orig/lib/fftw/configure ccp4-6.0/lib/fftw/configure
+--- ccp4-6.0-orig/lib/fftw/configure 2006-01-11 04:52:05.000000000 -0800
++++ ccp4-6.0/lib/fftw/configure 2006-02-26 08:24:31.000000000 -0800
+@@ -1907,7 +1907,8 @@
+ enableval="$enable_shared"
+ p=${PACKAGE-default}
+ case $enableval in
+- yes) enable_shared=yes ;;
++ # brute force it not to build shared fftw libs
++ yes) enable_shared=no ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+@@ -1916,7 +1917,7 @@
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+- enable_shared=yes
++ enable_shared=no
+ fi
+ done
+ IFS="$lt_save_ifs"
-------------------------------------------------------
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
