Changes 1.7.1:

gh-2973   Fix `1` is printed during numpy.test()
gh-2983   BUG: gh-2969: Backport memory leak fix 80b3a34.
gh-3007   Backport gh-3006
gh-2984   Backport fix complex polynomial fit
gh-2982   BUG: Make nansum work with booleans.
gh-2985   Backport large sort fixes
gh-3039   Backport object take
gh-3105   Backport nditer fix op axes initialization
gh-3108   BUG: npy-pkg-config ini files were missing after Bento build.
gh-3124   BUG: PyArray_LexSort allocates too much temporary memory.
gh-3131   BUG: Exported f2py_size symbol prevents linking multiple f2py
modules.
gh-3117   Backport gh-2992
gh-3135   DOC: Add mention of PyArray_SetBaseObject stealing a reference
gh-3134   DOC: Fix typo in fft docs (the indexing variable is 'm', not 'n').
gh-3136   Backport 3128

6 files changed, 78 insertions, 37 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index bd24338606b..9ebced3559e 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2013/02/21 10:59:38 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.25 2013/05/20 05:59:58 adam Exp $
 
-DISTNAME=	numpy-1.6.2
+DISTNAME=	numpy-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
@@ -12,16 +10,27 @@ HOMEPAGE=	http://numpy.scipy.org/
 COMMENT=	Array processing for numbers, strings, records, and objects
 LICENSE=	modified-bsd
 
-USE_LANGUAGES+=	c fortran
+USE_LANGUAGES=		c fortran
 PYTHON_VERSIONS_INCLUDE_3X= yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
-MAKE_ENV+=	ATLAS=None
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
+MAKE_ENV+=		ATLAS=None
 
-REPLACE_PYTHON+=	numpy/core/scons_support.py
-REPLACE_PYTHON+=	numpy/distutils/from_template.py
-REPLACE_PYTHON+=	numpy/distutils/system_info.py
-REPLACE_PYTHON+=	numpy/ma/bench.py
-REPLACE_PYTHON+=	numpy/distutils/conv_template.py
+REPLACE_PYTHON+=	numpy/*.py
+REPLACE_PYTHON+=	numpy/compat/*.py
+REPLACE_PYTHON+=	numpy/core/*.py
+REPLACE_PYTHON+=	numpy/distutils/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/f2py_ext/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/f2py_f90_ext/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/gen_ext/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/pyrex_ext/*.py
+REPLACE_PYTHON+=	numpy/distutils/tests/swig_ext/*.py
+REPLACE_PYTHON+=	numpy/f2py/*.py
+REPLACE_PYTHON+=	numpy/f2py/docs/usersguide/*.py
+REPLACE_PYTHON+=	numpy/fft/tests/*.py
+REPLACE_PYTHON+=	numpy/ma/*.py
+REPLACE_PYTHON+=	numpy/matrixlib/*.py
+REPLACE_PYTHON+=	numpy/testing/*.py
 
 SUBST_CLASSES+=		numpy
 SUBST_STAGE.numpy=	post-patch
@@ -33,17 +42,13 @@ SUBST_SED.numpy+=	-e 's:%(os.path.basename(sys.executable))::'
 .include "../../mk/compiler.mk"
 
 .if defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mg95)
-PYSETUPBUILDARGS+= --fcompiler=g95
+PYSETUPBUILDARGS+=	--fcompiler=g95
 .elif defined(PKGSRC_FORTRAN) && !empty(PKGSRC_FORTRAN:Mgfortran)
-PYSETUPBUILDARGS+= --fcompiler=gnu95
+PYSETUPBUILDARGS+=	--fcompiler=gnu95
 .elif !empty(PKGSRC_COMPILER:Mgcc)
-PYSETUPBUILDARGS+= --fcompiler=gnu
+PYSETUPBUILDARGS+=	--fcompiler=gnu
 .endif
 
-# According to http://projects.scipy.org/numpy/ticket/1101,
-# LDFLAGS should either not be set or include -shared.
-LDFLAGS+=		-shared
-
 # This package bypasses the wrappers and calls the compilers directly when
 # linking, so ensure that we pass through requisite options.
 LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
@@ -55,6 +60,14 @@ SUBST_STAGE.linkabi=	post-patch
 SUBST_FILES.linkabi=	numpy/distutils/fcompiler/gnu.py
 SUBST_SED.linkabi=	-e 's,@COMPILER_ABI_FLAG@,${_COMPILER_ABI_FLAG.${ABI}},'
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+# to avoid '-bundle can't be used with -dynamiclib' error
+BUILDLINK_TRANSFORM+=	rm:-bundle
+LDFLAGS+=		-lpython
+.endif
+
 # needs devel/py-nose
 #do-test:
 #	${PYTHONBIN} -c "import numpy; numpy.test()"
diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST
index 4f99d365be8..a16420f352a 100644
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/08/15 17:16:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/05/20 05:59:58 adam Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/numpy/__config__.py
@@ -31,13 +31,13 @@ ${PYSITELIB}/numpy/compat/setupscons.pyo
 ${PYSITELIB}/numpy/core/__init__.py
 ${PYSITELIB}/numpy/core/__init__.pyc
 ${PYSITELIB}/numpy/core/__init__.pyo
+${PYSITELIB}/numpy/core/_dummy.so
 ${PYSITELIB}/numpy/core/_internal.py
 ${PYSITELIB}/numpy/core/_internal.pyc
 ${PYSITELIB}/numpy/core/_internal.pyo
-${PYSITELIB}/numpy/core/_mx_datetime_parser.py
-${PYSITELIB}/numpy/core/_mx_datetime_parser.pyc
-${PYSITELIB}/numpy/core/_mx_datetime_parser.pyo
-${PYSITELIB}/numpy/core/_sort.so
+${PYSITELIB}/numpy/core/_methods.py
+${PYSITELIB}/numpy/core/_methods.pyc
+${PYSITELIB}/numpy/core/_methods.pyo
 ${PYSITELIB}/numpy/core/arrayprint.py
 ${PYSITELIB}/numpy/core/arrayprint.pyc
 ${PYSITELIB}/numpy/core/arrayprint.pyo
@@ -70,9 +70,11 @@ ${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_deprecated_api.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_endian.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_interrupt.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_math.h
+${PYSITELIB}/numpy/core/include/numpy/npy_no_deprecated_api.h
 ${PYSITELIB}/numpy/core/include/numpy/npy_os.h
 ${PYSITELIB}/numpy/core/include/numpy/numpyconfig.h
 ${PYSITELIB}/numpy/core/include/numpy/old_defines.h
@@ -132,10 +134,14 @@ ${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_indexerrors.py
+${PYSITELIB}/numpy/core/tests/test_indexing.py
+${PYSITELIB}/numpy/core/tests/test_item_selection.py
 ${PYSITELIB}/numpy/core/tests/test_machar.py
 ${PYSITELIB}/numpy/core/tests/test_memmap.py
 ${PYSITELIB}/numpy/core/tests/test_multiarray.py
+${PYSITELIB}/numpy/core/tests/test_multiarray_assignment.py
+${PYSITELIB}/numpy/core/tests/test_nditer.py
 ${PYSITELIB}/numpy/core/tests/test_numeric.py
 ${PYSITELIB}/numpy/core/tests/test_numerictypes.py
 ${PYSITELIB}/numpy/core/tests/test_print.py
@@ -363,6 +369,7 @@ ${PYSITELIB}/numpy/distutils/tests/swig_ext/src/zoo.h
 ${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_exec_command.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
@@ -586,6 +593,9 @@ ${PYSITELIB}/numpy/lib/_datasource.pyo
 ${PYSITELIB}/numpy/lib/_iotools.py
 ${PYSITELIB}/numpy/lib/_iotools.pyc
 ${PYSITELIB}/numpy/lib/_iotools.pyo
+${PYSITELIB}/numpy/lib/arraypad.py
+${PYSITELIB}/numpy/lib/arraypad.pyc
+${PYSITELIB}/numpy/lib/arraypad.pyo
 ${PYSITELIB}/numpy/lib/arraysetops.py
 ${PYSITELIB}/numpy/lib/arraysetops.pyc
 ${PYSITELIB}/numpy/lib/arraysetops.pyo
@@ -638,6 +648,7 @@ ${PYSITELIB}/numpy/lib/stride_tricks.pyc
 ${PYSITELIB}/numpy/lib/stride_tricks.pyo
 ${PYSITELIB}/numpy/lib/tests/test__datasource.py
 ${PYSITELIB}/numpy/lib/tests/test__iotools.py
+${PYSITELIB}/numpy/lib/tests/test_arraypad.py
 ${PYSITELIB}/numpy/lib/tests/test_arraysetops.py
 ${PYSITELIB}/numpy/lib/tests/test_arrayterator.py
 ${PYSITELIB}/numpy/lib/tests/test_financial.py
@@ -912,6 +923,7 @@ ${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_classes.py
 ${PYSITELIB}/numpy/polynomial/tests/test_hermite.py
 ${PYSITELIB}/numpy/polynomial/tests/test_hermite_e.py
 ${PYSITELIB}/numpy/polynomial/tests/test_laguerre.py
@@ -969,6 +981,7 @@ ${PYSITELIB}/numpy/testing/setupscons.py
 ${PYSITELIB}/numpy/testing/setupscons.pyc
 ${PYSITELIB}/numpy/testing/setupscons.pyo
 ${PYSITELIB}/numpy/testing/tests/test_decorators.py
+${PYSITELIB}/numpy/testing/tests/test_doctesting.py
 ${PYSITELIB}/numpy/testing/tests/test_utils.py
 ${PYSITELIB}/numpy/testing/utils.py
 ${PYSITELIB}/numpy/testing/utils.pyc
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 2cdd141a1ae..33c1e85b26d 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2013/02/21 10:59:38 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2013/05/20 05:59:58 adam Exp $
 
-SHA1 (numpy-1.6.2.tar.gz) = c36c471f44cf914abdf37137d158bf3ffa460141
-RMD160 (numpy-1.6.2.tar.gz) = 4dcaa30e30171c2bc582495043e8e885c89935a3
-Size (numpy-1.6.2.tar.gz) = 2585329 bytes
-SHA1 (patch-aa) = 4118f705888a933e73a3403d91c697d19b89097d
-SHA1 (patch-ab) = 18ef5b7ad8386a4e991bde9f7112ec7b13d2a39c
+SHA1 (numpy-1.7.1.tar.gz) = 11d878214d11a25e05a24f6b27e2b838815a2588
+RMD160 (numpy-1.7.1.tar.gz) = 7d46f2773beb8b8e804e8b813753fd1764cda13b
+Size (numpy-1.7.1.tar.gz) = 2838240 bytes
+SHA1 (patch-aa) = ca3c59f9fe4c94272a190ab794d195799acdaa37
+SHA1 (patch-ab) = c500abba63c1f2464c4db1b04c9a72f41744d5ae
+SHA1 (patch-numpy_distutils_ccompiler.py) = 7e14f10537abbb63dacddd818f66c66e202da95e
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 25453ef02b0fa46897e974761eb6137a647794bf
diff --git a/math/py-numpy/patches/patch-aa b/math/py-numpy/patches/patch-aa
index 5589f61375c..15d3e8756f2 100644
--- a/math/py-numpy/patches/patch-aa
+++ b/math/py-numpy/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2012/04/17 17:24:41 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2013/05/20 05:59:58 adam Exp $
 
---- numpy/distutils/fcompiler/__init__.py.orig	2011-07-01 21:31:13.000000000 +0000
+--- numpy/distutils/fcompiler/__init__.py.orig	2013-04-07 05:04:05.000000000 +0000
 +++ numpy/distutils/fcompiler/__init__.py
-@@ -702,7 +702,7 @@ _default_compilers = (
+@@ -713,7 +713,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','pg')),
+     ('mac', ('gnu95','gnu','pg')),
      )
diff --git a/math/py-numpy/patches/patch-ab b/math/py-numpy/patches/patch-ab
index dae51c80167..6a062c418b8 100644
--- a/math/py-numpy/patches/patch-ab
+++ b/math/py-numpy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/12/19 22:04:36 markd Exp $
+$NetBSD: patch-ab,v 1.2 2013/05/20 05:59:58 adam Exp $
 
 --- numpy/linalg/lapack_litemodule.c.orig	2008-05-26 19:39:50.000000000 +1200
 +++ numpy/linalg/lapack_litemodule.c
-@@ -16,6 +16,8 @@ typedef struct { float r, i; } f2c_compl
+@@ -17,6 +17,8 @@ typedef struct { float r, i; } f2c_compl
  typedef struct { double r, i; } f2c_doublecomplex;
  /* typedef long int (*L_fp)(); */
  
diff --git a/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py b/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py
new file mode 100644
index 00000000000..a9c0780b96a
--- /dev/null
+++ b/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py
@@ -0,0 +1,14 @@
+$NetBSD: patch-numpy_distutils_ccompiler.py,v 1.1 2013/05/20 05:59:58 adam Exp $
+
+Hack: use compiler with CFLAGS for linking executables.
+
+--- numpy/distutils/ccompiler.py.orig	2013-05-19 19:28:28.000000000 +0000
++++ numpy/distutils/ccompiler.py
+@@ -199,6 +199,7 @@ def CCompiler_compile(self, sources, out
+                     src = cyg2win32(src)
+                 self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
+     else:
++        self.linker_exe = ccomp
+         for obj, (src, ext) in build.items():
+             self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts)
+