svn commit: r383223 - head/science/py-scipy

[Dmitry Sivachenko]

Author: demon
Date: Sat Apr  4 13:30:20 2015
New Revision: 383223
URL: https://svnweb.freebsd.org/changeset/ports/383223

Log:
  As noted by thierry@ in D2086, scipy inherits blas library to use from numpy
  (via site.cfg).  So remove unused OPTIONs from here.
  Remove check for static ATLAS lib because now ATLAS always builds
  static version.
  Remove obsoleted malloc.h --> stdlib.h conversion.

Modified:
  head/science/py-scipy/Makefile

Modified: head/science/py-scipy/Makefile
==============================================================================
--- head/science/py-scipy/Makefile	Sat Apr  4 13:22:30 2015	(r383222)
+++ head/science/py-scipy/Makefile	Sat Apr  4 13:30:20 2015	(r383223)
@@ -17,7 +17,8 @@ COMMENT=	Scientific tools for Python
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
+RUN_DEPENDS=	${PYNUMPY} \
+		swig:${PORTSDIR}/devel/swig13
 
 USES=		fortran python
 USE_PYTHON=	distutils autoplist concurrent
@@ -27,33 +28,15 @@ PYDISTUTILS_BUILDARGS+=	--fcompiler=gnu9
 
 LDFLAGS+=	-shared
 
-OPTIONS_DEFINE=	ATLAS DOCS SUITESPARSE
-OPTIONS_DEFAULT=SUITESPARSE
-ATLAS_DESC=	Use optimized blas library
-SUITESPARSE_DESC=	Use AMD and UMFPACK in SuiteSparse
-
-ATLAS_USES=	blaslapack:atlas
-ATLAS_USES_OFF=	blaslapack:netlib
-SUITESPARSE_LIB_DEPENDS=	libumfpack.so:${PORTSDIR}/math/suitesparse
-SUITESPARSE_BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	scipy-ref-${PORTVERSION}.pdf
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MATLAS}
-.if !exists(${LOCALBASE}/lib/libalapack.a)
-IGNORE=		atlas needs to be built with WITH_STATIC for scipy to function properly
-.endif
-.endif
-
 post-extract:
 	@${CP} ${DISTDIR}/scipy-ref-${PORTVERSION}.pdf ${WRKDIR}
 
-post-patch:
-	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
-		-e "s at malloc\.h at stdlib.h@"
-
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}