[127718] trunk/dports/science/relax

[larryv at macports.org]

Revision: 127718
          https://trac.macports.org/changeset/127718
Author:   larryv at macports.org
Date:     2014-11-01 20:15:58 -0700 (Sat, 01 Nov 2014)
Log Message:
-----------
relax: Update to 3.3.1 (#45727)

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	2014-11-02 03:15:56 UTC (rev 127717)
+++ trunk/dports/science/relax/Portfile	2014-11-02 03:15:58 UTC (rev 127718)
@@ -6,7 +6,7 @@
 PortGroup           wxWidgets 1.0
 
 name                relax
-version             3.2.1
+version             3.3.1
 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     cdf5e5e9fc5d1a369fbbb6289ee10715 \
-                    sha1    50a1eadd7b594720427f207a959ced931254f082 \
-                    rmd160  a49920fe2174dbfd09ce550777471b1e3aba4b3e
+checksums           md5     fc3dd1cbc438e908aa9cb43e0282284c \
+                    sha1    9259586f366492ffd04d2f9500657ee1c4dae3b9 \
+                    rmd160  f07303c81d03369dca4c709ad417ac2e5f32053b
 use_bzip2           yes
 
 python.default_version 27

Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch	2014-11-02 03:15:56 UTC (rev 127717)
+++ trunk/dports/science/relax/files/relax.patch	2014-11-02 03:15:58 UTC (rev 127718)
@@ -1,6 +1,6 @@
---- sconstruct.orig	2012-10-17 10:28:31.000000000 -0400
-+++ sconstruct	2013-01-13 17:36:49.000000000 -0500
-@@ -99,7 +99,7 @@
+--- sconstruct.orig	2014-10-09 03:16:03.000000000 -0400
++++ sconstruct	2014-11-01 10:24:36.000000000 -0400
+@@ -101,7 +101,7 @@
      SYS = SYSTEM
  
      # Mac OS X installation path.
@@ -9,7 +9,7 @@
  
  
  # All other operating systems.
-@@ -119,13 +119,12 @@
+@@ -121,13 +121,12 @@
  RELAX_PATH = INSTALL_PATH + sep + 'relax'
  
  # Installation path for binaries.
@@ -24,7 +24,7 @@
  # The distribution files.
  #########################
  
-@@ -532,11 +531,11 @@
+@@ -570,7 +569,7 @@
                   'relax_fit.c']
  
          # Construct the python include path (for Python.h).
@@ -32,9 +32,13 @@
 +        py_include_minpath = '@PYTHON_INCL@' + path.sep + '..'
          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 @@
+                     py_include_fullpath = environ['PYTHON_INCLUDE_DIR']
+ 
          # Construct the python bin path.
 -        py_bin_minpath = sys.prefix + path.sep + 'bin'
-+        py_bin_minpath = '@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]`
  
          # Relaxation curve fitting build environment.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141101/3bffb999/attachment-0001.html>