Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1958

Modified Files:
        ccp4.info ccp4.patch 
Log Message:
ccp4 update to current patch release 10.3 unstable sci

Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ccp4.info   1 Mar 2005 00:20:35 -0000       1.25
+++ ccp4.info   16 Mar 2005 21:51:16 -0000      1.26
@@ -1,8 +1,8 @@
 Package: ccp4
 Version: 5.0.2
-Revision: 13
+Revision: 14
 #
-#  Revision 13 includes these post-release patches obtained from CCP4 web site 
Feb 27, 2005.
+#  Revision 14 includes these post-release patches obtained from CCP4 web site 
March 15, 2005.
 #
 #  CCP4_utils-25Aug2004.tcl.diff  cmtzlib_f-10Aug2004.c.diff      
lsqkab-9Aug2004.f.diff
 #  abs.f-18Aug2004.f              dmmulti-12Aug2004.f.diff        
refmac5-13Aug2004.tcl.diff
@@ -10,7 +10,8 @@
 #  pdb_utils-17Sep2004.tcl        maprot-20Sep2004.f              
mapmask-20Sep2004.f
 #  ccp4i/templates/mapmask.com    ccp4i mail interface fixed to work with OSX 
Mail.app
 #  autosnd-15Nov2004.f            cmtzlib_f-24Dec2004.c.diff      
cmtzlib_f-14Jan2005.c
-#  ncsref-26Jan2005.script.diff
+#  ncsref-26Jan2005.script.diff   truncate-02Mar2005.com.diff     
truncate-02Mar2005.def.diff  
+#  truncate-02Mar2005.tcl.diff`
 # 
 #
 Source: ftp://ftp.%n.ac.uk/%n/current/packed/%n-%v.tar.gz
@@ -130,7 +131,7 @@
 License agreement is part of configure file -- print out form and mail in,
 additional comments at http://chemistry.ucsc.edu/~wgscott/xtal/page5.html
 CCP4 files will be installed under /sw/share/xtal/ccp4-5.0.2
-This revision includes all available CCP4 patches as of Feb. 27, 2005,
+This revision includes all available CCP4 patches as of March 15, 2005,
 and new bash and zsh command completions specific to ccp4.
 <<
 DocFiles: README CHANGES COPYING PROBLEMS INSTALL INSTALL.html INSTALL.ps 
ccp4i_installation.html academic_software_licence.pdf  
academic_software_licence.ps.gz  academic_software_licence.rtf

Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ccp4.patch  1 Mar 2005 00:20:35 -0000       1.15
+++ ccp4.patch  16 Mar 2005 21:51:16 -0000      1.16
@@ -282,6 +282,63 @@
          }
        }
        # Check that all domains are defined
+diff -ruN ccp4-5.0.2-orig/ccp4i/tasks/truncate.def 
ccp4-5.0.2/ccp4i/tasks/truncate.def
+--- ccp4-5.0.2-orig/ccp4i/tasks/truncate.def   2004-01-26 03:24:18.000000000 
-0800
++++ ccp4-5.0.2/ccp4i/tasks/truncate.def        2005-03-15 21:37:13.000000000 
-0800
+@@ -6,7 +6,7 @@
+ #     A copy of the CCP4 licence can be obtained by writing to the
+ #     CCP4 Secretary, Daresbury Laboratory, Warrington WA4 4AD, UK.
+ #
+-#CCP4i_cvs_Id $Id$
++#CCP4i_cvs_Id $Id$
+ #CCP4I SCRIPT DEF truncate
+ #CCP4I DATE  25/10/97 16:05:30
+ #CCP4I USER lizp
+@@ -23,10 +23,10 @@
+ 
+ IMEANIN         _mtz_label_j            ""
+ SIGIMEANIN      _mtz_label_sig          ""
+-I+            _mtz_label_j            ""
+-SIGI+         _mtz_label_sig          ""
+-I-            _mtz_label_j            ""
+-SIGI-         _mtz_label_sig          ""
++Ipp           _mtz_label_j            ""
++SIGIpp                _mtz_label_sig          ""
++Imm           _mtz_label_j            ""
++SIGImm                _mtz_label_sig          ""
+ FMEANIN         _mtz_label_f            ""
+ SIGFMEANIN      _mtz_label_sig          ""
+ 
+diff -ruN ccp4-5.0.2-orig/ccp4i/tasks/truncate.tcl 
ccp4-5.0.2/ccp4i/tasks/truncate.tcl
+--- ccp4-5.0.2-orig/ccp4i/tasks/truncate.tcl   2004-01-26 03:24:18.000000000 
-0800
++++ ccp4-5.0.2/ccp4i/tasks/truncate.tcl        2005-03-15 21:37:39.000000000 
-0800
+@@ -6,7 +6,7 @@
+ #     A copy of the CCP4 licence can be obtained by writing to the
+ #     CCP4 Secretary, Daresbury Laboratory, Warrington WA4 4AD, UK.
+ #
+-#CCP4i_cvs_Id $Id$
++#CCP4i_cvs_Id $Id$
+ # ======================================================================
+ # truncate.tcl --
+ #
+@@ -352,13 +352,13 @@
+ 
+   CreateLabinLine line \
+     "Choose input anomalous intensity (I(+)) and sigma (SIGI(+))" \
+-     HKLIN "I(+)" I+  "I(+)" \
+-     -sigma "SigI(+)" SIGI+  {} 
++     HKLIN "I(+)" Ipp  "I(+)" \
++     -sigma "SigI(+)" SIGIpp  {} 
+ 
+     CreateLabinLine line \
+     "Choose input anomalous intensity (I(-)) and sigma (SIGI(-))" \
+-     HKLIN "I(-)" I-  "I(-)" \
+-     -sigma "SigI(-)" SIGI-  {}
++     HKLIN "I(-)" Imm  "I(-)" \
++     -sigma "SigI(-)" SIGImm  {}
+ 
+   CloseSubFrame
+ 
 diff -ruN ccp4-5.0.2-orig/ccp4i/templates/mapmask.com 
ccp4-5.0.2/ccp4i/templates/mapmask.com
 --- ccp4-5.0.2-orig/ccp4i/templates/mapmask.com        2004-01-26 
03:27:54.000000000 -0800
 +++ ccp4-5.0.2/ccp4i/templates/mapmask.com     2004-10-11 08:18:35.000000000 
-0700
@@ -294,6 +351,29 @@
  
  $IFBORDER BORDER $BORDER
  { ![StringSame $EXTEND_MODE DEFAULT] }  EXTEND $EXTEND_MODE
+diff -ruN ccp4-5.0.2-orig/ccp4i/templates/truncate.com 
ccp4-5.0.2/ccp4i/templates/truncate.com
+--- ccp4-5.0.2-orig/ccp4i/templates/truncate.com       2004-01-26 
03:27:58.000000000 -0800
++++ ccp4-5.0.2/ccp4i/templates/truncate.com    2005-03-15 21:37:54.000000000 
-0800
+@@ -6,7 +6,7 @@
+ #     A copy of the CCP4 licence can be obtained by writing to the
+ #     CCP4 Secretary, Daresbury Laboratory, Warrington WA4 4AD, UK.
+ #
+-#CCP4i_cvs_Id $Id$
++#CCP4i_cvs_Id $Id$
+ { [ IfSet $TITLE ] } title  $TITLE
+ $SYMMETRY symmetry $SPACE_GROUP
+ $CELL cell $CELL_1 $CELL_2 $CELL_3 $CELL_4 $CELL_5 $CELL_6
+@@ -44,8 +44,8 @@
+ IF { ![StringSame $INPUT_DATA AMPLITUDES] }
+   1 labin IMEAN=$IMEANIN SIGIMEAN=$SIGIMEANIN
+     IF $ANOMALOUS
+-    - 1 I(+)= $I+ I(-)= $I-
+-    - 1 SIGI(+)= $SIGI+ SIGI(-) = $SIGI-
++    - 1 I(+)=$Ipp I(-)=$Imm
++    - 1 SIGI(+)=$SIGIpp SIGI(-)=$SIGImm
+     ENDIF
+ ELSE
+   1 labin F=$FMEANIN SIGF=$SIGFMEANIN
 diff -ruN ccp4-5.0.2-orig/ccp4i/utils/pdb_utils.tcl 
ccp4-5.0.2/ccp4i/utils/pdb_utils.tcl
 --- ccp4-5.0.2-orig/ccp4i/utils/pdb_utils.tcl  2004-01-26 03:33:53.000000000 
-0800
 +++ ccp4-5.0.2/ccp4i/utils/pdb_utils.tcl       2004-09-19 14:35:40.000000000 
-0700



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to