6 files changed, 66 insertions, 63 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 58f946b4e0db..e8e32535ef42 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	numpy
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3.1
 PORTEPOCH=	1
 CATEGORIES=	math python
 MASTER_SITES=	http://numpy.scipy.org/:doc \
@@ -17,7 +17,7 @@ DISTFILES=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \
 		numpy.pdf:doc
 EXTRACT_ONLY=	numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}
 
-MAINTAINER=	db@FreeBSD.org
+MAINTAINER=	llwang@infor.org
 COMMENT=	The New Numeric Extension to Python
 
 CONFLICTS=	f2py-*
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 4741d0a29a75..b8bb51c08ad6 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,6 +1,6 @@
-MD5 (numpy-1.0.2.tar.gz) = 8be83678056ae31bfe641d35bbc181f4
-SHA256 (numpy-1.0.2.tar.gz) = 1f253c7482895f7ec95cb57f5f412eafcf3be23eaebdb7d1b7bbcc2c8a65c226
-SIZE (numpy-1.0.2.tar.gz) = 1400121
+MD5 (numpy-1.0.3.1.tar.gz) = 3358c772f0d51dcfd78c5ee23126aff9
+SHA256 (numpy-1.0.3.1.tar.gz) = 15999e7c0231a5aa1cab6347c9a512cddb31e8a014c9e0232bbf6fb4849fe18d
+SIZE (numpy-1.0.3.1.tar.gz) = 1500255
 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 d7c1699811e7..bbb37fbfe0bf 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,5 +1,5 @@
---- 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
+--- numpy/core/include/numpy/ufuncobject.h.orig	2007-08-20 21:00:58.000000000 -0500
++++ numpy/core/include/numpy/ufuncobject.h	2007-08-27 15:08:11.000000000 -0500
 @@ -262,7 +262,10 @@
  /* Solaris --------------------------------------------------------*/
  /* --------ignoring SunOS ieee_flags approach, someone else can
@@ -16,8 +16,8 @@
  	(void) fpsetsticky(0);						\
  	}
  
--#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#elif defined(linux) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+-#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__)
++#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
  
 -#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
 +#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
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 9c42980d29ad..fa1380656164 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,15 @@
---- 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 @@
+--- numpy/distutils/fcompiler/__init__.py.orig	2007-08-20 21:00:55.000000000 -0500
++++ numpy/distutils/fcompiler/__init__.py	2007-08-27 19:26:14.000000000 -0500
+@@ -78,7 +78,7 @@
+         'ranlib'       : None,
+         }
+ 
+-    compile_switch = "-c"
++    compile_switch = "-c -fPIC"
+     object_switch = "-o "   # Ending space matters! It will be stripped
+                             # but if it is missing then object_switch
+                             # will be prefixed to object file name by
+@@ -278,11 +278,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-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
index c79698892e7a..491a3afa4fcf 100644
--- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
+++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py
@@ -1,15 +1,6 @@
---- numpy/distutils/fcompiler/gnu.py.orig	Mon Mar 26 14:27:13 2007
-+++ numpy/distutils/fcompiler/gnu.py	Mon Jun 11 11:55:16 2007
-@@ -21,7 +21,7 @@
-     #         GNU Fortran 0.5.25 20010319 (prerelease)
-     # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5)
- 
--    for fc_exe in map(find_executable,['g77','f77']):
-+    for fc_exe in map(find_executable,['gfortran', 'gfortran42', 'g77','f77']):
-         if os.path.isfile(fc_exe):
-             break
-     executables = {
-@@ -47,7 +47,7 @@
+--- numpy/distutils/fcompiler/gnu.py.orig	2007-08-20 21:00:55.000000000 -0500
++++ numpy/distutils/fcompiler/gnu.py	2007-08-27 15:12:10.000000000 -0500
+@@ -67,12 +67,12 @@
          for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
              executables[key].append('-mno-cygwin')
  
@@ -18,12 +9,18 @@
  
      suggested_f90_compiler = 'gnu95'
  
-@@ -258,7 +258,7 @@
-     #       GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental)
-     #       GNU Fortran (GCC) 4.3.0 20070316 (experimental)
+     def find_executables(self):
+-        for fc_exe in [find_executable(c) for c in ['g77','f77']]:
++        for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'g77','f77']]:
+             if os.path.isfile(fc_exe):
+                 break
+         for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']:
+@@ -318,7 +318,7 @@
+     g2c = 'gfortran'
  
--    for fc_exe in map(find_executable,['gfortran','f95']):
-+    for fc_exe in map(find_executable,['gfortran','gfortran42','f95']):
-         if os.path.isfile(fc_exe):
-             break
-     executables = {
+     def find_executables(self):
+-        for fc_exe in [find_executable(c) for c in ['gfortran','f95']]:
++        for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'f95']]:
+             if os.path.isfile(fc_exe):
+                 break
+         for key in ['version_cmd', 'compiler_f77', 'compiler_f90',
diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist
index 89a9a86ba118..d5b13d0852d8 100644
--- a/math/py-numpy/pkg-plist
+++ b/math/py-numpy/pkg-plist
@@ -1,7 +1,6 @@
 bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/COMPATIBILITY
 %%PYTHON_SITELIBDIR%%/numpy/DEV_README.txt
-%%PYTHON_SITELIBDIR%%/numpy/DOCSTRING_README.txt
 %%PYTHON_SITELIBDIR%%/numpy/LICENSE.txt
 %%PYTHON_SITELIBDIR%%/numpy/README.txt
 %%PYTHON_SITELIBDIR%%/numpy/THANKS.txt
@@ -273,6 +272,7 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/src/zoo.i
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/tests/test_example.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/swig_ext/tests/test_example2.py
+%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_fcompiler_gnu.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_misc_util.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.py
 %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyc
@@ -292,18 +292,28 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/run_test.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/pyrex/setup.py
 %%PYTHON_SITELIBDIR%%/numpy/doc/records.txt
-%%PYTHON_SITELIBDIR%%/numpy/doc/simple.py
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.html
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.pdf
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/swig/Makefile
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Matrix.i
 %%PYTHON_SITELIBDIR%%/numpy/doc/swig/README
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Series.i
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Tensor.i
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.cxx
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/Vector.i
 %%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy.i
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/series.cxx
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/series.h
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.pdf
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/numpy_swig.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/swig/setup.py
-%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testSeries.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testMatrix.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testTensor.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testVector.py
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.html
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.pdf
+%%PYTHON_SITELIBDIR%%/numpy/doc/swig/testing.txt
 %%PYTHON_SITELIBDIR%%/numpy/doc/ufuncs.txt
 %%PYTHON_SITELIBDIR%%/numpy/dual.py
 %%PYTHON_SITELIBDIR%%/numpy/dual.pyc
@@ -405,7 +415,6 @@ bin/f2py
 %%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/DOCSTRING_README.txt
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/__init__.pyo
@@ -415,6 +424,9 @@ bin/f2py
 %%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/nary.py
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/nary.pyc
+%%PYTHON_SITELIBDIR%%/numpy/f2py/lib/nary.pyo
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.pyc
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser/Fortran2003.pyo
@@ -475,21 +487,6 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/setup.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/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
@@ -673,12 +670,12 @@ bin/f2py
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.py
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.pyc
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/alter_code2.pyo
-%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.py
-%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyc
-%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyo
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.py
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.pyc
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/array_printer.pyo
+%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.py
+%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyc
+%%PYTHON_SITELIBDIR%%/numpy/oldnumeric/arrayfns.pyo
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.py
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.pyc
 %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/compat.pyo
@@ -776,12 +773,12 @@ 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
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/src
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib/parser
+@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/lib
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs
 @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py