[92413] trunk/dports/science/relax

[ryandesign at macports.org]

Revision: 92413
          https://trac.macports.org/changeset/92413
Author:   ryandesign at macports.org
Date:     2012-04-27 21:32:29 -0700 (Fri, 27 Apr 2012)
Log Message:
-----------
relax: update to 1.3.15; use python27 instead of python26; enable tests; see #34238

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-04-28 04:31:32 UTC (rev 92412)
+++ trunk/dports/science/relax/Portfile	2012-04-28 04:32:29 UTC (rev 92413)
@@ -2,11 +2,10 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python26 1.0
+PortGroup           python27 1.0
 
 name                relax
-version             1.3.6
-revision            1
+version             1.3.15
 categories          science python
 maintainers         bromo.med.uc.edu:howarth
 description         Protein dynamics by NMR relax. data analysis
@@ -18,12 +17,12 @@
 master_sites        http://download.gna.org/relax/
 distfiles           ${name}-${version}.src.tar.bz2
 dist_subdir         ${name}
-checksums           md5     e515856a4255a832f7a0314f2e0509f3 \
-                    sha1    1fdec7d53ae6a63def31692403227733bef5c32f \
-                    rmd160  e0a05708bb0e4073dfed553888444c46bfc90a99
+checksums           md5     74790cfd285c2437046e98d9241671cd \
+                    sha1    6dcfc8911675e5a87ff326085f31530383b7a2f0 \
+                    rmd160  51dd3dba2b841a06e180654cf77f4b1954e8d1a6
 use_bzip2           yes
-depends_lib         port:scons port:py26-minfx port:py26-scientific \
-                    port:py26-scipy
+depends_lib-append  port:scons port:py27-scipy port:py27-numpy \
+                    port:py27-wxpython-devel port:pymol
 patchfiles          relax.patch
 post-patch {
     reinplace  "s|@DEST_ROOT@|${destroot}|g" ${worksrcpath}/sconstruct
@@ -32,6 +31,9 @@
 }
 build.cmd           ${prefix}/bin/scons
 build.target
+test.run            yes
+test.cmd            relax
+test.target         --test-suite
 destroot.cmd        ${build.cmd}
 destroot.destdir    DESTDIR=${destroot}
 post-destroot {

Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch	2012-04-28 04:31:32 UTC (rev 92412)
+++ trunk/dports/science/relax/files/relax.patch	2012-04-28 04:32:29 UTC (rev 92413)
@@ -2,7 +2,7 @@
 +++ relax	2008-08-11 02:13:30.000000000 -0400
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python
-+#!@PREFIX@/bin/python2.6
++#!@PREFIX@/bin/python2.7
  
  ###############################################################################
  #                                                                             #
@@ -32,6 +32,28 @@
  # 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
+ 
+         # Python library path.
+         libpath = ''
+@@ -537,11 +533,6 @@
+                 '-undefined', 'dynamic_lookup'
+             ]
+ 
+-            # 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')
 --- 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 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120427/3381a894/attachment.html>