- Update to 0.5.1

- Depends on newer NumPy
- Depends on wxPython either 2.4 or 2.6

PR:		ports/103830
Submitted by:	Li-Lun Wang
Approved by:	Diane Bruce (maintainer)

5 files changed, 21 insertions, 51 deletions

diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile
index 4e6e51a6d10..5990a9d11c9 100644
--- a/science/py-scipy/Makefile
+++ b/science/py-scipy/Makefile
@@ -7,23 +7,29 @@
 #
 
 PORTNAME=	scipy
-PORTVERSION=	0.3.2
-PORTREVISION=	2
+PORTVERSION=	0.5.1
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	scipy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	SciPy_complete-${PORTVERSION}
-LATEST_LINK=	py-${PORTNAME}
 
 MAINTAINER=	db@db.net
 COMMENT=	Scientific tools for Python
 
-BUILD_DEPENDS=	${PYNUMERIC} \
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy \
 		${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft \
-		f2py:${PORTSDIR}/lang/f2py \
-		${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+		f2py:${PORTSDIR}/lang/f2py
 LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw
+.if exists(${PYTHON_SITELIBDIR}/wx.pth)
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
+.elif exists(${PYTHON_SITELIBDIR}/wx/__init__.py)
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython24
+.else
+BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/wx.pth:${PORTSDIR}/x11-toolkits/py-wxPython26
+.endif
+
+LATEST_LINK=	py-${PORTNAME}
+OPTIONSFILE=	${PORT_DBDIR}/py-numpy/options
 
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	yes
@@ -38,22 +44,17 @@ post-patch:
 .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
+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	
+		blas.1:${PORTSDIR}/math/blas
 .endif
 
 post-install:
-	@${RMDIR} ${PYTHON_SITELIBDIR}/weave/swig # empty
-.for dir in ${PYTHON_SITELIBDIR}/gui_thread ${PYTHON_SITELIBDIR}/scipy \
-		${PYTHON_SITELIBDIR}/scipy_base ${PYTHON_SITELIBDIR}/scipy_distutils \
-		${PYTHON_SITELIBDIR}/scipy_test ${PYTHON_SITELIBDIR}/weave
-	@${FIND} ${dir} ! -type d | \
+	@${FIND} ${PYTHON_SITELIBDIR}/scipy ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${dir} -type d | ${SORT} -r | \
+	@${FIND} ${PYTHON_SITELIBDIR}/scipy -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.endfor
 
 .include <bsd.port.post.mk>
diff --git a/science/py-scipy/distinfo b/science/py-scipy/distinfo
index d0a627fa7fd..fe708dbada4 100644
--- a/science/py-scipy/distinfo
+++ b/science/py-scipy/distinfo
@@ -1,3 +1,3 @@
-MD5 (SciPy_complete-0.3.2.tar.gz) = 5ae2280ab2c4c653cb0ff8479e81284a
-SHA256 (SciPy_complete-0.3.2.tar.gz) = bd1addc8d41d79f8866e7960cea391cfbfc3c6b36d5af205864d7f30a2fb98e8
-SIZE (SciPy_complete-0.3.2.tar.gz) = 3368595
+MD5 (scipy-0.5.1.tar.gz) = 48442a427f0556ad2ad1721dd62e401c
+SHA256 (scipy-0.5.1.tar.gz) = 312e7562aa04923c02c346866e06fd44e4fcf872c518f64c0f9dabece5ff860a
+SIZE (scipy-0.5.1.tar.gz) = 4141008
diff --git a/science/py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c b/science/py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c
deleted file mode 100644
index 3d3320dcbb4..00000000000
--- a/science/py-scipy/files/patch-scipy__core_scipy__base_fastumathmodule.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- scipy_core/scipy_base/fastumathmodule.c.orig
-+++ scipy_core/scipy_base/fastumathmodule.c
-@@ -1,8 +1,8 @@
-+#include <math.h>
- #include "Python.h"
- #include "Numeric/arrayobject.h"
- #include "Numeric/ufuncobject.h"
- #include "abstract.h"
--#include <math.h>
- #include "mconf_lite.h"
- 
- /* Fast umath module whose functions do not check for range and domain
diff --git a/science/py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py b/science/py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py
deleted file mode 100644
index 5b960f4c52c..00000000000
--- a/science/py-scipy/files/patch-scipy__core_scipy__distutils_system__info.py
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- scipy_core/scipy_distutils/system_info.py.orig
-+++ scipy_core/scipy_distutils/system_info.py
-@@ -548,8 +548,8 @@
-         lib_dirs = self.get_lib_dirs()
-         info = {}
-         atlas_libs = self.get_libs('atlas_libs',
--                                   self._lib_names + ['atlas'])
--        lapack_libs = self.get_libs('lapack_libs',['lapack'])
-+                                   self._lib_names + ['atlas_r'])
-+        lapack_libs = self.get_libs('lapack_libs',['alapack_r'])
-         atlas = None
-         lapack = None
-         atlas_1 = None
diff --git a/science/py-scipy/pkg-descr b/science/py-scipy/pkg-descr
index 8b83bd7baee..94bab722ad7 100644
--- a/science/py-scipy/pkg-descr
+++ b/science/py-scipy/pkg-descr
@@ -1,5 +1,5 @@
 SciPy is an open source library of scientific tools for Python. SciPy
-supplements the popular Numeric module, gathering a variety of high level
+supplements the popular Numpy module, gathering a variety of high level
 science and engineering modules together as a single package.
 
 SciPy includes modules for graphics and plotting, optimization, integration,