Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9210

Modified Files:
        imosflm-aqua.info imosflm-aqua.patch imosflm.info 
        imosflm.patch mosflm.info 
Log Message:
compatibility changes for ccp4-6.1.13

Index: mosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/mosflm.info,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- mosflm.info 15 Feb 2010 21:54:39 -0000      1.26
+++ mosflm.info 1 Jul 2010 13:10:16 -0000       1.27
@@ -1,28 +1,34 @@
 Package: mosflm
 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)
+Revision: 2
+#Source: 
http://www.mrc-lmb.cam.ac.uk/harry/mosflm/ver706/build-it-yourself/mosflm706.tgz
+Source: none
+#SourceDirectory: mosflm706
+#Source-MD5: 8acf193fcc51ecd2909024997968db95
+Depends: x11, ccp4 (>= 6.1.13-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: 6c1153b570ca1ecea8c88bc702e0a9c8
+#BuildDepends: gcc44 (>= 4.4.1-1000), ccp4-dev (>= 6.1.2-1), x11, libjpeg, 
libgettext3-shlibs
+#PatchFile: %n.patch
+#PatchFile-MD5: 6c1153b570ca1ecea8c88bc702e0a9c8
 CompileScript: << 
 #!/bin/bash -efv
-source fink_gfortran.zsh
-make
-cd bin
-mv ipmosflm ipmosflm-706
+true
+#  source fink_gfortran.zsh
+#  make
+#  cd bin
+#  mv ipmosflm ipmosflm-706
 <<
 InstallScript: <<
-#!/bin/zsh -efv
+#!/bin/bash -efv
  mkdir -p %i/bin
- cd bin
- cp ipmosflm-* %i/bin/.
- cp ipmosflm-* %i/bin/ipmosflm
- cp ipmosflm-* %i/bin/mosflm
+source %p/bin/init.sh 2>/dev/null
+ln -s $CBIN/ipmosflm %i/bin/ipmosflm-%v
+ln -s $CBIN/ipmosflm %i/bin/mosflm
+# cd bin
+# cp ipmosflm-* %i/bin/.
+# cp ipmosflm-* %i/bin/ipmosflm
+# cp ipmosflm-* %i/bin/mosflm
 <<
 Description: X-ray data processing, large display
 DescDetail: <<

Index: imosflm.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imosflm.patch       15 Feb 2010 21:54:39 -0000      1.3
+++ imosflm.patch       1 Jul 2010 13:10:16 -0000       1.4
@@ -10,7 +10,7 @@
 +abspa...@prefix@/share/xtal/imosflm/src/imosflm
 +
 +export mosflm_wi...@prefix@/bin/wish
-+export mosflm_ex...@prefix@/bin/ipmosflm-706
++export MOSFLM_EXEC="$CBIN/ipmosflm"
 +
 +export CCP4_BROWSER=Safari
 +export MOSDIR=${PWD}  

Index: imosflm-aqua.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm-aqua.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imosflm-aqua.info   15 Feb 2010 21:54:39 -0000      1.2
+++ imosflm-aqua.info   1 Jul 2010 13:10:15 -0000       1.3
@@ -1,14 +1,14 @@
 Package: imosflm-aqua
 Version: 1.0.4
 Epoch: 1
-Revision: 1
+Revision: 3
 Source:  
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver104/downloads/imosflm-%v.zip
 Source-MD5: dc0675c693d5677efa413fd0d916f9ae
 PatchFile: imosflm-aqua.patch
-PatchFile-MD5: fbcdbfe116921d42e94f6ee2300c9c36
-Conflicts: imosflm
-Replaces: imosflm
-Depends: macosx, mosflm (>= 7.0.6) 
+PatchFile-MD5: d1555a89f39bc65fcf7117e94c2dcba1
+Conflicts: imosflm, mosflm
+Replaces: imosflm, mosflm
+Depends: macosx, ccp4 (>= 6.1.13-1)
 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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imosflm-aqua.patch  15 Feb 2010 21:54:39 -0000      1.2
+++ imosflm-aqua.patch  1 Jul 2010 13:10:16 -0000       1.3
@@ -10,7 +10,7 @@
 +abspa...@prefix@/share/xtal/imosflm/src/imosflm
 +
 +export MOSFLM_WISH=/usr/bin/wish8.4
-+export mosflm_ex...@prefix@/bin/ipmosflm-706
++export MOSFLM_EXEC=$CBIN/ipmosflm
 +
 +export CCP4_BROWSER=Safari
 +export MOSDIR=${PWD}  

Index: imosflm.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/imosflm.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imosflm.info        15 Feb 2010 21:54:39 -0000      1.5
+++ imosflm.info        1 Jul 2010 13:10:16 -0000       1.6
@@ -1,14 +1,14 @@
 Package: imosflm
 Version: 1.0.4
 Epoch: 1
-Revision: 1
+Revision: 3
 Source:  
http://www.mrc-lmb.cam.ac.uk/harry/imosflm/ver104/downloads/imosflm-%v.zip
 Source-MD5: dc0675c693d5677efa413fd0d916f9ae
 PatchFile: imosflm.patch
-PatchFile-MD5: 0a53b06137f1665c401cabf88c129181
-Conflicts: imosflm-aqua
-Replaces: imosflm-aqua
-Depends: x11, mosflm (>= 7.0.6), ccp4 (>= 6.1.2-1), itcl, itk, iwidgets, tdom, 
tkimg, tktreectrl  
+PatchFile-MD5: 4b62a8fbf3ba3096ee0b322b19709caf
+Conflicts: imosflm-aqua, mosflm 
+Replaces: imosflm-aqua, mosflm 
+Depends: x11, ccp4 (>= 6.1.13-1), itcl, itk, iwidgets, tdom, tkimg, tktreectrl 
 
 BuildDepends: fink (>= 0.24.12)
 BuildDependsOnly: false
 SourceDirectory: imosflm


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to