[104402] trunk/dports/science/relax

[ciserlohn at macports.org]

Revision: 104402
          https://trac.macports.org/changeset/104402
Author:   ciserlohn at macports.org
Date:     2013-03-24 11:28:18 -0700 (Sun, 24 Mar 2013)
Log Message:
-----------
relax: update to version 2.2.4 (#38517; maintainer)

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-03-24 18:18:11 UTC (rev 104401)
+++ trunk/dports/science/relax/Portfile	2013-03-24 18:28:18 UTC (rev 104402)
@@ -5,7 +5,7 @@
 PortGroup           python27 1.0
 
 name                relax
-version             2.1.2
+version             2.2.4
 categories          science python
 maintainers         bromo.med.uc.edu:howarth
 description         Protein dynamics by NMR relax. data analysis
@@ -17,9 +17,9 @@
 master_sites        http://download.gna.org/relax/
 distfiles           ${name}-${version}.src.tar.bz2
 dist_subdir         ${name}
-checksums           md5     71acc50c457d02aff7e430f2acbb49c3 \
-                    sha1    3c367ec44db3f56c935cdab356962efc9ccb8150 \
-                    rmd160  ba73f751bb7331679256a3148a9c1f617f82efe1
+checksums           md5     0b8c7b357f7ca662506ee339dd41cbd7 \
+                    sha1    e0c3548566ae8b44ed9f761600568180a5de2224 \
+                    rmd160  815834bc2f6b63a4f2fa0f68839de25166694274
 use_bzip2           yes
 depends_lib-append  port:scons port:py27-scipy port:py27-numpy \
                     port:py27-wxpython-devel port:pymol

Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch	2013-03-24 18:18:11 UTC (rev 104401)
+++ trunk/dports/science/relax/files/relax.patch	2013-03-24 18:28:18 UTC (rev 104402)
@@ -48,7 +48,7 @@
  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
-@@ -113,11 +113,11 @@
+@@ -111,11 +111,11 @@
      ###############
  
      # Run relax to create the *.pyc files.
@@ -65,61 +65,3 @@
  
      # 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/20130324/91b21efd/attachment.html>