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

Modified Files:
        clipper.info coot.info gpp4.info mmdb.info ssm.info 
Log Message:
update for stable coot and dependencies

Index: gpp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gpp4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpp4.info   16 Sep 2008 16:28:00 -0000      1.1
+++ gpp4.info   21 Sep 2009 07:18:04 -0000      1.2
@@ -1,18 +1,18 @@
 Package: gpp4
-Version: 1.0.4
-Revision: 5
+Version: 1.1.0
+Revision: 1
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net> 
-# Maintainer: Morten Kjeldgaard <m...@bioxray.dk>
 DescPackaging: <<
  Based on package created by Morten Kjeldgaard <m...@bioxray.dk> with minor
  edits to conform to standard Fink packaging requirements.
 <<
 Description: Library providing CCP4 functionality 
 License: LGPL
-Source: ftp://ftp.bioxray.au.dk/pub/mok/src/gpp4-%v.tar.gz
-Source-MD5: 48931781425a5b79a8255ebefaed24b3
+Source: http://code.launchpad.net/%n/trunk/%v/+download/gpp4-%v.tar.gz
+Source-MD5: 593383083af6cb5f05679b9adc7a14ab
 NoSourceDirectory: false
-Depends: %N-shlibs (= %v-%r)
+Depends: %N-shlibs (= %v-%r), gcc44-shlibs (>= 4.4.1-1000)
+BuildDepends: mmdb-dev (>= 1.19-12), ssm-dev (>= 0.1-12), gcc44 (>= 4.4.1-1000)
 BuildDependsOnly: true
 HomePage: http://www.bioxray.dk/~mok/gpp4
 DocFiles: README AUTHORS NEWS COPYING
@@ -42,6 +42,9 @@
     incurring excessive overheads.
 <<
 CompileScript: <<
+LDFLAGS="-L%p/lib/gcc4.4/lib -L%p/lib -L/usr/lib" \
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
   ./configure --prefix=%p
   make
 <<
@@ -52,17 +55,16 @@
   Package: %N-shlibs
   Files: <<
     lib/libgpp4.0.dylib
-       lib/libgpp4.0.0.0.dylib
   <<
   Shlibs: <<
-       %p/lib/libgpp4.0.dylib 1.0.0 %n (>= 1.0.4-2)
+       %p/lib/libgpp4.0.dylib 1.0.0 %n (>= 1.0.0-1)
   <<
 <<
 SplitOff2: <<
 Package: %N-dev
 BuildDependsOnly: True
-Conflicts: ccp4-onlylibs-dev  
-Replaces: ccp4-onlylibs-dev
+Conflicts: ccp4-onlylibs-dev, ccp4-dev
+Replaces: ccp4-onlylibs-dev, ccp4-dev
  Files: <<   
   lib/*.a
   lib/*.la

Index: mmdb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/mmdb.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mmdb.info   12 May 2009 15:23:33 -0000      1.2
+++ mmdb.info   21 Sep 2009 07:18:04 -0000      1.3
@@ -1,7 +1,6 @@
 Package: mmdb
 Version: 1.21
-Revision: 1
-# Maintainer: Morten Kjeldgaard <m...@bioxray.dk>
+Revision: 12
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net> 
 DescPackaging: <<
  Based on package created by Morten Kjeldgaard <m...@bioxray.dk> with minor
@@ -12,10 +11,11 @@
 HomePage: http://www.ebi.ac.uk/~keb/cldoc/
 Source: http://www.ebi.ac.uk/~keb/cldoc/downloads/%n-%v.tar.gz
 Source-MD5: 1cc8cbe91f6702a324735e333a6e20b2
-Depends: %N-shlibs (= %v-%r)
+Depends: %N-shlibs (= %v-%r), gcc44-shlibs (>= 4.4.1-1000)
+BuildDepends: libtool14, gcc44 (>= 4.4.1-1000)
 BuildDependsOnly: true
 DescDetail: << 
-MMDB is CCP4's macromolecular coordinate library, written by Eugene
+MMDB is CCP4\'s macromolecular coordinate library, written by Eugene
 Krissinel of the EBI.  The Coordinate Library is designed to assist
 CCP4 developers in working with coordinate files. The major source of
 coordinate information remains the PDB files, although more
@@ -23,7 +23,7 @@
 
 The Library features working with both file formats plus an internal
 binary format portable between different platforms. This is achieved
-at uniformity of the Library's interface functions, so that there is
+at uniformity of the Library\'s interface functions, so that there is
 no difference in handling different formats.
 
 The Library provides various high-level tools for working with
@@ -34,6 +34,9 @@
 coordinate-related operations.
 <<
 CompileScript: <<
+LDFLAGS="-L%p/lib/gcc4.4/lib -L%p/lib -L/usr/lib" \
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
   ./configure --prefix=%p
   make
 <<
@@ -49,8 +52,8 @@
 Package: %N-dev
 Depends: %N (= %v-%r)
 BuildDependsOnly: True
-Conflicts: ccp4-onlylibs-dev  
-Replaces: ccp4-onlylibs-dev
+Conflicts: ccp4-onlylibs-dev, ccp4-dev
+Replaces: ccp4-onlylibs-dev, ccp4-dev
 Files: <<   
 include/mmdb/*.h
 lib/*.a

Index: clipper.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/clipper.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- clipper.info        21 Sep 2009 05:16:57 -0000      1.3
+++ clipper.info        21 Sep 2009 07:18:04 -0000      1.4
@@ -1,14 +1,27 @@
 Package: clipper
 Epoch: 1
-Version: 2.0.3
-Revision: 5
-BuildDepends: fftw (>= 2.1.5-1010) | fftw-mpi (>= 2.1.5-1010), mmdb-dev (>= 
1.12-5), ssm-dev (>= 0.1-5), gpp4-dev (>= 1.0.4-5)
-Depends: %n-shlibs (>= 1:%v-%r), fftw-shlibs (>= 2.1.5-1010) | fftw-mpi-shlibs 
(>= 2.1.5-1010), mmdb-shlibs (>= 1.0.10-5), ssm-shlibs (>= 0.1-5), gpp4-shlibs 
(>= 1.0.4-5)
+Version: 2.1
+Revision: 12
+BuildDepends: <<
+fftw (>= 2.1.5-1010) | fftw-mpi (>= 2.1.5-1010), 
+mmdb-dev (>= 1.19-12), 
+ssm-dev (>= 0.1-12), 
+gpp4-dev (>= 1.0.4-12), 
+gcc44 (>= 4.4.1-1000)
+<<
+Depends: <<
+%n-shlibs (>= 1:%v-%r),
+fftw-shlibs (>= 2.1.5-1010) | fftw-mpi-shlibs (>= 2.1.5-1010),
+mmdb-shlibs (>= 1.19-12),
+ssm-shlibs (>= 0.1-12), 
+gpp4-shlibs (>= 1.0.4-12),
+gcc44-shlibs (>= 4.4.1-1000)
+<<
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net> 
 Homepage: http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html 
-Source: http://www.ysbl.york.ac.uk/~cowtan/%n/%n20ac.latest.tar.gz
-Source-MD5: cf5746cd7e040180c1e4cb429c7b2ac1
-NoSourceDirectory: true
+Source: http://www.ysbl.york.ac.uk/~cowtan/%n/%n-%v-090714-ac.tar.gz
+Source-MD5: 25124efb8d251cedfbd23f4b06851e47
+SourceDirectory: %n-%v
 DocFiles: README AUTHORS NEWS COPYING 
 Description: Object-oriented crystallographic libraries
 DescDetail: <<
@@ -18,13 +31,21 @@
 for new crystallographic software, which will allow the full power of 
 modern programming techniques to be exploited by the developer. 
 <<
-SetCFLAGS: -fno-strict-aliasing  -I%p/include -I%p/include/mmdb 
-I%p/include/ssm -I%p/include/gpp4/ccp4 -I/usr/include -I/usr/include/sys
-SetLDFLAGS: -L/usr/lib    
+SetCXXFLAGS: -fno-strict-aliasing -I%p/include -I%p/include/mmdb 
-I%p/include/ssm -I%p/include/gpp4 -I%p/include/gpp4/ccp4 
 License: LGPL
 CompileScript: <<
-  LDFLAGS="-L%p/lib" 
+#!/bin/bash -evf
+  LDFLAGS="-L%p/lib/gcc4.4/lib -L%p/lib -L/usr/lib" \
+  CXX="%p/lib/gcc4.4/bin/g++" \
+  CC="%p/lib/gcc4.4/bin/gcc" \
   ./configure  --prefix=%p --enable-shared --with-gpp4=%p --with-mmdb=%p 
--with-fftw=%p --enable-mmdb --enable-minimol --enable-cif --enable-cns 
--enable-gpp4
   perl -pi -e 's|examples||g' Makefile  
+  #  Fix for 10.4 libtool issue
+  if [[ $(sw_vers -productVersion) < 10.5 ]]; then
+     sed -e '/verstring=/s/\${wl}//g' < libtool > libtool.fixed
+        mv libtool.fixed libtool
+  fi
+  #
   make  
 <<
 InstallScript: <<
@@ -43,21 +64,21 @@
        lib/libclipper-phs.2.*dylib                                             
    
   <<
   Shlibs: <<
-       %p/lib/libclipper-ccp4.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-cif.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-cns.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-contrib.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-core.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-minimol.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-mmdb.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
-       %p/lib/libclipper-phs.2.dylib 3.0.0 %n (>= 1:2.0.3-4)
+       %p/lib/libclipper-ccp4.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-cif.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-cns.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-contrib.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-core.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-minimol.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-mmdb.2.dylib 3.0.0 %n (>= 1:2.1-1)
+       %p/lib/libclipper-phs.2.dylib 3.0.0 %n (>= 1:2.1-1)
   <<
 <<
 SplitOff2: <<
 Package: %N-dev
 BuildDependsOnly: True
-Conflicts: ccp4-onlylibs-dev  
-Replaces: ccp4-onlylibs-dev
+Conflicts: ccp4-onlylibs-dev, ccp4-dev
+Replaces: ccp4-onlylibs-dev, ccp4-dev
  Files: <<   
   lib/*.a
   lib/*.la

Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/coot.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- coot.info   26 Aug 2009 04:36:46 -0000      1.20
+++ coot.info   21 Sep 2009 07:18:04 -0000      1.21
@@ -1,17 +1,14 @@
 Package: coot
-Version: 0.5.2
+Version: 0.6-pre-1-revision-2327
 Revision: 1
-Architecture: i386, powerpc
-Distribution: 10.4, 10.5
-SourceDirectory: %n-%v
+SourceDirectory: %n-0.6-pre-1
 GCC: 4.0 
-Source: http://www.ysbl.york.ac.uk/~emsley/software/pre-release/%n-%v.tar.gz  
-Source-MD5: 9a67992eda01c96753503d13325dd793
-Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac5.4_dictionary.tar.gz
-Source2-MD5: 14b965dc5ab9762c819f632c133998b9
+Source: http://www.biop.ox.ac.uk/%n/software/source/pre-releases/%n-%v.tar.gz
+Source-MD5: d31eb6917d0b23678ba919a31e5f8d59
+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
 Source3-MD5: 257ab90d44f1c877ada96720dbb87c13 
-#
 ###############################################################################
 Description: Crystallographic molecular graphics
 Conflicts: guile, guile-shlibs
@@ -31,19 +28,21 @@
  include \"%p/share/themes/Glossy_P/gtk-2.0/gtkrc\"
 .
 Install povray and raster3d fink packages to use the F8 key for producing 
-ray-traced images.
+ray-traced images. You may have to re-map the Spaces.app keybinding.
 <<
 ###############################################################################
 Recommends:  povray, ccp4, raster3d                        
 BuildDepends: <<
- clipper-dev (>= 1:2.0.3-6)      ,
- clipper     (>= 1:2.0.3-6)      ,
+ fink (>= 0.24.12)               ,
+ 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-5)           ,
- mmdb-dev (>= 1.19-1)            ,
- mmdb     (>= 1.19-1)            ,
- ssm-dev (>= 0.1-6)              ,
- ssm     (>= 0.1-6)              ,
+ gpp4     (>= 1.0.4-10)          ,
+ mmdb-dev (>= 1.21-10)           ,
+ mmdb     (>= 1.21-10)           ,
+ ssm-dev (>= 0.1-10)             ,
+ ssm     (>= 0.1-10)             ,
  atk1 (>= 1.20.0-1)              ,
  cairo (>= 1.6-1)                ,
  expat1                          ,
@@ -51,7 +50,6 @@
  fontconfig2-dev (>= 2.4.1-1)    ,
  freetype219 (>= 2.3.5-1)        ,
  freeglut                        ,
- gail18-dev                      ,
  giflib                          ,
  glib2-dev (>= 2.14.0-1)         ,
  glitz                           ,
@@ -75,10 +73,11 @@
  libpng3                         ,
  librsvg2-gtk (>= 2.20.0-1)      ,
  libtool14                       ,
+ libxml2                         ,
  pango1-xft2-ft219-dev (>= 1.18.4-1) ,
  pixman (>= 0.10.0-1)            ,
- pygtk2-gtk-py25-dev             ,
- python25                        ,
+ pygobject2-py26-dev             ,
+ python26                        ,
  swig                            ,
  x11-dev                         ,
  xft2-dev
@@ -86,14 +85,15 @@
 #            
 # Note: gtkglext1 IS required at runtime for stereo functionality
 Depends: <<
- clipper-shlibs (>= 1:2.0.3-6)    ,
- gpp4-shlibs (>= 1.0.4-5)         ,
- mmdb-shlibs (>= 1.19-1)          ,
- ssm-shlibs (>= 0.1-6)            ,
+ clipper-shlibs (>= 1:2.1-11)     ,
+ gpp4-shlibs (>= 1.0.4-10)        ,
+ mmdb-shlibs (>= 1.21-10)         ,
+ ssm-shlibs (>= 0.1-10)           ,
  atk1-shlibs (>= 1.20.0-1)        ,
  coot-shlibs (= %v-%r)            ,
  fftw-shlibs | fftw-mpi-shlibs    ,
  freeglut-shlibs                  ,
+ gcc44-shlibs (>= 4.4.0-1000)     ,
  giflib-shlibs                    ,
  glib2-shlibs (>= 2.14.0-1)       ,
  gmp-shlibs                       , 
@@ -122,16 +122,17 @@
  libtiff-shlibs                   ,
  libtool14-shlibs                 ,
  librsvg2-gtk  (>= 2.20.0-1)      ,
+ libxml2-shlibs                   ,
  pango1-xft2-ft219-shlibs (>= 1.18.4-1) ,
- pygtk2-gtk-py25                  ,
- python25                         ,
+ python26                         ,
  x11
 <<
 #
 ###############################################################################
 BuildDependsOnly: false
+NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
-# Patch: %n.patch
+#
 PatchScript:  <<
 #!/bin/zsh -exf
 perl -pi.bak -e 's|use-modules \(goosh\)|use-modules \(goosh goosh\)|g' 
scheme/coot-utils.scm
@@ -142,7 +143,7 @@
 # This is required to get the map displayed on both sides of side-by-side 
stereo
 echo "(set-display-lists-for-maps 0)"  >>| scheme/group-settings.scm
 # Hopefully temporary hacks to configure
-perl -pi.bak -e 's|have_goosh=no|have_goosh=yes|g' configure
+perl -pi -e 's|have_goosh=no|have_goosh=yes|g' configure
 perl -pi -e "s|guile-config|guile-1.8-config|g" configure
 perl -pi -e 's|\(goosh\)|\(goosh goosh\)|g' configure
 perl -pi -e 's|lccp4c|lgpp4|g' configure
@@ -153,34 +154,41 @@
 --with-fftw=%p --with-gnomecanvas-prefix=%p  --with-gtk2 --with-glut-prefix=%p 
 \
 --with-guile-gtk --with-guile-gtk-prefix=%p --with-gl-prefix=/usr/X11R6        
 \
 --with-imlib-prefix=%p --with-gtkgl-prefix=%p --with-glib-prefix=%p            
 \
---with-gsl-prefix=%p --with-guile --with-python 
+--with-gsl-prefix=%p --with-guile --with-python=%p --with-pygtk=%p
 <<
 ###############################################################################
 CompileScript: <<
-#!/bin/zsh -efv
-export 
PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH:%p/share/guile/1.8/goosh
+#!/bin/bash -efv
+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" \
-CPPFLAGS="-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/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/usr/lib -lSystemStubs -flat_namespace 
-L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries" \
-CXX="/usr/bin/g++" \
-CC="/usr/bin/gcc" \
-PYTHON=%p/bin/python2.5 \
-python=%p/bin/python2.5 \
-DYLD_LIBRARY_PATH="" \
-./configure %c
+  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.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" \
+  DYLD_LIBRARY_PATH="" \
+  ./configure %c
 #
 # Force coot to link to single-precision fftw libraries.  The double-precision 
libraries
 # cause coot to crash.
-perl -pi -e 's|lrfftw |lsrfftw |g'                       **/Makefile
-perl -pi -e 's|lfftw |lsfftw |g'                         **/Makefile
+/bin/zsh -c  'perl -pi -e "s|lrfftw |lsrfftw |g"                      
**/Makefile'
+/bin/zsh -c  'perl -pi -e "s|lfftw |lsfftw |g"                        
**/Makefile'
 perl -pi -e 's|include <rfftw.h>|include <srfftw.h>|g'   
surface/CXXFFTSolventMap.h
 #
+if [[ $(sw_vers -productVersion) < 10.5 ]]; then
+    # Fix libtool compatibility issues
+    sed -e '/verstring=/s/\${wl}//g' < libtool > libtool.fixed
+    mv libtool.fixed libtool
+fi
+#
+
+
 #remake the  src/coot_wrap_python.cc and src/coot_wrap_guile.cc files
-   /bin/rm -f **/coot_wrap_**.cc
+   /bin/zsh -c  '/bin/rm -f **/coot_wrap_**.cc'
    cd src
    touch c-interface-database.hh
    make coot_wrap_guile.cc
@@ -192,7 +200,7 @@
 ###############################################################################
 InstallScript: <<
 #!/bin/zsh -efv
-export PATH=%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
+export PATH=$PWD/bin:%p/bin:%p/share/guile/1.8/scripts/binoverride:$PATH
 export SED=/usr/bin/sed
 export COOT_REFMAC_LIB_DIR=%p/share/coot/lib
 cp src/coot.py python/coot.py
@@ -211,6 +219,7 @@
 #
 mkdir -p %i/share/coot/etc
 mkdir -p %i/share/coot/python
+mkdir -p %i/bin
 cp src/coot.py %i/share/coot/python/coot.py
 cp -R setup %i/share/coot/. 
 # This installs the refmac monomer library
@@ -221,23 +230,25 @@
 cp -R * %i/share/coot/etc/.
 # Get rid of spurious, wrongly placed directory
 rm -rf %i/setup
-# The new wrapper creates problems.  Get rid of it.
-# Clean up the rest of the mess.
+# The original wrapper creates problems.  Get rid of it.
+# Replace with a new wrapper to set the required PYTHONPATH variable
+# and a few others as follows:
 /bin/rm -f %i/bin/coot
-cp %i/bin/coot-real %i/bin/coot
-/bin/rm -f %i/bin/coot-real 
+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/python2.6/site-packages:%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.
 /bin/rm -rf %i/include
 /bin/rm -rf %i/**/.libs
 <<
-RuntimeVars: <<
-COOT_REFMAC_LIB_DIR: %p/share/coot/lib
-COOT_PYTHON_DIR: %p/share/coot/python
-<<
 ###############################################################################
 DocFiles: README AUTHORS NEWS COPYING ABOUT-NLS BUGS TODO
 License: GPL
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net> 
-Homepage: http://www.ysbl.york.ac.uk/~emsley/coot/doc/user-manual.html 
+Homepage: http://www.biop.ox.ac.uk/coot
 ###############################################################################
 #
 SplitOff: <<
@@ -248,34 +259,34 @@
 lib/libcootaneer.0*.dylib
 <<
     Shlibs: <<
-        %p/lib/libccp4mg-surface.0.dylib            1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libccp4mg-utils.0.dylib              1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-analysis.0.dylib             1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-AngleInfo.0.dylib            1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-atomutils.0.dylib            1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-cabuild.0.dylib              1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-compat.0.dylib               1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-coord-extras.0.dylib         1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-coord-utils.0.dylib          1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-coords.0.dylib               1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-db-main.0.dylib              1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-geometry.0.dylib             1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-high-res.0.dylib             1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-ideal.0.dylib                1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-isosurface.0.dylib           1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-ligand.0.dylib               1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-map-heavy.0.dylib            1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-map-utils.0.dylib            1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-mini-mol.0.dylib             1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-sequence-view.0.dylib        1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-shelx.0.dylib                1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-skeleton.0.dylib             1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-surface.0.dylib              1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-tw.0.dylib                   1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-utils.0.dylib                1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-wrap-guile.0.dylib           1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcoot-wrap-python.0.dylib          1.0.0 %n (>= 0.5.2-1)
-        %p/lib/libcootaneer.0.dylib                 1.0.0 %n (>= 0.5.2-1)
+        %p/lib/libccp4mg-surface.0.dylib            1.0.0 %n (>= 0.6-1)
+        %p/lib/libccp4mg-utils.0.dylib              1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-analysis.0.dylib             1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-AngleInfo.0.dylib            1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-atomutils.0.dylib            1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-cabuild.0.dylib              1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-compat.0.dylib               1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-coord-extras.0.dylib         1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-coord-utils.0.dylib          1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-coords.0.dylib               1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-db-main.0.dylib              1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-geometry.0.dylib             1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-high-res.0.dylib             1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-ideal.0.dylib                1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-isosurface.0.dylib           1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-ligand.0.dylib               1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-map-heavy.0.dylib            1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-map-utils.0.dylib            1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-mini-mol.0.dylib             1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-sequence-view.0.dylib        1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-shelx.0.dylib                1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-skeleton.0.dylib             1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-surface.0.dylib              1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-tw.0.dylib                   1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-utils.0.dylib                1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-wrap-guile.0.dylib           1.0.0 %n (>= 0.6-1)
+        %p/lib/libcoot-wrap-python.0.dylib          1.0.0 %n (>= 0.6-1)
+        %p/lib/libcootaneer.0.dylib                 1.0.0 %n (>= 0.6-1)
     <<
 DocFiles: README AUTHORS NEWS COPYING ABOUT-NLS BUGS TODO
 << 

Index: ssm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/ssm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ssm.info    16 Sep 2008 16:28:00 -0000      1.1
+++ ssm.info    21 Sep 2009 07:18:04 -0000      1.2
@@ -1,6 +1,6 @@
 Package: ssm
 Version: 0.1
-Revision: 5
+Revision: 12
 Maintainer: W. G. Scott <wgsc...@users.sourceforge.net> 
 DescPackaging: <<
  Based on package created by Morten Kjeldgaard <m...@bioxray.dk> with minor
@@ -14,8 +14,8 @@
 Source: ftp://ftp.bioxray.au.dk/pub/mok/src/%N-%v.tar.gz
 Source-MD5: 317d9cc78a88fa5652a4a4b06f329823
 NoSourceDirectory: false
-Depends: %n-shlibs (= %v-%r)
-BuildDepends: mmdb-dev (>= 1.0.10-5)
+Depends: %n-shlibs (= %v-%r), gcc44-shlibs (>= 4.4.1-1000)
+BuildDepends: mmdb-dev (>= 1.19-12), gcc44 (>= 4.4.1-1000)
 BuildDependsOnly: true
 DocFiles: README AUTHORS NEWS COPYING 
 DescDetail: << 
@@ -42,6 +42,9 @@
 #
 <<
 CompileScript: <<
+LDFLAGS="-L%p/lib/gcc4.4/lib -L%p/lib -L/usr/lib" \
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
   ./configure --prefix=%p
   make
 <<


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to