4 files changed, 9 insertions, 22 deletions

diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile
index 886478be2b86..e58f1a67cec0 100644
--- a/math/py-numarray/Makefile
+++ b/math/py-numarray/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	numarray
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 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 8089d8d62986..ecdaa7298f82 100644
--- a/math/py-numarray/distinfo
+++ b/math/py-numarray/distinfo
@@ -1,2 +1,3 @@
-MD5 (numarray-1.4.1.tar.gz) = c61b7216feaafb3ecfd879c8cf4c0d39
-SIZE (numarray-1.4.1.tar.gz) = 1186165
+MD5 (numarray-1.5.0.tar.gz) = 6db331e321a74fa896cd5961fe33b7ef
+SHA256 (numarray-1.5.0.tar.gz) = 061a71f5324cf0808f611eb77455c273d1b9595ca6337d8ba7f201c2f1a8b12c
+SIZE (numarray-1.5.0.tar.gz) = 1192005
diff --git a/math/py-numarray/files/patch-Include::numarray::nummacro.h b/math/py-numarray/files/patch-Include::numarray::nummacro.h
deleted file mode 100644
index 1cb40e378d5f..000000000000
--- a/math/py-numarray/files/patch-Include::numarray::nummacro.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- Include/numarray/nummacro.h.orig	Fri Nov 18 20:42:15 2005
-+++ Include/numarray/nummacro.h	Fri Nov 18 20:43:33 2005
-@@ -24,7 +24,11 @@
- 				     int n_outs, PyObject*outs[]);
- typedef struct {
- 	PyObject_HEAD
-+#ifdef __cplusplus
-+	PyObject *operator_;         /* ufunc name */
-+#else
- 	PyObject *operator;          /* ufunc name */
-+#endif
-         PyObject *identity;          /* identity value, e.g. 0 for + or 1 for * */
-         int   n_inputs, n_outputs;
-         _ufunc_function call;
diff --git a/math/py-numarray/pkg-plist b/math/py-numarray/pkg-plist
index c9e9f0f91cd9..ae724bd767d4 100644
--- a/math/py-numarray/pkg-plist
+++ b/math/py-numarray/pkg-plist
@@ -1,4 +1,5 @@
 %%PYTHON_INCLUDEDIR%%/numarray/arraybase.h
+%%PYTHON_INCLUDEDIR%%/numarray/arrayif.h
 %%PYTHON_INCLUDEDIR%%/numarray/arrayobject.h
 %%PYTHON_INCLUDEDIR%%/numarray/cfunc.h
 %%PYTHON_INCLUDEDIR%%/numarray/ieeespecial.h
@@ -44,6 +45,9 @@
 %%PYTHON_SITELIBDIR%%/numarray/array_persist.py
 %%PYTHON_SITELIBDIR%%/numarray/array_persist.pyc
 %%PYTHON_SITELIBDIR%%/numarray/array_persist.pyo
+%%PYTHON_SITELIBDIR%%/numarray/array_protocol.py
+%%PYTHON_SITELIBDIR%%/numarray/array_protocol.pyc
+%%PYTHON_SITELIBDIR%%/numarray/array_protocol.pyo
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.py
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.pyc
 %%PYTHON_SITELIBDIR%%/numarray/arrayprint.pyo
@@ -282,14 +286,12 @@
 %%PYTHON_SITELIBDIR%%/numarray/ufunc.pyo
 %%PORTDOCS%%%%DOCSDIR%%/Announce.txt
 %%PORTDOCS%%%%DOCSDIR%%/CVS-files
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/Design.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
 %%PORTDOCS%%%%DOCSDIR%%/Repackaging.txt
 %%PORTDOCS%%%%DOCSDIR%%/UsersGuide.txt
 %%PORTDOCS%%%%DOCSDIR%%/doctest.py
 %%PORTDOCS%%%%DOCSDIR%%/header_pep.txt
-%%PORTDOCS%%%%DOCSDIR%%/manual/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/manual/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/manual/README
 %%PORTDOCS%%%%DOCSDIR%%/manual/StyleGuide
@@ -341,12 +343,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/release_notes/ANNOUNCE-1.2.2.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes/ANNOUNCE-1.3
 %%PORTDOCS%%%%DOCSDIR%%/release_notes/ANNOUNCE-1.4
+%%PORTDOCS%%%%DOCSDIR%%/release_notes/ANNOUNCE-1.5
 %%PORTDOCS%%%%DOCSDIR%%/sitecustomize.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/ChangeLog
 %%PORTDOCS%%%%EXAMPLESDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/__init__.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/bench.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/convolve/ChangeLog
 %%PORTDOCS%%%%EXAMPLESDIR%%/convolve/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/convolve/__init__.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/convolve/benchmark.py