summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--science/py-scipy/Makefile12
-rw-r--r--science/py-scipy03/Makefile12
2 files changed, 18 insertions, 6 deletions
diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 88fe0aca95df..bc3f7b732d57 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -8,7 +8,7 @@
PORTNAME= scipy
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scipy
@@ -22,11 +22,11 @@ BUILD_DEPENDS= ${PYNUMERIC} \
${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
f2py:${PORTSDIR}/lang/f2py \
${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
- atlas.1:${PORTSDIR}/math/atlas
+LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+OPTIONS= ATLAS "Use optimized blas library" OFF
post-patch:
@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
@@ -34,9 +34,15 @@ post-patch:
.include <bsd.port.pre.mk>
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+= atlas.1:${PORTSDIR}/math/atlas
.if !exists(${LOCALBASE}/lib/libalapack.a)
IGNORE= Atlas needs to be built with WITH_STATICLIB for scipy to function properly
.endif
+.else
+LIB_DEPENDS+= lapack.3:${PORTSDIR}/math/lapack \
+ blas.1:${PORTSDIR}/math/blas
+.endif
post-install:
@${RMDIR} ${PYTHON_SITELIBDIR}/weave/swig # empty
diff --git a/science/py-scipy03/Makefile b/science/py-scipy03/Makefile
index 88fe0aca95df..bc3f7b732d57 100644
--- a/science/py-scipy03/Makefile
+++ b/science/py-scipy03/Makefile
@@ -8,7 +8,7 @@
PORTNAME= scipy
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= scipy
@@ -22,11 +22,11 @@ BUILD_DEPENDS= ${PYNUMERIC} \
${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
f2py:${PORTSDIR}/lang/f2py \
${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
-LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw \
- atlas.1:${PORTSDIR}/math/atlas
+LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
USE_PYTHON= 2.3+
USE_PYDISTUTILS= yes
+OPTIONS= ATLAS "Use optimized blas library" OFF
post-patch:
@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \
@@ -34,9 +34,15 @@ post-patch:
.include <bsd.port.pre.mk>
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+= atlas.1:${PORTSDIR}/math/atlas
.if !exists(${LOCALBASE}/lib/libalapack.a)
IGNORE= Atlas needs to be built with WITH_STATICLIB for scipy to function properly
.endif
+.else
+LIB_DEPENDS+= lapack.3:${PORTSDIR}/math/lapack \
+ blas.1:${PORTSDIR}/math/blas
+.endif
post-install:
@${RMDIR} ${PYTHON_SITELIBDIR}/weave/swig # empty