Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15384
Modified Files:
pointless.info pointless.patch coot.info
Log Message:
updates to depend on new version of ccp4-onlylibs
Index: pointless.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pointless.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pointless.patch 12 Dec 2007 02:07:44 -0000 1.1
+++ pointless.patch 7 Jul 2008 17:34:04 -0000 1.2
@@ -18,10 +18,10 @@
# Clipper location
-CLPR=${CLIB}/clipper
+# CLPR=${CLIB}/clipper
-+CLPR=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/clipper
++CLPR=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.99/lib/clipper
-+CLIB=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.2/lib
-+CCP4=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.2
++CLIB=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.99/lib
++CCP4=/@prefix@/share/xtal/ccp4-onlylibs-dev-6.0.99
#<<<<< Includes
# CCP4
ICCP4=-I${CLIBS}
Index: pointless.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/pointless.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- pointless.info 6 Apr 2008 01:03:53 -0000 1.10
+++ pointless.info 7 Jul 2008 17:34:04 -0000 1.11
@@ -1,6 +1,6 @@
Package: pointless
Version: 1.2.10
-Revision: 1
+Revision: 2
Source: ftp://ftp.ccp4.ac.uk/ccp4/current/prerelease/%n-%v-src.tar.gz
Source-MD5: d2115796ea0aeaa42b2fe8f4ae16bcfd
Source2: ftp://ftp.ccp4.ac.uk/ccp4/6.0.2/prerelease/%n.html
@@ -9,15 +9,12 @@
Source3-MD5: e4d9a43059ad3981ea7eda165c5ba5aa
NoSourceDirectory: yes
Depends: ccp4 (>= 6.0.2), fftw-shlibs
-BuildDepends: fftw, ccp4-onlylibs-dev (>= 6.0.2-8) , cctbx-10.4 | cctbx-10.5
+BuildDepends: fftw, ccp4-onlylibs-dev (>= 6.0.99-1) , cctbx-10.4 | cctbx-10.5
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
PatchScript: <<
sed 's|@prefix@|%p|g' <%a/%n.patch | patch -p1
mv pointless pointless-ccp4i
-#cp Makefile.linux Makefile
-#perl -pi -e 's|CCTBX\=\${CLIB}/cctbx|CCTBX\=ccp4-6.0.2/lib/cctbx|g' Makefile
-#perl -pi -e 's|lm|lm -L%p/lib -ldrfftw -lfftw|' Makefile
<<
CompileScript: <<
#!/bin/bash -efv
@@ -40,8 +37,6 @@
cp templates/pointless.com %i/share/xtal/ccp4-6.0.2/ccp4i/templates/.
mkdir -p %i/share/xtal/ccp4-6.0.2/ccp4i/scripts
cp scripts/pointless_centre.script scripts/pointless_index.script
scripts/pointless_laue.script %i/share/xtal/ccp4-6.0.2/ccp4i/scripts/.
-#mkdir -p %i/share/xtal/ccp4-6.0.2/ccp4i/help
-# cppointless-ccp4i/help/* %i/share/xtal/ccp4-6.0.2/ccp4i/help/.
mkdir -p %i/share/xtal/ccp4-6.0.2/ccp4i/tasks
cp tasks/pointless.def tasks/pointless_index.def tasks/pointless_laue.tcl
tasks/pointless_centre.def tasks/pointless_index.tcl tasks/pointless_utils.tcl
tasks/pointless_centre.tcl tasks/pointless_laue.def
%i/share/xtal/ccp4-6.0.2/ccp4i/tasks/.
<<
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- coot.info 18 Jun 2008 21:25:59 -0000 1.73
+++ coot.info 7 Jul 2008 17:34:05 -0000 1.74
@@ -1,10 +1,10 @@
Package:coot
Version: 0.5-pre-1
-Revision: 1143
+Revision: 1223
GCC: 4.0
Source:
http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v-revision-%r.tar.gz
# Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
-Source-MD5: d800a7cce6a08879d7082ce09ed3ae8d
+Source-MD5: 1d1bceb47a6475155dc76d4558fc599d
SourceDirectory: %n-%v
Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac5.4_dictionary.tar.gz
Source2-MD5: 14b965dc5ab9762c819f632c133998b9
@@ -34,7 +34,7 @@
###############################################################################
Recommends: povray, ccp4, raster3d
BuildDepends: <<
- ccp4-onlylibs-dev (>= 6.0.2-9),
+ ccp4-onlylibs-dev (>= 6.0.99-1),
atk1 ,
freeglut ,
giflib ,
@@ -128,9 +128,9 @@
<<
###############################################################################
ConfigureParams: <<
---with-mmdb-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2
--with-clipper-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2
--with-fftw=%p/share/xtal/ccp4-onlylibs-dev-6.0.2 \
+--with-mmdb-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.99
--with-clipper-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.99
--with-fftw=%p/share/xtal/ccp4-onlylibs-dev-6.0.99 \
--with-glut-prefix=%p --with-gl-prefix=/usr/X11R6 --with-gtk2 \
---with-gnomecanvas-prefix=%p
--with-ssmlib-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.2 \
+--with-gnomecanvas-prefix=%p
--with-ssmlib-prefix=%p/share/xtal/ccp4-onlylibs-dev-6.0.99 \
--with-imlib-prefix=%p --with-gtkgl-prefix=%p --with-glib-prefix=%p \
--with-guile-gtk --with-guile-gtk-prefix=%p \
--with-gsl-prefix=%p --with-guile --with-python
@@ -143,8 +143,8 @@
export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
export
PYTHONPATH=%p/share/coot/python:%p/lib/python2.5:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/gtk-2.0:%p/lib/python2.5/site-packages/gtk-2.0
FLIBS="-L%p/lib" \
-CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/include
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib/ssm -I%p/include
-I$PWD/ccp4mg-utils -I$PWD/src" \
-LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib -L/usr/lib
-lSystemStubs -flat_namespace -L%p/lib/python2.5/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
+CPPFLAGS="-I%p/share/xtal/ccp4-onlylibs-dev-6.0.99/include
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.99/lib
-I%p/share/xtal/ccp4-onlylibs-dev-6.0.99/lib/ssm -I%p/include
-I$PWD/ccp4mg-utils -I$PWD/src" \
+LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.99/lib -L%p/lib -L/usr/lib
-lSystemStubs -flat_namespace -L%p/lib/python2.5/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
CXX="/usr/bin/g++" \
CC="/usr/bin/gcc" \
./configure %c
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
