Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv17396
Modified Files:
ccp4.info ccp4.patch
Log Message:
changed for gcc43 gfortran
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ccp4.info 30 Dec 2007 04:13:12 -0000 1.28
+++ ccp4.info 9 Mar 2008 22:16:58 -0000 1.29
@@ -1,6 +1,6 @@
Package: ccp4
Version: 6.0.2
-Revision: 7
+Revision: 8
GCC: 4
Source: ftp://ftp.ccp4.ac.uk/ccp4/%v/source/ccp4-%v-core-src.tar.gz
Source-MD5: a47ae8b8e6fa76eef7f17baa85e8dc16
@@ -23,10 +23,10 @@
Source8-MD5: 26a124b160c4215d6b20749f20932920
Source9: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/crystal.C-r1.5-r1.6.diff
Source9-MD5: 5c62b4a7399aded0f0c896c4315cfff6
-Source10: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/export-r1_12.tcl
-Source10-MD5: 984f7305ba151d961bef2ac25b1b9925
-Source11: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/export-r1_6.def
-Source11-MD5: 3babc1ee652fed6d2bb976bde41450a8
+Source10: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patched_files/export-r1_13.tcl
+Source10-MD5: 92c05d767ab7d29b62ab2d6d6fa7da10
+Source11: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patched_files/export-r1_7.def
+Source11-MD5: 8b10e6226833c6783bfc983e7215084b
Source12: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/mtz2various-r1_132.f
Source12-MD5: 7ed02a1cd000a912ecef8a61a59d8560
Source13: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/mtz2various-r1_40.html
@@ -35,6 +35,14 @@
Source14-MD5: 6471fce214ad8e3a1345fce4ce3ccf5b
Source15: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/rstats.f-r1.39-r1.40.diff
Source15-MD5: 05578c1bfd0eeb3a554170ae02b85ea9
+Source16: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/beast_MPI.f-r1.1-r1.2.diff
+Source16-MD5: f0765c071d86a9cb62450e0eec14558d
+Source17: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/rharvest.fh-r1.13-r1.14.diff
+Source17-MD5: 54f39fb8e8249b98f8e6be7399adc303
+Source18: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patches/detwin.tcl
+Source18-MD5: f945d86150e37b6cff942c3fc16438b4
+Source19: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/patched_files/refmac5.tcl
+Source19-MD5: 6b2b87f5fec217b0353824a5bc94e730
#
DescPort: <<
CCP4 is designed to compile with gfortran on OS X >= 10.4 by default.
@@ -75,15 +83,15 @@
x11,
tcltk,
blt,
- gcc42-shlibs,
- fftw-shlibs, %N-shlibs (= %v-%r)
+ gcc43-shlibs,
+ fftw-shlibs (>=2.1.5-1014), %N-shlibs (= %v-%r)
<<
BuildDepends: <<
- gcc42,
+ gcc43,
f2c,
fort77,
tcltk-dev,
- fftw
+ fftw (>=2.1.5-1014)
<<
Replaces: <<
mosflm (<= 6.2.3-2),
@@ -146,11 +154,14 @@
/usr/bin/patch src/bp3_/crystal.C
../crystal.C-r1.5-r1.6.diff
/usr/bin/patch src/fft.f
../fft.f-r1.98-r1.100.diff
/usr/bin/patch src/rstats.f
../rstats.f-r1.39-r1.40.diff
- cp ../export-r1_12.tcl ccp4i/tasks/export.tcl
- cp ../export-r1_6.def ccp4i/tasks/export.def
+ #/usr/bin/patch src/beast_/beast_MPI/beast_MPI.f
../beast_MPI.f-r1.1-r1.2.diff
+ /usr/bin/patch src/refmac5_/rharvest.fh
../rharvest.fh-r1.13-r1.14.diff
+ cp ../export-r1_13.tcl ccp4i/tasks/export.tcl
+ cp ../export-r1_7.def ccp4i/tasks/export.def
cp ../mtz2various-r1_132.f src/mtz2various.f
cp ../mtz2various-r1_40.html html/mtz2various.html
- #
+ cp ../detwin.tcl ccp4i/tasks/detwin.tcl
+ cp ../refmac5.tcl ccp4i/tasks/refmac5.tcl
<<
################################################################################
CompileScript: <<
@@ -194,9 +205,9 @@
# Disable building of pdb_extract and phaser in 10.5. CCP4 6.1 will fix
this.
if [[ $(sw_vers -productVersion) < 10.5 ]]; then
- FC="%p/lib/gcc4.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib"
./configure --with-shared-libs --with-fftw=%p --with-x Darwin
+ FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --with-shared-libs --with-fftw=%p --with-x Darwin
else
- FC="%p/lib/gcc4.2/bin/gfortran" F_LIBS="-L%p/lib/gcc4.2/lib"
./configure --disable-pdb_extract --disable-cctbx --disable-phaser
--with-shared-libs --with-fftw=%p --with-x Darwin
+ FC="%p/lib/gcc4.3/bin/gfortran" F_LIBS="-L%p/lib/gcc4.3/lib"
./configure --disable-pdb_extract --disable-cctbx --disable-phaser
--with-shared-libs --with-fftw=%p --with-x Darwin
fi
# fix some post-configure bugs by getting rid of -lg2c
@@ -205,7 +216,7 @@
if [[ $(uname -p) != powerpc ]];then
- perl -pi.bak -e 's|%p/lib/gcc4.2/bin/||g' lib/clipper/**/Makefile*
+ perl -pi.bak -e 's|%p/lib/gcc4.3/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
@@ -213,7 +224,7 @@
chmod a+x lib/clipper/libtool
fi
- ( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran
-L%p/lib/gcc4.2/lib |g' *akefile* ) || exit 1
+ ( cd x-windows/XCCPJIFFY; perl -pi.bak -e 's|-lgfortran|-lgfortran
-L%p/lib/gcc4.3/lib |g' *akefile* ) || exit 1
if [[ $(sw_vers -productVersion) < 10.5 ]]; then
:
else
@@ -242,7 +253,7 @@
#
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.2/lib
+ 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.3/lib
#
sleep 10
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ccp4.patch 23 Nov 2006 17:19:15 -0000 1.12
+++ ccp4.patch 9 Mar 2008 22:16:58 -0000 1.13
@@ -1128,3 +1128,48 @@
IH(5)=IDAY
IH(6)=IMON
IH(7)=IYR
+--- ccp4-6.0.2/configure.sav 2008-03-09 12:56:18.000000000 -0400
++++ ccp4-6.0.2/configure 2008-03-09 12:58:40.000000000 -0400
+@@ -1961,12 +1961,12 @@
+ case $FC in
+ *gfortran* )
+ case `$FC -dumpversion 2>&1` in
+- GNU\ Fortran\ 95\ \(GCC\ 4.1.0\)* )
SETFLAGS=${SETFLAGS:-"refmac5_FLAGS='$XFFLAGS -O0' lgglib_FLAGS='$XFFLAGS -O0'
arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem' " } ;;
+- * ) SETFLAGS=${SETFLAGS:-"lgglib_FLAGS='$XFFLAGS -O0'
arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem' " } ;;
++ GNU\ Fortran\ 95\ \(GCC\ 4.1.0\)* )
SETFLAGS=${SETFLAGS:-"refmac5_FLAGS='$XFFLAGS -O0' lgglib_FLAGS='$XFFLAGS -O0'
arp_waters_FLAGS='$XFFLAGS $FOPTIM' " } ;;
++ * ) SETFLAGS=${SETFLAGS:-"lgglib_FLAGS='$XFFLAGS -O0'
arp_waters_FLAGS='$XFFLAGS $FOPTIM' " } ;;
+ esac
+ ;;
+ * ) SETFLAGS=${SETFLAGS:-"sftools_FLAGS='$XFFLAGS $FOPTIM' \
+- arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem' \
++ arp_waters_FLAGS='$XFFLAGS $FOPTIM' \
+ mlphare_FLAGS='$XFFLAGS $FOPTIM -fno-move-all-movables'
\
+ stereo_FLAGS='$XFFLAGS $FOPTIM -fno-move-all-movables'
"} ;;
+ esac
+@@ -2187,7 +2187,7 @@
+ i386 ) FOPTIM="-O1"
+ SETFLAGS=${SETFLAGS:-"sftools_FLAGS='$XFFLAGS $FOPTIM' \
+ refmac5_FLAGS='$XFFLAGS -O1' \
+- arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem' \
++ arp_waters_FLAGS='$XFFLAGS $FOPTIM' \
+ mplot_FLAGS='$XFFLAGS -O1' \
+ molrep_FLAGS='$XFFLAGS -O0' \
+ xdlmapman_FLAGS='$XFFLAGS -O1'\
+@@ -2308,7 +2308,7 @@
+ INSTALL_PROGRAM=${INSTALL_PROGRAM:-"cp"}
+ SETFLAGS=${SETFLAGS:-"sftools_FLAGS='$XFFLAGS $FOPTIM' \
+ refmac5_FLAGS='$XFFLAGS -O3' \
+- arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem' \
++ arp_waters_FLAGS='$XFFLAGS $FOPTIM' \
+ mplot_FLAGS='$XFFLAGS -O3' \
+ molrep_FLAGS='$XFFLAGS -O3' \
+ xdlmapman_FLAGS='$XFFLAGS -O3'"}
+@@ -2634,7 +2634,7 @@
+ INSTALL_DATA=${INSTALL_DATA:-"cp"}
+ INSTALL_PROGRAM=${INSTALL_PROGRAM:-"cp"}
+ SETFLAGS=${SETFLAGS:-"sftools_FLAGS='$XFFLAGS $FOPTIM' \
+- arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem'"}
++ arp_waters_FLAGS='$XFFLAGS $FOPTIM'"}
+ XDL_LIB=${XDL_LIB:-"-L${CCP4_LIB} -lxdl_view"}
+ XWIN_LIB=${XWIN_LIB:-"-L/usr/X11R6/lib -lXt -lSM -lX11 -lICE"}
+ XTYPE=${XTYPE:-"LINUX"}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
