diff options
author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-10-13 13:09:18 +0000 |
---|---|---|
committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2017-10-13 13:09:18 +0000 |
commit | d9dcdeed8ccdbcc98488d19e8722273a8645c8c4 (patch) | |
tree | 1e8bf365ca777f4e286aa1d15ff3ed1e8440e660 /math/py-numpy | |
parent | eff273f978c336e6c21d70e06be8dcd949667198 (diff) | |
download | ports-d9dcdeed8ccdbcc98488d19e8722273a8645c8c4.tar.gz ports-d9dcdeed8ccdbcc98488d19e8722273a8645c8c4.zip |
Notes
Diffstat (limited to 'math/py-numpy')
-rw-r--r-- | math/py-numpy/Makefile | 11 | ||||
-rw-r--r-- | math/py-numpy/distinfo | 6 | ||||
-rw-r--r-- | math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src | 17 |
3 files changed, 8 insertions, 26 deletions
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 8c5eb1ae34bb..7ecf64969b7e 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= numpy -PORTVERSION= 1.13.1 +PORTVERSION= 1.13.3 DISTVERSIONPREFIX= v -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= math python -MASTER_SITES= http://docs.scipy.org/doc/${PORTNAME}-${PORTVERSION:C/\.[0-9]+$/.0/}/:doc +MASTER_SITES= http://docs.scipy.org/doc/${PORTNAME}-${PORTVERSION:R}.0/:doc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${PORTNAME}-ref-${PORTVERSION:C/\.[0-9]+$/.0/}.pdf:doc \ ${PORTNAME}-user-${PORTVERSION:C/\.[0-9]+$/.0/}.pdf:doc @@ -54,8 +53,8 @@ PLIST_FILES+= man/man1/f2py.1.gz .endif post-patch: - ${REINPLACE_CMD} -e "s|%%FC%%|${FC}|" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py - ${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg + @${REINPLACE_CMD} -e "s|%%FC%%|${FC}|" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py + @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg pre-configure: @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" \ @@ -91,7 +90,7 @@ pre-configure-SUITESPARSE-off: post-install: ${INSTALL_MAN} ${WRKSRC}/doc/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} - ${LN} -sf ${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 + ${LN} -sf f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 .endif ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo index 34046c561a79..a45cd1bf40cd 100644 --- a/math/py-numpy/distinfo +++ b/math/py-numpy/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1503322433 +TIMESTAMP = 1507191103 SHA256 (numpy-ref-1.13.0.pdf) = 954a70e3724680603d40ad287201b7999aedd3e803033066f11e95a25a7d4028 SIZE (numpy-ref-1.13.0.pdf) = 5047809 SHA256 (numpy-user-1.13.0.pdf) = 9bba988452f0e58c257833df80658509ccb85af5d946c55b19ffb16367f1704f SIZE (numpy-user-1.13.0.pdf) = 580593 -SHA256 (numpy-numpy-v1.13.1_GH0.tar.gz) = cf8652b96582b282a5bb710aa4fe2300dca63bdd678a3cd7820314cb6c97ca89 -SIZE (numpy-numpy-v1.13.1_GH0.tar.gz) = 4336552 +SHA256 (numpy-numpy-v1.13.3_GH0.tar.gz) = 1db97b12ea8f2ae5a8b847505f634dcd8c670ee311057ff5412a126becca45b8 +SIZE (numpy-numpy-v1.13.3_GH0.tar.gz) = 4339878 diff --git a/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src b/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src index d564148f08af..cea7a746441f 100644 --- a/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src +++ b/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src @@ -17,20 +17,3 @@ Revert changes in revision c15f774, "remove a bunch of compiler warnings" /**begin repeat -@@ -184,8 +183,6 @@ npy_carg@c@(@ctype@ z) - #define SCALED_CEXP_LOWERL 11357.216553474703895L - #define SCALED_CEXP_UPPERL 22756.021937783004509L - --#ifndef HAVE_CEXP@C@ -- - static - @ctype@ - _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt) -@@ -212,6 +209,7 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, - npy_ldexp@c@(mant * mantsin, expt + exsin)); - } - -+#ifndef HAVE_CEXP@C@ - @ctype@ - npy_cexp@c@(@ctype@ z) - { |