From 05b3b2ed3461d05161578d6f59e769326c7c0ef9 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 17 Apr 2012 17:24:41 +0000
Subject: [PATCH] update to 1.6.1 changes: any new features, performance
 improvements and bug fixes, Some highlights are: -Re-introduction of datetime
 dtype support to deal with dates in arrays. -A new 16-bit floating point
 type. -A new iterator, which improves performance of many functions.

---
 math/py-numpy/Makefile                        |  7 +-
 math/py-numpy/PLIST                           | 99 +++++++++++++++----
 math/py-numpy/distinfo                        | 12 +--
 math/py-numpy/patches/patch-aa                |  8 +-
 .../patch-numpy_distutils_fcompiler_gnu.py    |  8 +-
 5 files changed, 98 insertions(+), 36 deletions(-)

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 8d9c5a0e199c..0a30f4eb6edc 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2012/02/09 13:09:09 obache Exp $
+# $NetBSD: Makefile,v 1.17 2012/04/17 17:24:41 drochner Exp $
 #
 
-DISTNAME=	numpy-1.4.1
-PKGREVISION=	3
+DISTNAME=	numpy-1.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
@@ -14,7 +13,7 @@ LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LANGUAGES+=	c fortran77
+USE_LANGUAGES+=	c fortran
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=	ATLAS=None
 
diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST
index f949ff73f257..a3b2cec0b20d 100644
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@@ -1,12 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2012/04/08 20:21:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/04/17 17:24:41 drochner Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}
-${PYSITELIB}/numpy/COMPATIBILITY
-${PYSITELIB}/numpy/DEV_README.txt
-${PYSITELIB}/numpy/INSTALL.txt
-${PYSITELIB}/numpy/LICENSE.txt
-${PYSITELIB}/numpy/README.txt
-${PYSITELIB}/numpy/THANKS.txt
 ${PYSITELIB}/numpy/__config__.py
 ${PYSITELIB}/numpy/__config__.pyc
 ${PYSITELIB}/numpy/__config__.pyo
@@ -25,6 +19,9 @@ ${PYSITELIB}/numpy/compat/__init__.pyo
 ${PYSITELIB}/numpy/compat/_inspect.py
 ${PYSITELIB}/numpy/compat/_inspect.pyc
 ${PYSITELIB}/numpy/compat/_inspect.pyo
+${PYSITELIB}/numpy/compat/py3k.py
+${PYSITELIB}/numpy/compat/py3k.pyc
+${PYSITELIB}/numpy/compat/py3k.pyo
 ${PYSITELIB}/numpy/compat/setup.py
 ${PYSITELIB}/numpy/compat/setup.pyc
 ${PYSITELIB}/numpy/compat/setup.pyo
@@ -65,9 +62,12 @@ ${PYSITELIB}/numpy/core/include/numpy/_neighborhood_iterator_imp.h
 ${PYSITELIB}/numpy/core/include/numpy/_numpyconfig.h
 ${PYSITELIB}/numpy/core/include/numpy/arrayobject.h
 ${PYSITELIB}/numpy/core/include/numpy/arrayscalars.h
+${PYSITELIB}/numpy/core/include/numpy/halffloat.h
 ${PYSITELIB}/numpy/core/include/numpy/multiarray_api.txt
 ${PYSITELIB}/numpy/core/include/numpy/ndarrayobject.h
+${PYSITELIB}/numpy/core/include/numpy/ndarraytypes.h
 ${PYSITELIB}/numpy/core/include/numpy/noprefix.h
+${PYSITELIB}/numpy/core/include/numpy/npy_3kcompat.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_common.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_cpu.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_endian.h
@@ -121,12 +121,18 @@ ${PYSITELIB}/numpy/core/shape_base.pyc
 ${PYSITELIB}/numpy/core/shape_base.pyo
 ${PYSITELIB}/numpy/core/tests/data/astype_copy.pkl
 ${PYSITELIB}/numpy/core/tests/data/recarray_from_file.fits
+${PYSITELIB}/numpy/core/tests/test_api.py
+${PYSITELIB}/numpy/core/tests/test_arrayprint.py
 ${PYSITELIB}/numpy/core/tests/test_blasdot.py
+${PYSITELIB}/numpy/core/tests/test_datetime.py
 ${PYSITELIB}/numpy/core/tests/test_defchararray.py
 ${PYSITELIB}/numpy/core/tests/test_dtype.py
+${PYSITELIB}/numpy/core/tests/test_einsum.py
 ${PYSITELIB}/numpy/core/tests/test_errstate.py
 ${PYSITELIB}/numpy/core/tests/test_function_base.py
 ${PYSITELIB}/numpy/core/tests/test_getlimits.py
+${PYSITELIB}/numpy/core/tests/test_half.py
+${PYSITELIB}/numpy/core/tests/test_iterator.py
 ${PYSITELIB}/numpy/core/tests/test_machar.py
 ${PYSITELIB}/numpy/core/tests/test_memmap.py
 ${PYSITELIB}/numpy/core/tests/test_multiarray.py
@@ -215,6 +221,9 @@ ${PYSITELIB}/numpy/distutils/command/scons.pyo
 ${PYSITELIB}/numpy/distutils/command/sdist.py
 ${PYSITELIB}/numpy/distutils/command/sdist.pyc
 ${PYSITELIB}/numpy/distutils/command/sdist.pyo
+${PYSITELIB}/numpy/distutils/compat.py
+${PYSITELIB}/numpy/distutils/compat.pyc
+${PYSITELIB}/numpy/distutils/compat.pyo
 ${PYSITELIB}/numpy/distutils/conv_template.py
 ${PYSITELIB}/numpy/distutils/conv_template.pyc
 ${PYSITELIB}/numpy/distutils/conv_template.pyo
@@ -269,6 +278,9 @@ ${PYSITELIB}/numpy/distutils/fcompiler/nag.pyo
 ${PYSITELIB}/numpy/distutils/fcompiler/none.py
 ${PYSITELIB}/numpy/distutils/fcompiler/none.pyc
 ${PYSITELIB}/numpy/distutils/fcompiler/none.pyo
+${PYSITELIB}/numpy/distutils/fcompiler/pathf95.py
+${PYSITELIB}/numpy/distutils/fcompiler/pathf95.pyc
+${PYSITELIB}/numpy/distutils/fcompiler/pathf95.pyo
 ${PYSITELIB}/numpy/distutils/fcompiler/pg.py
 ${PYSITELIB}/numpy/distutils/fcompiler/pg.pyc
 ${PYSITELIB}/numpy/distutils/fcompiler/pg.pyo
@@ -312,6 +324,9 @@ ${PYSITELIB}/numpy/distutils/npy_pkg_config.pyo
 ${PYSITELIB}/numpy/distutils/numpy_distribution.py
 ${PYSITELIB}/numpy/distutils/numpy_distribution.pyc
 ${PYSITELIB}/numpy/distutils/numpy_distribution.pyo
+${PYSITELIB}/numpy/distutils/pathccompiler.py
+${PYSITELIB}/numpy/distutils/pathccompiler.pyc
+${PYSITELIB}/numpy/distutils/pathccompiler.pyo
 ${PYSITELIB}/numpy/distutils/setup.py
 ${PYSITELIB}/numpy/distutils/setup.pyc
 ${PYSITELIB}/numpy/distutils/setup.pyo
@@ -349,6 +364,7 @@ ${PYSITELIB}/numpy/distutils/tests/swig_ext/src/zoo.i
 ${PYSITELIB}/numpy/distutils/tests/swig_ext/tests/test_example.py
 ${PYSITELIB}/numpy/distutils/tests/swig_ext/tests/test_example2.py
 ${PYSITELIB}/numpy/distutils/tests/test_fcompiler_gnu.py
+${PYSITELIB}/numpy/distutils/tests/test_fcompiler_intel.py
 ${PYSITELIB}/numpy/distutils/tests/test_misc_util.py
 ${PYSITELIB}/numpy/distutils/tests/test_npy_pkg_config.py
 ${PYSITELIB}/numpy/distutils/unixccompiler.py
@@ -513,6 +529,29 @@ ${PYSITELIB}/numpy/f2py/setupscons.pyc
 ${PYSITELIB}/numpy/f2py/setupscons.pyo
 ${PYSITELIB}/numpy/f2py/src/fortranobject.c
 ${PYSITELIB}/numpy/f2py/src/fortranobject.h
+${PYSITELIB}/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c
+${PYSITELIB}/numpy/f2py/tests/src/assumed_shape/.f2py_f2cmap
+${PYSITELIB}/numpy/f2py/tests/src/assumed_shape/foo_free.f90
+${PYSITELIB}/numpy/f2py/tests/src/assumed_shape/foo_mod.f90
+${PYSITELIB}/numpy/f2py/tests/src/assumed_shape/foo_use.f90
+${PYSITELIB}/numpy/f2py/tests/src/assumed_shape/precision.f90
+${PYSITELIB}/numpy/f2py/tests/src/kind/foo.f90
+${PYSITELIB}/numpy/f2py/tests/src/mixed/foo.f
+${PYSITELIB}/numpy/f2py/tests/src/mixed/foo_fixed.f90
+${PYSITELIB}/numpy/f2py/tests/src/mixed/foo_free.f90
+${PYSITELIB}/numpy/f2py/tests/src/size/foo.f90
+${PYSITELIB}/numpy/f2py/tests/test_array_from_pyobj.py
+${PYSITELIB}/numpy/f2py/tests/test_assumed_shape.py
+${PYSITELIB}/numpy/f2py/tests/test_callback.py
+${PYSITELIB}/numpy/f2py/tests/test_kind.py
+${PYSITELIB}/numpy/f2py/tests/test_mixed.py
+${PYSITELIB}/numpy/f2py/tests/test_return_character.py
+${PYSITELIB}/numpy/f2py/tests/test_return_complex.py
+${PYSITELIB}/numpy/f2py/tests/test_return_integer.py
+${PYSITELIB}/numpy/f2py/tests/test_return_logical.py
+${PYSITELIB}/numpy/f2py/tests/test_return_real.py
+${PYSITELIB}/numpy/f2py/tests/test_size.py
+${PYSITELIB}/numpy/f2py/tests/util.py
 ${PYSITELIB}/numpy/f2py/use_rules.py
 ${PYSITELIB}/numpy/f2py/use_rules.pyc
 ${PYSITELIB}/numpy/f2py/use_rules.pyo
@@ -553,7 +592,11 @@ ${PYSITELIB}/numpy/lib/arraysetops.pyo
 ${PYSITELIB}/numpy/lib/arrayterator.py
 ${PYSITELIB}/numpy/lib/arrayterator.pyc
 ${PYSITELIB}/numpy/lib/arrayterator.pyo
-${PYSITELIB}/numpy/lib/benchmarks/bench_arraysetops.py
+${PYSITELIB}/numpy/lib/benchmarks/benchmark.py
+${PYSITELIB}/numpy/lib/benchmarks/casting.py
+${PYSITELIB}/numpy/lib/benchmarks/creating.py
+${PYSITELIB}/numpy/lib/benchmarks/simpleindex.py
+${PYSITELIB}/numpy/lib/benchmarks/sorting.py
 ${PYSITELIB}/numpy/lib/financial.py
 ${PYSITELIB}/numpy/lib/financial.pyc
 ${PYSITELIB}/numpy/lib/financial.pyo
@@ -569,9 +612,9 @@ ${PYSITELIB}/numpy/lib/index_tricks.pyo
 ${PYSITELIB}/numpy/lib/info.py
 ${PYSITELIB}/numpy/lib/info.pyc
 ${PYSITELIB}/numpy/lib/info.pyo
-${PYSITELIB}/numpy/lib/io.py
-${PYSITELIB}/numpy/lib/io.pyc
-${PYSITELIB}/numpy/lib/io.pyo
+${PYSITELIB}/numpy/lib/npyio.py
+${PYSITELIB}/numpy/lib/npyio.pyc
+${PYSITELIB}/numpy/lib/npyio.pyo
 ${PYSITELIB}/numpy/lib/polynomial.py
 ${PYSITELIB}/numpy/lib/polynomial.pyc
 ${PYSITELIB}/numpy/lib/polynomial.pyo
@@ -725,6 +768,12 @@ ${PYSITELIB}/numpy/numarray/functions.pyo
 ${PYSITELIB}/numpy/numarray/image.py
 ${PYSITELIB}/numpy/numarray/image.pyc
 ${PYSITELIB}/numpy/numarray/image.pyo
+${PYSITELIB}/numpy/numarray/include/numpy/arraybase.h
+${PYSITELIB}/numpy/numarray/include/numpy/cfunc.h
+${PYSITELIB}/numpy/numarray/include/numpy/ieeespecial.h
+${PYSITELIB}/numpy/numarray/include/numpy/libnumarray.h
+${PYSITELIB}/numpy/numarray/include/numpy/numcomplex.h
+${PYSITELIB}/numpy/numarray/include/numpy/nummacro.h
 ${PYSITELIB}/numpy/numarray/linear_algebra.py
 ${PYSITELIB}/numpy/numarray/linear_algebra.pyc
 ${PYSITELIB}/numpy/numarray/linear_algebra.pyo
@@ -743,12 +792,6 @@ ${PYSITELIB}/numpy/numarray/nd_image.pyo
 ${PYSITELIB}/numpy/numarray/numerictypes.py
 ${PYSITELIB}/numpy/numarray/numerictypes.pyc
 ${PYSITELIB}/numpy/numarray/numerictypes.pyo
-${PYSITELIB}/numpy/numarray/numpy/arraybase.h
-${PYSITELIB}/numpy/numarray/numpy/cfunc.h
-${PYSITELIB}/numpy/numarray/numpy/ieeespecial.h
-${PYSITELIB}/numpy/numarray/numpy/libnumarray.h
-${PYSITELIB}/numpy/numarray/numpy/numcomplex.h
-${PYSITELIB}/numpy/numarray/numpy/nummacro.h
 ${PYSITELIB}/numpy/numarray/random_array.py
 ${PYSITELIB}/numpy/numarray/random_array.pyc
 ${PYSITELIB}/numpy/numarray/random_array.pyo
@@ -844,6 +887,18 @@ ${PYSITELIB}/numpy/polynomial/__init__.pyo
 ${PYSITELIB}/numpy/polynomial/chebyshev.py
 ${PYSITELIB}/numpy/polynomial/chebyshev.pyc
 ${PYSITELIB}/numpy/polynomial/chebyshev.pyo
+${PYSITELIB}/numpy/polynomial/hermite.py
+${PYSITELIB}/numpy/polynomial/hermite.pyc
+${PYSITELIB}/numpy/polynomial/hermite.pyo
+${PYSITELIB}/numpy/polynomial/hermite_e.py
+${PYSITELIB}/numpy/polynomial/hermite_e.pyc
+${PYSITELIB}/numpy/polynomial/hermite_e.pyo
+${PYSITELIB}/numpy/polynomial/laguerre.py
+${PYSITELIB}/numpy/polynomial/laguerre.pyc
+${PYSITELIB}/numpy/polynomial/laguerre.pyo
+${PYSITELIB}/numpy/polynomial/legendre.py
+${PYSITELIB}/numpy/polynomial/legendre.pyc
+${PYSITELIB}/numpy/polynomial/legendre.pyo
 ${PYSITELIB}/numpy/polynomial/polynomial.py
 ${PYSITELIB}/numpy/polynomial/polynomial.pyc
 ${PYSITELIB}/numpy/polynomial/polynomial.pyo
@@ -857,6 +912,10 @@ ${PYSITELIB}/numpy/polynomial/setup.py
 ${PYSITELIB}/numpy/polynomial/setup.pyc
 ${PYSITELIB}/numpy/polynomial/setup.pyo
 ${PYSITELIB}/numpy/polynomial/tests/test_chebyshev.py
+${PYSITELIB}/numpy/polynomial/tests/test_hermite.py
+${PYSITELIB}/numpy/polynomial/tests/test_hermite_e.py
+${PYSITELIB}/numpy/polynomial/tests/test_laguerre.py
+${PYSITELIB}/numpy/polynomial/tests/test_legendre.py
 ${PYSITELIB}/numpy/polynomial/tests/test_polynomial.py
 ${PYSITELIB}/numpy/polynomial/tests/test_polyutils.py
 ${PYSITELIB}/numpy/random/__init__.py
@@ -874,13 +933,13 @@ ${PYSITELIB}/numpy/random/setupscons.py
 ${PYSITELIB}/numpy/random/setupscons.pyc
 ${PYSITELIB}/numpy/random/setupscons.pyo
 ${PYSITELIB}/numpy/random/tests/test_random.py
+${PYSITELIB}/numpy/random/tests/test_regression.py
 ${PYSITELIB}/numpy/setup.py
 ${PYSITELIB}/numpy/setup.pyc
 ${PYSITELIB}/numpy/setup.pyo
 ${PYSITELIB}/numpy/setupscons.py
 ${PYSITELIB}/numpy/setupscons.pyc
 ${PYSITELIB}/numpy/setupscons.pyo
-${PYSITELIB}/numpy/site.cfg.example
 ${PYSITELIB}/numpy/testing/__init__.py
 ${PYSITELIB}/numpy/testing/__init__.pyc
 ${PYSITELIB}/numpy/testing/__init__.pyo
@@ -899,6 +958,9 @@ ${PYSITELIB}/numpy/testing/nulltester.pyo
 ${PYSITELIB}/numpy/testing/numpytest.py
 ${PYSITELIB}/numpy/testing/numpytest.pyc
 ${PYSITELIB}/numpy/testing/numpytest.pyo
+${PYSITELIB}/numpy/testing/print_coercion_tables.py
+${PYSITELIB}/numpy/testing/print_coercion_tables.pyc
+${PYSITELIB}/numpy/testing/print_coercion_tables.pyo
 ${PYSITELIB}/numpy/testing/setup.py
 ${PYSITELIB}/numpy/testing/setup.pyc
 ${PYSITELIB}/numpy/testing/setup.pyo
@@ -911,6 +973,7 @@ ${PYSITELIB}/numpy/testing/utils.py
 ${PYSITELIB}/numpy/testing/utils.pyc
 ${PYSITELIB}/numpy/testing/utils.pyo
 ${PYSITELIB}/numpy/tests/test_ctypeslib.py
+${PYSITELIB}/numpy/tests/test_matlib.py
 ${PYSITELIB}/numpy/version.py
 ${PYSITELIB}/numpy/version.pyc
 ${PYSITELIB}/numpy/version.pyo
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index b4a6b699e561..49ae97bc7b87 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2011/12/20 16:38:30 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/04/17 17:24:41 drochner Exp $
 
-SHA1 (numpy-1.4.1.tar.gz) = ec6078aa09acbcca3d90f9f36353fc83e7e1daa0
-RMD160 (numpy-1.4.1.tar.gz) = a0bbebd1138ffc93517095e3c06459cd9744a9d6
-Size (numpy-1.4.1.tar.gz) = 2201795 bytes
-SHA1 (patch-aa) = 5dc5d8c1ffb2bbbb6c89656aaa6404ac01e977ed
+SHA1 (numpy-1.6.1.tar.gz) = 3f73ff9231a1c15e28e6e259ef5cc35a72b34059
+RMD160 (numpy-1.6.1.tar.gz) = e4619fd5860c85a9c00bce0d0cb8dd9bb07a56f5
+Size (numpy-1.6.1.tar.gz) = 2637779 bytes
+SHA1 (patch-aa) = 4118f705888a933e73a3403d91c697d19b89097d
 SHA1 (patch-ab) = 18ef5b7ad8386a4e991bde9f7112ec7b13d2a39c
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 4e0c8cfd2893c050872061ce3b7fc87fda4b03ac
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 9d26e975e3652c4c05f1579e4ff35c7400e9840e
diff --git a/math/py-numpy/patches/patch-aa b/math/py-numpy/patches/patch-aa
index 56eb044240ce..5589f61375cf 100644
--- a/math/py-numpy/patches/patch-aa
+++ b/math/py-numpy/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/12/19 22:04:36 markd Exp $
+$NetBSD: patch-aa,v 1.2 2012/04/17 17:24:41 drochner Exp $
 
---- numpy/distutils/fcompiler/__init__.py.orig	2008-06-04 23:26:41.000000000 +1200
+--- numpy/distutils/fcompiler/__init__.py.orig	2011-07-01 21:31:13.000000000 +0000
 +++ numpy/distutils/fcompiler/__init__.py
-@@ -690,7 +690,7 @@ _default_compilers = (
+@@ -702,7 +702,7 @@ _default_compilers = (
      ('irix.*', ('mips','gnu','gnu95',)),
      ('aix.*', ('ibm','gnu','gnu95',)),
      # os.name mappings
 -    ('posix', ('gnu','gnu95',)),
 +    ('posix', ('gnu','gnu95','g95',)),
      ('nt', ('gnu','gnu95',)),
-     ('mac', ('gnu','gnu95',)),
+     ('mac', ('gnu','gnu95','pg')),
      )
diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
index e050042e1b39..c896c40f9c50 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.1 2011/11/22 20:56:13 minskim Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.2 2012/04/17 17:24:41 drochner Exp $
 
 Do not run a shell command when it is "None".
 
---- numpy/distutils/fcompiler/gnu.py.orig	2010-04-22 09:35:24.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2011-03-11 05:56:15.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -249,7 +249,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -268,7 +268,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""
@@ -12,4 +12,4 @@ Do not run a shell command when it is "None".
 +        if not sys.platform == 'darwin' or cmd == None:
              return []
          arch_flags = []
-         for arch in ["ppc", "i686", "x86_64"]:
+         # get arches the C compiler gets.