Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13512
Modified Files:
refmac.info refmac.patch
Log Message:
version update with bug fixes and other improvements from upstream
Index: refmac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/refmac.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- refmac.patch 26 Jul 2007 15:10:46 -0000 1.6
+++ refmac.patch 30 Dec 2007 06:54:47 -0000 1.7
@@ -1,21 +1,22 @@
-diff -ruN refmac-5.4-orig/atom_com.fh refmac-5.4/atom_com.fh
---- refmac-5.4-orig/atom_com.fh 2007-07-02 09:26:55.000000000 -0700
-+++ refmac-5.4/atom_com.fh 2007-07-12 20:31:41.000000000 -0700
-@@ -74,7 +74,7 @@
- C
- C ------------------------------------------------------------------
- INTEGER MAXATOM
-- PARAMETER (MAXATOM = 120000)
-+ PARAMETER (MAXATOM = 800000)
- INTEGER MAXATSD
- PARAMETER (MAXATSD = 1 )
- INTEGER MAXNSO
-diff -ruN refmac-5.4-orig/makefile_gfortran refmac-5.4/makefile_gfortran
---- refmac-5.4-orig/makefile_gfortran 2007-04-25 12:39:20.000000000 -0700
-+++ refmac-5.4/makefile_gfortran 2007-07-12 20:43:36.000000000 -0700
-@@ -1,4 +1,4 @@
--VERSION = gfortran
-+VERSION = -5.4
- FC = gfortran
- FOPTIM = -O3
- COPTIM = -O
+diff -ruN refmac-orig/makefile_fink refmac/makefile_fink
+--- refmac-orig/makefile_fink 1969-12-31 16:00:00.000000000 -0800
++++ refmac/makefile_fink 2007-12-29 21:57:57.000000000 -0800
+@@ -0,0 +1,18 @@
++VERSION = -5.4
++FC = gfortran
++FOPTIM = -O3
++COPTIM = -O
++XFFLAGS = -fno-second-underscore
++
++XCFLAGS = -DGFORTRAN -DPROTOTYPE
++FFLAGS = $(FOPTIM) $(XFFLAGS) -static-libgcc
++
++CFLAGS = $(COPTIM) $(XCFLAGS)
++
++
++LLIBCIF =
++LLIBCCP = $(CLIB)/libccp4f.a $(CLIB)/libccp4c.a $(BLAS_DIR)/libLAPACK.dylib
$(BLAS_DIR)/libBLAS.dylib $(FORTLIB)/libgfortran.a
++LLIBOTHERS = -lstdc++ $(FORTLIB)/libgfortran.a
$(FORTLIB2)/libgfortranbegin.a $(FORTLIB2)/libgcc.a
++
++
++include make_refmac.inc
Index: refmac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/refmac.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- refmac.info 26 Jul 2007 15:10:46 -0000 1.12
+++ refmac.info 30 Dec 2007 06:54:47 -0000 1.13
@@ -1,21 +1,34 @@
Package: refmac
Version: 5.4
-Revision: 1
+# version 5.4.0066 : 12/07/07##
+Revision: 2
Source: http://www.ysbl.york.ac.uk/refmac/data/refmac5.4_source.tar.gz
-Source-MD5: e06dd93e3d4a65d8876e73a998b8118b
+Source-MD5: ca5d41fcf45ceeb6d91b7a7c3af1c5fb
SourceRename: %n-%v.tar.gz
-Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac5.3_dictionary.tar.gz
-Source2-MD5: 53faccfdb396125c1f885cdba4a5bd5b
+Source2: http://www.ysbl.york.ac.uk/refmac/data/refmac5.4_dictionary.tar.gz
+Source2-MD5: 9f6d945927751531505298b0b8789687
NoSourceDirectory: yes
-Depends: ccp4 (>= 6.0.2-1) | ccp4-g77, gcc42-shlibs
-BuildDepends: ccp4-dev (>= 6.0.2-1) | ccp4-g77-dev, gcc42, ccp4 (>= 6.0.2-1) |
ccp4-g77
+Depends: ccp4 (>= 6.0.2-7), gcc42-shlibs
+BuildDepends: ccp4-dev (>= 6.0.2-7), gcc42, ccp4 (>= 6.0.2-7)
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
Patch: refmac.patch
CompileScript: <<
#!/bin/bash -efv
-source %p/bin/init.sh
-make -f makefile_gfortran
+export CLIB=%p/lib/ccp4-6.0.2
+export
BLAS_DIR=/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A
+export FORTLIB=%p/lib/gcc4.2/lib
+export FORTLIB2=${FORTLIB}/gcc/$(gfortran -dumpmachine)/$(gfortran
-dumpversion | head -n 1 | awk '{print $NF}')
+ # Reality checks
+if [[ ! -d $CLIB || ! -d $FORTLIB2 ]];then
+ echo "Failed to find required library directory."
+ echo "Check ccp4 and gcc42 installations."
+ return 10
+else
+ echo "" ; echo "Found ${FORTLIB2}" ; echo ""
+fi
+#
+make -f makefile_fink
<<
InstallScript: <<
#!/bin/bash -efv
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
