Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv25875
Added Files: relax-py.info relax-py.patch Log Message: sync with 10.4 --- NEW FILE: relax-py.info --- Info2: << Package: relax-py%type_pkg[python] Version: 1.3.10 Revision: 1 Type: python (2.5 2.6 2.7) Source: http://download.gna.org/relax/relax-%v.src.tar.bz2 Source-MD5: 119234c3b6543821a4b8d839c87b377c SourceDirectory: relax-%v Depends: python%type_pkg[python], numpy-py%type_pkg[python], scientificpython-py%type_pkg[python] (>= 2.9.0), wxgtk2.8-py%type_pkg[python] BuildDepends: python%type_pkg[python], scons, numpy-py%type_pkg[python], scientificpython-py%type_pkg[python] (>= 2.9.0), wxgtk2.8-py%type_pkg[python], fink (>= 0.24.12) Conflicts: relax-py24, relax-py25, relax-py26, relax-py27 Replaces: relax-py24, relax-py25, relax-py26, relax-py27 SetCC: gcc-4.2 PatchFile: relax-py.patch PatchFile-MD5: f41bb7a09906f0c30233dbba107780fd PatchScript: << #!/bin/sh -ev sed 's|python2.X|python%type_raw[python]|g' < %{PatchFile} |sed 's|FINK_PREFIX|%p|g' | sed 's|FINK_INSTALL_DIR|%i|g' | sed 's|relax-py2X|relax-py%type_pkg[python]|g' | patch -p1 if [ "%m" == "x86_64" ] ; then perl -pi -e "s|cflags = '-I'|cflags = '-m64 -I'|g" ./sconstruct perl -pi -e "s|'-bundle',|'-m64', '-bundle',|g" ./sconstruct else perl -pi -e "s|cflags = '-I'|cflags = '-m32 -I'|g" ./sconstruct perl -pi -e "s|'-bundle',|'-m32', '-bundle',|g" ./sconstruct fi << # running relax compiles the scripts InfoTest: TestScript: ./relax --test-suite; /usr/bin/find %i/lib/relax-py%type_pkg[python] -name '*.pyc' -delete; /usr/bin/find %i/lib/relax-py%type_pkg[python] -name '*.pyo' -delete; exit 0 : CompileScript: << %p/bin/python%type_raw[python] %p/bin/scons << InstallScript: << mkdir -p %i/lib mkdir -p %i/bin %p/bin/python%type_raw[python] %p/bin/scons install /usr/bin/find %i/lib/relax-py%type_pkg[python] -name '*.pyc' -delete /usr/bin/find %i/lib/relax-py%type_pkg[python] -name '*.pyo' -delete rm %i/bin/relax << PostInstScript: << update-alternatives --install %p/bin/relax relax %p/lib/relax-py%type_pkg[python]/relax %type_pkg[python] %p/bin/python%type_raw[python] -O %p/lib/python%type_raw[python]/compileall.py -q %p/lib/relax-py%type_pkg[python] cd %p/lib/relax-py%type_pkg[python] perl -pi -e 's|%i|%p|g' ./sconstruct relax --test << PreRmScript: << if [ $1 != "upgrade" ]; then update-alternatives --remove relax %p/lib/relax-py%type_pkg[python]/relax fi /usr/bin/find %p/lib/relax-py%type_pkg[python] -name '*.pyc' -delete /usr/bin/find %p/lib/relax-py%type_pkg[python] -name '*.pyo' -delete << Description: Protein dynamics by NMR relax. data analysis License: GPL Homepage: http://www.nmr-relax.com/ Maintainer: None <fink-de...@lists.sourceforge.net> << --- NEW FILE: relax-py.patch --- diff -uNr relax-1.3.5/relax relax-1.3.5.new/relax --- relax-1.3.5/relax 2010-05-21 11:00:31.000000000 -0400 +++ relax-1.3.5.new/relax 2010-06-24 15:27:29.000000000 -0400 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2.X ############################################################################### # # diff -uNr relax-1.3.5/scons/install.py relax-1.3.5.new/scons/install.py --- relax-1.3.5/scons/install.py 2010-05-21 11:00:21.000000000 -0400 +++ relax-1.3.5.new/scons/install.py 2010-06-24 15:28:06.000000000 -0400 @@ -112,8 +112,8 @@ ############### # Run relax to create the *.pyc files. - print("\nRunning relax to create the byte-compiled *.pyc files.") - system(env['SYMLINK'] + " --test") + # print("\nRunning relax to create the byte-compiled *.pyc files.") + # system(env['SYMLINK'] + " --test") # Final print out. print("\n\n\n") diff -uNr relax-1.3.5/sconstruct relax-1.3.5.new/sconstruct --- relax-1.3.5/sconstruct 2010-05-21 11:00:31.000000000 -0400 +++ relax-1.3.5.new/sconstruct 2010-06-24 15:44:24.000000000 -0400 @@ -98,7 +98,7 @@ SYS = SYSTEM # Mac OS X installation path. - INSTALL_PATH = sys.prefix + sep + 'local' + INSTALL_PATH = 'FINK_INSTALL_DIR' + sep + 'lib' # All other operating systems. @@ -115,10 +115,10 @@ ############### # Relax installation directory. -RELAX_PATH = INSTALL_PATH + sep + 'relax' +RELAX_PATH = INSTALL_PATH + sep + 'relax-py2X' # Installation path for binaries. -BIN_PATH = INSTALL_PATH + sep + 'bin' +BIN_PATH = 'FINK_INSTALL_DIR' + sep + 'bin' # Symbolic link installation path. SYMLINK = BIN_PATH + sep + 'relax' @@ -475,11 +475,11 @@ 'relax_fit.c'] # Construct the python include path (for Python.h). - py_include_minpath = sys.prefix + path.sep + 'include' + py_include_minpath = 'FINK_PREFIX' + path.sep + 'include' py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` # Construct the python bin path. - py_bin_minpath = sys.prefix + path.sep + 'bin' + py_bin_minpath = 'FINK_PREFIX' + path.sep + 'bin' py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]` # Get the numpy include path (for numpy/arrayobject.h). ------------------------------------------------------------------------------ Magic Quadrant for Content-Aware Data Loss Prevention Research study explores the data loss prevention market. Includes in-depth analysis on the changes within the DLP market, and the criteria used to evaluate the strengths and weaknesses of these DLP solutions. http://www.accelacomm.com/jaw/sfnl/114/51385063/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs