[74961] trunk/dports/science/relax
ryandesign at macports.org
ryandesign at macports.org
Sun Jan 9 18:08:12 PST 2011
Revision: 74961
http://trac.macports.org/changeset/74961
Author: ryandesign at macports.org
Date: 2011-01-09 18:08:06 -0800 (Sun, 09 Jan 2011)
Log Message:
-----------
relax: maintainer update to 1.3.6 (#27909); disable universal variant
Modified Paths:
--------------
trunk/dports/science/relax/Portfile
trunk/dports/science/relax/files/relax.patch
Removed Paths:
-------------
trunk/dports/science/relax/files/sample.patch
Modified: trunk/dports/science/relax/Portfile
===================================================================
--- trunk/dports/science/relax/Portfile 2011-01-10 02:00:15 UTC (rev 74960)
+++ trunk/dports/science/relax/Portfile 2011-01-10 02:08:06 UTC (rev 74961)
@@ -5,7 +5,7 @@
PortGroup python26 1.0
name relax
-version 1.3.4
+version 1.3.6
categories science python
maintainers bromo.med.uc.edu:howarth
description Protein dynamics by NMR relax. data analysis
@@ -17,17 +17,15 @@
master_sites http://download.gna.org/relax/
distfiles ${name}-${version}.src.tar.bz2
dist_subdir ${name}
-checksums md5 421d92a998bfd359678d689e2f65fc62 \
- sha1 fb5a7b1533b10d358c141cfbf0a267deb502affb \
- rmd160 2ba248402c3e0e0efaf00ac61696965ff316a0d0
+checksums md5 e515856a4255a832f7a0314f2e0509f3 \
+ sha1 1fdec7d53ae6a63def31692403227733bef5c32f \
+ rmd160 e0a05708bb0e4073dfed553888444c46bfc90a99
use_bzip2 yes
depends_lib port:scons port:py26-minfx port:py26-scientific
-patchfiles relax.patch sample.patch
+patchfiles relax.patch
post-patch {
- reinplace "s|@DEST_ROOT@|${destroot}|g" ${worksrcpath}/scons/install.py \
- ${worksrcpath}/sconstruct
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/scons/install.py \
- ${worksrcpath}/sconstruct \
+ reinplace "s|@DEST_ROOT@|${destroot}|g" ${worksrcpath}/sconstruct
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/sconstruct \
${worksrcpath}/relax
}
build.cmd ${prefix}/bin/scons
@@ -41,3 +39,5 @@
eval file delete -force [glob -directory ${destroot}${prefix}/lib/relax/scons/ *.pyc]
system "${python.bin} -O ${python.libdir}/compileall.py -d ${prefix}/lib/relax ${destroot}${prefix}/lib/relax"
}
+
+universal_variant no
Modified: trunk/dports/science/relax/files/relax.patch
===================================================================
--- trunk/dports/science/relax/files/relax.patch 2011-01-10 02:00:15 UTC (rev 74960)
+++ trunk/dports/science/relax/files/relax.patch 2011-01-10 02:08:06 UTC (rev 74961)
@@ -6,22 +6,9 @@
###############################################################################
# #
---- scons/install.py.orig 2008-08-10 15:31:01.000000000 -0400
-+++ scons/install.py 2008-08-10 16:01:22.000000000 -0400
-@@ -112,8 +112,8 @@
- ###############
-
- # 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")
-
- # Final print out.
- print "\n\n\n"
---- sconstruct.orig 2007-02-19 00:36:06.000000000 -0500
-+++ sconstruct 2008-08-11 02:02:56.000000000 -0400
-@@ -94,7 +94,7 @@
+--- sconstruct.orig 2010-12-31 04:18:48.000000000 -0500
++++ sconstruct 2011-01-09 15:46:22.000000000 -0500
+@@ -98,7 +98,7 @@
SYS = SYSTEM
# Mac OS X installation path.
@@ -30,13 +17,9 @@
# All other operating systems.
-@@ -111,16 +111,15 @@
- ###############
+@@ -118,13 +118,12 @@
+ RELAX_PATH = INSTALL_PATH + sep + 'relax'
- # Relax installation directory.
--RELAX_PATH = INSTALL_PATH + sep + 'relax'
-+RELAX_PATH = INSTALL_PATH + sep + 'relax'
-
# Installation path for binaries.
-BIN_PATH = INSTALL_PATH + sep + 'bin'
+BIN_PATH = '@DEST_ROOT@@PREFIX@' + sep + 'bin'
@@ -49,12 +32,16 @@
# The distribution files.
#########################
-@@ -486,7 +485,7 @@
+--- 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 @@
+ ###############
- # Catch Mac OS X and send the correct command line options to the linker (these may become redundant as SCons improves).
- if env['PLATFORM'] == 'darwin':
-- env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix + path.sep + 'bin' + path.sep + 'python', '-dynamic'])
-+ env.Append(LINKFLAGS = ['-bundle', '-bundle_loader', sys.prefix + path.sep + 'bin' + path.sep + 'python2.6', '-dynamic', '-undefined', 'dynamic_lookup'])
- env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS')
- env['SHLIBSUFFIX'] = '.so'
+ # 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")
+ # Final print out.
+ print("\n\n\n")
Deleted: trunk/dports/science/relax/files/sample.patch
===================================================================
--- trunk/dports/science/relax/files/sample.patch 2011-01-10 02:00:15 UTC (rev 74960)
+++ trunk/dports/science/relax/files/sample.patch 2011-01-10 02:08:06 UTC (rev 74961)
@@ -1,29 +0,0 @@
---- sample_scripts/relax_curve_diff.py.org 2009-10-30 21:42:35.000000000 -0400
-+++ sample_scripts/relax_curve_diff.py 2009-10-30 21:43:11.000000000 -0400
-@@ -62,7 +62,7 @@
- cdp = pipes.get_pipe()
-
- # Loop over the spins.
-- for spin in spin_loop()
-+ for spin in spin_loop():
- # Skip deselected spins.
- if not spin.select:
- continue
-@@ -106,7 +106,7 @@
- ###################################
-
- # Loop over the spins.
-- for spin in spin_loop()
-+ for spin in spin_loop():
- # Skip deselected spins.
- if not spin.select:
- continue
-@@ -132,7 +132,7 @@
- ####################################
-
- # Loop over the spins.
-- for spin in spin_loop()
-+ for spin in spin_loop():
- # Skip deselected spins.
- if not spin.select:
- continue
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110109/d026570f/attachment-0001.html>
More information about the macports-changes
mailing list