8 files changed, 92 insertions, 5 deletions
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index c948c7491d8..30e04540b66 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2001/02/17 18:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/03/07 14:33:40 drochner Exp $
 
-DISTNAME=	Numeric-17.2.0
-PKGNAME=	py-Numeric-17.2.0
+DISTNAME=	Numeric-17.3.0
+PKGNAME=	py-Numeric-17.3.0
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
@@ -18,6 +18,12 @@ IGNORE="${PKGNAME} needs dynamic loading"
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 EVAL_PREFIX+=	PYPREFIX=python
 
+#Together with patch/*, this works around build glitches which are
+# already fixed in the numpy CVS. So all this can go on the next update.
+post-extract:
+	${MKDIR} ${WRKSRC}/Include/Numeric
+	${MV} ${WRKSRC}/Include/*.h ${WRKSRC}/Include/Numeric
+
 do-build:
 	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup_all.py build)
 
diff --git a/math/py-Numeric/files/md5 b/math/py-Numeric/files/md5
index a2abb966fee..40bede9530b 100644
--- a/math/py-Numeric/files/md5
+++ b/math/py-Numeric/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 2001/01/15 11:58:25 drochner Exp $
+$NetBSD: md5,v 1.7 2001/03/07 14:33:40 drochner Exp $
 
-MD5 (Numeric-17.2.0.tar.gz) = ce2d6b1b7762a71f49bb4f2119f4a884
+MD5 (Numeric-17.3.0.tar.gz) = 27accdbbf19fb2bd956e0b6753c83494
diff --git a/math/py-Numeric/files/patch-sum b/math/py-Numeric/files/patch-sum
new file mode 100644
index 00000000000..db13de062ea
--- /dev/null
+++ b/math/py-Numeric/files/patch-sum
@@ -0,0 +1,7 @@
+$NetBSD: patch-sum,v 1.3 2001/03/07 14:33:40 drochner Exp $
+
+SHA1 (patch-aa) = 0cf18a1807851b78ad4ca248a51925616461bb0f
+SHA1 (patch-ab) = ee281e742f1c8af857907a98c2992d2d605c8d42
+SHA1 (patch-ac) = 18c8256c72da65d9695f32cd0f60e2f0275f70a4
+SHA1 (patch-ad) = bd76392771241cfc0b58d25ac4b4b62fce0fb432
+SHA1 (patch-ae) = af12ab6a30c857f7f75e87e48f59ab013142c60d
diff --git a/math/py-Numeric/patches/patch-aa b/math/py-Numeric/patches/patch-aa
new file mode 100644
index 00000000000..82b9179d3ae
--- /dev/null
+++ b/math/py-Numeric/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2001/03/07 14:33:41 drochner Exp $
+
+--- Packages/FFT/setup.py.orig	Fri Sep 29 17:02:20 2000
++++ Packages/FFT/setup.py
+@@ -17,7 +17,7 @@
+ 
+        packages = ['FFT'],
+        package_dir = {'FFT': 'Lib'},
+-       include_dirs = ['Include'],
++       include_dirs = ['Include','../../Include'],
+        ext_modules = [ Extension('FFT.fftpack',
+                                 ['Src/fftpackmodule.c',
+                                  'Src/fftpack.c']),
diff --git a/math/py-Numeric/patches/patch-ab b/math/py-Numeric/patches/patch-ab
new file mode 100644
index 00000000000..80c1fdb75d0
--- /dev/null
+++ b/math/py-Numeric/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2001/03/07 14:33:41 drochner Exp $
+
+--- Packages/LALITE/setup.py.orig	Fri Sep 29 17:02:34 2000
++++ Packages/LALITE/setup.py
+@@ -28,7 +28,7 @@
+        packages = [''],
+        package_dir = {'': 'Lib'},
+        extra_path = 'Numeric',
+-       include_dirs = ['Include'],
++       include_dirs = ['Include','../../Include'],
+        headers = headers,
+        ext_modules = [ Extension('lapack_lite', sourcelist,
+                            library_dirs=library_dirs_list,
diff --git a/math/py-Numeric/patches/patch-ac b/math/py-Numeric/patches/patch-ac
new file mode 100644
index 00000000000..19ab1643c41
--- /dev/null
+++ b/math/py-Numeric/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/03/07 14:33:41 drochner Exp $
+
+--- Packages/RANLIB/setup.py.orig	Fri Sep 29 17:02:55 2000
++++ Packages/RANLIB/setup.py
+@@ -18,7 +18,7 @@
+        packages = [''],
+        package_dir = {'': 'Lib'},
+        extra_path = 'Numeric',
+-       include_dirs = ['Include'],
++       include_dirs = ['Include','../../Include'],
+        headers = headers,
+        ext_modules = [ Extension('ranlib',
+                                 ['Src/ranlibmodule.c',
diff --git a/math/py-Numeric/patches/patch-ad b/math/py-Numeric/patches/patch-ad
new file mode 100644
index 00000000000..fc07a468063
--- /dev/null
+++ b/math/py-Numeric/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/03/07 14:33:41 drochner Exp $
+
+--- Packages/RNG/setup.py.orig	Fri Sep 29 17:03:05 2000
++++ Packages/RNG/setup.py
+@@ -24,7 +24,7 @@
+ 
+        packages = ['RNG'],
+        package_dir = {'RNG': 'Lib'},
+-       include_dirs=['Include'],
++       include_dirs=['Include','../../Include'],
+        ext_modules=[Extension('RNG.RNG',
+                        ['Src/RNGmodule.c',
+                         'Src/ranf.c',
diff --git a/math/py-Numeric/patches/patch-ae b/math/py-Numeric/patches/patch-ae
new file mode 100644
index 00000000000..bf49159f391
--- /dev/null
+++ b/math/py-Numeric/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2001/03/07 14:33:41 drochner Exp $
+
+--- setup.py.orig	Fri Jan 19 16:53:08 2001
++++ setup.py
+@@ -12,7 +12,7 @@
+ except:
+     raise SystemExit, "Distutils problem, see Numeric README."
+ 
+-headers = glob (os.path.join ("Include","*.h"))
++headers = glob (os.path.join ("Include","Numeric","*.h"))
+ 
+ # The version is set in Lib/numeric_version.py
+ execfile(os.path.join('Lib','numeric_version.py'))
+@@ -27,7 +27,7 @@
+        packages = [''],
+        package_dir = {'': 'Lib'},
+        extra_path = 'Numeric',
+-       include_dirs = ['Include'],
++       include_dirs = ['Include/Numeric'],
+        headers = headers,
+        ext_modules = [Extension('_numpy',
+                                 ['Src/_numpymodule.c',