3 files changed, 31 insertions, 18 deletions

diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index bfd3476953cf..aa9e647842fa 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	numarray
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	numpy
diff --git a/math/py-numarray/distinfo b/math/py-numarray/distinfo
index c55cf766992c..111381b4d216 100644
--- a/math/py-numarray/distinfo
+++ b/math/py-numarray/distinfo
@@ -1 +1 @@
-MD5 (numarray-0.5.tar.gz) = 76a4b32979d2490fa8200ee06eb9f4f9
+MD5 (numarray-0.6.tar.gz) = dd91d9c59dc53dbf4b780659e0325ce5
diff --git a/math/py-numarray/pkg-plist b/math/py-numarray/pkg-plist
index dbbb7ba548e3..9a7c1516c6b8 100644
--- a/math/py-numarray/pkg-plist
+++ b/math/py-numarray/pkg-plist
@@ -8,7 +8,9 @@
 %%PYTHON_INCLUDEDIR%%/numarray/numconfig.h
 %%PYTHON_INCLUDEDIR%%/numarray/nummacro.h
 %%PYTHON_INCLUDEDIR%%/numarray/tc.h
-%%PYTHON_SITELIBDIR%%/numarray.pth
+%%PYTHON_SITELIBDIR%%/numarray/__init__.py
+%%PYTHON_SITELIBDIR%%/numarray/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numarray/__init__.pyo
 %%PYTHON_SITELIBDIR%%/numarray/_bytes.so
 %%PYTHON_SITELIBDIR%%/numarray/_chararray.so
 %%PYTHON_SITELIBDIR%%/numarray/_conv.so
@@ -36,12 +38,12 @@
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.py
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.pyc
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.pyo
-%%PYTHON_SITELIBDIR%%/numarray/chararray.py
-%%PYTHON_SITELIBDIR%%/numarray/chararray.pyc
-%%PYTHON_SITELIBDIR%%/numarray/chararray.pyo
 %%PYTHON_SITELIBDIR%%/numarray/codegenerator.py
 %%PYTHON_SITELIBDIR%%/numarray/codegenerator.pyc
 %%PYTHON_SITELIBDIR%%/numarray/codegenerator.pyo
+%%PYTHON_SITELIBDIR%%/numarray/generic.py
+%%PYTHON_SITELIBDIR%%/numarray/generic.pyc
+%%PYTHON_SITELIBDIR%%/numarray/generic.pyo
 %%PYTHON_SITELIBDIR%%/numarray/ieeespecial.py
 %%PYTHON_SITELIBDIR%%/numarray/ieeespecial.pyc
 %%PYTHON_SITELIBDIR%%/numarray/ieeespecial.pyo
@@ -50,15 +52,18 @@
 %%PYTHON_SITELIBDIR%%/numarray/memmap.pyc
 %%PYTHON_SITELIBDIR%%/numarray/memmap.pyo
 %%PYTHON_SITELIBDIR%%/numarray/memory.so
-%%PYTHON_SITELIBDIR%%/numarray/ndarray.py
-%%PYTHON_SITELIBDIR%%/numarray/ndarray.pyc
-%%PYTHON_SITELIBDIR%%/numarray/ndarray.pyo
-%%PYTHON_SITELIBDIR%%/numarray/numarray.py
-%%PYTHON_SITELIBDIR%%/numarray/numarray.pyc
-%%PYTHON_SITELIBDIR%%/numarray/numarray.pyo
+%%PYTHON_SITELIBDIR%%/numarray/numarrayall.py
+%%PYTHON_SITELIBDIR%%/numarray/numarrayall.pyc
+%%PYTHON_SITELIBDIR%%/numarray/numarrayall.pyo
+%%PYTHON_SITELIBDIR%%/numarray/numarraycore.py
+%%PYTHON_SITELIBDIR%%/numarray/numarraycore.pyc
+%%PYTHON_SITELIBDIR%%/numarray/numarraycore.pyo
 %%PYTHON_SITELIBDIR%%/numarray/numarrayext.py
 %%PYTHON_SITELIBDIR%%/numarray/numarrayext.pyc
 %%PYTHON_SITELIBDIR%%/numarray/numarrayext.pyo
+%%PYTHON_SITELIBDIR%%/numarray/numeric.py
+%%PYTHON_SITELIBDIR%%/numarray/numeric.pyc
+%%PYTHON_SITELIBDIR%%/numarray/numeric.pyo
 %%PYTHON_SITELIBDIR%%/numarray/numerictypes.py
 %%PYTHON_SITELIBDIR%%/numarray/numerictypes.pyc
 %%PYTHON_SITELIBDIR%%/numarray/numerictypes.pyo
@@ -68,18 +73,24 @@
 %%PYTHON_SITELIBDIR%%/numarray/numtest.py
 %%PYTHON_SITELIBDIR%%/numarray/numtest.pyc
 %%PYTHON_SITELIBDIR%%/numarray/numtest.pyo
-%%PYTHON_SITELIBDIR%%/numarray/numtestall.py
-%%PYTHON_SITELIBDIR%%/numarray/numtestall.pyc
-%%PYTHON_SITELIBDIR%%/numarray/numtestall.pyo
-%%PYTHON_SITELIBDIR%%/numarray/recarray.py
-%%PYTHON_SITELIBDIR%%/numarray/recarray.pyc
-%%PYTHON_SITELIBDIR%%/numarray/recarray.pyo
+%%PYTHON_SITELIBDIR%%/numarray/records.py
+%%PYTHON_SITELIBDIR%%/numarray/records.pyc
+%%PYTHON_SITELIBDIR%%/numarray/records.pyo
+%%PYTHON_SITELIBDIR%%/numarray/safethread.py
+%%PYTHON_SITELIBDIR%%/numarray/safethread.pyc
+%%PYTHON_SITELIBDIR%%/numarray/safethread.pyo
+%%PYTHON_SITELIBDIR%%/numarray/strings.py
+%%PYTHON_SITELIBDIR%%/numarray/strings.pyc
+%%PYTHON_SITELIBDIR%%/numarray/strings.pyo
 %%PYTHON_SITELIBDIR%%/numarray/teacup.py
 %%PYTHON_SITELIBDIR%%/numarray/teacup.pyc
 %%PYTHON_SITELIBDIR%%/numarray/teacup.pyo
 %%PYTHON_SITELIBDIR%%/numarray/template.py
 %%PYTHON_SITELIBDIR%%/numarray/template.pyc
 %%PYTHON_SITELIBDIR%%/numarray/template.pyo
+%%PYTHON_SITELIBDIR%%/numarray/testall.py
+%%PYTHON_SITELIBDIR%%/numarray/testall.pyc
+%%PYTHON_SITELIBDIR%%/numarray/testall.pyo
 %%PYTHON_SITELIBDIR%%/numarray/testdata.py
 %%PYTHON_SITELIBDIR%%/numarray/testdata.pyc
 %%PYTHON_SITELIBDIR%%/numarray/testdata.pyo
@@ -95,6 +106,7 @@
 %%PORTDOCS%%share/doc/py-numarray/ChangeLog
 %%PORTDOCS%%share/doc/py-numarray/Design.txt
 %%PORTDOCS%%share/doc/py-numarray/INSTALL.txt
+%%PORTDOCS%%share/doc/py-numarray/Repackaging.txt
 %%PORTDOCS%%share/doc/py-numarray/UsersGuide.txt
 %%PORTDOCS%%share/doc/py-numarray/doctest.py
 %%PORTDOCS%%share/doc/py-numarray/manual/ChangeLog
@@ -146,6 +158,7 @@
 %%PORTDOCS%%share/examples/py-numarray/setup.py
 %%PORTDOCS%%share/examples/py-numarray/sortperf.py
 %%PORTDOCS%%share/examples/py-numarray/testall.py
+%%PORTDOCS%%share/examples/py-numarray/testthread.py
 %%PORTDOCS%%@dirrm share/examples/py-numarray/convolve
 %%PORTDOCS%%@dirrm share/examples/py-numarray
 %%PORTDOCS%%@dirrm share/doc/py-numarray/manual/webpage