Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28660
Modified Files:
coot.info
Log Message:
new version pygtk+2 scripting window now works
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- coot.info 21 Dec 2007 00:53:20 -0000 1.51
+++ coot.info 22 Dec 2007 01:21:26 -0000 1.52
@@ -1,14 +1,14 @@
Package:coot
-Version: 0.4-pre-2-revision-601
+Version: 0.4-pre-2-revision-611
Revision: 1
GCC: 4.0
#Source: http://www.ysbl.york.ac.uk/~emsley/software/%n-%v.tar.gz
Source: http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v.tar.gz
-Source-MD5: f0f63c4b198301f75fe5ff5887f64a1e
+Source-MD5: aa41d33a8f29ef6f9e0fa5c0ccc0dc96
#SourceDirectory: %n-%v
SourceDirectory: %n-0.4-pre-2
-Source2:
http://www.ysbl.york.ac.uk/~emsley/software/extras/refmac-lib-data-monomers.tar.gz
-Source2-MD5: 88cdbabf47914740f2d13e6960eea3c6
+Source2:
http://www.ysbl.york.ac.uk/~garib/refmac/data/refmac5.3_dictionary.tar.gz
+Source2-MD5: 53faccfdb396125c1f885cdba4a5bd5b
Source3:
http://www.ysbl.york.ac.uk/~emsley/software/extras/reference-structures.tar.gz
Source3-MD5: c09bb6b5524901cb0fde14589546224e
#
@@ -28,13 +28,13 @@
or simply create a file called ~/.gtkrc-2.0 and put this line in it:
include \"/sw/share/themes/Glossy_P/gtk-2.0/gtkrc\"
.
-Install fink's povray and raster3d to use the F8 key for producing ray-traced
-images.
+Install povray and raster3d fink packages to use the F8 key for producing
+ray-traced images.
<<
###############################################################################
-Recommends: povray, ccp4, raster3d
+Recommends: povray, ccp4, raster3d
BuildDepends: <<
- ccp4-onlylibs-dev (>= 6.0.2-8),
+ ccp4-onlylibs-dev (>= 6.0.2-9),
atk1 ,
freeglut ,
giflib ,
@@ -60,6 +60,8 @@
librsvg2-gtk ,
libtool14 ,
pango1-xft2-dev ,
+ pygtk2-py25-dev ,
+ python25 ,
swig
<<
# Note: gtkglext1 IS required at runtime for stereo functionality
@@ -95,10 +97,11 @@
libtiff-shlibs ,
libtool14-shlibs ,
librsvg2-gtk ,
- pango1-xft2-shlibs
+ pango1-xft2-shlibs ,
+ pygtk2-py25 ,
+ python25 ,
<<
#
-# raster3d
###############################################################################
BuildDependsOnly: false
NoSetLDFLAGS: true
@@ -133,33 +136,18 @@
###############################################################################
CompileScript: <<
#!/bin/zsh -efx
-
-export
PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
+export PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
export SED=/usr/bin/sed
-# Use the system-supplied python, which differs for 10.4 vs. 10.5
-if [[ -d
/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.5
]];then
- alias
python="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.5"
- export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.5"
- FLIBS="-L/System/Library/Frameworks/Python.framework/Versions/Current/lib
-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/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.5"
\
- LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib -L/usr/lib
-lSystemStubs -flat_namespace
-L/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.5/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
- CXX="/usr/bin/g++" \
- CC="/usr/bin/gcc" \
-
py_path=/System/Library/Frameworks/Python.framework/Versions/Current/bin/python2.5
\
- ./configure %c
-else
- alias
python="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
- export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
-
FLIBS="-L/System/Library/Frameworks/Python.framework/Versions/Current/lib
-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/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.3"
\
- LDFLAGS="-L%p/share/xtal/ccp4-onlylibs-dev-6.0.2/lib -L%p/lib
-L/usr/lib -lSystemStubs -flat_namespace
-L/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3/config
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
- CXX="/usr/bin/g++" \
- CC="/usr/bin/gcc" \
-
py_path=/System/Library/Frameworks/Python.framework/Versions/Current/bin/python2.3
\
- ./configure %c
-fi
-
-
+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" \
+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" \
+CXX="/usr/bin/g++" \
+CC="/usr/bin/gcc" \
+./configure %c
+# py_path="%p/bin/python2.5" \
+#
#remake the src/coot_wrap_python.cc and src/coot_wrap_guile.cc files
/bin/rm -f **/coot_wrap_*.cc
cd src
@@ -174,7 +162,9 @@
#!/bin/zsh -efv
export PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
export PYTHONPATH=""
+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
export SED=/usr/bin/sed
+export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
cp src/coot.py python/coot.py
make install prefix=%i
#
@@ -194,7 +184,9 @@
mkdir -p %i/share/coot/python
cp src/coot.py %i/share/coot/python/coot.py
cp -R setup %i/share/coot/.
-cp -R ../lib %i/share/coot/.
+# This installs the refmac monomer library
+mkdir -p %i/share/coot/lib/data
+cp -R ../dic %i/share/coot/lib/data/monomers
# cp %i/share/coot/etc/python/coot.py %i/share/coot/python/.
# Reference structures should be in %i/share/coot/reference-structures
cp -R ../reference-structures %i/share/coot/.
@@ -209,6 +201,7 @@
/bin/rm -rf %i/include
/bin/rm -rf %i/**/.libs
<<
+RuntimeVars: COOT_REFMAC_LIB_DIR: %p/share/coot/lib
###############################################################################
DocFiles: README AUTHORS NEWS COPYING ABOUT-NLS BUGS TODO
License: GPL
@@ -221,6 +214,7 @@
Files: <<
lib/libccp4mg-*.dylib
lib/libcoot-*.dylib
+lib/libcootaneer*.dylib
<<
Shlibs: <<
%p/lib/libccp4mg-surface.0.0.0.dylib 1.0.0
%n (>= 0.3-1)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
