Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9425
Modified Files:
ccp4.info ccp4.patch
Log Message:
ccp4 revision upgrade
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ccp4.info 3 Feb 2006 18:41:18 -0000 1.2
+++ ccp4.info 20 Feb 2006 06:02:32 -0000 1.3
@@ -1,7 +1,6 @@
Package: ccp4
Version: 5.99.5
-Revision: 1001
-GCC: 4.0
+Revision: 1002
Source: ftp://ftp.%n.ac.uk/%n/%v/packed/%n-core.tar.gz
Source2: ftp://ftp.%n.ac.uk/%n/%v/packed/phaser-cctbx.tar.gz
Source-MD5: 1dc37afc2597bceaabd971ba20d86ac3
@@ -42,7 +41,9 @@
export TEMPXTAL=$PWD:h
source include/%n.setup-zsh
export DYLD_LIBRARY_PATH=$CLIB
-export PYTHONHOME=/System/Library/Frameworks/Python.framework/Versions/Current
+export
PATH=/System/Library/Frameworks/Python.framework/Versions/Current/bin:$PATH
+export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
+export
PYTHONPATH="/System/Library/Frameworks/Python.framework/Versions/Current/lib/python2.3"
./configure --with-x --with-shared-libs --with-fftw=%p Darwin
# fix some post-configure bugs
perl -pi.bak -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' **/*akefile
@@ -51,7 +52,9 @@
perl -pi.bak -e 's|\-lcc_dynamic||g' **/*akefile
perl -pi.bak -e 's|\-lgfortran||g' x-windows/XCCPJIFFY/*akefile*
#
+export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
make -i
+export
PYTHONHOME="/System/Library/Frameworks/Python.framework/Versions/Current"
make -i install
#
echo "recompile xplot84driver and xccpjiffy2idraw"
@@ -91,13 +94,20 @@
perl -pi.bak -e 's|5.0.1|%v|g' XCCPJiffy
mv -f XCCPJiffy lib/X11/app-defaults/XCCPJiffy
#
- perl -pi.bak -e 's|/src/ccp4lib-5.99.5-1/ccp4-5.99.5||g' bin/clipper-config
+ perl -pi.bak -e 's|/src/ccp4lib-5.99.5-2/ccp4-5.99.5||g' bin/clipper-config
rm -f bin/clipper-config.bak
perl -pi.bak -e 's|lclipper |lclipper-core |g' bin/clipper-config
rm -f bin/clipper-config.bak
perl -pi.bak -e 's|lib/lib -lrfftw -lfftw |lib/ccp4-%v -lsrfftw -lsfftw |g'
bin/clipper-config
rm -f bin/clipper-config.bak
#
+# Fix path in libfoo.la files:
+#
+ perl -pi.bak -e 's|/src/fink.build/%n-%v-%r/%n-%v/lib|/lib/%n-%v|g' lib/*.la
+ rm -f lib/*.la.bak
+#
+# Now install:
+#
mkdir -p %i/lib
cp -R lib %i/lib/%n-%v
mkdir -p %i/bin
@@ -114,8 +124,8 @@
# back to build directory
cd ..
#
- /bin/rm -rf lib
-# /bin/mv lib lib-save
+/bin/rm -rf lib
+#/bin/mv lib lib-save
cp -R * %i/share/xtal/%n-%v/.
ln -s %p/lib/%n-%v %i/share/xtal/%n-%v/lib
@@ -182,7 +192,6 @@
lib/ccp4-5.99.5/libjwc_c.0.1.1.dylib
lib/ccp4-5.99.5/libjwc_c.0.dylib
lib/ccp4-5.99.5/libjwc_c.dylib
-lib/ccp4-5.99.5/libmmdb.dylib
lib/ccp4-5.99.5/libssm.0.0.0.dylib
lib/ccp4-5.99.5/libssm.0.dylib
lib/ccp4-5.99.5/libssm.dylib
@@ -193,46 +202,47 @@
lib/ccp4-5.99.5/libxdl_viewextra.0.dylib
lib/ccp4-5.99.5/libxdl_viewextra.dylib
<<
- Shlibs: <<
- %p/lib/ccp4-5.99.5/libccif.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1)
- %p/lib/ccp4-5.99.5/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
- %p/lib/ccp4-5.99.5/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1)
+#lib/ccp4-5.99.5/libmmdb.dylib
+Shlibs: <<
+ %p/lib/ccp4-5.99.5/libccif.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libccp4c.dylib 0.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-ccp4.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-ccp4.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-ccp4.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-cif.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-cif.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-cif.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-contrib.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-contrib.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-contrib.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-core.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-core.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-core.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-minimol.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-minimol.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-minimol.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-mmdb.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-mmdb.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-mmdb.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-phs.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-phs.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libclipper-phs.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libjwc_c.0.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libjwc_c.0.1.1.dylib 2.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libjwc_c.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_view.2.dylib 3.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_view.2.0.0.dylib 2.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_view.dylib 2.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_viewextra.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_viewextra.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libxdl_viewextra.dylib 1.0.0 ccp4lib-shlibs (>=
5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libssm.0.0.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libssm.0.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
+ %p/lib/ccp4-5.99.5/libssm.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
<<
DocFiles: CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS
academic_software_licence.pdf
<<
+# %p/lib/ccp4-5.99.5/libmmdb.dylib 1.0.0 ccp4lib-shlibs (>= 5.99.5-1002)
#
SplitOff2: <<
Package: %N-dev
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ccp4.patch 20 Jan 2006 20:30:39 -0000 1.1
+++ ccp4.patch 20 Feb 2006 06:02:32 -0000 1.2
@@ -668,7 +668,7 @@
- case `$CC -v 2>&1` in
- *4.* )
+# CXX=${CXX:-g++}
-+ CXX=${CXX:-g++-3.3}
++ CXX=${CXX:-g++}
+# case `$CC -v 2>&1` in
+# *4.* )
# default to gfortran for the moment
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
