[132632] trunk/dports/science/relax

[ryandesign at macports.org]

Revision: 132632
          https://trac.macports.org/changeset/132632
Author:   ryandesign at macports.org
Date:     2015-02-06 00:54:41 -0800 (Fri, 06 Feb 2015)
Log Message:
-----------
relax: update to 3.3.6 (#46777; 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	2015-02-06 08:16:01 UTC (rev 132631)
+++ trunk/dports/science/relax/Portfile	2015-02-06 08:54:41 UTC (rev 132632)
@@ -6,7 +6,7 @@
 PortGroup           wxWidgets 1.0
 
 name                relax
-version             3.3.1
+version             3.3.6
 categories          science python chemistry
 license             GPL-3
 maintainers         gmail.com:howarth.at.macports
@@ -19,9 +19,9 @@
 master_sites        http://download.gna.org/relax/
 distfiles           ${name}-${version}.src.tar.bz2
 dist_subdir         ${name}
-checksums           md5     fc3dd1cbc438e908aa9cb43e0282284c \
-                    sha1    9259586f366492ffd04d2f9500657ee1c4dae3b9 \
-                    rmd160  f07303c81d03369dca4c709ad417ac2e5f32053b
+checksums           md5     66a915e6112db5018253112966926efd \
+                    sha1    2eed0df4b0e64d6daf0d809f0a96fcb6d2a87409 \
+                    rmd160  41e4845fb12135a4b3b0843687e909abe83e05ee
 use_bzip2           yes
 
 python.default_version 27

Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch	2015-02-06 08:16:01 UTC (rev 132631)
+++ trunk/dports/science/relax/files/relax.patch	2015-02-06 08:54:41 UTC (rev 132632)
@@ -1,5 +1,5 @@
---- sconstruct.orig	2014-10-09 03:16:03.000000000 -0400
-+++ sconstruct	2014-11-01 10:24:36.000000000 -0400
+--- sconstruct.orig	2015-01-27 05:41:08.000000000 -0500
++++ sconstruct	2015-01-29 17:58:50.000000000 -0500
 @@ -101,7 +101,7 @@
      SYS = SYSTEM
  
@@ -24,7 +24,7 @@
  # The distribution files.
  #########################
  
-@@ -570,7 +569,7 @@
+@@ -572,7 +571,7 @@
                   'relax_fit.c']
  
          # Construct the python include path (for Python.h).
@@ -33,7 +33,7 @@
          py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
  
          # Test if Python.h resides here.
-@@ -586,7 +585,7 @@
+@@ -588,7 +587,7 @@
                      py_include_fullpath = environ['PYTHON_INCLUDE_DIR']
  
          # Construct the python bin path.
@@ -50,22 +50,22 @@
  
  # 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
+--- scons/install.py.orig	2015-01-27 05:39:55.000000000 -0500
++++ scons/install.py	2015-01-29 18:01:43.000000000 -0500
 @@ -111,11 +111,11 @@
      ###############
  
      # Run relax to create the *.pyc files.
 -    print("\nCreating the byte-compiled *.pyc files.")
--    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
+-    python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + repr(sys.version_info[0]) + '.' + repr(sys.version_info[1])
 -    cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
 -    print(cmd)
 -    system(cmd)
-+    #print("\nCreating the byte-compiled *.pyc files.")
-+    #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
-+    #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
-+    #print(cmd)
-+    #system(cmd)
++    # print("\nCreating the byte-compiled *.pyc files.")
++    # python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + repr(sys.version_info[0]) + '.' + repr(sys.version_info[1])
++    # cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
++    # print(cmd)
++    # system(cmd)
  
      # Final printout.
      print("\n\n\n")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150206/99be806f/attachment-0001.html>