Upgrade to latest distribution. Version number hasn't changed.

The author wants the include files in $PREFIX/include/python1.5/numerical/.
Change the "NumPy" names for symmetry.

3 files changed, 51 insertions, 50 deletions

diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 2053819080b4..ba8a2a7158bb 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -3,10 +3,10 @@
 # Date created:		20 April 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.13 1998/11/16 08:54:41 tg Exp $
+# $Id: Makefile,v 1.14 1998/12/29 14:32:06 tg Exp $
 #
 
-DISTNAME=	LLNLPython8
+DISTNAME=	LLNLDistribution11
 PKGNAME=	py-numeric-1.8
 CATEGORIES=	math python
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/python/
@@ -23,9 +23,9 @@ ALL_TARGET=	sharedmods
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 
 PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
-NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/NumPy
-DOCDIR=		${PREFIX}/share/doc/NumPy
-EXAMPLEDIR=	${PREFIX}/share/examples/NumPy
+NUMPYDIR=	${PYTHONSCRIPTDIR}/site-packages/numerical
+DOCDIR=		${PREFIX}/share/doc/py-numerical
+EXAMPLEDIR=	${PREFIX}/share/examples/py-numerical
 
 do-configure:
 	@(cd ${WRKSRC} && ${CONFIGURE_ENV} python makethis.py)
@@ -34,8 +34,9 @@ post-install:
 	@${MKDIR} ${NUMPYDIR}
 	${INSTALL_DATA} ${WRKSRC}/Lib/* ${NUMPYDIR}
 	@${PREFIX}/bin/python -O ${PYTHONSCRIPTDIR}/compileall.py ${NUMPYDIR}
-	@${ECHO} "NumPy" > ${NUMPYDIR}/../NumPy.pth
-	${INSTALL_DATA} ${WRKSRC}/Include/*object.h ${PREFIX}/include/python1.5
+	@${ECHO} "numerical" > ${NUMPYDIR}/../numerical.pth
+	@${MKDIR} ${PREFIX}/include/python1.5/numerical
+	${INSTALL_DATA} ${WRKSRC}/Include/*object.h ${PREFIX}/include/python1.5/numerical
 	@${MKDIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/Demo/* ${EXAMPLEDIR}
 .if !defined(NOPORTDOCS)
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index 02dc8bb27c5c..8195abb118e7 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1 +1 @@
-MD5 (LLNLPython8.tgz) = aa1bcac7b453444aab6aea8882b48a9a
+MD5 (LLNLDistribution11.tgz) = 7ce5043ff3ec5d8202170c4d7892aa0e
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 4b1156667d12..e9df84da6b7a 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -1,49 +1,49 @@
-include/python1.5/arrayobject.h
-include/python1.5/ufuncobject.h
-lib/python1.5/site-packages/NumPy/ArrayPrinter.py
-lib/python1.5/site-packages/NumPy/ArrayPrinter.pyc
-lib/python1.5/site-packages/NumPy/ArrayPrinter.pyo
-lib/python1.5/site-packages/NumPy/FFT.py
-lib/python1.5/site-packages/NumPy/FFT.pyc
-lib/python1.5/site-packages/NumPy/FFT.pyo
-lib/python1.5/site-packages/NumPy/LinearAlgebra.py
-lib/python1.5/site-packages/NumPy/LinearAlgebra.pyc
-lib/python1.5/site-packages/NumPy/LinearAlgebra.pyo
-lib/python1.5/site-packages/NumPy/MLab.py
-lib/python1.5/site-packages/NumPy/MLab.pyc
-lib/python1.5/site-packages/NumPy/MLab.pyo
-lib/python1.5/site-packages/NumPy/Matrix.py
-lib/python1.5/site-packages/NumPy/Matrix.pyc
-lib/python1.5/site-packages/NumPy/Matrix.pyo
-lib/python1.5/site-packages/NumPy/Numeric.py
-lib/python1.5/site-packages/NumPy/Numeric.pyc
-lib/python1.5/site-packages/NumPy/Numeric.pyo
-lib/python1.5/site-packages/NumPy/Precision.py
-lib/python1.5/site-packages/NumPy/Precision.pyc
-lib/python1.5/site-packages/NumPy/Precision.pyo
-lib/python1.5/site-packages/NumPy/RandomArray.py
-lib/python1.5/site-packages/NumPy/RandomArray.pyc
-lib/python1.5/site-packages/NumPy/RandomArray.pyo
-lib/python1.5/site-packages/NumPy/UserArray.py
-lib/python1.5/site-packages/NumPy/UserArray.pyc
-lib/python1.5/site-packages/NumPy/UserArray.pyo
-@dirrm lib/python1.5/site-packages/NumPy
-lib/python1.5/site-packages/NumPy.pth
+include/python1.5/numerical/arrayobject.h
+include/python1.5/numerical/ufuncobject.h
+@dirrm include/python1.5/numerical
+lib/python1.5/site-packages/numerical/ArrayPrinter.py
+lib/python1.5/site-packages/numerical/ArrayPrinter.pyc
+lib/python1.5/site-packages/numerical/ArrayPrinter.pyo
+lib/python1.5/site-packages/numerical/FFT.py
+lib/python1.5/site-packages/numerical/FFT.pyc
+lib/python1.5/site-packages/numerical/FFT.pyo
+lib/python1.5/site-packages/numerical/LinearAlgebra.py
+lib/python1.5/site-packages/numerical/LinearAlgebra.pyc
+lib/python1.5/site-packages/numerical/LinearAlgebra.pyo
+lib/python1.5/site-packages/numerical/MLab.py
+lib/python1.5/site-packages/numerical/MLab.pyc
+lib/python1.5/site-packages/numerical/MLab.pyo
+lib/python1.5/site-packages/numerical/Matrix.py
+lib/python1.5/site-packages/numerical/Matrix.pyc
+lib/python1.5/site-packages/numerical/Matrix.pyo
+lib/python1.5/site-packages/numerical/Numeric.py
+lib/python1.5/site-packages/numerical/Numeric.pyc
+lib/python1.5/site-packages/numerical/Numeric.pyo
+lib/python1.5/site-packages/numerical/Precision.py
+lib/python1.5/site-packages/numerical/Precision.pyc
+lib/python1.5/site-packages/numerical/Precision.pyo
+lib/python1.5/site-packages/numerical/RandomArray.py
+lib/python1.5/site-packages/numerical/RandomArray.pyc
+lib/python1.5/site-packages/numerical/RandomArray.pyo
+lib/python1.5/site-packages/numerical/UserArray.py
+lib/python1.5/site-packages/numerical/UserArray.pyc
+lib/python1.5/site-packages/numerical/UserArray.pyo
+@dirrm lib/python1.5/site-packages/numerical
+lib/python1.5/site-packages/numerical.pth
 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
 @unexec rmdir %B 2>/dev/null || true
-share/doc/NumPy/doc.html
-share/doc/NumPy/home.html
-@dirrm share/doc/NumPy
-share/examples/NumPy/life.py
-share/examples/NumPy/life.pyc
-share/examples/NumPy/mandelbrot.py
-share/examples/NumPy/mandelbrot.pyc
-share/examples/NumPy/sieve.py
-share/examples/NumPy/sieve.pyc
-@dirrm share/examples/NumPy
+share/doc/py-numerical/doc.html
+share/doc/py-numerical/home.html
+@dirrm share/doc/py-numerical
+share/examples/py-numerical/life.py
+share/examples/py-numerical/life.pyc
+share/examples/py-numerical/mandelbrot.py
+share/examples/py-numerical/mandelbrot.pyc
+share/examples/py-numerical/sieve.py
+share/examples/py-numerical/sieve.pyc
+@dirrm share/examples/py-numerical