[94378] trunk/dports/science/relax

[ryandesign at macports.org]

Revision: 94378
          https://trac.macports.org/changeset/94378
Author:   ryandesign at macports.org
Date:     2012-06-16 18:01:06 -0700 (Sat, 16 Jun 2012)
Log Message:
-----------
relax: maintainer update to 2.0.0 (#34890)

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	2012-06-16 22:45:44 UTC (rev 94377)
+++ trunk/dports/science/relax/Portfile	2012-06-17 01:01:06 UTC (rev 94378)
@@ -5,7 +5,7 @@
 PortGroup           python27 1.0
 
 name                relax
-version             1.3.15
+version             2.0.0
 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     74790cfd285c2437046e98d9241671cd \
-                    sha1    6dcfc8911675e5a87ff326085f31530383b7a2f0 \
-                    rmd160  51dd3dba2b841a06e180654cf77f4b1954e8d1a6
+checksums           md5     3449d0fca777925b0f15a10b88a72a85 \
+                    sha1    d8e23c515a92d3d144729515af9000c19b66f781 \
+                    rmd160  66b402494497ff0821d99c0af1795f9bab87d5cc
 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	2012-06-16 22:45:44 UTC (rev 94377)
+++ trunk/dports/science/relax/files/relax.patch	2012-06-17 01:01:06 UTC (rev 94378)
@@ -1,14 +1,14 @@
---- relax.orig	2007-02-19 00:36:06.000000000 -0500
-+++ relax	2008-08-11 02:13:30.000000000 -0400
+--- 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
  
- ###############################################################################
- #                                                                             #
---- sconstruct.orig	2010-12-31 04:18:48.000000000 -0500
-+++ sconstruct	2011-01-09 15:46:22.000000000 -0500
-@@ -98,7 +98,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 @@
      SYS = SYSTEM
  
      # Mac OS X installation path.
@@ -17,7 +17,7 @@
  
  
  # All other operating systems.
-@@ -118,13 +118,12 @@
+@@ -119,13 +119,12 @@
  RELAX_PATH = INSTALL_PATH + sep + 'relax'
  
  # Installation path for binaries.
@@ -54,16 +54,22 @@
              # Set up the environment.
              env.Append(LINKFLAGS = lnflags)
              env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
---- scons/install.py.orig	2010-12-31 04:18:33.000000000 -0500
-+++ scons/install.py	2011-01-09 15:52:38.000000000 -0500
-@@ -112,8 +112,8 @@
+--- 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 @@
      ###############
  
      # Run relax to create the *.pyc files.
--    print("\nRunning relax to create the byte-compiled *.pyc files.")
--    system(env['SYMLINK'] + " --test")
-+    # print("\nRunning relax to create the byte-compiled *.pyc files.")
-+    # system(env['SYMLINK'] + " --test")
+-    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' + `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)
  
-     # Final print out.
+     # Final printout.
      print("\n\n\n")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120616/94bfb99a/attachment.html>