Index: head/math/py-numpy/Makefile =================================================================== --- head/math/py-numpy/Makefile (revision 451989) +++ head/math/py-numpy/Makefile (revision 451990) @@ -1,103 +1,102 @@ # Created by: Tony Maher # $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 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= python@FreeBSD.org COMMENT= The New Numeric Extension to Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 USES= fortran python USE_GITHUB= yes USE_PYTHON= concurrent distutils py3kplist LDFLAGS+= -shared OPTIONS_DEFINE= DOCS SUITESPARSE TESTS OPTIONS_SINGLE= BLASLIB OPTIONS_DEFAULT= NETLIB SUITESPARSE OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse TESTS_DESC= Install test suite requirements PLIST_SUB= PYTHON_VER=${PYTHON_VER} PORTDOCS= * GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so// ATLAS_USES= blaslapack:atlas NETLIB_USES= blaslapack:netlib NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose BUILD_DEPENDS+= cython:lang/cython .include .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} 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})|" \ -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/site.cfg @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/numpy/distutils/system_info.py pre-configure-ATLAS-on: @${REINPLACE_CMD} -e "s|%%BLASNAME%%|atlas|" \ -e "s|%%LIBRARIES%%|atlas_libs|" \ -e "s|%%BLASLIBS%%|%%ATLASLIBS%%|" \ -e "s|%%LAPACKLIBS%%|alapack|" \ -e "s|%%ATLASLIBS%%|ptf77blas, ptcblas|" \ ${WRKSRC}/site.cfg pre-configure-NETLIB-on: @${REINPLACE_CMD} -e "s|%%BLASNAME%%|atlas|" \ -e "s|%%LIBRARIES%%|atlas_libs|" \ -e "s|%%BLASLIBS%%|blas, cblas|" \ -e "s|%%LAPACKLIBS%%|lapack|" \ ${WRKSRC}/site.cfg pre-configure-OPENBLAS-on: @${REINPLACE_CMD} -e "s|%%BLASNAME%%|openblas|" \ -e "s|%%LIBRARIES%%|libraries|" \ -e "s|%%LAPACKLIBS%%|%%BLASLIBS%%|" \ -e "s|%%BLASLIBS%%|openblasp, gfortran|" \ ${WRKSRC}/site.cfg pre-configure-SUITESPARSE-off: @${REINPLACE_CMD} -e "s|:%%LOCALBASE%%/include/suitesparse||" ${WRKSRC}/site.cfg 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} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-ref-${PORTVERSION:C/\.[0-9]+$/.0/}.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-user-${PORTVERSION:C/\.[0-9]+$/.0/}.pdf ${STAGEDIR}${DOCSDIR} .include Index: head/math/py-numpy/distinfo =================================================================== --- head/math/py-numpy/distinfo (revision 451989) +++ head/math/py-numpy/distinfo (revision 451990) @@ -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 Index: head/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src =================================================================== --- head/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src (revision 451989) +++ head/math/py-numpy/files/patch-numpy_core_src_npymath_npy__math__complex.c.src (revision 451990) @@ -1,36 +1,19 @@ Revert changes in revision c15f774, "remove a bunch of compiler warnings" --- numpy/core/src/npymath/npy_math_complex.c.src.orig 2015-08-11 17:03:43 UTC +++ numpy/core/src/npymath/npy_math_complex.c.src @@ -33,13 +33,12 @@ */ #include "npy_math_common.h" #include "npy_math_private.h" -#include #define raise_inexact() do { volatile npy_float junk = 1 + tiny; } while(0) -static __COMP_NPY_UNUSED npy_float tiny = 3.9443045e-31f; +static npy_float tiny = 3.9443045e-31f; /**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) - {