Integrate some improvements done by Ty Sarna.

5 files changed, 42 insertions, 11 deletions

diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 548806abd6a..ea860c29c05 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 March 1998
 # Whom:			tsarna@endicor.com
 #
-# $NetBSD: Makefile,v 1.2 1998/04/12 21:54:37 tron Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/12 23:19:32 tron Exp $
 
 DISTNAME=	NumPy-11
 PKGNAME=	py-Numeric-1.1
@@ -18,14 +18,21 @@ RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 
 WRKSRC=		${WRKDIR}/LLNLDistribution/Numerical
 ALL_TARGET=	default
+MAKE_FLAGS=	'OPT=${CFLAGS}'
+DOCDIR=		${PREFIX}/share/doc/py-Numeric
 
 .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "alpha"
 IGNORE="Needs dynamic loading"
 .endif
 
+do-configure:
+	@(cd ${WRKSRC} && PREFIX=${PREFIX} python makethis.py)
+
 post-install:
-	(cd ${WRKSRC}/Lib ; \
-	python -O ${PREFIX}/lib/python1.5/compileall.py . ; \
+	@(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}
 
 .include <bsd.port.mk>
diff --git a/math/py-Numeric/patches/patch-aa b/math/py-Numeric/patches/patch-aa
index 177703783f8..3871965051f 100644
--- a/math/py-Numeric/patches/patch-aa
+++ b/math/py-Numeric/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/04/12 21:56:05 tron Exp $
+$NetBSD: patch-aa,v 1.3 1998/04/12 23:19:33 tron Exp $
 
 Turn LLNL's compile script into a configure script :-)
 
diff --git a/math/py-Numeric/patches/patch-ab b/math/py-Numeric/patches/patch-ab
index 3dc5cf728a3..5edbec5453a 100644
--- a/math/py-Numeric/patches/patch-ab
+++ b/math/py-Numeric/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/04/12 21:56:05 tron Exp $
+$NetBSD: patch-ab,v 1.3 1998/04/12 23:19:33 tron Exp $
 
 The trailing space after the shared line breaks makesetup due to a bug
 in NetBSD 1.3[.1] /bin/sh. It's fixed in current. See PR#4805 for
diff --git a/math/py-Numeric/pkg/DESCR b/math/py-Numeric/pkg/DESCR
index 9380e78b01e..4dbb69d8c93 100644
--- a/math/py-Numeric/pkg/DESCR
+++ b/math/py-Numeric/pkg/DESCR
@@ -1,3 +1,24 @@
-NumPy (Numeric Python) is a collection of extension modules to provide
-high-performance multidimensional numeric arrays to the Python
-programming language. 
+The Numeric Extensions to Python (NumPy) give Python the number crunching
+power of numeric languages like Matlab and IDL while maintaining all of the
+advantages of the general-purpose programming language Python.
+
+These extensions add two new object types to Python, and then include a
+number of extensions that take advantage of these two new objects.
+
+  * Multidimensional Array Objects
+       + Efficient arrays of homogeneous machine types
+       + Arbitrary number of dimensions
+       + Sophisticated structural operations
+  * Universal Function Objects
+       + Supports mathematical functions on all python objects
+       + Very efficient for Array Objects
+  * Simple interfaces to existing numerical libraries:
+       + Linear Algebra (LAPACK)
+       + Fourier Transforms (FFTPACK)
+       + Random Numbers (RANLIB)
+
+To use the numeric extension, add /usr/local/share/python1.4/NumPy
+to your PYTHONPATH.
+
+For more information, see the NumPy home page at
+http://www.sls.lcs.mit.edu/~jjh/numeric
diff --git a/math/py-Numeric/pkg/PLIST b/math/py-Numeric/pkg/PLIST
index 1c84ee3824e..46d93e5a572 100644
--- a/math/py-Numeric/pkg/PLIST
+++ b/math/py-Numeric/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 1998/04/12 21:56:05 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/04/12 23:19:33 tron Exp $
 lib/python1.5/site-packages/_numpymodule.so
-lib/python1.5/site-packages/multiarraymodule.so
 lib/python1.5/site-packages/fast_umathmodule.so
-lib/python1.5/site-packages/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
@@ -34,3 +34,6 @@ lib/python1.5/site-packages/UserArray.py
 lib/python1.5/site-packages/UserArray.pyc
 lib/python1.5/site-packages/UserArray.pyo
 @dirrm lib/python1.5/site-packages
+share/doc/py-Numeric/doc.html
+share/doc/py-Numeric/home.html
+@dirrm share/doc/py-Numeric