Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16224
Modified Files:
ccp4.info ccp4.patch
Log Message:
ccp4 update with 2 recent patchs, unstable/sci 10.3
Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ccp4.info 13 Jul 2004 07:23:55 -0000 1.8
+++ ccp4.info 23 Jul 2004 23:11:25 -0000 1.9
@@ -1,6 +1,7 @@
Package: ccp4
Version: 5.0.1
-Revision: 13
+Revision: 14
+# Revision 14 includes all released patches up through July 23 2004
Source: ftp://ftp.%n.ac.uk/%n/current/packed/%n-%v.tar.gz
Source-MD5: c2087efdd9c30ccfd39ac5e60d1fdfde
SourceDirectory: %n-%v
Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ccp4.patch 13 Jul 2004 07:23:36 -0000 1.1
+++ ccp4.patch 23 Jul 2004 23:11:25 -0000 1.2
@@ -1,4 +1,4 @@
-diff -urN ccp4-5.0.1-orig/ccp4i/scripts/dhm_tool.script
ccp4-5.0.1/ccp4i/scripts/dhm_tool.script
+diff -ruN ccp4-5.0.1-orig/ccp4i/scripts/dhm_tool.script
ccp4-5.0.1/ccp4i/scripts/dhm_tool.script
--- ccp4-5.0.1-orig/ccp4i/scripts/dhm_tool.script 2004-07-02 08:56:14.000000000
-0700
+++ ccp4-5.0.1/ccp4i/scripts/dhm_tool.script 2004-07-12 16:12:40.000000000 -0700
@@ -10,7 +10,8 @@
@@ -105,7 +105,7 @@
append cmd " -r " $REFINEMENT
if { $REFINE_CIFIN != "" } {
append cmd " -iCIF " $REFINE_CIFIN
-diff -urN ccp4-5.0.1-orig/ccp4i/tasks/fffear.tcl ccp4-5.0.1/ccp4i/tasks/fffear.tcl
+diff -ruN ccp4-5.0.1-orig/ccp4i/tasks/fffear.tcl ccp4-5.0.1/ccp4i/tasks/fffear.tcl
--- ccp4-5.0.1-orig/ccp4i/tasks/fffear.tcl 2004-01-26 03:24:01.000000000 -0800
+++ ccp4-5.0.1/ccp4i/tasks/fffear.tcl 2004-07-12 16:13:14.000000000 -0700
@@ -140,8 +140,8 @@
@@ -119,7 +119,7 @@
theor-strand-5 ]
-diff -urN ccp4-5.0.1-orig/etc/xloggraph ccp4-5.0.1/etc/xloggraph
+diff -ruN ccp4-5.0.1-orig/etc/xloggraph ccp4-5.0.1/etc/xloggraph
--- ccp4-5.0.1-orig/etc/xloggraph 1969-12-31 16:00:00.000000000 -0800
+++ ccp4-5.0.1/etc/xloggraph 2004-07-12 16:13:49.000000000 -0700
@@ -0,0 +1,6 @@
@@ -129,7 +129,7 @@
+export XUSERFILESEARCHPATH=""
+print "Plot button sends pdf to Preview. Print or save pdf in Preview window."
+exit 0
-diff -urN ccp4-5.0.1-orig/etc/xplot84 ccp4-5.0.1/etc/xplot84
+diff -ruN ccp4-5.0.1-orig/etc/xplot84 ccp4-5.0.1/etc/xplot84
--- ccp4-5.0.1-orig/etc/xplot84 1969-12-31 16:00:00.000000000 -0800
+++ ccp4-5.0.1/etc/xplot84 2004-07-12 16:13:44.000000000 -0700
@@ -0,0 +1,6 @@
@@ -139,7 +139,7 @@
+export XUSERFILESEARCHPATH=""
+print "Plot button sends pdf to Preview. Print or save pdf in Preview window."
+exit 0
-diff -urN ccp4-5.0.1-orig/etc/xplot84driver ccp4-5.0.1/etc/xplot84driver
+diff -ruN ccp4-5.0.1-orig/etc/xplot84driver ccp4-5.0.1/etc/xplot84driver
--- ccp4-5.0.1-orig/etc/xplot84driver 1969-12-31 16:00:00.000000000 -0800
+++ ccp4-5.0.1/etc/xplot84driver 2004-07-12 16:13:44.000000000 -0700
@@ -0,0 +1,6 @@
@@ -149,7 +149,7 @@
+export XUSERFILESEARCHPATH=""
+print "Plot button sends pdf to Preview. Print or save pdf in Preview window."
+exit 0
-diff -urN ccp4-5.0.1-orig/include/ccp4.setup-bash ccp4-5.0.1/include/ccp4.setup-bash
+diff -ruN ccp4-5.0.1-orig/include/ccp4.setup-bash ccp4-5.0.1/include/ccp4.setup-bash
--- ccp4-5.0.1-orig/include/ccp4.setup-bash 2004-07-05 07:53:54.000000000 -0700
+++ ccp4-5.0.1/include/ccp4.setup-bash 1969-12-31 16:00:00.000000000 -0800
@@ -1,355 +0,0 @@
@@ -508,7 +508,7 @@
-
- unset alias # clean up
-fi # ksh test
-diff -urN ccp4-5.0.1-orig/include/ccp4.setup-dist ccp4-5.0.1/include/ccp4.setup-dist
+diff -ruN ccp4-5.0.1-orig/include/ccp4.setup-dist ccp4-5.0.1/include/ccp4.setup-dist
--- ccp4-5.0.1-orig/include/ccp4.setup-dist 2004-07-05 07:53:55.000000000 -0700
+++ ccp4-5.0.1/include/ccp4.setup-dist 2004-07-12 16:09:21.000000000 -0700
@@ -54,10 +54,10 @@
@@ -619,7 +619,7 @@
#
foreach dir ( ${ccp4pathlist} )
if ( ${?PATH} ) then
-diff -urN ccp4-5.0.1-orig/include/ccp4.setup-sh ccp4-5.0.1/include/ccp4.setup-sh
+diff -ruN ccp4-5.0.1-orig/include/ccp4.setup-sh ccp4-5.0.1/include/ccp4.setup-sh
--- ccp4-5.0.1-orig/include/ccp4.setup-sh 2003-11-12 07:23:49.000000000 -0800
+++ ccp4-5.0.1/include/ccp4.setup-sh 2004-07-12 16:05:09.000000000 -0700
@@ -1,9 +1,8 @@
@@ -755,7 +755,94 @@
#
for dir in ${ccp4pathlist}
do
-diff -urN ccp4-5.0.1-orig/x-windows/XCCPJIFFY/plot84_file.h
ccp4-5.0.1/x-windows/XCCPJIFFY/plot84_file.h
+diff -ruN ccp4-5.0.1-orig/lib/src/cmaplib_f.c ccp4-5.0.1/lib/src/cmaplib_f.c
+--- ccp4-5.0.1-orig/lib/src/cmaplib_f.c 2004-03-10 09:22:52.000000000 -0800
++++ ccp4-5.0.1/lib/src/cmaplib_f.c 2004-07-23 14:43:28.000000000 -0700
+@@ -76,6 +76,7 @@
+ #include"ccp4_fortran.h"
+ #include"ccp4_parser.h"
+ #include"csymlib.h"
++#include"ccp4_general.h"
+ static char rcsid[] = "$Id$";
+
+ static struct _IOConvMap *ioArray[MAXFILES];
+@@ -1899,15 +1900,21 @@
+ (const fpstr label, int label_len))
+ {
+ char *temp_label;
+- int nlabel,i;
++ int nlabel=0,i;
++
++ /* no output map, nothing to do */
++ if (last_Write == -1) return;
+
+ temp_label = ccp4_FtoCString(FTN_STR(label), FTN_LEN(label));
+-
+- nlabel = ccp4_cmap_number_label(ioArray[last_Read]->mapfile);
+- for (i=0 ; i != nlabel ; ++i)
+- ccp4_cmap_set_label(ioArray[last_Write]->mapfile,
++
++ if (last_Read != -1) {
++ nlabel = ccp4_cmap_number_label(ioArray[last_Read]->mapfile);
++ for (i=0 ; i != nlabel ; ++i)
++ ccp4_cmap_set_label(ioArray[last_Write]->mapfile,
+ ccp4_cmap_get_label(ioArray[last_Read]->mapfile,i),
+ i);
++ }
++
+ ccp4_cmap_set_label(ioArray[last_Write]->mapfile, temp_label,nlabel);
+
+ free(temp_label);
+@@ -1921,15 +1928,21 @@
+ /* see MTTCPY */
+ {
+ char *temp_label;
+- int nlabel,i;
++ int nlabel=0,i;
++
++ /* no output map, nothing to do */
++ if (last_Write == -1) return;
+
+ temp_label = ccp4_FtoCString(FTN_STR(label), FTN_LEN(label));
+
+- nlabel = ccp4_cmap_number_label(ioArray[last_Read]->mapfile);
+- for (i=0 ; i != nlabel ; ++i)
+- ccp4_cmap_set_label(ioArray[last_Write]->mapfile,
++ if (last_Read != -1) {
++ nlabel = ccp4_cmap_number_label(ioArray[last_Read]->mapfile);
++ for (i=0 ; i != nlabel ; ++i)
++ ccp4_cmap_set_label(ioArray[last_Write]->mapfile,
+ ccp4_cmap_get_label(ioArray[last_Read]->mapfile,i),
+ i);
++ }
++
+ ccp4_cmap_set_label(ioArray[last_Write]->mapfile, temp_label,nlabel);
+
+ free(temp_label);
+diff -ruN ccp4-5.0.1-orig/src/fft.f ccp4-5.0.1/src/fft.f
+--- ccp4-5.0.1-orig/src/fft.f 2004-01-26 02:08:19.000000000 -0800
++++ ccp4-5.0.1/src/fft.f 2004-07-23 14:42:29.000000000 -0700
+@@ -6235,7 +6235,7 @@
+ CALL MTZINI
+ CALL CCPOPN(5,'DATA',5,1,LDUM,IFAIL)
+ CALL CCPOPN(6,'PRINTER',6,1,LDUM,IFAIL)
+- CALL CCPRCS(6,'FFT','$Date$')
++ CALL CCPRCS(6,'FFT','$Date$')
+ C ***********************************
+ C
+ C---- Read input including spacegroup number
+@@ -9753,7 +9753,9 @@
+ C -- Not a patterson
+ IF (ISQ.GT.0) THEN
+ C These pattersons can be set. No others..
+- IF(NLAFFT.EQ.4) NSPFFT = 10
++C fft10 has a bug - disable it altogether..
++C IF(NLAFFT.EQ.4) NSPFFT = 10
++ IF(NLAFFT.EQ.4) NSPFFT = 2
+ IF(NLAFFT.EQ.6) NSPFFT = 47
+ C -- Set to P1 (from P1bar) because permution of axes permitted
+ IF(NLAFFT.EQ.3) NSPFFT = 1
+diff -ruN ccp4-5.0.1-orig/x-windows/XCCPJIFFY/plot84_file.h
ccp4-5.0.1/x-windows/XCCPJIFFY/plot84_file.h
--- ccp4-5.0.1-orig/x-windows/XCCPJIFFY/plot84_file.h 2004-06-03 08:27:20.000000000
-0700
+++ ccp4-5.0.1/x-windows/XCCPJIFFY/plot84_file.h 2004-07-12 16:11:20.000000000
-0700
@@ -28,7 +28,7 @@
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
