update to 24.2

another "final release"
changes:
-__array_data__, __array_struct__ support
-some bugfixes
-Support array interface in objecttype function
-build system improvements

inofficial note:
The default indices of diagonal() and trace() changed, this causes
a selftest to fail. The default indices behaviour is documented, so
it seems that just the selftest is wrong. This only affects arrays with
more than 2 dimensions.

5 files changed, 33 insertions, 44 deletions

diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 91d2c7b0a76..5d46226c354 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2006/02/05 23:10:03 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/02/15 17:37:08 drochner Exp $
 
-DISTNAME=	Numeric-23.7
+DISTNAME=	Numeric-24.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
diff --git a/math/py-Numeric/PLIST b/math/py-Numeric/PLIST
index f4a5d5c0fa7..efd2b2a80db 100644
--- a/math/py-Numeric/PLIST
+++ b/math/py-Numeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/14 17:43:53 recht Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/02/15 17:37:08 drochner Exp $
 ${PYINC}/Numeric/arrayobject.h
 ${PYINC}/Numeric/f2c.h
 ${PYINC}/Numeric/ranlib.h
@@ -32,6 +32,9 @@ ${PYSITELIB}/Numeric/MLab.pyo
 ${PYSITELIB}/Numeric/Matrix.py
 ${PYSITELIB}/Numeric/Matrix.pyc
 ${PYSITELIB}/Numeric/Matrix.pyo
+${PYSITELIB}/Numeric/Numeric_headers/__init__.py
+${PYSITELIB}/Numeric/Numeric_headers/__init__.pyc
+${PYSITELIB}/Numeric/Numeric_headers/__init__.pyo
 ${PYSITELIB}/Numeric/Numeric.py
 ${PYSITELIB}/Numeric/Numeric.pyc
 ${PYSITELIB}/Numeric/Numeric.pyo
@@ -61,6 +64,7 @@ ${PYSITELIB}/Numeric/numeric_version.pyo
 ${PYSITELIB}/Numeric/ranlib.so
 ${PYSITELIB}/Numeric/umath.so
 @dirrm ${PYSITELIB}/Numeric/RNG
+@dirrm ${PYSITELIB}/Numeric/Numeric_headers
 @dirrm ${PYSITELIB}/Numeric/MA
 @dirrm ${PYSITELIB}/Numeric/FFT
 @dirrm ${PYSITELIB}/Numeric
diff --git a/math/py-Numeric/distinfo b/math/py-Numeric/distinfo
index a717d233b8b..10847376a4e 100644
--- a/math/py-Numeric/distinfo
+++ b/math/py-Numeric/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/02/25 17:10:09 drochner Exp $
+$NetBSD: distinfo,v 1.13 2006/02/15 17:37:08 drochner Exp $
 
-SHA1 (Numeric-23.7.tar.gz) = 3fe90c14692c9fe9da0d4202df4036e8ecfdd365
-RMD160 (Numeric-23.7.tar.gz) = 1ff89d0e809c97b5cc06184676503bfee12c2fcd
-Size (Numeric-23.7.tar.gz) = 725824 bytes
+SHA1 (Numeric-24.2.tar.gz) = 72869ef80c12630a9a125ba10c96093b6ae16aff
+RMD160 (Numeric-24.2.tar.gz) = c9502db28663558c535e236392c9beddec9743bb
+Size (Numeric-24.2.tar.gz) = 743800 bytes
 SHA1 (patch-aa) = 0096fe9de4c3912cdefd3278385edd4b7f55cf63
-SHA1 (patch-ab) = 26f8c8bbd2bd74b5fcefb474d66d5d1fd411fbd4
+SHA1 (patch-ac) = 45ca40e38123dc72ec42b3775b2401c0037674c0
diff --git a/math/py-Numeric/patches/patch-ab b/math/py-Numeric/patches/patch-ab
deleted file mode 100644
index f2c7c32bae5..00000000000
--- a/math/py-Numeric/patches/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2005/02/25 17:10:09 drochner Exp $
-
---- setup.py.orig	2005-01-06 23:16:13.000000000 +0100
-+++ setup.py
-@@ -33,19 +33,22 @@ elif sys.platform in ['mac', 'beos5']:
- 
- # delete all but the first one in this list if using your own LAPACK/BLAS
- sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
--              #os.path.join('Src', 'blas_lite.c'), 
--              #os.path.join('Src', 'f2c_lite.c'), 
--              #os.path.join('Src', 'zlapack_lite.c'),
--              #os.path.join('Src', 'dlapack_lite.c')
-+              os.path.join('Src', 'blas_lite.c'), 
-+              os.path.join('Src', 'f2c_lite.c'), 
-+              os.path.join('Src', 'zlapack_lite.c'),
-+              os.path.join('Src', 'dlapack_lite.c')
-              ]
- # set these to use your own BLAS;
- 
--library_dirs_list = ['/usr/lib/atlas']
--libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
-+library_dirs_list = []
-+#library_dirs_list = ['/usr/lib/atlas']
-+libraries_list = []
-+#libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c'] 
- 
- # set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
--use_dotblas = 1 
--include_dirs = ['/usr/include/atlas']  
-+use_dotblas = 0
-+include_dirs = []
-+#include_dirs = ['/usr/include/atlas']  
-                    # You may need to set this to find cblas.h
-                    #  e.g. on UNIX using ATLAS this should be ['/usr/include/atlas']
- extra_link_args = []
diff --git a/math/py-Numeric/patches/patch-ac b/math/py-Numeric/patches/patch-ac
new file mode 100644
index 00000000000..ce93bdc5253
--- /dev/null
+++ b/math/py-Numeric/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.3 2006/02/15 17:37:08 drochner Exp $
+
+--- Packages/RNG/Src/ranf.c.orig	2005-04-03 14:23:06.000000000 +0200
++++ Packages/RNG/Src/ranf.c
+@@ -148,12 +148,16 @@ void Mixranf(int *s,u32 s48[2])
+ 	s48[1] = (u32)clock_time;
+ #else
+ 	struct timeval tv;
++#if 0
+ 	struct timezone tz;
+ #if !defined(__sgi)
+ 	int gettimeofday(struct timeval *, struct timezone *);
+ #endif
+ 
+ 	(void)gettimeofday(&tv,&tz);
++#else
++	(void)gettimeofday(&tv,0);
++#endif
+ 	s48[0] = (u32)tv.tv_sec;
+ 	s48[1] = (u32)tv.tv_usec;
+ #endif /* !_WIN32 */