update to work wiyh python 2.x:

-newest version - 17 (new numbering scheme)
-hosted by sourceforge now
-uses python's new "distutils"

6 files changed, 77 insertions, 90 deletions

diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 275fbf1e54d..8045c9dc78f 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,37 +1,31 @@
-# $NetBSD: Makefile,v 1.15 2000/09/05 08:47:38 rh Exp $
+# $NetBSD: Makefile,v 1.16 2000/12/05 10:05:45 drochner Exp $
 
-DISTNAME=	LLNLPython4
-PKGNAME=	py-Numeric-1.3
+DISTNAME=	Numeric-17.1.2
+PKGNAME=	py-Numeric-17.1.2
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
 MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://www.python.org/sigs/matrix-sig/
+HOMEPAGE=	http://numpy.sourceforge.net/
 
-DEPENDS+=	python-1.5.2:../../lang/python
-
-WRKSRC=		${WRKDIR}/LLNLPython4/Numerical
-ALL_TARGET=	default
-MAKE_FLAGS=	'OPT=${CFLAGS}'
-DOCDIR=		${PREFIX}/share/doc/py-Numeric
+DEPENDS+=	python>=1.6:../../lang/python
 
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
 IGNORE="${PKGNAME} needs dynamic loading"
 .endif
 
-do-configure:
-	@(cd ${WRKSRC} && PREFIX=${PREFIX} python makethis.py)
-
-post-install:
-	@(cd ${WRKSRC}/Lib ; \
-	${PREFIX}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py . ; \
-	${INSTALL_DATA} *.py *.pyc *.pyo ${PREFIX}/lib/python1.5/site-packages)
-	@${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/*.html ${DOCDIR}
-.for incs in arrayobject.h f2c.h fftpack.h ranlib.h ufuncobject.h
-	${INSTALL_DATA} ${WRKSRC}/Include/${incs} \
-		${PREFIX}/include/python1.5
-.endfor
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
+EVAL_PREFIX+=	PYPREFIX=python
+
+do-build:
+	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup_all.py build)
+
+post-build:
+	(eval `${PYPREFIX}/bin/python ${FILESDIR}/printpypath.py` && \
+	${SED} "s|PYINC|$${PYINC}|g;s|PYSITELIB|$${PYSITELIB}|g" \
+	<${PKGDIR}/PLIST >${PLIST_SRC})
+
+do-install:
+	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup_all.py install)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Numeric/files/md5 b/math/py-Numeric/files/md5
index 81a0c752650..c66c986eb24 100644
--- a/math/py-Numeric/files/md5
+++ b/math/py-Numeric/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:25:03 agc Exp $
+$NetBSD: md5,v 1.5 2000/12/05 10:05:45 drochner Exp $
 
-MD5 (LLNLPython4.tgz) = 3fc0ebf2b7a12547de236adec2840100
+MD5 (Numeric-17.1.2.tar.gz) = 2f97c71bc1681112d0f07b9129a69fdb
diff --git a/math/py-Numeric/files/patch-sum b/math/py-Numeric/files/patch-sum
deleted file mode 100644
index 89cd026bc81..00000000000
--- a/math/py-Numeric/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:09 agc Exp $
-
-MD5 (patch-aa) = 759e269123ea75dbcc73bc0fe89ae3fa
diff --git a/math/py-Numeric/files/printpypath.py b/math/py-Numeric/files/printpypath.py
new file mode 100644
index 00000000000..aa53572f19c
--- /dev/null
+++ b/math/py-Numeric/files/printpypath.py
@@ -0,0 +1,5 @@
+from distutils.sysconfig import get_python_inc
+from distutils.sysconfig import get_python_lib
+
+print "PYINC=" + get_python_inc(0, "")
+print "PYSITELIB=" + get_python_lib(0, 0, "")
diff --git a/math/py-Numeric/patches/patch-aa b/math/py-Numeric/patches/patch-aa
deleted file mode 100644
index 3871965051f..00000000000
--- a/math/py-Numeric/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1998/04/12 23:19:33 tron Exp $
-
-Turn LLNL's compile script into a configure script :-)
-
-		-- tsarna@endicor.com, 18 March 1998
-
---- ../Tools/compile.py.orig	Tue Mar 17 23:28:14 1998
-+++ ../Tools/compile.py	Tue Mar 17 23:28:14 1998
-@@ -632,7 +632,7 @@
- 
-     compileall.compile_dir(".")
-     os.system("make -f Makefile.pre.in boot")
--    os.system("make")
-+#    os.system("make")
- 
- if sys.platform == 'win32':
- 	swig_found = find_swig()
diff --git a/math/py-Numeric/pkg/PLIST b/math/py-Numeric/pkg/PLIST
index 46b607eb629..61e917439e2 100644
--- a/math/py-Numeric/pkg/PLIST
+++ b/math/py-Numeric/pkg/PLIST
@@ -1,43 +1,51 @@
-@comment $NetBSD: PLIST,v 1.5 2000/09/05 08:47:38 rh Exp $
-include/python1.5/arrayobject.h
-include/python1.5/f2c.h
-include/python1.5/fftpack.h
-include/python1.5/ranlib.h
-include/python1.5/ufuncobject.h
-lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/fast_umathmodule.so
-lib/python1.5/site-packages/fftpack.so
-lib/python1.5/site-packages/lapack_lite.so
-lib/python1.5/site-packages/multiarraymodule.so
-lib/python1.5/site-packages/ranlib.so
-lib/python1.5/site-packages/umathmodule.so
-lib/python1.5/site-packages/ArrayPrinter.py
-lib/python1.5/site-packages/ArrayPrinter.pyc
-lib/python1.5/site-packages/ArrayPrinter.pyo
-lib/python1.5/site-packages/FFT.py
-lib/python1.5/site-packages/FFT.pyc
-lib/python1.5/site-packages/FFT.pyo
-lib/python1.5/site-packages/LinearAlgebra.py
-lib/python1.5/site-packages/LinearAlgebra.pyc
-lib/python1.5/site-packages/LinearAlgebra.pyo
-lib/python1.5/site-packages/MLab.py
-lib/python1.5/site-packages/MLab.pyc
-lib/python1.5/site-packages/MLab.pyo
-lib/python1.5/site-packages/Matrix.py
-lib/python1.5/site-packages/Matrix.pyc
-lib/python1.5/site-packages/Matrix.pyo
-lib/python1.5/site-packages/Numeric.py
-lib/python1.5/site-packages/Numeric.pyc
-lib/python1.5/site-packages/Numeric.pyo
-lib/python1.5/site-packages/Precision.py
-lib/python1.5/site-packages/Precision.pyc
-lib/python1.5/site-packages/Precision.pyo
-lib/python1.5/site-packages/RandomArray.py
-lib/python1.5/site-packages/RandomArray.pyc
-lib/python1.5/site-packages/RandomArray.pyo
-lib/python1.5/site-packages/UserArray.py
-lib/python1.5/site-packages/UserArray.pyc
-lib/python1.5/site-packages/UserArray.pyo
-share/doc/py-Numeric/doc.html
-share/doc/py-Numeric/home.html
-@dirrm share/doc/py-Numeric
+@comment $NetBSD: PLIST,v 1.6 2000/12/05 10:05:46 drochner Exp $
+PYINC/Numeric/arrayobject.h
+PYINC/Numeric/f2c.h
+PYINC/Numeric/ranlib.h
+PYINC/Numeric/ufuncobject.h
+PYSITELIB/FFT/FFT.py
+PYSITELIB/FFT/FFT.pyc
+PYSITELIB/FFT/__init__.py
+PYSITELIB/FFT/__init__.pyc
+PYSITELIB/FFT/fftpack.so
+PYSITELIB/MA/MA_version.py
+PYSITELIB/MA/MA_version.pyc
+PYSITELIB/MA/__init__.py
+PYSITELIB/MA/__init__.pyc
+PYSITELIB/MA/activeattr.py
+PYSITELIB/MA/activeattr.pyc
+PYSITELIB/Numeric/ArrayPrinter.py
+PYSITELIB/Numeric/ArrayPrinter.pyc
+PYSITELIB/Numeric/LinearAlgebra.py
+PYSITELIB/Numeric/LinearAlgebra.pyc
+PYSITELIB/Numeric/MLab.py
+PYSITELIB/Numeric/MLab.pyc
+PYSITELIB/Numeric/Matrix.py
+PYSITELIB/Numeric/Matrix.pyc
+PYSITELIB/Numeric/Numeric.py
+PYSITELIB/Numeric/Numeric.pyc
+PYSITELIB/Numeric/Precision.py
+PYSITELIB/Numeric/Precision.pyc
+PYSITELIB/Numeric/RandomArray.py
+PYSITELIB/Numeric/RandomArray.pyc
+PYSITELIB/Numeric/UserArray.py
+PYSITELIB/Numeric/UserArray.pyc
+PYSITELIB/Numeric/_numpy.so
+PYSITELIB/Numeric/arrayfns.so
+PYSITELIB/Numeric/lapack_lite.so
+PYSITELIB/Numeric/multiarray.so
+PYSITELIB/Numeric/numeric_version.py
+PYSITELIB/Numeric/numeric_version.pyc
+PYSITELIB/Numeric/ranlib.so
+PYSITELIB/Numeric/umath.so
+PYSITELIB/RNG/RNG.so
+PYSITELIB/RNG/Statistics.py
+PYSITELIB/RNG/Statistics.pyc
+PYSITELIB/RNG/__init__.py
+PYSITELIB/RNG/__init__.pyc
+PYSITELIB/Numeric.pth
+@dirrm PYINC/Numeric
+@dirrm PYSITELIB/FFT
+@dirrm PYSITELIB/Numeric
+@dirrm PYSITELIB/MA
+@dirrm PYSITELIB/RNG