Index: head/math/py-numpy/Makefile =================================================================== --- head/math/py-numpy/Makefile (revision 405019) +++ head/math/py-numpy/Makefile (revision 405020) @@ -1,101 +1,103 @@ # Created by: Tony Maher # $FreeBSD$ PORTNAME= numpy -PORTVERSION= 1.10.1 +PORTVERSION= 1.10.2 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME}/:doc \ CHEESESHOP:source \ SF:source PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \ - numpy-ref-${PORTVERSION}.pdf:doc \ - numpy-user-${PORTVERSION}.pdf:doc + numpy-ref-${DOCVERSION}.pdf:doc \ + numpy-user-${DOCVERSION}.pdf:doc EXTRACT_ONLY= numpy-${PORTVERSION:S/r/rc/}${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_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= * WRKSRC= ${WRKDIR}/${DISTNAME:S/r/rc/} +DOCVERSION= ${PORTVERSION:S/2/1/} 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:${PORTSDIR}/math/cblas OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose .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 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|" \ + -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 .endif ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/numpy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/numpy-ref-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/numpy-user-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR} .include Index: head/math/py-numpy/distinfo =================================================================== --- head/math/py-numpy/distinfo (revision 405019) +++ head/math/py-numpy/distinfo (revision 405020) @@ -1,6 +1,6 @@ -SHA256 (numpy-1.10.1.tar.gz) = 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 -SIZE (numpy-1.10.1.tar.gz) = 4048478 +SHA256 (numpy-1.10.2.tar.gz) = 23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9 +SIZE (numpy-1.10.2.tar.gz) = 4055005 SHA256 (numpy-ref-1.10.1.pdf) = 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SIZE (numpy-ref-1.10.1.pdf) = 5382006 SHA256 (numpy-user-1.10.1.pdf) = 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SIZE (numpy-user-1.10.1.pdf) = 406114