Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10237

Modified Files:
        coot.info 
Log Message:
update clipper and python dependencies

Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- coot.info   12 Jul 2009 16:34:09 -0000      1.116
+++ coot.info   16 Jul 2009 03:06:34 -0000      1.117
@@ -1,6 +1,6 @@
 Package: coot
 Version: 0.6-pre-1-revision-2131
-Revision: 1
+Revision: 2
 SourceDirectory: %n-0.6-pre-1
 GCC: 4.0 
 Source: http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v.tar.gz
@@ -34,8 +34,8 @@
 ###############################################################################
 Recommends:  povray, ccp4, raster3d                        
 BuildDepends: <<
- clipper-dev (>= 1:2.1-10)       ,
- clipper     (>= 1:2.1-10)       ,
+ clipper-dev (>= 1:2.1-11)       ,
+ clipper     (>= 1:2.1-11)       ,
  gcc44        (>= 4.4.0-1000)    ,
  gpp4-dev (>= 1.0.4-5)           ,
  gpp4     (>= 1.0.4-10)          ,
@@ -76,9 +76,9 @@
  libxml2                         ,
  pango1-xft2-ft219-dev (>= 1.18.4-1) ,
  pixman (>= 0.10.0-1)            ,
- pygtk2-gtk-py25-dev             ,
- pygobject2-py25-dev             ,
- python25                        ,
+ pygtk2-gtk-py26-dev             ,
+ pygobject2-py26-dev             ,
+ python26                        ,
  swig                            ,
  x11-dev                         ,
  xft2-dev
@@ -86,7 +86,7 @@
 #            
 # Note: gtkglext1 IS required at runtime for stereo functionality
 Depends: <<
- clipper-shlibs (>= 1:2.1-10)     ,
+ clipper-shlibs (>= 1:2.1-11)     ,
  gpp4-shlibs (>= 1.0.4-10)        ,
  mmdb-shlibs (>= 1.21-10)         ,
  ssm-shlibs (>= 0.1-10)           ,
@@ -125,8 +125,8 @@
  librsvg2-gtk  (>= 2.20.0-1)      ,
  libxml2-shlibs                   ,
  pango1-xft2-ft219-shlibs (>= 1.18.4-1) ,
- pygtk2-gtk-py25                  ,
- python25                         ,
+ pygtk2-gtk-py26                  ,
+ python26                         ,
  x11
 <<
 #
@@ -161,17 +161,17 @@
 ###############################################################################
 CompileScript: <<
 #!/bin/zsh -efv
-alias python=%p/bin/python2.5
-export PYTHON=%p/bin/python2.5
-export python=%p/bin/python2.5
+alias python=%p/bin/python2.6
+export PYTHON=%p/bin/python2.6
+export python=%p/bin/python2.6
 export 
PATH=$PWD/bin:%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH:%p/share/guile/1.8/goosh
 export SED=/usr/bin/sed
 export GDK_USE_XFT='1'
 export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
 export 
PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pkgconfig:${PKG_CONFIG_PATH}
   FLIBS="-L%p/lib/gcc4.4/lib -L%p/lib" \
-  CPPFLAGS="-I%p/include/libglade-2.0/glade -I%p/include/libglade-2.0 
-I%p/include/python2.5  -I%p/include/mmdb -I%p/include/ssm 
-I%p/include/gpp4/ccp4 -I%p/include/clipper -I%p/include -I/usr/X11R6/include" \
-  
LDFLAGS="-Wl,-dylib_file,%p/lib/python2.5/config/libpython2.5.dylib:%p/lib/libsfftw.2.0.7.dylib:%p/lib/libsrfftw.2.0.7.dylib:%p/lib/pango-ft219/lib/libpango-1.0.dylib:%p/lib/pango-ft219/lib/libpangocairo-1.0.dylib:%p/lib/pango-ft219/lib/libpangoft2-1.0.dylib:%p/lib/pango-ft219/lib/libpangox-1.0.dylib:%p/lib/pango-ft219/lib/libpangoxft-1.0.dylib
 -L%p/lib/pango-ft219/lib -L%p/lib -L%p/lib/gcc4.4/lib -L/usr/lib -lSystemStubs 
-flat_namespace 
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
+  CPPFLAGS="-I%p/include/libglade-2.0/glade -I%p/include/libglade-2.0 
-I%p/include/python2.6  -I%p/include/mmdb -I%p/include/ssm 
-I%p/include/gpp4/ccp4 -I%p/include/clipper -I%p/include -I/usr/X11R6/include" \
+  
LDFLAGS="-Wl,-dylib_file,%p/lib/python2.6/config/libpython2.6.dylib:%p/lib/libsfftw.2.0.7.dylib:%p/lib/libsrfftw.2.0.7.dylib:%p/lib/pango-ft219/lib/libpango-1.0.dylib:%p/lib/pango-ft219/lib/libpangocairo-1.0.dylib:%p/lib/pango-ft219/lib/libpangoft2-1.0.dylib:%p/lib/pango-ft219/lib/libpangox-1.0.dylib:%p/lib/pango-ft219/lib/libpangoxft-1.0.dylib
 -L%p/lib/pango-ft219/lib -L%p/lib -L%p/lib/gcc4.4/lib -L/usr/lib -lSystemStubs 
-flat_namespace 
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
   CXX="%p/lib/gcc4.4/bin/g++" \
   CC="%p/lib/gcc4.4/bin/gcc" \
   DYLD_LIBRARY_PATH="" \
@@ -240,7 +240,7 @@
 echo '#!/bin/sh -f ' >  %i/bin/coot
 echo "export COOT_REFMAC_LIB_DIR=%p/share/coot/lib"  >>  %i/bin/coot
 echo "export COOT_PYTHON_DIR=%p/share/coot/python"   >>  %i/bin/coot
-echo "export 
PYTHONPATH=%p/lib/python25.zip:%p/lib/python2.5:%p/lib/python2.5/plat-darwin:%p/lib/python2.5/plat-mac:%p/lib/python2.5/plat-mac/lib-scriptpackages:%p/lib/python2.5/lib-tk:%p/lib/python2.5/lib-dynload:%p/lib/python2.5/site-packages:%p/lib/python2.5/site-packages/Numeric:%p/lib/python2.5/site-packages/gtk-2.0:%p/share/coot/python:\$PYTHONPATH"
  >>  %i/bin/coot
+echo "export 
PYTHONPATH=%p/lib/python26.zip:%p/lib/python2.6:%p/lib/python2.6/plat-darwin:%p/lib/python2.6/plat-mac:%p/lib/python2.6/plat-mac/lib-scriptpackages:%p/lib/python2.6/lib-tk:%p/lib/python2.6/lib-dynload:%p/lib/python2.6/site-packages:%p/lib/python2.6/site-packages/Numeric:%p/lib/python2.6/site-packages/gtk-2.0:%p/share/coot/python:\$PYTHONPATH"
  >>  %i/bin/coot
 echo "%p/bin/coot-real \"\...@\" "  >>  %i/bin/coot
 chmod a+x %i/bin/coot
 # Clean up the rest of the mess.


------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge  
This is your chance to win up to $100,000 in prizes! For a limited time, 
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize  
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to