<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/c2c8811cd7748c0486b5722aa0cc7be42d23a354">https://github.com/macports/macports-ports/commit/c2c8811cd7748c0486b5722aa0cc7be42d23a354</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 c2c8811 py*-numpy: fix patches to work
</span>c2c8811 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c2c8811cd7748c0486b5722aa0cc7be42d23a354
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Mar 15 11:00:28 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py*-numpy: fix patches to work
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55987
</span>---
python/py-numpy/Portfile | 11 ++++++-----
python/py-numpy/files/patch-fcompiler_g95.26.diff | 11 +++++++++++
.../py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff | 4 ++--
3 files changed, 19 insertions(+), 7 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 48ea674..f6b09e0 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;'>@@ -44,18 +44,19 @@ if {${name} ne ${subport}} {
</span> sha256 dbdda9104c7dbc2d8ae691367a2bb1815a62598c5278097b4eee035b85abf6a1
patchfiles-append patch-numpy_core_setup.py.26.diff \
patch-numpy_distutils_fcompiler_gnu.py.26.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.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;'>+ patch-fcompiler_g95.26.diff
</span> } else {
patchfiles-append patch-numpy_core_setup.py.diff \
patch-numpy_distutils_fcompiler_gnu.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_tests_test_scripts.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fcompiler_g95.diff
</span> }
compilers.setup require_fortran -clang -dragonegg -gcc44 -gcc45 \
-gcc46 -gcc47 -gcc48 -g95 clang37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 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;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-f2py_setup.py.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-fcompiler_g95.26.diff b/python/py-numpy/files/patch-fcompiler_g95.26.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f200810
</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-fcompiler_g95.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/__init__.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/fcompiler/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -710,7 +710,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('irix.*', ('mips', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('aix.*', ('ibm', 'gnu', '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><span style='display:block; white-space:pre;color:#808080;'>index d3794b8..b037fbc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.26.diff
</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;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test_scripts.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/tests/test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/tests/test_scripts.py
</span> @@ -84,7 +84,7 @@
major = str(version[0])
minor = str(version[1])
</pre><pre style='margin:0'>
</pre>