Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25430

Modified Files:
        ccp4.info ccp4.patch 
Log Message:
ccp4 version upgrade of suite to 6.1.0 released today

Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ccp4.info   18 Sep 2008 15:09:33 -0000      1.37
+++ ccp4.info   11 Dec 2008 02:51:40 -0000      1.38
@@ -1,15 +1,16 @@
 Package: ccp4
-Version: 6.0.99e
-Revision: 7
+Version: 6.1.0
+Revision: 1
 Distribution: 10.5
 GCC: 1
 Source: ftp://ftp.%n.ac.uk/%n/6.1/%n-%v-core-src.tar.gz
-Source-MD5: f36be231a4c89f53eafc1c281d07ad47
+Source-MD5: 51b76244da561880adbcfa9fbe08aeb0
 SourceDirectory: %n-%v
 Source2: http://chemistry.ucsc.edu/~wgscott/xtal/xtalfink/XCCPJiffy-custom.gz
 Source2-MD5: 21568dd2475505929573a3fd452c538f
-Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.1/ccp4-6.0.99e-phaser-src.tar.gz
-Source3-MD5: 10ea5d1115b19110fa5c0111de766f6d
+# Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.1/ccp4-6.1.0-phaser-src.tar.gz
+Source3: ftp://ftp.ccp4.ac.uk/ccp4/6.1/phaser-2.1.4-cctbx-src.tar.gz 
+Source3-MD5: 3395e1ad9cfedfa89f24eaffa888955f
 #
 DescPort: <<
     CCP4 is designed to compile with gfortran on OS X >= 10.4 by default. 
@@ -315,27 +316,28 @@
         lib/ccp4-%v/libmmdb.dylib
     <<
     Shlibs: <<
-        %p/lib/ccp4-%v/libDiffractionImage.0.dylib                   1.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libccif.dylib                                 0.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libccp4c.dylib                                0.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-ccp4.2.dylib                       3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-cif.2.dylib                        3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-cns.0.dylib                        1.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-contrib.2.dylib                    3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-core.2.dylib                       3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-minimol.2.dylib                    3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-mmdb.2.dylib                       3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libclipper-phs.2.dylib                        3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libcord.1.dylib                               2.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libgc.1.dylib                                 2.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libjwc_c.0.dylib                              2.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libmmdb.dylib                                 0.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libssm.0.dylib                                1.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libxdl_view.2.dylib                           3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libxdl_viewextra.0.dylib                      1.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libxml2.2.dylib                               9.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/libfftw.2.dylib                               3.0.0  %n 
  (>= 6.0.99e-1)
-        %p/lib/ccp4-%v/librfftw.2.dylib                              3.0.0  %n 
  (>= 6.0.99e-1)
+        %p/lib/ccp4-%v/libDiffractionImage.0.dylib                   1.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/lib_DiffractionImage.0.dylib                  1.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libccif.dylib                                 0.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libccp4c.dylib                                0.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-ccp4.2.dylib                       3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-cif.2.dylib                        3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-cns.0.dylib                        1.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-contrib.2.dylib                    3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-core.2.dylib                       3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-minimol.2.dylib                    3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-mmdb.2.dylib                       3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libclipper-phs.2.dylib                        3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libcord.1.dylib                               2.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libgc.1.dylib                                 2.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libjwc_c.0.dylib                              2.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libmmdb.dylib                                 0.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libssm.0.dylib                                1.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libxdl_view.2.dylib                           3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libxdl_viewextra.0.dylib                      1.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libxml2.2.dylib                               9.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/libfftw.2.dylib                               3.0.0  %n 
  (>= 6.1.0-1)
+        %p/lib/ccp4-%v/librfftw.2.dylib                              3.0.0  %n 
  (>= 6.1.0-1)
     << 
     DocFiles:  CHANGES COPYING INSTALL INSTALL.html INSTALL.ps README PROBLEMS 
academic_software_licence.pdf
 <<

Index: ccp4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ccp4.patch  30 Jul 2008 23:47:25 -0000      1.14
+++ ccp4.patch  11 Dec 2008 02:51:40 -0000      1.15
@@ -1,8 +1,6 @@
-Binary files ccp4-6.0.99e-orig/.DS_Store and ccp4-6.0.99e/.DS_Store differ
-Binary files ccp4-6.0.99e-orig/ccp4i/.DS_Store and 
ccp4-6.0.99e/ccp4i/.DS_Store differ
-diff -ruN ccp4-6.0.99e-orig/ccp4i/etc/configure.def.dist 
ccp4-6.0.99e/ccp4i/etc/configure.def.dist
---- ccp4-6.0.99e-orig/ccp4i/etc/configure.def.dist     2008-04-09 
13:03:01.000000000 -0700
-+++ ccp4-6.0.99e/ccp4i/etc/configure.def.dist  2008-07-29 19:18:23.000000000 
-0700
+diff -ruN ccp4-6.1.0-orig/ccp4i/etc/configure.def.dist 
ccp4-6.1.0/ccp4i/etc/configure.def.dist
+--- ccp4-6.1.0-orig/ccp4i/etc/configure.def.dist       2008-11-21 
07:01:04.000000000 -0800
++++ ccp4-6.1.0/ccp4i/etc/configure.def.dist    2008-12-10 13:24:07.000000000 
-0800
 @@ -61,8 +61,8 @@
  MESSAGE                   _text                               ""
  BLT_LIBRARY               _text                     ""
[...1480 lines suppressed...]
+                           -undefined suppress \\\
+-                          -dylib_install_name $(libdir)/$(SHARED_LIB_NAME) \\\
++                          -dylib_install_name ${rpath}/$(SHARED_LIB_NAME) \\\
                            -all_load $L \\\
-                           -o $(SHARED_LIB_NAME) -ldylib1.o'
+                           -o $(SHARED_LIB_NAME) -ldylib1.o -lirc'
           SHARED_LIB_EXPORTS_CMD=''
-@@ -1909,7 +1909,7 @@
+@@ -1911,7 +1911,7 @@
           fi
           SHARED_LIB_CMD='$(CC) $(SHARED_LIB_CFLAGS) -dynamiclib 
-flat_namespace \\\
-                                -undefined suppress -install_name \\\
--                                $(SHARED_LIB_NAME) \\\
-+                                ${RPATH}/$(SHARED_LIB_NAME) \\\
+                                -undefined suppress \\\
+-                               -install_name $(libdir)/$(SHARED_LIB_NAME) \\\
++                               -install_name ${rpath}/$(SHARED_LIB_NAME) \\\
                                 -all_load $L \\\
                                 -o $(SHARED_LIB_NAME)'
           SHARED_LIB_EXPORTS_CMD=''


------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to