Update to scipy 0.7.2

SciPy 0.7.2 is a bug-fix release with no new features compared to 0.7.1. The
only change is that all C sources from Cython code have been regenerated with
Cython 0.12.1. This fixes the incompatibility between binaries of SciPy 0.7.1
and NumPy 1.4.

SciPy 0.7.1 is a bug-fix release with no new features compared to 0.7.0.

3 files changed, 44 insertions, 15 deletions

diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile
index 5c6b2077793..5dd9aed3720 100644
--- a/math/py-scipy/Makefile
+++ b/math/py-scipy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/02/21 15:13:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/06 02:37:08 markd Exp $
 
-DISTNAME=	scipy-0.7.0
-PKGNAME=	${PYPKGPREFIX}-scipy-0.7.0
-PKGREVISION=	1
+DISTNAME=	scipy-0.7.2
+PKGNAME=	${PYPKGPREFIX}-scipy-0.7.2
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scipy/}
 
@@ -18,6 +17,17 @@ PLIST_SUBST+=   PYPKGPREFIX=${PYPKGPREFIX}
 USE_LANGUAGES+=	c c++ fortran
 MAKE_ENV+=	ATLAS=None
 
+# XXX Avoid picking up other compilers when installed
+.include "../../mk/compiler.mk"
+
+.if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95)
+PYSETUPBUILDARGS+= --fcompiler=g95
+.elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran)
+PYSETUPBUILDARGS+= --fcompiler=gnu95
+.else
+BROKEN=		Requires fortran 95
+.endif
+
 .include "../../lang/python/extension.mk"
 .include "../../math/fftw/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/math/py-scipy/PLIST b/math/py-scipy/PLIST
index d1ac15e79a0..dff1a569da6 100644
--- a/math/py-scipy/PLIST
+++ b/math/py-scipy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/25 12:16:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/06/06 02:37:08 markd Exp $
 ${PYSITELIB}/scipy/INSTALL.txt
 ${PYSITELIB}/scipy/LATEST.txt
 ${PYSITELIB}/scipy/LICENSE.txt
@@ -11,9 +11,6 @@ ${PYSITELIB}/scipy/__config__.pyo
 ${PYSITELIB}/scipy/__init__.py
 ${PYSITELIB}/scipy/__init__.pyc
 ${PYSITELIB}/scipy/__init__.pyo
-${PYSITELIB}/scipy/__svn_version__.py
-${PYSITELIB}/scipy/__svn_version__.pyc
-${PYSITELIB}/scipy/__svn_version__.pyo
 ${PYSITELIB}/scipy/cluster/__init__.py
 ${PYSITELIB}/scipy/cluster/__init__.pyc
 ${PYSITELIB}/scipy/cluster/__init__.pyo
@@ -232,9 +229,6 @@ ${PYSITELIB}/scipy/io/matlab/__init__.pyo
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.py
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.pyc
 ${PYSITELIB}/scipy/io/matlab/byteordercodes.pyo
-${PYSITELIB}/scipy/io/matlab/gzipstreams.py
-${PYSITELIB}/scipy/io/matlab/gzipstreams.pyc
-${PYSITELIB}/scipy/io/matlab/gzipstreams.pyo
 ${PYSITELIB}/scipy/io/matlab/mio.py
 ${PYSITELIB}/scipy/io/matlab/mio.pyc
 ${PYSITELIB}/scipy/io/matlab/mio.pyo
@@ -250,71 +244,96 @@ ${PYSITELIB}/scipy/io/matlab/miobase.pyo
 ${PYSITELIB}/scipy/io/matlab/setup.py
 ${PYSITELIB}/scipy/io/matlab/setup.pyc
 ${PYSITELIB}/scipy/io/matlab/setup.pyo
+${PYSITELIB}/scipy/io/matlab/tests/afunc.m
 ${PYSITELIB}/scipy/io/matlab/tests/data/japanese_utf8.txt
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/test3dmatrix_7.4_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/test_empty_struct.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/test_skip_variable.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcell_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcell_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testcell_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcellnest_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcellnest_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcellnest_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testcellnest_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcomplex_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcomplex_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcomplex_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testcomplex_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testcomplex_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testdouble_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testdouble_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testdouble_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testdouble_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testdouble_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testemptycell_5.3_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testemptycell_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testemptycell_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testemptycell_7.4_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testfunc_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testhdf5_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmatrix_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmatrix_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmatrix_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmatrix_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testmatrix_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testminus_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testminus_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testminus_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testminus_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testminus_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmulti_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testmulti_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testmulti_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testobject_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testobject_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testobject_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testobject_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testonechar_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testonechar_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testonechar_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testonechar_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testonechar_7.4_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testscalarcell_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparse_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparse_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparse_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparse_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testsparse_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparsecomplex_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparsecomplex_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparsecomplex_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testsparsecomplex_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testsparsecomplex_7.4_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testsparsefloat_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststring_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststring_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststring_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststring_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/teststring_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststringarray_4.2c_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststringarray_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststringarray_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststringarray_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/teststringarray_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststruct_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststruct_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststruct_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/teststruct_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructarr_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructarr_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructarr_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/teststructarr_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructnest_6.1_SOL2.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructnest_6.5.1_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/teststructnest_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/teststructnest_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testunicode_7.1_GLNX86.mat
+${PYSITELIB}/scipy/io/matlab/tests/data/testunicode_7.4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/data/testvec_4_GLNX86.mat
 ${PYSITELIB}/scipy/io/matlab/tests/gen_mat4files.m
 ${PYSITELIB}/scipy/io/matlab/tests/gen_mat5files.m
diff --git a/math/py-scipy/distinfo b/math/py-scipy/distinfo
index 04968dcc248..22bc223f3aa 100644
--- a/math/py-scipy/distinfo
+++ b/math/py-scipy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/07/25 12:16:45 markd Exp $
+$NetBSD: distinfo,v 1.3 2010/06/06 02:37:08 markd Exp $
 
-SHA1 (scipy-0.7.0.tar.gz) = 7daef781253bafccf3be54b9eb3541f084503076
-RMD160 (scipy-0.7.0.tar.gz) = 3583901f679cbc7f91560626f437d7edcd2bf6cf
-Size (scipy-0.7.0.tar.gz) = 4636167 bytes
+SHA1 (scipy-0.7.2.tar.gz) = c3223df023008ee339cf1d3fad74d4566af69c8a
+RMD160 (scipy-0.7.2.tar.gz) = 456e4ab9d69f9d4056bca6b52474b72bea37b122
+Size (scipy-0.7.2.tar.gz) = 4557178 bytes