Ticket #40341: relax-3.0.0.diff

File relax-3.0.0.diff, 4.2 KB (added by mojca (Mojca Miklavec), 11 years ago)

patch for upgrading relax to version 3.0.0

  • Portfile

     
    22# $Id$
    33
    44PortSystem          1.0
    5 PortGroup           python27 1.0
     5PortGroup           python 1.0
    66PortGroup           wxWidgets 1.0
    77
    88name                relax
    9 version             2.2.4
     9version             3.0.0
    1010categories          science python chemistry
     11license             GPL-3
    1112maintainers         bromo.med.uc.edu:howarth
    1213description         Protein dynamics by NMR relax. data analysis
    1314long_description    The program relax is designed for the study of the \
    … …  
    1819master_sites        http://download.gna.org/relax/
    1920distfiles           ${name}-${version}.src.tar.bz2
    2021dist_subdir         ${name}
    21 checksums           md5     0b8c7b357f7ca662506ee339dd41cbd7 \
    22                     sha1    e0c3548566ae8b44ed9f761600568180a5de2224 \
    23                     rmd160  815834bc2f6b63a4f2fa0f68839de25166694274
     22checksums           md5     eb89c6879545973de95d58797f584301 \
     23                    sha1    f0cc6716d44bcbf4b8fd6b73d6d5847e738700fc \
     24                    rmd160  7124ecee5c35eb8935c966759b6707a26fce7fe1
    2425use_bzip2           yes
    25 depends_lib-append  port:scons port:py27-scipy port:py27-numpy \
    26                     port:py27-wxpython-3.0 port:pymol
     26
     27python.default_version 27
     28
     29depends_build-append \
     30                    port:scons
     31depends_lib-append  port:pymol \
     32                    port:py${python.version}-scipy \
     33                    port:py${python.version}-numpy \
     34                    port:py${python.version}-wxpython-3.0
    2735patchfiles          relax.patch
    2836post-patch {
    2937    reinplace  "s|'i386', 'ppc', 'x86_64'|'${build_arch}'|g" ${worksrcpath}/sconstruct
    3038    reinplace  "s|cflags = '-I'|cflags = '-O3 -ffast-math -funroll-loops -I'|g" ${worksrcpath}/sconstruct
    3139    reinplace  "s|@DEST_ROOT@|${destroot}|g" ${worksrcpath}/sconstruct
     40    reinplace  "s|@PYTHON_BIN@|${python.bin}|g" ${worksrcpath}/relax
    3241    reinplace  "s|@PYTHON_INCL@|${python.include}|g" ${worksrcpath}/sconstruct
    33     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sconstruct \
    34                                         ${worksrcpath}/relax
     42    reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sconstruct
    3543}
    3644build.cmd           ${prefix}/bin/scons
    3745build.target

  • files/relax.patch

     
    11--- sconstruct.orig     2012-10-17 10:28:31.000000000 -0400
    22+++ sconstruct  2013-01-13 17:36:49.000000000 -0500
    3 @@ -100,7 +100,7 @@
     3@@ -99,7 +99,7 @@
    44     SYS = SYSTEM
    55 
    66     # Mac OS X installation path.
    … …  
    99 
    1010 
    1111 # All other operating systems.
    12 @@ -120,13 +120,12 @@
     12@@ -119,13 +119,12 @@
    1313 RELAX_PATH = INSTALL_PATH + sep + 'relax'
    1414 
    1515 # Installation path for binaries.
    … …  
    2424 # The distribution files.
    2525 #########################
    2626 
    27 @@ -533,11 +532,11 @@
     27@@ -532,11 +531,11 @@
    2828                  'relax_fit.c']
    2929 
    3030         # Construct the python include path (for Python.h).
    … …  
    3737+        py_bin_minpath = '@PREFIX@'+ path.sep + 'bin'
    3838         py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
    3939 
    40          # Get the numpy include path (for numpy/arrayobject.h).
     40         # Relaxation curve fitting build environment.
    4141--- relax.orig  2012-06-11 05:51:33.000000000 -0400
    4242+++ relax       2012-06-16 17:03:52.000000000 -0400
    4343@@ -1,4 +1,4 @@
    4444-#! /usr/bin/env python
    45 +#!@PREFIX@/bin/python2.7
     45+#!@PYTHON_BIN@
    4646 
    4747 # Import the relax module.
    4848 import relax
    … …  
    6565 
    6666     # Final printout.
    6767     print("\n\n\n")
     68========================
     69fixed upstream in r20596
     70========================
     71--- test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py.orig
     72+++ test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
     73@@ -151,7 +151,7 @@ class Analysis:
     74 
     75         # PyMOL.
     76         pymol.view()
     77-        pymol.command('show spheres'_pseudo_ellipse)
     78+        pymol.command('show spheres')
     79         pymol.cone_pdb('cone_pseudo_ellipse.pdb')
     80 
     81