Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21598
Modified Files:
imosflm.info
Added Files:
imosflm-aqua.info imosflm-aqua.patch imosflm.patch mosflm.info
mosflm.patch
Log Message:
mosflm update and associated GUI with both X11 and AquaTclTk versions
--- NEW FILE: mosflm.info ---
Package: mosflm
Version: 7.0.5
Revision: 1
Source:
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver705/build-it-yourself/mosflm705.tgz
SourceDirectory: mosflm705
Source-MD5: 972a14604d5a291501555fc758329dcb
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
CompileScript: <<
#!/bin/zsh -efv
source %p/bin/init.sh
source fink_gfortran.zsh
make
cd bin
mv ipmosflm ipmosflm-705
<<
InstallScript: <<
#!/bin/zsh -efv
mkdir -p %i/bin
cd bin
cp ipmosflm-* %i/bin/.
cp ipmosflm-* %i/bin/ipmosflm
cp ipmosflm-* %i/bin/mosflm
<<
Description: X-ray data processing, large display
DescDetail: <<
Mosflm is a program for integrating single crystal diffraction data
from area detectors. It is assumed that the experiment was conducted
using the Arndt-Wonacott oscillation method, and also that
monochromatic radiation was used.
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"
Authors:
Harry Powell and
Andrew G.W. Leslie
MRC Laboratory of Molecular Biology
Hills Road,
Cambridge CB2 2QH
UK
E-mail: harry AT mrc-lmb DOT cam DOT ac DOT uk
<<
Homepage: <<
http://www.mrc-lmb.cam.ac.uk/harry/frames/
<<
License: GPL
Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
--- NEW FILE: imosflm.patch ---
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
-#export MOSFLM_WISH=/path/to/your/wish8.4
-#export MOSFLM_EXEC=/path/to/your/ipmosflm
+export mosflm_wi...@prefix@/bin/wish8.5
+export mosflm_ex...@prefix@/bin/ipmosflm-705
+
+export CCP4_BROWSER=Safari
+export MOSDIR=${PWD}
+
+echo "Using $MOSFLM_EXEC with $MOSFLM_WISH starting in $MOSDIR"
STARTDIR=
IMAGEDIR=
STARTDIRSET=
@@ -119,14 +119,7 @@
esac
done
-if [ $HOSTTYPE = "intel-pc" ]
-# echo looks like an Intel Mac to me...
-then export GFORTRAN_UNBUFFERED_ALL=1
-fi
-case $0 in
- /*) abspath=$0 ;;
- *) abspath=$PWD/$0 ;;
-esac
+
# function to test wish executable
test_wish()
--- NEW FILE: mosflm.patch ---
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
@@ -0,0 +1,76 @@
+#!/bin/zsh -f
+#
+# setup shell script for the release copies of Mosflm for different
+# platforms.
+#
+# Common stuff first
+#
+
+
+export CCP4_LIB_FILES='-lccp4f -lccp4c -lxdl_view'
+mosroot=${PWD:h}
+export MOSROOT=$mosroot
+echo MOSROOT has been set to $MOSROOT
+moshome=${PWD}
+export MOSHOME=$moshome
+echo MOSHOME has been set to $MOSHOME
+export DEBUG=""
+# intel compiler specifics - change this to your local installation -
+# note that you will need to use gcc 4.* from Apple for the C compilation
+# unless you have bought the Intel C compiler!
+
+GFORTRANPREFIX=$(dirname $( dirname $(/usr/bin/which gfortran) ))
+export F77="gfortran"
+export FC="${F77}"
+export CC="gcc ${DEBUG}"
+export FLINK="gfortran"
+export AR_FLAGS="vru"
+export DPS=${MOSHOME}
+export IND=${MOSHOME}/index
+export UTIL=${MOSHOME}/src/dps/util
+export JPG=${MOSHOME}/jpg
+#
+# now for platform dependent items
+#
+
+###################################################################
+#intel-pc:
+export FFLAGS="-O3 "
+export FFLAGS="-O3 "
+export CFLAGS="-O0 -DPROTOTYPE -DIFC -c -w"
+# if no "fudge.o" vide infra setenv LFLAGS "-Vaxlib -i_dynamic"
+# export LFLAGS="-Vaxlib"
+
+
+#
+# (2) Mosflm directory
+#
+#setenv MOSFLAGS "-O3 -ip -ipo -parallel"
+
+export MOSFLAGS="-O3 "
+export MCFLAGS="-O0 -w"
+export MOSLIBS="-L${GFORTRANPREFIX}/lib -L${CCP4_LIB} ${CCP4_LIB_FILES}
-L/usr/X11R6/lib -lXt -lSM -lICE -lX11 -lcurses"
+#
+# (3) CBF directories
+#
+export CBFCFLAGS="-O2 -DPROTOTYPE -DIFC"
+
+export VERBOSE="v"
+export UTILFLAGS="-O -DPROTOTYPE -DIFC -c -w"
+export EXTRAFLAGS="-I${UTIL} "
+export STDCFLAGS=""
+#
+# special for MacOSX - it needs files to exist for rm under some
+# circumstances
+#
+touch ${MOSHOME}/index/junk.a
+touch ${MOSHOME}/src/junk.a
+touch ${MOSHOME}/lib/junk.a
+touch ${MOSHOME}/util/junk.a
+touch ${MOSHOME}/cbf/junk.a
+#exit
+
+echo CCP4 resides in $CCP4
+
+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 *);
/*------------------------------*
--- NEW FILE: imosflm-aqua.info ---
Package: imosflm-aqua
Version: 1.0.3
Epoch: 1
Revision: 1
Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver103/downloads/imosflm-%v.zip
Source-MD5: c785a6290c5a08fd5cc584914b77323e
PatchFile: imosflm-aqua.patch
PatchFile-MD5: 7e99f094a40fed6d5d3a8fc2f976ede1
Conflicts: imosflm
Replaces: imosflm
Depends: macosx, mosflm (>= 7.0.5), ccp4 (>= 6.1.2-1)
BuildDepends: fink (>= 0.29.00)
Distribution: 10.6
BuildDependsOnly: false
SourceDirectory: imosflm
NoSetLDFLAGS: true
NoSetCPPFLAGS: true
Description: Installs mosflm GUI for use with aqua TclTk
DescDetail: <<
Enables users to run the optional imosflm interface for the ccp4
program mosflm by installing all the required dependencies.
<<
PatchScript: <<
#!/bin/zsh -evf
/bin/rm -f lib/tkImageLoad.so
/bin/rm -rf c
/usr/bin/sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
<<
CompileScript: <<
#!/bin/zsh -evf
set +x
if [[ ! -x
/System/Library/Frameworks/Tk.framework/Versions/8.4/Resources/Wish.app/Contents/MacOS/Wish
|| $(sw_vers -productVersion) < 10.6 ]];then
print "Requires system TclTk on OS X 10.6 to be present"
return 1
fi
<<
License: OSI-Approved
Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
Homepage: http://www.mrc-lmb.cam.ac.uk/harry/imosflm/
InstallScript: <<
#!/bin/zsh -evf
mkdir -p %i/share/xtal
/bin/cp -r ../imosflm %i/share/xtal/.
mkdir -p %i/bin
ln -s %p/share/xtal/imosflm/src/imosflm %i/bin/imosflm
ln -s %p/share/xtal/imosflm/src/imosflm %i/bin/imosflm-aqua
<<
--- NEW FILE: imosflm-aqua.patch ---
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
-#export MOSFLM_WISH=/path/to/your/wish8.4
-#export MOSFLM_EXEC=/path/to/your/ipmosflm
+export MOSFLM_WISH=/usr/bin/wish8.4
+export mosflm_ex...@prefix@/bin/ipmosflm-705
+
+export CCP4_BROWSER=Safari
+export MOSDIR=${PWD}
+
+echo "Using $MOSFLM_EXEC with $MOSFLM_WISH starting in $MOSDIR"
STARTDIR=
IMAGEDIR=
STARTDIRSET=
@@ -119,14 +119,7 @@
esac
done
-if [ $HOSTTYPE = "intel-pc" ]
-# echo looks like an Intel Mac to me...
-then export GFORTRAN_UNBUFFERED_ALL=1
-fi
-case $0 in
- /*) 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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imosflm.info 17 Dec 2008 16:44:30 -0000 1.1
+++ imosflm.info 7 Sep 2009 02:22:22 -0000 1.2
@@ -1,20 +1,42 @@
Package: imosflm
-Version: 7.0.4
+Version: 1.0.3
+Epoch: 1
Revision: 1
-Depends: ccp4 (>= 6.1.0-1), itcl, itk, iwidgets, tdom, tkimg, tktreectrl
-GCC: 4.0
+Source:
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver103/downloads/imosflm-%v.zip
+Source-MD5: c785a6290c5a08fd5cc584914b77323e
+PatchFile: imosflm.patch
+PatchFile-MD5: 0578039427272bc4f7d5ba30e7ad1c6a
+Conflicts: imosflm-aqua
+Replaces: imosflm-aqua
+Depends: x11, mosflm (>= 7.0.5), ccp4 (>= 6.1.2-1), itcl, itk, iwidgets, tdom,
tkimg, tktreectrl
+BuildDepends: fink (>= 0.24.12)
BuildDependsOnly: false
-NoSourceDirectory: true
-Type: NoSource
+SourceDirectory: imosflm
NoSetLDFLAGS: true
NoSetCPPFLAGS: true
-Description: Installs TclTk widgets for mosflm interface
+Description: Installs mosflm GUI for use with X11 TclTk
DescDetail: <<
Enables users to run the optional imosflm interface for the ccp4
program mosflm by installing all the required dependencies.
<<
-CompileScript: /usr/bin/true
-InstallScript: /usr/bin/true
+PatchScript: <<
+#!/bin/zsh -evf
+/bin/rm -f lib/tkImageLoad.so
+/bin/rm -rf c
+/usr/bin/sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
+<<
+CompileScript: true
License: OSI-Approved
Maintainer: W. G. Scott <wgsc...@users.sourceforge.net>
Homepage: http://www.mrc-lmb.cam.ac.uk/harry/imosflm/
+
+InstallScript: <<
+#!/bin/zsh -evf
+mkdir -p %i/share/xtal
+/bin/cp -r ../imosflm %i/share/xtal/.
+mkdir -p %i/bin
+ln -s %p/share/xtal/imosflm/src/imosflm %i/bin/imosflm
+ln -s %p/share/xtal/imosflm/src/imosflm %i/bin/imosflm-x
+<<
+
+
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
