[119027] trunk/dports/python/py-numpy
michaelld at macports.org
michaelld at macports.org
Tue Apr 15 08:40:21 PDT 2014
Revision: 119027
https://trac.macports.org/changeset/119027
Author: michaelld at macports.org
Date: 2014-04-15 08:40:21 -0700 (Tue, 15 Apr 2014)
Log Message:
-----------
py*-numpy:
+ update to 1.8.1;
+ rename patch file with directories to match other patches.
Modified Paths:
--------------
trunk/dports/python/py-numpy/Portfile
Added Paths:
-----------
trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff
Removed Paths:
-------------
trunk/dports/python/py-numpy/files/patch-setup.py.diff
Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile 2014-04-15 15:18:36 UTC (rev 119026)
+++ trunk/dports/python/py-numpy/Portfile 2014-04-15 15:40:21 UTC (rev 119027)
@@ -5,9 +5,8 @@
PortGroup python 1.0
PortGroup github 1.0
-github.setup numpy numpy 1.8.0 v
+github.setup numpy numpy 1.8.1 v
name py-numpy
-revision 2
categories-append math
license BSD
platforms darwin
@@ -15,8 +14,8 @@
description The core utilities for the scientific library scipy for Python
long_description ${description}
-checksums rmd160 9845788ac05f6c0fec619f16e93ef352a8b126bb \
- sha256 0fd329d90ce3e019ebcdebacc420f5f22e77794768fd8124df4de9480a90d600
+checksums rmd160 6a7ddb28fe8e8f92f6326f62f2dfcf0ba0880b22 \
+ sha256 159c0be7ca4d876c42ce7332f727f7bd42de119e6c31780ea63f73c9e94b8bcf
python.versions 26 27 32 33 34
@@ -24,7 +23,7 @@
patchfiles patch-f2py_setup.py.diff \
patch-numpy_distutils_fcompiler___init__.py.diff \
patch-fcompiler_g95.diff \
- patch-setup.py.diff
+ patch-numpy_core_setup.py.diff
depends_lib-append port:fftw-3 \
port:py${python.version}-nose
Copied: trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff (from rev 119023, trunk/dports/python/py-numpy/files/patch-setup.py.diff)
===================================================================
--- trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff (rev 0)
+++ trunk/dports/python/py-numpy/files/patch-numpy_core_setup.py.diff 2014-04-15 15:40:21 UTC (rev 119027)
@@ -0,0 +1,34 @@
+--- numpy/core/setup.py.orig 2014-03-25 19:03:06.000000000 -0400
++++ numpy/core/setup.py 2014-03-25 19:03:26.000000000 -0400
+@@ -481,7 +481,14 @@
+ if isinstance(d, str):
+ target_f.write('#define %s\n' % (d))
+ else:
+- target_f.write('#define %s %s\n' % (d[0], d[1]))
++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
++ target_f.write('#define %s %s\n' % (d[0], d[1]))
++ else:
++ target_f.write('#ifdef __LP64__\n')
++ target_f.write('#define %s %s\n' % (d[0], 8))
++ target_f.write('#else\n')
++ target_f.write('#define %s %s\n' % (d[0], 4))
++ target_f.write('#endif\n')
+
+ # define inline to our keyword, or nothing
+ target_f.write('#ifndef __cplusplus\n')
+@@ -581,7 +588,14 @@
+ if isinstance(d, str):
+ target_f.write('#define %s\n' % (d))
+ else:
+- target_f.write('#define %s %s\n' % (d[0], d[1]))
++ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
++ target_f.write('#define %s %s\n' % (d[0], d[1]))
++ else:
++ target_f.write('#ifdef __LP64__\n')
++ target_f.write('#define %s %s\n' % (d[0], 8))
++ target_f.write('#else\n')
++ target_f.write('#define %s %s\n' % (d[0], 4))
++ target_f.write('#endif\n')
+
+ # Define __STDC_FORMAT_MACROS
+ target_f.write("""
Deleted: trunk/dports/python/py-numpy/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-numpy/files/patch-setup.py.diff 2014-04-15 15:18:36 UTC (rev 119026)
+++ trunk/dports/python/py-numpy/files/patch-setup.py.diff 2014-04-15 15:40:21 UTC (rev 119027)
@@ -1,34 +0,0 @@
---- numpy/core/setup.py.orig 2013-10-28 19:21:02.000000000 -0400
-+++ numpy/core/setup.py 2013-11-16 08:45:06.000000000 -0500
-@@ -480,7 +480,14 @@
- if isinstance(d, str):
- target_f.write('#define %s\n' % (d))
- else:
-- target_f.write('#define %s %s\n' % (d[0], d[1]))
-+ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
-+ else:
-+ target_f.write('#ifdef __LP64__\n')
-+ target_f.write('#define %s %s\n' % (d[0], 8))
-+ target_f.write('#else\n')
-+ target_f.write('#define %s %s\n' % (d[0], 4))
-+ target_f.write('#endif\n')
-
- # define inline to our keyword, or nothing
- target_f.write('#ifndef __cplusplus\n')
-@@ -576,7 +583,14 @@
- if isinstance(d, str):
- target_f.write('#define %s\n' % (d))
- else:
-- target_f.write('#define %s %s\n' % (d[0], d[1]))
-+ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
-+ else:
-+ target_f.write('#ifdef __LP64__\n')
-+ target_f.write('#define %s %s\n' % (d[0], 8))
-+ target_f.write('#else\n')
-+ target_f.write('#define %s %s\n' % (d[0], 4))
-+ target_f.write('#endif\n')
-
- # Define __STDC_FORMAT_MACROS
- target_f.write("""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140415/32a6fc7c/attachment.html>
More information about the macports-changes
mailing list