Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17984
Modified Files:
coot.info clipper.info gpp4.info mmdb.info ssm.info
Log Message:
fixes to coot and dependencies to ensure compilation on 10.4 as well as 10.5
and 64-bit
Index: gpp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpp4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpp4.info 10 Sep 2008 08:14:03 -0000 1.1
+++ gpp4.info 28 May 2009 19:57:51 -0000 1.2
@@ -1,6 +1,6 @@
Package: gpp4
Version: 1.0.4
-Revision: 5
+Revision: 10
Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
# Maintainer: Morten Kjeldgaard <m...@bioxray.dk>
DescPackaging: <<
@@ -12,7 +12,8 @@
Source: ftp://ftp.bioxray.au.dk/pub/mok/src/gpp4-%v.tar.gz
Source-MD5: 48931781425a5b79a8255ebefaed24b3
NoSourceDirectory: false
-Depends: %N-shlibs (= %v-%r)
+Depends: %N-shlibs (= %v-%r), gcc44-shlibs (>= 4.4.0-1000)
+BuildDepends: gcc44 (>= 4.4.0-1000), mmdb-dev (>= 1.19-10), ssm-dev (>= 0.1-10)
BuildDependsOnly: true
HomePage: http://www.bioxray.dk/~mok/gpp4
DocFiles: README AUTHORS NEWS COPYING
@@ -42,6 +43,8 @@
incurring excessive overheads.
<<
CompileScript: <<
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
./configure --prefix=%p
make
<<
Index: mmdb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mmdb.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mmdb.info 12 May 2009 15:13:12 -0000 1.4
+++ mmdb.info 28 May 2009 19:57:51 -0000 1.5
@@ -1,6 +1,6 @@
Package: mmdb
Version: 1.21
-Revision: 1
+Revision: 10
# Maintainer: Morten Kjeldgaard <m...@bioxray.dk>
Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
DescPackaging: <<
@@ -12,7 +12,8 @@
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.0-1000)
+BuildDepends: gcc44 (>= 4.4.0-1000)
BuildDependsOnly: true
DescDetail: <<
MMDB is CCP4's macromolecular coordinate library, written by Eugene
@@ -34,6 +35,8 @@
coordinate-related operations.
<<
CompileScript: <<
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
./configure --prefix=%p
make
<<
Index: clipper.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/clipper.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clipper.info 24 May 2009 22:27:33 -0000 1.5
+++ clipper.info 28 May 2009 19:57:51 -0000 1.6
@@ -1,9 +1,9 @@
Package: clipper
Epoch: 1
Version: 2.1
-Revision: 3
-BuildDepends: fftw (>= 2.1.5-1010) | fftw-mpi (>= 2.1.5-1010), mmdb-dev (>=
1.19-1), ssm-dev (>= 0.1-6), 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.19-1), ssm-shlibs (>= 0.1-6), gpp4-shlibs
(>= 1.0.4-5)
+Revision: 10
+BuildDepends: fftw (>= 2.1.5-1010) | fftw-mpi (>= 2.1.5-1010), mmdb-dev (>=
1.19-10), ssm-dev (>= 0.1-10), gpp4-dev (>= 1.0.4-10), gcc44 (>= 4.4.0-1000)
+Depends: %n-shlibs (>= 1:%v-%r), fftw-shlibs (>= 2.1.5-1010) | fftw-mpi-shlibs
(>= 2.1.5-1010), mmdb-shlibs (>= 1.19-10), ssm-shlibs (>= 0.1-10), gpp4-shlibs
(>= 1.0.4-10), gcc44-shlibs (>= 4.4.0-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/%n-%v-090522-ac.tar.gz
@@ -20,14 +20,20 @@
modern programming techniques to be exploited by the developer.
<<
SetCXXFLAGS: -fno-strict-aliasing -I%p/include -I%p/include/mmdb
-I%p/include/ssm -I%p/include/gpp4 -I%p/include/gpp4/ccp4
-SetLDFLAGS: -L%p/lib/gcc4.4/lib -L/usr/lib
License: LGPL
CompileScript: <<
- LDFLAGS="-L%p/lib/gcc4.4/lib -L%p/lib" \
+#!/bin/bash -f
+ 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: <<
Index: coot.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/coot.info,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- coot.info 24 May 2009 22:28:19 -0000 1.110
+++ coot.info 28 May 2009 19:57:50 -0000 1.111
@@ -1,11 +1,11 @@
Package: coot
-Version: 0.6-pre-1-revision-2026
+Version: 0.6-pre-1-revision-2028
Revision: 1
#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: 9acbbac369f65a21aaffb0abaad573c3
+Source-MD5: df727c50639d104fb94a9197d0998558
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
@@ -35,14 +35,15 @@
###############################################################################
Recommends: povray, ccp4, raster3d
BuildDepends: <<
- clipper-dev (>= 1:2.1-3) ,
- clipper (>= 1:2.1-3) ,
+ clipper-dev (>= 1:2.1-10) ,
+ clipper (>= 1:2.1-10) ,
+ gcc44 (>= 4.4.0-1000) ,
gpp4-dev (>= 1.0.4-5) ,
- gpp4 (>= 1.0.4-5) ,
- mmdb-dev (>= 1.21-1) ,
- mmdb (>= 1.21-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 ,
@@ -86,14 +87,15 @@
#
# Note: gtkglext1 IS required at runtime for stereo functionality
Depends: <<
- clipper-shlibs (>= 1:2.1-3) ,
- gpp4-shlibs (>= 1.0.4-5) ,
- mmdb-shlibs (>= 1.21-1) ,
- ssm-shlibs (>= 0.1-6) ,
+ clipper-shlibs (>= 1:2.1-10) ,
+ 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 ,
@@ -168,13 +170,13 @@
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" \
-CXX="%p/lib/gcc4.4/bin/g++" \
-CC="%p/lib/gcc4.4/bin/gcc" \
-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.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" \
+ CXX="%p/lib/gcc4.4/bin/g++" \
+ CC="%p/lib/gcc4.4/bin/gcc" \
+ DYLD_LIBRARY_PATH="" \
+ ./configure %c
#
# Force coot to link to single-precision fftw libraries. The double-precision
libraries
# cause coot to crash.
@@ -182,6 +184,13 @@
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
cd src
Index: ssm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ssm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ssm.info 12 Nov 2008 22:57:04 -0000 1.2
+++ ssm.info 28 May 2009 19:57:51 -0000 1.3
@@ -1,6 +1,6 @@
Package: ssm
Version: 0.1
-Revision: 6
+Revision: 10
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.19-1)
+Depends: %n-shlibs (= %v-%r), gcc44-shlibs (>= 4.4.0-1000)
+BuildDepends: mmdb-dev (>= 1.19-10), gcc44 (>= 4.4.0-1000)
BuildDependsOnly: true
DocFiles: README AUTHORS NEWS COPYING
DescDetail: <<
@@ -42,6 +42,8 @@
#
<<
CompileScript: <<
+CXX="%p/lib/gcc4.4/bin/g++" \
+CC="%p/lib/gcc4.4/bin/gcc" \
./configure --prefix=%p
make
<<
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
