Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26786
Modified Files: eden.info Added Files: eden.patch Log Message: eden revision upgrade --- NEW FILE: eden.patch --- diff -ruN eden_orig/source/Makefile eden/source/Makefile --- eden_orig/source/Makefile 2004-11-21 23:55:13.000000000 -0800 +++ eden/source/Makefile 2004-11-22 00:08:51.000000000 -0800 @@ -56,14 +56,14 @@ ####################################################################### # Directory where the FFTW include and lib are ####################################################################### -FFTW = /sw +FFTW = /swprefix LIB = $(FFTW)/lib INC = $(FFTW)/include ####################################################################### # Directory to install the binary, version ####################################################################### -BIN = $(HOME)/bin +BIN = /swinstallprefix/bin VERSION =V5.3 ####################################################################### @@ -74,7 +74,11 @@ # -O3 on HP, -O2 on SGI or DEC. # ####################################################################### -CFLAGS = -Wall -pipe -g3 +# added for os x fink: + +CFLAGS = -Wall -pipe -g3 -Wno-long-double + +#CFLAGS = -Wall -pipe -g3 #CFLAGS = -Wall -pipe -marchi686 -pedantic -gdwarf-2 -g3 #CFLAGS = -Wall -O3 -march=i686 ifneq ($(FFTW),/usr/local) @@ -88,7 +92,9 @@ # Use different libraries and include files for single and # double precision versions of EDEN. ####################################################################### -DOUBLESWITCH = ON +# got rid of tab + +DOUBLESWITCH = ON ifeq ($(DOUBLESWITCH),ON) LDFLAGS = -L$(LIB) -ldfftw -lm @@ -126,8 +132,8 @@ $(CC) -o $@ $^ install: all - mv fbyteswap $(BIN) - mv eden $(BIN)/$(TARGET) + cp fbyteswap $(BIN) + cp eden $(BIN)/$(TARGET) chmod 751 $(BIN)/$(TARGET) chmod +x mkeden.csh ./mkeden.csh $(BIN) $(BIN)/$(TARGET) Index: eden.info =================================================================== RCS file: /cvsroot/fink/dists/10.2/unstable/main/finkinfo/sci/eden.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- eden.info 5 Nov 2003 07:56:17 -0000 1.1 +++ eden.info 19 Feb 2006 05:22:49 -0000 1.2 @@ -1,38 +1,55 @@ Package: eden -Version: 4.1 -Revision: 1 -Source: http://www.edencrystallography.com/%n.tgz -Source-MD5: 7959a9b2f90c00666ef40cbdde72b490 -SourceDirectory: EDEN -Depends: x11, fftw-shlibs, tcltk, grace -BuildDepends: fftw, tcltk-dev +Version: 5.3 +Revision: 5 +Source: http://www.edencrystallography.org/%n_V%v.tar.gz +SourceRename: %n-%v.tar.gz +Source-MD5: 17f4908db1944d788bac44e59c8a5cb5 +SourceDirectory: eden +Depends: x11, fftw-shlibs | fftw-mpi-shlibs, grace, gsl-shlibs +BuildDepends: x11-dev, gsl, fftw | fftw-mpi, gsl +NoSetCPPFLAGS: true +NoSetLDFLAGS: true +Patch: %n.patch PatchScript: << -#!/bin/csh -f - mv source/Makefile source/Makefile_dist - sed s/"libs="/"libs= -L\%p\/lib"/g source/Makefile_dist > source/Makefile - mv source/apodutil.c source/apodutil.c-dist - sed s/xmgr/xmgrace/g source/apodutil.c-dist > source/apodutil.c +perl -pi.bak -e 's|/swprefix|%p|g' source/Makefile +perl -pi.bak -e 's|/swinstallprefix|%i|g' source/Makefile +perl -pi.bak -e 's|/swprefix|%p|g' python/eden.py +perl -pi.bak -e 's|mozilla|open|g' python/eden.py << CompileScript: << - cd source; make +PATH=/usr/bin:$PATH ; cd source; make << InstallScript: << - mkdir -p %i/share - mkdir -p %i/share/xtal - mkdir -p %i/share/xtal/%n - cp -R * %i/share/xtal/%n/. - mkdir -p %i/bin - ln -s %p/share/xtal/%n/source/%n %i/bin/%n - mkdir -p %i/share/doc - mkdir -p %i/share/doc/%n - cp manual/UserManual.ps %i/share/doc/%n/EdenUserManual.ps +#!/bin/zsh -ef +mkdir -p %i/bin +PATH=/usr/bin:$PATH ; cd source; make install +make clean +perl -pi.bak -e 's|DOUBLESWITCH = ON|DOUBLESWITCH = OFF|g' Makefile +PATH=/usr/bin:$PATH ; make; make install; make clean +cd .. +mkdir -p %i/share/xtal/%n +cp -R * %i/share/xtal/%n/. +mkdir -p %i/share/doc/%n +cp manual/UserManual.pdf %i/share/doc/%n/EdenUserManual.pdf +rm -f %i/bin/eden +rm -f %i/bin/ieden +ln -s %p/share/xtal/%n/python/%n.py %i/bin/ieden +cp %i/bin/seden %i/bin/eden << RunTimeVars: EDENHOME: %p/share/xtal/%n Description: Electron density holographic refinement DescDetail: << -Improve Electron Density Maps in a Maximally Unbiased Manner. -Hanna and Abraham Szoke. +Improve electron density maps in a maximally unbiased manner. +Written by Hanna and Abraham Szoke. There are now two versions +of eden, "seden" and "deden." seden is compiled with single-precision +fftw libs, and is faster and less memory-intensive. deden is double- +precision and is possibly more accurate (but in practice the differences +appear insignificant). ieden is a new python Tkinter-based GUI. Type +"eden" or "seden" to invoke single-precision eden, "ieden" for the GUI, +and "deden" for double-precision eden. GUI users need to define the +environment variable EDITOR, eg: export EDITOR='see' +or setenv EDITOR vim. << -License: Restrictive -Homepage: http://www.edencrystallography.com/index.html +License: GPL +Homepage: http://www.edencrystallography.org Maintainer: W. G. Scott <[EMAIL PROTECTED]> ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits