Page MenuHomeFreeBSD
Files F160290000

D1579.diff
No OneTemporary
Actions

D1579.diff
View Options

Index: head/science/py-scipy/Makefile
===================================================================
--- head/science/py-scipy/Makefile
+++ head/science/py-scipy/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= scipy
-PORTVERSION= 0.14.0
-PORTREVISION= 4
+PORTVERSION= 0.15.1
CATEGORIES= science python
MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME}/:doc \
SF:source
@@ -17,15 +16,17 @@
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS+= ${PYNUMPY} \
+BUILD_DEPENDS= ${PYNUMPY} \
${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3
-RUN_DEPENDS= ${PYNUMPY} \
- nosetests:${PORTSDIR}/devel/py-nose
+RUN_DEPENDS= ${PYNUMPY}
USES= fortran python
USE_PYTHON= distutils autoplist concurrent
+PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95
+PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95
+
LDFLAGS+= -shared
OPTIONS_DEFINE= ATLAS DOCS SUITESPARSE
@@ -33,35 +34,28 @@
ATLAS_DESC= Use optimized blas library
SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse
-PORTDOCS= scipy-ref-${PORTVERSION}.pdf
+ATLAS_USES= blaslapack:atlas
+ATLAS_USES_OFF= blaslapack:netlib
+SUITESPARSE_LIB_DEPENDS= libumfpack.so:${PORTSDIR}/math/suitesparse
+SUITESPARSE_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13
-post-patch:
- @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
- -e "s@malloc\.h@stdlib.h@"
+PORTDOCS= scipy-ref-${PORTVERSION}.pdf
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MATLAS}
-LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas
.if !exists(${LOCALBASE}/lib/libalapack.a)
IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly
.endif
-.else
-LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack \
- libblas.so:${PORTSDIR}/math/blas
.endif
-.if ${PORT_OPTIONS:MSUITESPARSE}
-BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13
-LIB_DEPENDS+= libumfpack.so:${PORTSDIR}/math/suitesparse
-.endif
-
-PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95
-PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95
-
post-extract:
@${CP} ${DISTDIR}/scipy-ref-${PORTVERSION}.pdf ${WRKDIR}
+post-patch:
+ @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
+ -e "s@malloc\.h@stdlib.h@"
+
post-install:
.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: head/science/py-scipy/distinfo
===================================================================
--- head/science/py-scipy/distinfo
+++ head/science/py-scipy/distinfo
@@ -1,4 +1,4 @@
-SHA256 (scipy-0.14.0.tar.gz) = 4b41a3e6bf178df1c7f0ef3bfeabf1f56610329aca5dbd7b6d64da8ac9af6b14
-SIZE (scipy-0.14.0.tar.gz) = 10212944
-SHA256 (scipy-ref-0.14.0.pdf) = 8ecaf05c83b13d0730d23b4a374c5d7566a8b48d88addf06ead01c319ab2938c
-SIZE (scipy-ref-0.14.0.pdf) = 17398860
+SHA256 (scipy-0.15.1.tar.gz) = a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a
+SIZE (scipy-0.15.1.tar.gz) = 11401878
+SHA256 (scipy-ref-0.15.1.pdf) = d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e
+SIZE (scipy-ref-0.15.1.pdf) = 18313446

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 23, 11:39 PM (13 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34263414
Default Alt Text
D1579.diff (2 KB)

Event Timeline