Date: Sun, 7 Oct 2012 10:26:44 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305453 - head/science/py-scipy Message-ID: <201210071026.q97AQia3075319@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Sun Oct 7 10:26:43 2012 New Revision: 305453 URL: http://svn.freebsd.org/changeset/ports/305453 Log: - Remove automatic dependency to SuiteSparse; use OPTIONS instead - Change to new OPTIONS style - Add RUN_DEPENDS on py-nose PR: ports/171349 Submitted by: Li-Lun Wang <llwang@infor.org> (maintainer) Reported by: A.J. Kehoe IV (Nanoman) Modified: head/science/py-scipy/Makefile (contents, props changed) Modified: head/science/py-scipy/Makefile ============================================================================== --- head/science/py-scipy/Makefile Sun Oct 7 10:24:47 2012 (r305452) +++ head/science/py-scipy/Makefile Sun Oct 7 10:26:43 2012 (r305453) @@ -7,6 +7,7 @@ PORTNAME= scipy PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= science python MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME}/:doc \ SF:source @@ -21,7 +22,8 @@ COMMENT= Scientific tools for Python BUILD_DEPENDS+= ${PYNUMPY} \ ${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} \ + nosetests:${PORTSDIR}/devel/py-nose LATEST_LINK= py-${PORTNAME} OPTIONSFILE= ${PORT_DBDIR}/py-numpy/options @@ -29,7 +31,11 @@ OPTIONSFILE= ${PORT_DBDIR}/py-numpy/opti USE_FORTRAN= yes USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes -OPTIONS= ATLAS "Use optimized blas library" OFF + +OPTIONS_DEFINE= ATLAS SUITESPARSE +OPTIONS_DEFAULT= SUITESPARSE +ATLAS_DESC= Use optimized blas library +SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse post-patch: @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ @@ -37,7 +43,7 @@ post-patch: .include <bsd.port.pre.mk> -.if defined(WITH_ATLAS) +.if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly @@ -47,7 +53,7 @@ LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/ blas.2:${PORTSDIR}/math/blas .endif -.if exists(${LOCALBASE}/lib/libumfpack.so.1) +.if ${PORT_OPTIONS:MSUITESPARSE} BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS+= umfpack.1:${PORTSDIR}/math/suitesparse .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210071026.q97AQia3075319>