Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31711
Modified Files:
coot.info coot.patch
Log Message:
coot revision update
Index: coot.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- coot.patch 14 Nov 2009 07:14:05 -0000 1.9
+++ coot.patch 10 May 2010 16:03:03 -0000 1.10
@@ -1,46 +1,29 @@
-diff -ruN coot-0.6-pre-1-orig/configure coot-0.6-pre-1/configure
---- coot-0.6-pre-1-orig/configure 2009-11-12 09:02:22.000000000 -0800
-+++ coot-0.6-pre-1/configure 2009-11-13 21:52:32.000000000 -0800
-@@ -23343,14 +23343,14 @@
- # added lz, we should have proper autoconf check for this.
- #
- CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-mtz -lclipper-cif
-lclipper-phs -lclipper-contrib -lclipper-mmdb -lclipper-mmdbold -lclipper-core
-lmccp4 $MMDB_LIBS -lrfftw -lfftw -lz -lm"
-- CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-ccp4 -lclipper-cif
-lclipper-phs -lclipper-contrib -lclipper-minimol -lclipper-cns -lclipper-mmdb
-lclipper-core -lccp4c $MMDB_LIBS -lrfftw -lfftw -lz -lm"
-+ CLIPPER_LDOPTS="-L$clipper_prefix/lib -lclipper-ccp4 -lclipper-cif
-lclipper-phs -lclipper-contrib -lclipper-minimol -lclipper-cns -lclipper-mmdb
-lclipper-core -lgpp4 $MMDB_LIBS -lrfftw -lfftw -lz -lm"
- # -L$clipper_prefix/boost/lib -lclipper-cctbx -L$clipper_prefix/cctbx/lib
-lsgtbx -luctbx
- else
- # the compiler looks in the "standard" places for clipper. In real life,
- # it would be quite unlikely that clipper would be installed in /usr/include,
- # /usr/lib etc. so this code will not usually find the right dependencies.
- CLIPPER_CXXFLAGS=""
-- CLIPPER_LDOPTS="-lclipper-ccp4 -lclipper-cif -lclipper-phs -lclipper-contrib
-lclipper-mmdb -lclipper-minimol -lclipper-cns -lclipper-core -lccp4c
$MMDB_LIBS -lrfftw -lfftw -lz -lm"
-+ CLIPPER_LDOPTS="-lclipper-ccp4 -lclipper-cif -lclipper-phs -lclipper-contrib
-lclipper-mmdb -lclipper-minimol -lclipper-cns -lclipper-core -lgpp4 $MMDB_LIBS
-lrfftw -lfftw -lz -lm"
- fi
-
- # BL: workaround needed for new MinGW
-diff -ruN coot-0.6-pre-1-orig/scheme/group-settings.scm
coot-0.6-pre-1/scheme/group-settings.scm
---- coot-0.6-pre-1-orig/scheme/group-settings.scm 2009-07-04
05:57:36.000000000 -0700
-+++ coot-0.6-pre-1/scheme/group-settings.scm 2009-11-13 21:52:32.000000000
-0800
-@@ -49,3 +49,4 @@
- #f)))
+diff -ruN coot-0.6.2-pre-1-orig/scheme/group-settings.scm
coot-0.6.2-pre-1/scheme/group-settings.scm
+--- coot-0.6.2-pre-1-orig/scheme/group-settings.scm 2009-07-04
05:57:36.000000000 -0700
++++ coot-0.6.2-pre-1/scheme/group-settings.scm 2010-03-31 09:52:42.000000000
-0700
+@@ -28,6 +28,7 @@
+ (set-browser-interface "firefox"))
+ (if (string=? os-type "Darwin")
++ (set-display-lists-for-maps 0)
+ (set-browser-interface "open")))
-+(set-display-lists-for-maps 0)
-diff -ruN coot-0.6-pre-1-orig/scheme/povray.scm
coot-0.6-pre-1/scheme/povray.scm
---- coot-0.6-pre-1-orig/scheme/povray.scm 2009-07-04 05:57:34.000000000
-0700
-+++ coot-0.6-pre-1/scheme/povray.scm 2009-11-13 21:52:32.000000000 -0800
+ ;; York setting for molprobity.
+diff -ruN coot-0.6.2-pre-1-orig/scheme/povray.scm
coot-0.6.2-pre-1/scheme/povray.scm
+--- coot-0.6.2-pre-1-orig/scheme/povray.scm 2009-07-04 05:57:34.000000000
-0700
++++ coot-0.6.2-pre-1/scheme/povray.scm 2010-03-31 09:54:43.000000000 -0700
@@ -14,7 +14,7 @@
(lambda ()
; this is directory that contains colors.inc
- (list (string-append "+L/sw/share/povray-" povray-version "/include")
-+ (list (string-append "+L@/share/povray-" povray-version "/include")
++ (list (string-append "+...@prefix@/share/povray-" povray-version
"/include")
"+FN16")))
;; Run provray using current displayed image and write .pov file to
-diff -ruN coot-0.6-pre-1-orig/scheme/raster3d.scm
coot-0.6-pre-1/scheme/raster3d.scm
---- coot-0.6-pre-1-orig/scheme/raster3d.scm 2009-07-04 05:57:34.000000000
-0700
-+++ coot-0.6-pre-1/scheme/raster3d.scm 2009-11-13 21:52:32.000000000 -0800
+diff -ruN coot-0.6.2-pre-1-orig/scheme/raster3d.scm
coot-0.6.2-pre-1/scheme/raster3d.scm
+--- coot-0.6.2-pre-1-orig/scheme/raster3d.scm 2009-07-04 05:57:34.000000000
-0700
++++ coot-0.6.2-pre-1/scheme/raster3d.scm 2010-03-31 09:55:54.000000000
-0700
@@ -1,7 +1,7 @@
(define coot-r3d-file-name "coot.r3d")
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- coot.info 27 Jan 2010 00:19:07 -0000 1.147
+++ coot.info 10 May 2010 16:02:52 -0000 1.148
@@ -1,12 +1,11 @@
Package: coot
-Version: 0.6.1.0
-Revision: 1
-#SourceDirectory: %n-%v
-SourceDirectory: %n-0.6.1
+Version: 0.6.2-pre-1
+Revision: 5
+SourceDirectory: %n-%v
GCC: 4.0
-Source: http://www.biop.ox.ac.uk/%n/software/source/releases/%n-0.6.1.tar.gz
-#Source:
http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v-revision-2734.tar.gz
-Source-MD5: 2a17a2fba680bd7c86dad33a94488e4f
+# Source: http://www.biop.ox.ac.uk/%n/software/source/releases/%n-0.6.1.tar.gz
+Source:
http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v-revision-2943.tar.gz
+Source-MD5: 6d9a44a7ddb5e9a94afa15b90123bd25
Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac_dictionary.tar.gz
Source2-MD5: d6eab829728608d0b8eade38debcedd3
Source3:
http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz
@@ -131,9 +130,10 @@
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
PatchFile: %n.patch
-PatchFile-MD5: 8fed407c920102ba0dffbccc60a49fb0
+PatchFile-MD5: 847c69ea1ded1d4238b66ab4840a8141
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+perl -pi -e 's|ccp4c=ccp4c|ccp4c=gpp4|g' configure
<<
###############################################################################
ConfigureParams: <<
@@ -177,7 +177,8 @@
mv libtool.fixed libtool
fi
#
- make
+NUMPROC="$(sysctl -n hw.ncpu)"
+make -j $NUMPROC
<<
###############################################################################
InstallScript: <<
@@ -187,7 +188,8 @@
export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
cp src/coot.py python/coot.py
#
-make install prefix=%i
+NUMPROC="$(sysctl -n hw.ncpu)"
+make -j $NUMPROC install prefix=%i
#
# Clean up the 120 MB mess, which zsh makes so much fun:
/bin/rm -f **/*.o
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
