<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e17e21ecb4c6feb901cca6a1b6125262a816b518">https://github.com/macports/macports-ports/commit/e17e21ecb4c6feb901cca6a1b6125262a816b518</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new e17e21e  py-numpy: fix support for py26-numpy, which is capped upstream at 1.11.3; add 26-only patches.
</span>e17e21e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e17e21ecb4c6feb901cca6a1b6125262a816b518
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Jan 22 20:59:04 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-numpy: fix support for py26-numpy, which is capped upstream at 1.11.3; add 26-only patches.
</span>---
 python/py-numpy/Portfile                           | 21 +++++++++----
 .../files/patch-numpy_core_setup.py.26.diff        | 34 ++++++++++++++++++++++
 .../patch-numpy_distutils_fcompiler_gnu.py.26.diff | 11 +++++++
 .../patch-numpy_tests_test_scripts.py.26.diff      | 18 ++++++++++++
 4 files changed, 78 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e6eaebb..e334c31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,15 +38,24 @@ python.consistent_destroot yes
</span> #universal_variant no
 
 if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 -gcc46 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            -gcc47 -gcc48 -g95 clang37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles              patch-f2py_setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-fcompiler_g95.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            patch-numpy_core_setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {${python.version} == 26} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        github.setup        numpy numpy 1.11.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        checksums           rmd160 8cc323d5944301aefa1f66f17d4af14c364c6b32 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256 dbdda9104c7dbc2d8ae691367a2bb1815a62598c5278097b4eee035b85abf6a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-numpy_core_setup.py.26.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-numpy_distutils_fcompiler_gnu.py.26.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-numpy_tests_test_scripts.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append   patch-numpy_core_setup.py.diff \
</span>                             patch-numpy_distutils_fcompiler_gnu.py.diff \
                             patch-numpy_tests_test_scripts.py.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compilers.setup         require_fortran -clang -dragonegg -gcc44 -gcc45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -gcc46 -gcc47 -gcc48 -g95 clang37
</span> 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles              patch-f2py_setup.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            patch-fcompiler_g95.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span>     depends_lib-append      port:fftw-3 \
                             port:py${python.version}-nose \
                             port:py${python.version}-cython
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_core_setup.py.26.diff b/python/py-numpy/files/patch-numpy_core_setup.py.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b341226
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_core_setup.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/core/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/core/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,7 +460,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             # define inline to our keyword, or nothing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             target_f.write('#ifndef __cplusplus\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -557,7 +564,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                     target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                    target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                    else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                        target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             # Define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             target_f.write("""
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.diff b/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0a4bbb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/fcompiler/gnu.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/fcompiler/gnu.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     def runtime_library_dir_option(self, dir):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        return '-Wl,-rpath="%s"' % dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        return '-Wl,-rpath -Wl,"%s"' % dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Gnu95FCompiler(GnuFCompiler):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     compiler_type = 'gnu95'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d3794b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test_scripts.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,7 +84,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         major = str(version[0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         minor = str(version[1])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         success = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         for f2py_cmd in f2py_cmds:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,5 +95,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        msg = "Warning: none of %s, %s, %s, nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         assert_(success, msg)
</span></pre><pre style='margin:0'>

</pre>