Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19086
Modified Files: ccp4.info ccp4.patch Log Message: fix for 10.6 to enable mosflm to compile Index: ccp4.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- ccp4.info 18 Jul 2009 05:07:50 -0000 1.50 +++ ccp4.info 30 Aug 2009 19:16:16 -0000 1.51 @@ -1,6 +1,6 @@ Package: ccp4 Version: 6.1.2 -Revision: 1 +Revision: 2 GCC: 1 # Source: ftp://ftp.%n.ac.uk/%n/%v/%n-%v-core-src.tar.gz @@ -14,7 +14,7 @@ Source3-MD5: 4467bb6a0647304c33dd14843959e15d # PatchFile: ccp4.patch -PatchFile-MD5: d0e9f09975acdc95bdc83839b124d2ea +PatchFile-MD5: e172d66ec7eec242578d015d6a4e2790 # DescPort: << CCP4 is designed to compile with gfortran on OS X >= 10.4 by default. @@ -95,9 +95,15 @@ perl -pi.bak -e 's|ccp4_first_in_path\ =\ 1|ccp4_first_in_path\ =\ 0|g' include/ccp4.setup* perl -pi.bak -e 's|setenv GFORTRAN_UNBUFFERED_ALL Y|# setenv GFORTRAN_UNBUFFERED_ALL Y|g' include/ccp4.setup* perl -pi.bak -e 's|export GFORTRAN_UNBUFFERED_ALL|# export GFORTRAN_UNBUFFERED_ALL|g' include/ccp4.setup* - + if [[ $(sw_vers -productVersion) < 10.6 ]]; then + true + else + /usr/bin/grep -v "char \*strcat( char \*, const char \*);" x-windows/Mosflm/src/dps/index/ind_gen_direct.c >| x-windows/Mosflm/src/dps/index/ind_gen_direct.tmp + /bin/cp x-windows/Mosflm/src/dps/index/ind_gen_direct.tmp x-windows/Mosflm/src/dps/index/ind_gen_direct.c + /bin/rm -f x-windows/Mosflm/src/dps/index/ind_gen_direct.tmp + fi # - cp include/ccp4.setup-dist include/ccp4.setup + /bin/cp include/ccp4.setup-dist include/ccp4.setup rm -f include/ccp4.setup-sh include/ccp4.setup*.bak # # Set up XCCPJiffy wrapper scripts in $CCP4/etc @@ -349,7 +355,7 @@ << ################################################################################ PreRmScript: << - /usr/bin/find %p/share/xtal/%n-%v/src/phaser/phaser-2.1.4 -name '*.pyo' -delete + [[ -d %p/share/xtal/%n-%v/src/phaser/phaser-2.1.4 ]] && /usr/bin/find %p/share/xtal/%n-%v/src/phaser/phaser-2.1.4 -name '*.pyo' -delete << ################################################################################ PostInstScript: << Index: ccp4.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ccp4.patch 18 Jul 2009 05:07:50 -0000 1.19 +++ ccp4.patch 30 Aug 2009 19:16:16 -0000 1.20 @@ -461,7 +461,7 @@ + export CLIB="$CCP4/lib" - setenv CCP4_BROWSER firefox -+ CCP4_BROWSER=""; export CCP4_BROWSER="open" ++ CCP4_BROWSER=""; export CCP4_BROWSER="Safari" if test "$MANPATH"; then - if [ $ccp4_first_in_path -eq 1 ]; then @@ -1077,7 +1077,7 @@ + setenv CBIN $CCP4/bin + setenv CLIB $CCP4/lib + -+ setenv CCP4_BROWSER firefox ++ setenv CCP4_BROWSER Safari + + if (${?MANPATH}) then + if ($ccp4_first_in_path) then @@ -1559,7 +1559,7 @@ - export CCP4_BROWSER=firefox + CCP4_BROWSER="" + if [[ $(uname) == Darwin ]]; then -+ export CCP4_BROWSER="open" ++ export CCP4_BROWSER="Safari" + elif [[ -x $(which firefox) ]]; then + export CCP4_BROWSER="firefox" + else ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs