[117856] trunk/dports/python/py-scientific

[sean at macports.org]

Revision: 117856
          https://trac.macports.org/changeset/117856
Author:   sean at macports.org
Date:     2014-03-14 15:55:47 -0700 (Fri, 14 Mar 2014)
Log Message:
-----------
py-scientific: update to 2.9.3

Modified Paths:
--------------
    trunk/dports/python/py-scientific/Portfile
    trunk/dports/python/py-scientific/files/patch-Src-MPI-compile.py.diff

Modified: trunk/dports/python/py-scientific/Portfile
===================================================================
--- trunk/dports/python/py-scientific/Portfile	2014-03-14 22:55:42 UTC (rev 117855)
+++ trunk/dports/python/py-scientific/Portfile	2014-03-14 22:55:47 UTC (rev 117856)
@@ -10,8 +10,7 @@
 mpi.setup
 
 name                py-scientific
-version             2.9.2
-revision            2
+version             2.9.3
 categories-append   science
 license             CeCILL-C
 platforms           darwin
@@ -24,12 +23,12 @@
                     are useful for scientific computing.
 
 homepage            http://dirac.cnrs-orleans.fr/ScientificPython/
-master_sites        https://sourcesup.renater.fr/frs/download.php/4153/
+master_sites        https://sourcesup.renater.fr/frs/download.php/4425/
 distname            ScientificPython-${version}
 fetch.ignore_sslcert yes
 
-checksums           rmd160  aa9aa06a09645e422ed6174d745bacd4c6404885 \
-                    sha256  0ed9cb725a7c1736a15de27d62a2abfd1d84de1a45b5932e9747bc3952a73ad9
+checksums           rmd160  9680f4dca583f49ffdfdecbe9c3cf0704d3c18c3 \
+                    sha256  a4dfc55c2ec84a0795b0641e5571b79b25a5ef6d92bbb01e934c298ee34b5bc8
 
 if {${name} ne ${subport}} {
     depends_lib     port:netcdf \

Modified: trunk/dports/python/py-scientific/files/patch-Src-MPI-compile.py.diff
===================================================================
--- trunk/dports/python/py-scientific/files/patch-Src-MPI-compile.py.diff	2014-03-14 22:55:42 UTC (rev 117855)
+++ trunk/dports/python/py-scientific/files/patch-Src-MPI-compile.py.diff	2014-03-14 22:55:47 UTC (rev 117856)
@@ -1,6 +1,8 @@
---- Src/MPI/compile.py.orig	2009-10-13 18:42:27.000000000 +0400
-+++ Src/MPI/compile.py	2009-10-13 18:42:40.000000000 +0400
-@@ -5,7 +5,6 @@
+--- Src/MPI/compile.py
++++ Src/MPI/compile.py
+@@ -3,24 +3,22 @@
+ 
+ # Normally nothing needs to be changed below
  import distutils
  import distutils.sysconfig
  import os, sys
@@ -8,23 +10,28 @@
  
  cfgDict = distutils.sysconfig.get_config_vars()
  
-@@ -14,11 +13,10 @@
+ # Name of the MPI compilation script.
+ mpicompiler = 'mpicc'
  sources='mpipython.c Scientific_mpi.c'
  
  extra_compile_args = ""
 -if N.package == "NumPy":
 -    arrayobject_h_include = os.path.join(sys.prefix,
--                            "lib/python%s.%s/site-packages/numpy/core/include"
--                                          % sys.version_info [:2])
+-                            "%s/numpy/core/include"
+-                                          % distutils.sysconfig.get_python_lib())
 -    extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
 +arrayobject_h_include = os.path.join(sys.prefix,
-+                        "lib/python%s.%s/site-packages/numpy/core/include"
-+                                      % sys.version_info [:2])
++                        "%s/numpy/core/include"
++                                      % distutils.sysconfig.get_python_lib())
 +extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
  
  linkforshared = cfgDict['LINKFORSHARED']
  if sys.platform == 'darwin':
-@@ -32,14 +30,12 @@
+     # Fix LINKFORSHARED for framework builds under MacOS
+     items = linkforshared.split()
+@@ -30,18 +28,16 @@ if sys.platform == 'darwin':
+     for i in range(len(items)):
+         if 'Python.framework' in items[i] and not os.path.exists(items[i]):
              items[i] = os.path.join(frameworkdir[0], items[i])
      linkforshared = ' '.join(items)
  
@@ -40,3 +47,5 @@
       cfgDict['LIBS'], 
       cfgDict['LIBM'])
  
+ print 'cmd = ', cmd 
+ os.system(cmd)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140314/31eee3b9/attachment.html>