Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4885
Modified Files:
imosflm-aqua.info imosflm-aqua.patch imosflm.info
imosflm.patch mosflm.info mosflm.patch
Log Message:
version updates to mosflm and interfaces
Index: mosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm.info,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- mosflm.info 7 Sep 2009 22:56:09 -0000 1.25
+++ mosflm.info 15 Feb 2010 21:54:39 -0000 1.26
@@ -1,20 +1,20 @@
Package: mosflm
-Version: 7.0.5
-Revision: 2
-Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver705/build-it-yourself/mosflm705.tgz
-SourceDirectory: mosflm705
-Source-MD5: 972a14604d5a291501555fc758329dcb
+Version: 7.0.6
+Revision: 1
+Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver706/build-it-yourself/mosflm706.tgz
+SourceDirectory: mosflm706
+Source-MD5: 8acf193fcc51ecd2909024997968db95
Depends: x11, ccp4 (>= 6.1.2-1), libjpeg-shlibs, libgettext3-shlibs,
gcc44-shlibs (>= 4.4.1-1000)
# imosflm (>= 1:1.0.3-1) | imosflm-aqua (>= 1:1.0.3-1)
BuildDepends: gcc44 (>= 4.4.1-1000), ccp4-dev (>= 6.1.2-1), x11, libjpeg,
libgettext3-shlibs
PatchFile: %n.patch
-PatchFile-MD5: 237a59e6ce608eb43584d619777c944b
+PatchFile-MD5: 6c1153b570ca1ecea8c88bc702e0a9c8
CompileScript: <<
#!/bin/bash -efv
source fink_gfortran.zsh
make
cd bin
-mv ipmosflm ipmosflm-705
+mv ipmosflm ipmosflm-706
<<
InstallScript: <<
#!/bin/zsh -efv
@@ -33,7 +33,7 @@
Mosflm can process data from a wide variety of modern area
detectors, e.g. from Mar Research, Rigaku/MSC, ADSC, DIP etc.
-Invoke with "ipmosflm" or "ipmosflm-705" or "mosflm"
+Invoke with "ipmosflm" or "ipmosflm-706" or "mosflm"
Authors:
Harry Powell and
Index: imosflm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imosflm.patch 30 Sep 2009 20:08:58 -0000 1.2
+++ imosflm.patch 15 Feb 2010 21:54:39 -0000 1.3
@@ -1,31 +1,26 @@
diff -ruN imosflm.orig/src/imosflm imosflm/src/imosflm
---- imosflm.orig/src/imosflm 2009-08-10 15:57:50.000000000 -0700
-+++ imosflm/src/imosflm 2009-09-06 18:29:04.000000000 -0700
-@@ -1,14 +1,14 @@
--#!/bin/sh
-+#!/bin/sh -f
-
--# At LMB (and probably elsewhere!) ignore the following 3 lines - this should
--# be set up in a site-wide setup file.
--#
--# N.B. If you want to setup a site-wide installation, you'll probably want to
--# edit and uncomment the following lines to point to the site-wide wish8.4
--# and Mosflm 7.0.2 executables
-+abspa...@prefix@/share/xtal/imosflm/src/imosflm
+--- imosflm.orig/src/imosflm 2010-01-29 15:56:58.000000000 -0800
++++ imosflm/src/imosflm 2010-02-15 12:50:55.000000000 -0800
+@@ -7,8 +7,16 @@
+ # edit and uncomment the following lines to point to the site-wide wish8.4
+ # and Mosflm executables
-#export MOSFLM_WISH=/path/to/your/wish8.4
-#export MOSFLM_EXEC=/path/to/your/ipmosflm
++abspa...@prefix@/share/xtal/imosflm/src/imosflm
++
+export mosflm_wi...@prefix@/bin/wish
-+export mosflm_ex...@prefix@/bin/ipmosflm-705
++export mosflm_ex...@prefix@/bin/ipmosflm-706
+
+export CCP4_BROWSER=Safari
+export MOSDIR=${PWD}
+
+echo "Using $MOSFLM_EXEC with $MOSFLM_WISH starting in $MOSDIR"
++
STARTDIR=
IMAGEDIR=
STARTDIRSET=
-@@ -119,14 +119,7 @@
+@@ -119,14 +127,6 @@
esac
done
@@ -37,7 +32,6 @@
- /*) abspath=$0 ;;
- *) abspath=$PWD/$0 ;;
-esac
-+
# function to test wish executable
test_wish()
Index: mosflm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mosflm.patch 7 Sep 2009 02:22:22 -0000 1.1
+++ mosflm.patch 15 Feb 2010 21:54:39 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ruN mosflm705.orig/fink_gfortran.zsh mosflm705/fink_gfortran.zsh
---- mosflm705.orig/fink_gfortran.zsh 1969-12-31 16:00:00.000000000 -0800
-+++ mosflm705/fink_gfortran.zsh 2009-09-06 14:52:45.000000000 -0700
+diff -ruN mosflm706.orig/fink_gfortran.zsh mosflm706/fink_gfortran.zsh
+--- mosflm706.orig/fink_gfortran.zsh 1969-12-31 16:00:00.000000000 -0800
++++ mosflm706/fink_gfortran.zsh 2009-09-06 14:52:45.000000000 -0700
@@ -0,0 +1,76 @@
+#!/bin/zsh -f
+#
@@ -78,14 +78,3 @@
+
+echo "Now issue the command \"make\" "
+
-diff -ruN mosflm705.orig/src/dps/index/ind_gen_direct.c
mosflm705/src/dps/index/ind_gen_direct.c
---- mosflm705.orig/src/dps/index/ind_gen_direct.c 2009-08-13
09:07:59.000000000 -0700
-+++ mosflm705/src/dps/index/ind_gen_direct.c 2009-09-06 14:53:11.000000000
-0700
-@@ -41,7 +41,6 @@
- /* #include <malloc.h> */
- #include "util.h"
- #include "ind_gen_direct.h"
--char *strcat( char *, const char *);
-
-
- /*------------------------------*
Index: imosflm-aqua.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm-aqua.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imosflm-aqua.info 7 Sep 2009 02:22:22 -0000 1.1
+++ imosflm-aqua.info 15 Feb 2010 21:54:39 -0000 1.2
@@ -1,14 +1,14 @@
Package: imosflm-aqua
-Version: 1.0.3
+Version: 1.0.4
Epoch: 1
Revision: 1
-Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver103/downloads/imosflm-%v.zip
-Source-MD5: c785a6290c5a08fd5cc584914b77323e
+Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver104/downloads/imosflm-%v.zip
+Source-MD5: dc0675c693d5677efa413fd0d916f9ae
PatchFile: imosflm-aqua.patch
-PatchFile-MD5: 7e99f094a40fed6d5d3a8fc2f976ede1
+PatchFile-MD5: fbcdbfe116921d42e94f6ee2300c9c36
Conflicts: imosflm
Replaces: imosflm
-Depends: macosx, mosflm (>= 7.0.5), ccp4 (>= 6.1.2-1)
+Depends: macosx, mosflm (>= 7.0.6)
BuildDepends: fink (>= 0.29.00)
Distribution: 10.6
BuildDependsOnly: false
Index: imosflm-aqua.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm-aqua.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imosflm-aqua.patch 7 Sep 2009 02:22:22 -0000 1.1
+++ imosflm-aqua.patch 15 Feb 2010 21:54:39 -0000 1.2
@@ -1,31 +1,26 @@
diff -ruN imosflm.orig/src/imosflm imosflm/src/imosflm
---- imosflm.orig/src/imosflm 2009-08-10 15:57:50.000000000 -0700
-+++ imosflm/src/imosflm 2009-09-06 18:29:04.000000000 -0700
-@@ -1,14 +1,14 @@
--#!/bin/sh
-+#!/bin/sh -f
-
--# At LMB (and probably elsewhere!) ignore the following 3 lines - this should
--# be set up in a site-wide setup file.
--#
--# N.B. If you want to setup a site-wide installation, you'll probably want to
--# edit and uncomment the following lines to point to the site-wide wish8.4
--# and Mosflm 7.0.2 executables
-+abspa...@prefix@/share/xtal/imosflm/src/imosflm
+--- imosflm.orig/src/imosflm 2010-01-29 15:56:58.000000000 -0800
++++ imosflm/src/imosflm 2010-02-15 12:50:55.000000000 -0800
+@@ -7,8 +7,16 @@
+ # edit and uncomment the following lines to point to the site-wide wish8.4
+ # and Mosflm executables
-#export MOSFLM_WISH=/path/to/your/wish8.4
-#export MOSFLM_EXEC=/path/to/your/ipmosflm
++abspa...@prefix@/share/xtal/imosflm/src/imosflm
++
+export MOSFLM_WISH=/usr/bin/wish8.4
-+export mosflm_ex...@prefix@/bin/ipmosflm-705
++export mosflm_ex...@prefix@/bin/ipmosflm-706
+
+export CCP4_BROWSER=Safari
+export MOSDIR=${PWD}
+
+echo "Using $MOSFLM_EXEC with $MOSFLM_WISH starting in $MOSDIR"
++
STARTDIR=
IMAGEDIR=
STARTDIRSET=
-@@ -119,14 +119,7 @@
+@@ -119,14 +127,6 @@
esac
done
@@ -37,7 +32,6 @@
- /*) abspath=$0 ;;
- *) abspath=$PWD/$0 ;;
-esac
-+
# function to test wish executable
test_wish()
Index: imosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imosflm.info 30 Sep 2009 20:16:04 -0000 1.4
+++ imosflm.info 15 Feb 2010 21:54:39 -0000 1.5
@@ -1,14 +1,14 @@
Package: imosflm
-Version: 1.0.3
+Version: 1.0.4
Epoch: 1
-Revision: 2
-Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver103/downloads/imosflm-%v.zip
-Source-MD5: c785a6290c5a08fd5cc584914b77323e
+Revision: 1
+Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver104/downloads/imosflm-%v.zip
+Source-MD5: dc0675c693d5677efa413fd0d916f9ae
PatchFile: imosflm.patch
-PatchFile-MD5: e09fd118bcdef594225018d7396e9520
+PatchFile-MD5: 0a53b06137f1665c401cabf88c129181
Conflicts: imosflm-aqua
Replaces: imosflm-aqua
-Depends: x11, mosflm (>= 7.0.5), ccp4 (>= 6.1.2-1), itcl, itk, iwidgets, tdom,
tkimg, tktreectrl
+Depends: x11, mosflm (>= 7.0.6), ccp4 (>= 6.1.2-1), itcl, itk, iwidgets, tdom,
tkimg, tktreectrl
BuildDepends: fink (>= 0.24.12)
BuildDependsOnly: false
SourceDirectory: imosflm
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
