Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17309
Modified Files:
ccp4.info
Log Message:
update to ccp4 version 5 unstable/sci in 10.3
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ccp4.info 3 Feb 2004 01:06:42 -0000 1.1
+++ ccp4.info 15 May 2004 18:50:13 -0000 1.2
@@ -1,119 +1,71 @@
Package: ccp4
-Version: 4.2.2
-Revision: 10321
-Source: ftp://ftp.%n.ac.uk/pub/%n/%v/packed/%n-%v.tar.gz
+Version: 5.0
+Revision: 1
+Source: ftp://ftp.%n.ac.uk/%n/current/packed/%n-%v.tar.gz
+Source-MD5: 0a0c9950ed5ed0670387773c26a4cab6
SourceDirectory: %n-%v
-Source-MD5: 5494bd30c02be678aa28e9d82f739e9d
-Source2: http://chemistry.ucsc.edu/~wgscott/xtal/%n.setup_revised_sh.gz
-Source2-MD5: 6953953afff0fe21d81115f6856d9b8f
-Source3: http://chemistry.ucsc.edu/~wgscott/xtal/%n-%v-patch.tar.gz
-Source3-MD5: 516bc69be4baab045f2afa98268aaaf0
+# Refmac bug fix
+Source2: ftp://ftp.%n.ac.uk/%n/%v/patches/rcard_tor1.f-14May2004
+Source2-MD5: 9109ba1436460f65aa9de4f78ab85fe0
#
Depends: x11, tcltk, blt
-BuildDepends: g77 (>= 3.4-1), f2c, fort77, tcltk-dev
+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)
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
PatchScript: <<
#!/bin/zsh -f
umask 0022
-perl -pi -e 's/include <malloc.h>//g' **/*.c
-# make a setup script specific for compiling
-cp include/%n.setup-dist include/%n.setup-initial
-perl -pi -e 's/\/xtal/\%p\/src\/%f/g' include/%n.setup-initial
-perl -pi -e 's/CCP4I_TCLTK\ \/usr\/local\/bin/CCP4I_TCLTK\ \%p\/bin/g'
include/%n.setup-initial
-perl -pi -e 's/netscape/safari/g' include/%n.setup-initial
+# setup script for zsh and bash users
+perl -pi -e 's|/usr/local|%p|g' include/%n.setup-sh # location of tcktk, blt
+perl -pi -e 's|%n-5.0d|%n-5.0|g' include/%n.setup-sh # fix error
+perl -pi -e 's|/xtal|%p/src/%f|g' include/%n.setup-sh # build prefix
+perl -pi -e 's|safari|open|g' include/%n.setup-sh # open with any default
browser
+perl -pi -e 's|\${CCP4}/etc \${CBIN} \${CCP4I_TOP}/bin
|\${CCP4}/etc:\${CBIN}:\${CCP4I_TOP}/bin |g' include/%n.setup-sh # fix really bad
path error
#
-# make final csh and sh setup scripts for the installed version of ccp4
-cp include/%n.setup-initial include/%n.setup-csh
-perl -pi -e 's/\%p\/src\/%f/\%p\/share\/xtal/g' include/%n.setup-csh
-# replaced badly broken ccp4.setup-bash with my own version that works for bash, zsh,
sh
-# this will be included in the next ccp4 release
-cp ../%n.setup_revised_sh.gz %n.setup_revised_sh.gz
-gunzip %n.setup_revised_sh.gz
-sed s/"\/sw"/"\%p"/g %n.setup_revised_sh > include/%n.setup-sh
-\rm -f %n.setup_revised_sh
+# setup script for tcsh users
+cp include/%n.setup-dist include/%n.setup
+perl -pi -e 's|/usr/local|%p|g' include/%n.setup # location of tcktk, blt
+perl -pi -e 's|/xtal|%p/src/%f|g' include/%n.setup # build prefix (may be
needed here)
+perl -pi -e 's|netscape|open|g' include/%n.setup # open with any default
browser
+perl -pi -e 's|\${CCP4}/etc \${CBIN} \${CCP4I_TOP}/bin
|\${CCP4}/etc:\${CBIN}:\${CCP4I_TOP}/bin |g' include/%n.setup # fix really bad path
error
#
# Quick-fix for some compilation header omissions
- cp %p/include/f2c.h lib/ccif/f2c.h
- cp %p/include/f2c.h lib/src/f2c.h
- cp %p/include/f2c.h lib/f2c.h
- cp %p/include/f2c.h lib/ccif/g2c.h
- cp %p/include/f2c.h lib/src/g2c.h
- cp %p/include/f2c.h lib/g2c.h
- cp include/%n.setup-csh include/%n.setup
-#
-# Fix configure file to use Apple's Blas/Lapack
- cp configure configure-dist
- head -1815 configure-dist > top_configure
- tail -770 configure-dist > bottom_configure
- echo 'Darwin)' >> top_configure
- echo 'XLAPACK_LIB="-lcc_dynamic -Wl,-framework -Wl,vecLib" ' >> top_configure
- echo 'LAPACKLIB="-lcc_dynamic -Wl,-framework -Wl,vecLib" ' >> top_configure
- echo 'noblas=yes ' >> top_configure
- echo 'trylapack= ' >> top_configure
- echo 'tryblas= ' >> top_configure
- echo ' ;; ' >> top_configure
-cat top_configure bottom_configure > configure
-# perl -pi -e 's/\$FOPTIM -OPT:Olimit=2180/-O0/g' configure
-#
-# Apply CCP4's patch set:
-# get the patch files and patch them to fix those bugs listed
-# on http://www.ccp4.ac.uk/problems.html if there is a solution.
-#
-#
-#
-patch -i ../%n-%v-patch/molrep.patch %b/src/molrep_/molrep.f
-patch -i ../%n-%v-patch/scala.patch %b/src/scala_/scala.f
-patch -i ../%n-%v-patch/tcl.patch %b/ccp4i/src/utils.tcl
-patch -i ../%n-%v-patch/sigmaa.patch %b/ccp4i/tasks/sigmaa.tcl
-patch -i ../%n-%v-patch/molrep.com.patch %b/ccp4i/templates/molrep.com
-patch -i ../%n-%v-patch/parser.patch %b/lib/src/parser.f
-patch -i ../%n-%v-patch/EditString.c.patch %b/x-windows/XCCPJIFFY/EditString.c
-patch -i ../%n-%v-patch/log_file.c.patch %b/x-windows/XCCPJIFFY/log_file.c
+ cp %p/include/f2c.h lib/ccif/g2c.h
+ cp %p/include/f2c.h lib/src/g2c.h
+ cp %p/include/f2c.h lib/g2c.h
+ cp %p/include/f2c.h x-windows/Mosflm/cbf/src/g2c.h
+ cp %p/include/f2c.h x-windows/Mosflm/src/g2c.h
+ cp %p/include/f2c.h x-windows/RasMol/src/g2c.h
+ cp %p/include/f2c.h x-windows/ipdisp/src/g2c.h
+ cp %p/include/f2c.h x-windows/xdl_view/src/g2c.h
#
-mv ../%n-%v-patch/ccp4i.tcl-4.2.2 %b/ccp4i/bin/ccp4i.tcl
-mv ../%n-%v-patch/system.tcl-4.2.2 %b/ccp4i/src/system.tcl
-mv ../%n-%v-patch/cad.tcl-outlim %b/ccp4i/tasks/cad.tcl
-mv ../%n-%v-patch/cad.def-outlim %b/ccp4i/tasks/cad.def
-mv ../%n-%v-patch/cad.com-outlim %b/ccp4i/templates/cad.com
+# Put the refmac patch into place
+ cp ../rcard_tor1.f-14May2004 src/refmac5_/rcard_tor1.f
#
<<
CompileScript: <<
-#!/bin/csh
-umask 022
-source include/%n.setup-initial
+#!/bin/zsh -f
+ umask 0022
+. include/%n.setup-sh
./configure --with-x Darwin
-# additional ugly hacks to get X-windows programs to compile
-#
-foreach distmakefile ( `find . -iname *akefile` )
- perl -pi -e 's/-lxdl_view/-lxdl_view -lcc_dynamic/g' $distmakefile
- perl -pi -e 's/-lXt/-lXt -lcc_dynamic/g' $distmakefile
- perl -pi -e 's/-L\/usr\/X11R6\/lib/-L\/usr\/X11R6\/lib -lcc_dynamic/g'
$distmakefile
- perl -pi -e 's/-no-cpp-precomp//g' $distmakefile
-end
-#
-#
-perl -pi -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' %b/x-windows/XCCPJIFFY/Imakefile
-#
-# fix error I introduced above
-#
-perl -pi -e 's/dynamicextra/dynamic -lxdl_viewextra/g' %b/x-windows/Rotgen/Makefile
-#
+# fix a post-configure bug
+perl -pi -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' x-windows/XCCPJIFFY/Imakefile
#
-make
-make install
+make -i
+make -i install
make clean
-# Check that it all compiled and works
-#
-cd $CCP4/examples/unix/runnable
-run-all
-#
<<
InstallScript: <<
-#!/bin/csh
- umask 022
- rm -f include/%n.setup-initial
+#!/bin/zsh -f
+umask 0022
+# Change environment scripts to match final installation
+perl -pi -e 's|%p/src/%f|%p/share/xtal|g' include/%n.setup-sh # install prefix
+perl -pi -e 's|%p/src/%f|%p/share/xtal|g' include/%n.setup # install prefix
+#
mkdir -p %i/share/xtal/%n-%v
mkdir -p %i/share/man/man1
- source include/%n.setup-csh
+ source include/%n.setup
# set up man pages in a fink-compliant manner
cd %p/src/%n-%v-%r/%n-%v/doc
mv rasmol.doc eightbit_rasmol.doc
@@ -129,7 +81,7 @@
#
# make scripts for %p/etc/profile.d and fix a bad variable that caused bugs for fink
#
- echo "source %p/share/xtal/%n-%v/include/%n.setup-csh" > %i/etc/profile.d/%n.csh
+ echo "source %p/share/xtal/%n-%v/include/%n.setup" > %i/etc/profile.d/%n.csh
echo "unsetenv XUSERFILESEARCHPATH" >> %i/etc/profile.d/%n.csh
# echo "setenv XAPPLRESDIR %p/etc/app-defaults/" >> %i/etc/profile.d/%n.csh
#
@@ -141,7 +93,7 @@
#
# needed for compilation of ancilliary programs such as mosflm
#
-ranlib %i/share/xtal/ccp4-4.2.2/lib/*.a
+ranlib %i/share/xtal/%n-%v/lib/*.a
#
<<
Description: Macromolecular crystallography package
@@ -149,12 +101,31 @@
CCP4 macromolecular crystallography program suite
This version compiles with Apple's Lapack/Blas
http://www.ccp4.ac.uk
-http://www.ccp4.ac.uk/problems/mac_4_2.html
-License agreement is part of configure file -- print out form and send in
+License agreement is part of configure file -- print out form and mail in,
additional comments at http://chemistry.ucsc.edu/%7Ewgscott/xtal/page5.html
-CCP4 files will be installed under %p/share/xtal/ccp4-4.x.x
+CCP4 files will be installed under %p/share/xtal/ccp4-5.0
+Note that xloggraph (still) does not compile on OSX. View logfiles in
+mozzilla-type browser.
<<
-DocFiles: README CHANGES COPYING PROBLEMS ccp4i_installation.html licence.txt
-Homepage: http://www.ccp4.ac.uk
+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
+Homepage: http://www.ccp4.ac.uk conditions.txt
License: Restrictive
-Maintainer: W. G. Scott <[EMAIL PROTECTED]>
+Maintainer: W. G. Scott <[EMAIL PROTECTED]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
