Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Jan 2016 17:34:41 +0000 (UTC)
From:      Olivier Duchateau <olivierd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405020 - head/math/py-numpy
Message-ID:  <201601011734.u01HYf6N022424@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: olivierd
Date: Fri Jan  1 17:34:40 2016
New Revision: 405020
URL: https://svnweb.freebsd.org/changeset/ports/405020

Log:
  - Update to 1.10.2
  - Reintroduce DOCVERSION variable, PDF documentation is not synchronized with
  release
  - Add missing dependency [1] for NETLIB option
  
  PR:		203638 [1]
  Submitted by:	John Hein [1]

Modified:
  head/math/py-numpy/Makefile
  head/math/py-numpy/distinfo

Modified: head/math/py-numpy/Makefile
==============================================================================
--- head/math/py-numpy/Makefile	Fri Jan  1 17:32:44 2016	(r405019)
+++ head/math/py-numpy/Makefile	Fri Jan  1 17:34:40 2016	(r405020)
@@ -2,7 +2,7 @@
 # $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 \
@@ -10,8 +10,8 @@ MASTER_SITES=	http://docs.scipy.org/doc/
 		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
@@ -36,11 +36,13 @@ TESTS_DESC=		Install test suite requirem
 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
@@ -72,7 +74,7 @@ pre-configure-ATLAS-on:
 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
 
@@ -95,7 +97,7 @@ post-install:
 
 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 <bsd.port.post.mk>

Modified: head/math/py-numpy/distinfo
==============================================================================
--- head/math/py-numpy/distinfo	Fri Jan  1 17:32:44 2016	(r405019)
+++ head/math/py-numpy/distinfo	Fri Jan  1 17:34:40 2016	(r405020)
@@ -1,5 +1,5 @@
-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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601011734.u01HYf6N022424>