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

Modified Files:
        ccp4.info ccp4.patch 
Log Message:
ccp4 patches added 10.3 sci unstable

Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ccp4.info   20 Sep 2004 12:58:48 -0000      1.20
+++ ccp4.info   30 Sep 2004 12:56:45 -0000      1.21
@@ -1,13 +1,13 @@
 Package: ccp4
 Version: 5.0.2
-Revision: 7
+Revision: 8
 #
-#  Revision 7 includes these post-release patches obtained from CCP4 web site Sept 
17, 2004.
+#  Revision 8 includes these post-release patches obtained from CCP4 web site Sept 
29, 2004.
 #
 #  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
 #  ccp4_parser-25Aug2004.c.diff   dmmulti_dmlib-12Aug2004.f.diff  
unsupported-Makefile.in-11Aug2004.diff
-#  pdb_utils-17Sep2004.tcl
+#  pdb_utils-17Sep2004.tcl        maprot-20Sep2004.f              mapmask-20Sep2004.f
 # 
 #
 Source: ftp://ftp.%n.ac.uk/%n/current/packed/%n-%v.tar.gz
@@ -122,7 +122,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 Sept 17, 2004
+This revision includes all available CCP4 patches as of Sept 29, 2004
 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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ccp4.patch  22 Sep 2004 08:10:36 -0000      1.11
+++ ccp4.patch  30 Sep 2004 12:56:45 -0000      1.12
@@ -1020,6 +1020,59 @@
          IF (CHK.GT.0.0) PHI = CONV*ATAN2(DC(2),DC(1))
        END IF
        WRITE (6,FMT=6006) THETA1,THETA2,THETA3,OMEGA,PHI,CHI,
+diff -ruN ccp4-5.0.2-orig/src/mapmask_/mapmask.f ccp4-5.0.2/src/mapmask_/mapmask.f
+--- ccp4-5.0.2-orig/src/mapmask_/mapmask.f     2004-06-16 02:06:23.000000000 -0700
++++ ccp4-5.0.2/src/mapmask_/mapmask.f  2004-09-29 08:42:14.000000000 -0700
+@@ -40,7 +40,7 @@
+       data types /'R','R'/
+ c
+       call ccpfyp
+-      call ccprcs (6, 'mapmask', '$Date$')
++      call ccprcs (6, 'mapmask', '$Date$')
+       call XYZINIT
+ c
+       idum=0
+@@ -348,7 +348,8 @@
+        ouvwlim13=int(uvwlim(1,3))
+        ouvwlim23=int(uvwlim(2,3))
+       endif
+-      if (lxyzmtc) call ccpmaplim('MAPLIM')
++cmdw argument to ccpmaplim needs to be 8 charcters long, hence spaces
++      if (lxyzmtc) call ccpmaplim('MAPLIM  ')
+       write (lpt,510)
+      +  iuvwlim11,iuvwlim21,iuvwlim12,iuvwlim22,iuvwlim13,iuvwlim23,
+      +  ouvwlim11,ouvwlim21,ouvwlim12,ouvwlim22,ouvwlim13,ouvwlim23
+diff -ruN ccp4-5.0.2-orig/src/maprot_/maprot.f ccp4-5.0.2/src/maprot_/maprot.f
+--- ccp4-5.0.2-orig/src/maprot_/maprot.f       2004-01-22 07:15:14.000000000 -0800
++++ ccp4-5.0.2/src/maprot_/maprot.f    2004-09-29 08:41:39.000000000 -0700
+@@ -39,7 +39,7 @@
+       data types /'R','R','R','R','R','R','R','R'/
+ c
+       call ccpfyp
+-      call ccprcs (6, 'maprot', '$Date$')
++      call ccprcs (6, 'maprot', '$Date$')
+ c
+       idum=0
+       lpt=lunsto(idum)
+@@ -72,7 +72,7 @@
+       real map(nmap),wrk(nwrk),wrk1(nwrk1),wrk2(nwrk2)
+ c
+       integer i
+-      integer lu1,lv1,lw1,lu2,lv2,lw2
++      integer lu1,lv1,lw1,lu2,lv2,lw2,cutspgrp
+       character*240 title,title1
+ c
+       do 100 i=1,nmap
+@@ -130,7 +130,8 @@
+      +  wu,wv,ww,wu1,wv1,ww1,wu2,wv2,ww2,wu1,wv1,ww1,wu2,wv2,ww2)
+       if (lmapout) call ccpmapout('MAPOUT',title,map,mspgrp,mcell,
+      +  mu,mv,mw,mu1,mv1,mw1,mu2,mv2,mw2,mu1,mv1,mw1,mu2,mv2,mw2)
+-      if (lcutout) call ccpmapout('CUTOUT',title,map,1,mcell,
++      cutspgrp=1
++      if (lcutout) call ccpmapout('CUTOUT',title,map,cutspgrp,mcell,
+      +  mu,mv,mw,mu1,mv1,mw1,mu2,mv2,mw2,lu1,lv1,lw1,lu2,lv2,lw2)
+ c
+       return
 diff -ruN ccp4-5.0.2-orig/unsupported/src/Makefile.in 
ccp4-5.0.2/unsupported/src/Makefile.in
 --- ccp4-5.0.2-orig/unsupported/src/Makefile.in        2003-12-01 03:02:44.000000000 
-0800
 +++ ccp4-5.0.2/unsupported/src/Makefile.in     2004-08-11 23:02:57.000000000 -0700



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to