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

Modified Files:
        ccp4.info 
Log Message:
cleaning up my ccp4 mess: back to one ccp4 package

Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccp4.info   23 Mar 2006 06:22:09 -0000      1.8
+++ ccp4.info   24 May 2006 00:40:59 -0000      1.9
@@ -1,24 +1,26 @@
 Package: ccp4
 Version: 6.0
-Revision: 1003
+Revision: 1008
 GCC: 4
-Architecture: powerpc
-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
+#Architecture: i386 # Works on both platforms now
+Source: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/ccp4-%v.0-core-src.tar.gz
+Source2: ftp://ftp.ccp4.ac.uk/ccp4/%v.0/packed/phaser-1.3.2-cctbx-src.tar.gz
 Source-MD5: 00fe64b4600c9602aef56af0135f3016  
 Source2-MD5: e4eee45ca8a299242a1089e35e63c7a0
-SourceDirectory: %n-%v
+SourceDirectory: ccp4-%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, 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), ccp4-gfortran
-Conflicts: ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.99.5-9999 ), ccp4-gfortran
+Source4: 
http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/ccp4_i686-apple-darwin8.6.1_libtool.gz
+Source4-MD5: e40104835406c75c8aee16471b2dd06e
+Depends: x11, tcltk, blt
+BuildDepends: gcc4 (>= 2:4.1.99-20060515), f2c, fort77, tcltk-dev
+Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<= 
5.1999-3), ccp4-shlibs, ccp4 (<= 6.0-1007), ccp4-dev (<= 6.0-1007), 
bundle-ccp4-inel, clipper-bin, ccp4-gfortran, ccp4-gfortran-dev, 
bundle-ccp4-powerpc
+Conflicts: ccp4-shlibs (<= 6.0-1007) , ccp4 (<= 6.0-1007), ccp4-dev (<= 
6.0-1007), bundle-ccp4-intel, bundle-ccp4-powerpc, ccp4-gfortran, 
ccp4-gfortran-dev
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 #
 
################################################################################
-Patch: %n.patch
+Patch: ccp4.patch
 PatchScript: <<
 #!/bin/zsh -ef
 umask 0022
@@ -29,81 +31,122 @@
 perl -pi.bak -e 's|/xtal|\$TEMPXTAL|g' include/ccp4.setup*   # 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
 #
 perl -pi.bak -e 's|SW_PREFIX|%p|g' **/configure            # location of 
tcktk, blt  
-cp include/%n.setup-dist include/%n.setup
-rm -f include/%n.setup-bash **/configure.bak include/ccp4.setup*.bak
+cp include/ccp4.setup-dist include/ccp4.setup
+rm -f include/ccp4.setup-bash **/configure.bak include/ccp4.setup*.bak
 #
 # 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*
-# Try to fix the dylib install path in configure
-perl -pi.bak -e 's|\$rpath|%p/lib/%n-%v|g' **/configure
+# Fix the dylib install path in configure
+perl -pi.bak -e 's|\$rpath|%p/lib/ccp4-%v|g' **/configure
+ 
+ # We need the mmdbold clipper libraries built for COOT:
+perl -pi.bak -e 's|enable_mmdbold=no|enable_mmdbold=yes|g' 
lib/clipper/configure*
 <<
 
################################################################################
 CompileScript: <<
 #!/bin/zsh -ef
 umask 0022
-# These are required for the build environment
+ # These are required for the build environment
 export TEMPXTAL=$PWD:h
-source include/%n.setup-zsh
+source include/ccp4.setup-zsh
 export DYLD_LIBRARY_PATH=$CLIB
-export rpath=%p/lib/%n-%v
-export RPATH=%p/lib/%n-%v
+export rpath=%p/lib/ccp4-%v
+export RPATH=%p/lib/ccp4-%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"
-# Force configure to use fink's g77 Fortran compiler.  gfortran is not good 
enough yet
-FC="g77" ./configure --with-x --with-shared-libs --with-fftw=%p Darwin
+ # gfortran is actually used by default, but to ensure the right thing 
happens, specify it.
+ # Build static libs only for now. (Problems with dylibs and g++-4).
+FC="%p/lib/gcc4/bin/gfortran" FOPTIM="-O0" CC="%p/lib/gcc4/bin/gcc" 
CXX="%p/lib/gcc4/bin/g++"  ./configure --with-x Darwin
+# FC="gfortran" ./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*
+perl -pi.bak -e 's|-lg2c||g' x-windows/**/*akefile*
 #
+# change molrep optimization:
+perl -pi.bak -e "s|molrep_FLAGS='-fno-second-underscore 
-O1'|molrep_FLAGS='-fno-second-underscore -O0'|g" src/Makefile
+
+# perl -pi.bak -e 's|FC = g77 -fno-second-underscore||g' 
x-windows/XCCPJIFFY/Makefile
+
+
+
+if [[ $(uname -p) != powerpc ]];then 
+    perl -pi.bak -e 's|%p/lib/gcc4/bin/||g' lib/clipper/**/Makefile*
+    # Replace the ccp4 libtool file with one that works and compiles cpirate:
+    cp ../ccp4_i686-apple-darwin8.6.1_libtool.gz  lib/clipper/libtool.gz 
+    mv -f lib/clipper/libtool lib/clipper/libtool-dist
+    gunzip lib/clipper/libtool.gz
+    chmod a+x lib/clipper/libtool
+fi
+
+#################
 make -i
 make -i install
+#################
+
+# xloggraph will fail, but we will link it with fort77 below
 #
 # Make wrappers for xplot84driver and xloggraph, so rename the executables
 cd  x-windows/XCCPJIFFY
 cp xplot84driver  $CBIN/xplot84driver.exe
 rm -f $CBIN/xplot84driver
 #
-# Manually link xloggraph with g77 (fails in make)
+# Manually link xloggraph with fort77 (fails in make)
 echo ""
 echo "**********************************************************************"
-echo "Re-linking xloggraph with g77.  Ignore previous error messages."
+echo "Re-linking xloggraph with fort77.  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
+ perl -pi.bak -e 's|FC = g77 -fno-second-underscore||g' Makefile
+ make -i xloggraph  2>/dev/null
+ fort77 -o xloggraph 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 -lgfortran -L%p/lib/gcc4/lib
+
 #
 sleep 10
 #
 cp xloggraph $CBIN/xloggraph.exe
 cd ../..
 #
+# Cleanup:
+#
 # make realclean
 /bin/rm -f **/*.o
+/bin/rm -f **/*.bak
+/bin/rm -R src 
+/bin/rm -R x-windows 
+/bin/rm -R unsupported
+/bin/rm -R testcomp* 
+/bin/rm -R BINARY*
+cd $CLIB
+/bin/rm -f **/*.c 
+/bin/rm -f **/*.f 
+/bin/rm -f **/*.cpp
 echo "Compile Phase Completed!"
-echo "There are $(command ls -1 $CBIN | wc -l) programs in $CBIN; there should 
be 200"
+echo "There are $(command ls -1 $CBIN | wc -l) programs in $CBIN; "
+echo "there should be 200"
 <<
 
################################################################################
 InstallScript: <<
 #!/bin/zsh -ef
 umask 0022
 export TEMPXTAL=$PWD:h
-source include/%n.setup-zsh
+source include/ccp4.setup-zsh
 export DYLD_LIBRARY_PATH=$CLIB
 ORIGDIR=$(dirname $PWD)
 # Change environment scripts to match final installation
-perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' include/%n.setup*      # 
install prefix
-# perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' 
lib/cctbx/cctbx_build/setpaths* 
+perl -pi -e 's|\$TEMPXTAL|%p/share/xtal|g' include/ccp4.setup*      # install 
prefix
 #
 #
  cp ../XCCPJiffy-custom.gz  XCCPJiffy.gz ; gunzip XCCPJiffy.gz; chmod a+x 
XCCPJiffy
- perl -pi.bak -e 's|5.0.1|%v|g' XCCPJiffy
+ perl -pi -e 's|5.0.1|%v|g' XCCPJiffy
  mv -f  XCCPJiffy lib/X11/app-defaults/XCCPJiffy
 #  
- perl -pi.bak -e 's|/src/fink.build/%n-%v-%r|/share/xtal|g' bin/clipper-config
+ perl -pi.bak -e 's|/src/fink.build/ccp4-%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                                
@@ -112,23 +155,23 @@
 #
 # 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
+ perl -pi.bak -e 's|/src/fink.build/ccp4-%v-%r/ccp4-%v/lib|/lib/ccp4-%v|g' 
lib/**/*.la
  rm -f lib/**/*.la.bak
 #
 # Now install:
 #
  mkdir -p %i/lib
- cp -R lib %i/lib/%n-%v
+ cp -R lib %i/lib/ccp4-%v
  mkdir -p %i/bin
 #
- mkdir -p %i/share/xtal/%n-%v/help
+ mkdir -p %i/share/xtal/ccp4-%v/help
  mkdir -p %i/share/man/man1
 # set up man pages in a fink-compliant manner
  cd $PWD/doc
  mv rasmol.doc eightbit_rasmol.doc
  foreach docfilepage ( *.doc )
      cp ${docfilepage}  %i/share/man/man1/${docfilepage:r}.1
-     cp ${docfilepage}  %i/share/xtal/%n-%v/help/${docfilepage:r}
+     cp ${docfilepage}  %i/share/xtal/ccp4-%v/help/${docfilepage:r}
 end
 # back to build directory
  cd ..
@@ -136,175 +179,41 @@
 /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
+ cp -R * %i/share/xtal/ccp4-%v/.
+ ln -s   %p/lib/ccp4-%v      %i/share/xtal/ccp4-%v/lib
 #
 # making scripts for %p/etc/profile.d  
  mkdir -p %i/etc/profile.d
 #
- echo "source %p/share/xtal/%n-%v/include/%n.setup"                     > 
%i/etc/profile.d/%n.csh
- echo "setenv CLIB %p/lib/ccp4-%v "                                    >> 
%i/etc/profile.d/%n.csh
+ echo "source %p/share/xtal/ccp4-%v/include/ccp4.setup"                 > 
%i/etc/profile.d/ccp4.csh
+ echo "setenv CLIB %p/lib/ccp4-%v "                                    >> 
%i/etc/profile.d/ccp4.csh
 #
 
-echo "if [ -z \$ZSH_NAME ];then                           "                    
    > %i/etc/profile.d/%n.sh 
-echo "    source %p/share/xtal/%n-%v/include/%n.setup-sh "                     
  >> %i/etc/profile.d/%n.sh    
-echo "else                                               "                     
  >> %i/etc/profile.d/%n.sh
-echo "    source %p/share/xtal/%n-%v/include/%n.setup-zsh"                     
  >> %i/etc/profile.d/%n.sh
-echo "fi                                                 "                     
  >> %i/etc/profile.d/%n.sh
-echo "export CLIB=%p/lib/ccp4-%v "                                    >> 
%i/etc/profile.d/%n.sh
+echo "if [ -z \$ZSH_NAME ];then                           "             > 
%i/etc/profile.d/ccp4.sh 
+echo "    source %p/share/xtal/ccp4-%v/include/ccp4.setup-sh "         >> 
%i/etc/profile.d/ccp4.sh    
+echo "else                                               "             >> 
%i/etc/profile.d/ccp4.sh
+echo "    source %p/share/xtal/ccp4-%v/include/ccp4.setup-zsh"         >> 
%i/etc/profile.d/ccp4.sh
+echo "fi                                                 "             >> 
%i/etc/profile.d/ccp4.sh
+echo "export CLIB=%p/lib/ccp4-%v "                                     >> 
%i/etc/profile.d/ccp4.sh
 #
- chmod a+x %i/etc/profile.d/%n.*
+ chmod a+x %i/etc/profile.d/ccp4.*
 #
- chmod a+x  %i/share/xtal/%n-%v/ccp4i/etc/osx_ccp4_mail
+ chmod a+x  %i/share/xtal/ccp4-%v/ccp4i/etc/osx_ccp4_mail
 #
-# chmod a+x %i/share/xtal/%n-%v/etc/ccp4help 
+# chmod a+x %i/share/xtal/ccp4-%v/etc/ccp4help 
 #
- ranlib %i/lib/%n-%v/*.a
- ranlib %i/lib/%n-%v/**/*.a
+ ranlib %i/lib/ccp4-%v/*.a
+ ranlib %i/lib/ccp4-%v/**/*.a
 #
 <<
 
################################################################################
 PostInstScript: <<
 # 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
-Replaces: ccp4lib, ccp4lib-shlibs
-  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-1003)
-   %p/lib/ccp4-6.0/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-  << 
-  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-1003)
-#
-################################################################################
-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
-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
+more %p/share/xtal/ccp4-%v/conditions.txt
 <<
-Shlibs: <<
-   %p/lib/ccp4-6.0/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 
6.0-1003)
-   %p/lib/ccp4-6.0/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>= 6.0-1003)
-  << 
-  DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS 
academic_software_licence.pdf
-<< 
 
################################################################################
-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: <<
+SplitOff: <<
 Package: %N-dev
 BuildDependsOnly: true
 Description: CCP4 static libraries and libtool files
@@ -317,14 +226,9 @@
 
################################################################################
 Description:  Macromolecular crystallography package
 DescDetail: <<
-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.
+These are the ccp4 programs compiled with gfortran instead of g77.
+The (currently default) g77 version won't work on intel.  The hope
+is that this will. (With gfortran-4.2, everything compiles.)
 
 CCP4 macromolecular crystallography suite has approximately
 200 programs and utilities. This version included Clipper
@@ -341,7 +245,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 Mar 22, 2006. 
+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



_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to