[101566] trunk/dports/science/relax

cal at macports.org cal at macports.org
Sun Jan 13 16:24:36 PST 2013


Revision: 101566
          https://trac.macports.org/changeset/101566
Author:   cal at macports.org
Date:     2013-01-13 16:24:36 -0800 (Sun, 13 Jan 2013)
Log Message:
-----------
relax: update to 2.1.2, maintainer, closes #37630

Modified Paths:
--------------
    trunk/dports/science/relax/Portfile
    trunk/dports/science/relax/files/relax.patch

Modified: trunk/dports/science/relax/Portfile
===================================================================
--- trunk/dports/science/relax/Portfile	2013-01-14 00:16:39 UTC (rev 101565)
+++ trunk/dports/science/relax/Portfile	2013-01-14 00:24:36 UTC (rev 101566)
@@ -5,7 +5,7 @@
 PortGroup           python27 1.0
 
 name                relax
-version             2.0.0
+version             2.1.2
 categories          science python
 maintainers         bromo.med.uc.edu:howarth
 description         Protein dynamics by NMR relax. data analysis
@@ -17,15 +17,18 @@
 master_sites        http://download.gna.org/relax/
 distfiles           ${name}-${version}.src.tar.bz2
 dist_subdir         ${name}
-checksums           md5     3449d0fca777925b0f15a10b88a72a85 \
-                    sha1    d8e23c515a92d3d144729515af9000c19b66f781 \
-                    rmd160  66b402494497ff0821d99c0af1795f9bab87d5cc
+checksums           md5     71acc50c457d02aff7e430f2acbb49c3 \
+                    sha1    3c367ec44db3f56c935cdab356962efc9ccb8150 \
+                    rmd160  ba73f751bb7331679256a3148a9c1f617f82efe1
 use_bzip2           yes
 depends_lib-append  port:scons port:py27-scipy port:py27-numpy \
                     port:py27-wxpython-devel port:pymol
 patchfiles          relax.patch
 post-patch {
+    reinplace  "s|'i386', 'ppc', 'x86_64'|'${build_arch}'|g" ${worksrcpath}/sconstruct
+    reinplace  "s|cflags = '-I'|cflags = '-O3 -ffast-math -funroll-loops -I'|g" ${worksrcpath}/sconstruct
     reinplace  "s|@DEST_ROOT@|${destroot}|g" ${worksrcpath}/sconstruct
+    reinplace  "s|@PYTHON_INCL@|${python.include}|g" ${worksrcpath}/sconstruct
     reinplace  "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sconstruct \
                                         ${worksrcpath}/relax
 }

Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch	2013-01-14 00:16:39 UTC (rev 101565)
+++ trunk/dports/science/relax/files/relax.patch	2013-01-14 00:24:36 UTC (rev 101566)
@@ -1,14 +1,6 @@
---- relax.orig	2012-06-11 05:51:33.000000000 -0400
-+++ relax	2012-06-16 17:03:52.000000000 -0400
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!@PREFIX@/bin/python2.7
- 
- # Import the relax module.
- import relax
---- sconstruct.orig	2012-06-11 05:51:33.000000000 -0400
-+++ sconstruct	2012-06-16 17:03:52.000000000 -0400
-@@ -99,7 +99,7 @@
+--- sconstruct.orig	2012-10-17 10:28:31.000000000 -0400
++++ sconstruct	2013-01-13 17:36:49.000000000 -0500
+@@ -100,7 +100,7 @@
      SYS = SYSTEM
  
      # Mac OS X installation path.
@@ -17,7 +9,7 @@
  
  
  # All other operating systems.
-@@ -119,13 +119,12 @@
+@@ -120,13 +120,12 @@
  RELAX_PATH = INSTALL_PATH + sep + 'relax'
  
  # Installation path for binaries.
@@ -32,31 +24,31 @@
  # The distribution files.
  #########################
  
-@@ -515,9 +514,6 @@
-             cflags = '/nologo /I\"' + py_include_minpath + '\" /I\"' + numpy_path + '\"'
-         else:
-             cflags = '-I' + py_include_fullpath + ' -I' + numpy_path
--        if env['PLATFORM'] == 'darwin':
--            for arch in ['i386', 'ppc', 'x86_64']:
--                cflags += ' -arch %s' % arch
+@@ -533,11 +532,11 @@
+                  'relax_fit.c']
  
-         # Python library path.
-         libpath = ''
-@@ -537,11 +533,6 @@
-                 '-undefined', 'dynamic_lookup'
-             ]
+         # Construct the python include path (for Python.h).
+-        py_include_minpath = sys.prefix + path.sep + 'include'
++        py_include_minpath = '@PYTHON_INCL@' + path.sep + '..'
+         py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
  
--            # Force all architectures.
--            for arch in ['i386', 'ppc', 'x86_64']:
--                lnflags.append('-arch')
--                lnflags.append(arch)
--
-             # Set up the environment.
-             env.Append(LINKFLAGS = lnflags)
-             env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
+         # Construct the python bin path.
+-        py_bin_minpath = sys.prefix + path.sep + 'bin'
++        py_bin_minpath = '@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).
+--- relax.orig	2012-06-11 05:51:33.000000000 -0400
++++ relax	2012-06-16 17:03:52.000000000 -0400
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!@PREFIX@/bin/python2.7
+ 
+ # Import the relax module.
+ import relax
 --- scons/install.py.orig	2012-06-11 05:50:51.000000000 -0400
 +++ scons/install.py	2012-06-14 08:49:48.000000000 -0400
-@@ -112,11 +112,11 @@
+@@ -113,11 +113,11 @@
      ###############
  
      # Run relax to create the *.pyc files.
@@ -73,3 +65,61 @@
  
      # Final printout.
      print("\n\n\n")
+--- dep_check.py.orig	2013-01-13 17:20:47.000000000 -0500
++++ dep_check.py	2013-01-13 17:18:10.000000000 -0500
+@@ -142,7 +142,7 @@
+ try:
+     import scipy
+     scipy_module = True
+-except ImportError:
++except:
+     scipy_module = False
+ 
+ # Numeric python package check.
+@@ -157,7 +157,7 @@
+     from Scientific.Visualization import VMD    # This requires Numeric to be installed (at least in Scientific 2.7.8).
+     del VMD
+     vmd_module = True
+-except ImportError:
++except:
+     vmd_module = False
+ 
+ # mpi4py.
+@@ -217,12 +217,19 @@
+ # ctypes module.
+ try:
+     import ctypes
+-    from ctypes import Structure
+     ctypes_module = True
+ except ImportError:
+     message = sys.exc_info()[1]
+     ctypes_module = False
+     ctypes_module_message = message.args[0]
++try:
++    from ctypes import Structure
++    ctypes_structure_module = True
++except ImportError:
++    message = sys.exc_info()[1]
++    ctypes_structure_module = False
++    ctypes_structure_module_message = message.args[0]
++
+ 
+ 
+ 
+--- info.py.orig	2012-10-17 10:28:31.000000000 -0400
++++ info.py	2013-01-13 17:18:10.000000000 -0500
+@@ -28,11 +28,13 @@
+ # Python module imports.
+ if dep_check.ctypes_module:
+     import ctypes
+-    from ctypes import Structure
+     if hasattr(ctypes, 'windll'):
+         import ctypes.wintypes
+ else:
+     ctypes = None
++if dep_check.ctypes_structure_module:
++    from ctypes import Structure
++else:
+     Structure = object
+ import numpy
+ from os import environ, waitpid
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130113/92f7ab35/attachment.html>


More information about the macports-changes mailing list