Upgrade to 23.0.

Submitted by:	Jeremy Messenger <mezz7@cox.net>

3 files changed, 18 insertions, 46 deletions

diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 73b0656ff930..390d1ad8132c 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	numeric
-PORTVERSION=	21.0
+PORTVERSION=	23.0
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
@@ -19,7 +19,6 @@ COMMENT=	The Numeric Extension to Python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-DOCDIR=		${PREFIX}/share/doc/py-numeric
 EXAMPLEDIR=	${PREFIX}/share/examples/py-numeric
 
 .include <bsd.port.pre.mk>
@@ -36,9 +35,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLEDIR}
 	@${MKDIR} ${EXAMPLEDIR}/NumTut
 	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLEDIR}/NumTut
-.if !defined(NOPORTDOCS)
-#	@${MKDIR} ${DOCDIR}
-#	${INSTALL_DATA} ${WRKSRC}/Doc/numpy.pdf ${DOCDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/math/py-numeric/distinfo b/math/py-numeric/distinfo
index e266ece870af..ba78dd304112 100644
--- a/math/py-numeric/distinfo
+++ b/math/py-numeric/distinfo
@@ -1 +1 @@
-MD5 (Numeric-21.0.tar.gz) = 0684989aa6dfa4eba616ca7e36c524fd
+MD5 (Numeric-23.0.tar.gz) = 2f8c3c5d0703ce12f55f04f43d1a9ab3
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
index 7e56ffa264e1..110a85ae2c50 100644
--- a/math/py-numeric/pkg-plist
+++ b/math/py-numeric/pkg-plist
@@ -2,6 +2,10 @@
 %%PYTHON_INCLUDEDIR%%/Numeric/f2c.h
 %%PYTHON_INCLUDEDIR%%/Numeric/ranlib.h
 %%PYTHON_INCLUDEDIR%%/Numeric/ufuncobject.h
+%%PYTHON_SITELIBDIR%%/Numeric.pth
+%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.py
+%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyc
+%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.py
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyo
@@ -9,6 +13,9 @@
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/FFT/fftpack.so
+%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.py
+%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyc
+%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/MA/MA.py
 %%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyo
@@ -18,13 +25,6 @@
 %%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.py
 %%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric.pth
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.py
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.py
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/MLab.py
 %%PYTHON_SITELIBDIR%%/Numeric/MLab.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/MLab.pyo
@@ -37,6 +37,13 @@
 %%PYTHON_SITELIBDIR%%/Numeric/Precision.py
 %%PYTHON_SITELIBDIR%%/Numeric/Precision.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/Precision.pyo
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/RNG.so
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.py
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyc
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyo
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.py
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Numeric/RandomArray.py
 %%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyo
@@ -47,38 +54,11 @@
 %%PYTHON_SITELIBDIR%%/Numeric/arrayfns.so
 %%PYTHON_SITELIBDIR%%/Numeric/lapack_lite.so
 %%PYTHON_SITELIBDIR%%/Numeric/multiarray.so
-%%PYTHON_SITELIBDIR%%/Numeric/ranlib.so
-%%PYTHON_SITELIBDIR%%/Numeric/umath.so
 %%PYTHON_SITELIBDIR%%/Numeric/numeric_version.py
 %%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyc
 %%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties.py
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties_version.py
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties_version.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/Properties_version.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/RNG.so
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.py
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/_kinds.so
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds.py
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds_version.py
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds_version.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/kinds/kinds_version.pyo
-@comment share/doc/py-numeric/numpy.pdf
+%%PYTHON_SITELIBDIR%%/Numeric/ranlib.so
+%%PYTHON_SITELIBDIR%%/Numeric/umath.so
 share/examples/py-numeric/NumTut/__init__.py
 share/examples/py-numeric/NumTut/greece.pik
 share/examples/py-numeric/NumTut/mkpic.py
@@ -89,10 +69,7 @@ share/examples/py-numeric/mandelbrot.py
 share/examples/py-numeric/sieve.py
 @dirrm share/examples/py-numeric/NumTut
 @dirrm share/examples/py-numeric
-@comment @dirrm share/doc/py-numeric
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/kinds
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/RNG
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/PropertiedClasses
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/MA
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric/FFT
 @dirrm %%PYTHON_SITELIBDIR%%/Numeric