[113422] trunk/dports/python/py-numpy

[sean at macports.org]

Revision: 113422
          https://trac.macports.org/changeset/113422
Author:   sean at macports.org
Date:     2013-11-15 13:52:48 -0800 (Fri, 15 Nov 2013)
Log Message:
-----------
py-numpy: update to 1.8.0

Modified Paths:
--------------
    trunk/dports/python/py-numpy/Portfile
    trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff
    trunk/dports/python/py-numpy/files/patch-fcompiler_g95.diff

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2013-11-15 21:52:44 UTC (rev 113421)
+++ trunk/dports/python/py-numpy/Portfile	2013-11-15 21:52:48 UTC (rev 113422)
@@ -5,10 +5,8 @@
 PortGroup               python 1.0
 PortGroup               github 1.0
 
-github.setup            numpy numpy 1.7.1 v
+github.setup            numpy numpy 1.8.0 v
 name                    py-numpy
-revision                1
-dist_subdir             ${name}/${version}_1
 
 categories-append       math
 license                 BSD
@@ -17,8 +15,8 @@
 description             The core utilities for the scientific library scipy for Python
 long_description        ${description}
 
-checksums               rmd160  16df4216f40b22077e1f14cc41b8c8ae486b45af \
-                        sha256  14964724915e5fa1ed34d2cdb93eed5a86bc16edd4a1203cf521ad8bbbcb5215
+checksums               rmd160  9845788ac05f6c0fec619f16e93ef352a8b126bb \
+                        sha256  0fd329d90ce3e019ebcdebacc420f5f22e77794768fd8124df4de9480a90d600
 
 python.versions         24 25 26 27 31 32 33
 

Modified: trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	2013-11-15 21:52:44 UTC (rev 113421)
+++ trunk/dports/python/py-numpy/files/patch-f2py_setup.py.diff	2013-11-15 21:52:48 UTC (rev 113422)
@@ -1,6 +1,8 @@
---- numpy/f2py/setup.py.orig	2013-02-10 00:51:36.000000000 +0400
-+++ numpy/f2py/setup.py	2013-03-19 15:27:15.000000000 +0400
-@@ -41,7 +41,7 @@
+--- numpy/f2py/setup.py
++++ numpy/f2py/setup.py
+@@ -41,21 +41,21 @@ def configuration(parent_package='',top_
+                           )
+ 
      config.make_svn_version_py()
  
      def generate_f2py_py(build_dir):
@@ -9,21 +11,29 @@
          if f2py_exe[-4:]=='.exe':
              f2py_exe = f2py_exe[:-4] + '.py'
          if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
-@@ -51,7 +51,7 @@
+             f2py_exe = f2py_exe + '.py'
+         target = os.path.join(build_dir, f2py_exe)
+         if newer(__file__, target):
              log.info('Creating %s', target)
-             f = open(target,'w')
+             f = open(target, 'w')
              f.write('''\
--#!/usr/bin/env %s
+-#!%s
 +#!@@MPORTS_PYTHON@@
  # See http://cens.ioc.ee/projects/f2py2e/
  import os, sys
  for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
-@@ -75,7 +75,7 @@
+     try:
+         i=sys.argv.index("--"+mode)
+@@ -75,11 +75,11 @@ elif mode=="2e-numpy":
+     from numpy.f2py import main
+ else:
      sys.stderr.write("Unknown mode: " + repr(mode) + "\\n")
      sys.exit(1)
  main()
--'''%(os.path.basename(sys.executable)))
+-'''%(sys.executable))
 +''')
              f.close()
          return target
  
+     config.add_scripts(generate_f2py_py)
+ 

Modified: trunk/dports/python/py-numpy/files/patch-fcompiler_g95.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-fcompiler_g95.diff	2013-11-15 21:52:44 UTC (rev 113421)
+++ trunk/dports/python/py-numpy/files/patch-fcompiler_g95.diff	2013-11-15 21:52:48 UTC (rev 113422)
@@ -1,11 +1,15 @@
---- numpy/distutils/fcompiler/__init__.py.orig	2013-03-19 13:35:03.000000000 +0400
-+++ numpy/distutils/fcompiler/__init__.py	2013-03-19 13:35:27.000000000 +0400
-@@ -708,7 +708,7 @@
-     ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')),
-     ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq',
-                 'intele','intelem','gnu','g95','pathf95')),
+--- numpy/distutils/fcompiler/__init__.py
++++ numpy/distutils/fcompiler/__init__.py
+@@ -708,11 +708,11 @@
+     ('win32', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95',
+                'intelvem', 'intelem')),
+     ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
+     ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
+                 'intele', 'intelem', 'gnu', 'g95', 'pathf95')),
 -    ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
 +    ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
-     ('sunos.*', ('sun','gnu','gnu95','g95')),
-     ('irix.*', ('mips','gnu','gnu95',)),
-     ('aix.*', ('ibm','gnu','gnu95',)),
+     ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
+     ('irix.*', ('mips', 'gnu', 'gnu95',)),
+     ('aix.*', ('ibm', 'gnu', 'gnu95',)),
+     # os.name mappings
+     ('posix', ('gnu', 'gnu95',)),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131115/8364d702/attachment.html>