Update to version 1.0

Change maintainer

PR:		106551
Submitted by:	Diane Bruce <db@db.net>
Approved by:	tmclaugh (implicit)

7 files changed, 117 insertions, 17 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index d6e7dc8b9a98..63ed18e68171 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.0r1
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
 		${MASTER_SITE_SOURCEFORGE:S/$/:source/}
@@ -34,6 +35,9 @@ WRKSRC=	${WRKDIR}/${DISTNAME:S/r/rc/}
 
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	atlas.1:${PORTSDIR}/math/atlas
+.if !exists(${LOCALBASE}/lib/libalapack.a)
+IGNORE=	atlas needs to be built with WITH_STATICLIB for numpy to function properly
+.endif
 .else
 LIB_DEPENDS+=	lapack.3:${PORTSDIR}/math/lapack \
 		blas.1:${PORTSDIR}/math/blas
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 547d70d9401f..170b266a9685 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
-MD5 (numpy-1.0rc1.tar.gz) = b8cd486ee334520047f9a35454dad94a
-SHA256 (numpy-1.0rc1.tar.gz) = af994dacc3e58beb51876b6d465fe5ca7435d945475ce382388453070102bb5c
-SIZE (numpy-1.0rc1.tar.gz) = 1120453
+MD5 (numpy-1.0.tar.gz) = 47dd0daa82e7b3f0fe74b969b388d7b3
+SHA256 (numpy-1.0.tar.gz) = dcd46eb5f3c09018912f590fa7fbf92f2c85421314c12b8fcd2e19d74757d5c7
+SIZE (numpy-1.0.tar.gz) = 1217867
 MD5 (numpy.pdf) = 258b3758645568724ab1a3ead67db78a
 SHA256 (numpy.pdf) = 1005b55ee84265be490d8270b4e464e11f59455c220da822f6901342f5fe804f
 SIZE (numpy.pdf) = 1234555
diff --git a/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h b/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
index 3382e09819b9..d7c1699811e7 100644
--- a/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
+++ b/math/py-numpy/files/patch-numpy-core-include-numpy-ufuncobject.h
@@ -1,6 +1,6 @@
---- numpy/core/include/numpy/ufuncobject.h.orig	Wed Sep 13 22:22:47 2006
-+++ numpy/core/include/numpy/ufuncobject.h	Fri Sep 29 16:35:25 2006
-@@ -251,7 +251,10 @@
+--- numpy/core/include/numpy/ufuncobject.h.orig	Mon Oct 23 15:13:40 2006
++++ numpy/core/include/numpy/ufuncobject.h	Sat Dec  9 22:51:47 2006
+@@ -262,7 +262,10 @@
  /* Solaris --------------------------------------------------------*/
  /* --------ignoring SunOS ieee_flags approach, someone else can
  **         deal with that! */
@@ -12,7 +12,7 @@
  #include <ieeefp.h>
  
  #define UFUNC_CHECK_STATUS(ret) {				\
-@@ -265,9 +268,9 @@
+@@ -276,9 +279,9 @@
  	(void) fpsetsticky(0);						\
  	}
  
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
index 63df1556e8d5..9c42980d29ad 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-__init__.py
@@ -1,6 +1,6 @@
---- numpy/distutils/fcompiler/__init__.py.orig	Tue Oct  3 20:39:58 2006
-+++ numpy/distutils/fcompiler/__init__.py	Tue Oct  3 22:43:18 2006
-@@ -268,11 +268,7 @@
+--- numpy/distutils/fcompiler/__init__.py.orig	Wed Oct 11 22:28:42 2006
++++ numpy/distutils/fcompiler/__init__.py	Sat Dec  9 22:51:47 2006
+@@ -273,11 +273,7 @@
          f90 = self.__get_cmd('compiler_f90','F90',(conf,'f90exec'))
          # Temporarily setting f77,f90 compilers so that
          # version_cmd can use their executables.
diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py
index 60983bbdefaf..b5c52e190285 100644
--- a/math/py-numpy/files/patch-numpy-distutils-system_info.py
+++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py
@@ -1,6 +1,6 @@
---- numpy/distutils/system_info.py.orig	Sun Jul 30 11:08:48 2006
-+++ numpy/distutils/system_info.py	Fri Sep 29 12:22:29 2006
-@@ -855,6 +855,8 @@
+--- numpy/distutils/system_info.py.orig	Tue Oct  3 00:35:22 2006
++++ numpy/distutils/system_info.py	Sat Dec  9 22:51:47 2006
+@@ -860,6 +860,8 @@
          atlas_1 = None
          for d in lib_dirs:
              atlas = self.check_libs2(d,atlas_libs,[])
diff --git a/math/py-numpy/files/patch-numpy_f2py_setup.py b/math/py-numpy/files/patch-numpy_f2py_setup.py
index a1ca10e8ab0b..b8f7b27ec5e1 100644
--- a/math/py-numpy/files/patch-numpy_f2py_setup.py
+++ b/math/py-numpy/files/patch-numpy_f2py_setup.py
@@ -1,6 +1,6 @@
---- numpy/f2py/setup.py.orig	Sat Sep 23 05:25:27 2006
-+++ numpy/f2py/setup.py	Sat Sep 23 05:25:41 2006
-@@ -32,8 +32,7 @@
+--- numpy/f2py/setup.py.orig	Tue Oct  3 00:35:22 2006
++++ numpy/f2py/setup.py	Sat Dec  9 22:51:47 2006
+@@ -34,8 +34,7 @@
      config.add_data_dir('docs')
  
      config.add_data_files('src/fortranobject.c',
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index e79bc7c9b68e..941951baa179 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -79,6 +79,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyc
 %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyo
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_defmatrix.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_errstate.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_ma.orig
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_ma.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_multiarray.py
@@ -87,6 +88,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_numerictypes.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_records.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_regression.py
+%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_reshape.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_scalarmath.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_umath.py
 %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_unicode.py
@@ -381,6 +383,97 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide/string_session.dat
 %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide/var.pyf
 %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide/var_session.dat
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/__init__.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/api.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/api.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/api.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/base_classes.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/base_classes.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/base_classes.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/block_statements.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/block_statements.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/block_statements.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/doc.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/expressions.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/expressions.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/expressions.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/parsefortran.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/parsefortran.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/parsefortran.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/pattern_tools.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/pattern_tools.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/pattern_tools.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/readfortran.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/readfortran.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/readfortran.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/sourceinfo.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/sourceinfo.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/sourceinfo.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/splitline.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/splitline.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/splitline.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/statements.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/statements.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/statements.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_expressions.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_expressions.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_expressions.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_parser.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_parser.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/test_parser.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/typedecl_statements.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/typedecl_statements.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/typedecl_statements.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/utils.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/utils.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/utils.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src/F_FUNC.cpp
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src/pyobj_to_string_len.c
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/DEV_README.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/LICENSE.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/README.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/THANKS.txt
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/api.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/main.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_subprogram.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_subprogram.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_subprogram.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_type.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_type.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/py_wrap_type.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/setup.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/setup.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/setup.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_derived_scalar.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_module.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_module_scalar.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_function_in.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/test_scalar_in_out.pyo
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/wrapper_base.pyo
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.pyo
@@ -677,6 +770,9 @@ bin/f2py
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/linalg
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft/tests
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/src