Import of pkgsrc-2016Q3

math/py-numpy/Makefile

@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2015/04/17 00:41:38 wen Exp $
+# $NetBSD: Makefile,v 1.32 2016/08/28 15:48:33 wiz Exp $
 
-DISTNAME=	numpy-1.9.2
+DISTNAME=	numpy-1.11.1
+GITHUB_PROJECT=	numpy
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=numpy/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.numpy.org/
@@ -11,28 +13,9 @@ COMMENT=	Array processing for numbers, strings, records, and objects
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=		c fortran
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 MAKE_ENV+=		ATLAS=None
 
-REPLACE_PYTHON+=	*.py
-REPLACE_PYTHON+=	numpy/*.py
-REPLACE_PYTHON+=	numpy/compat/*.py
-REPLACE_PYTHON+=	numpy/core/*.py
-REPLACE_PYTHON+=	numpy/core/tests/*.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/random/mtrand/*.py
-REPLACE_PYTHON+=	numpy/testing/*.py
+REPLACE_PYTHON+=	*.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
 
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
@@ -51,12 +34,15 @@ LDFLAGS+=		${_COMPILER_ABI_FLAG.${ABI}}
 
 .include "../../mk/bsd.prefs.mk"
 
-# needs devel/py-nose
-#do-test:
-#	${PYTHONBIN} -c "import numpy; numpy.test()"
+# TEST_DEPENDS
+BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
+do-test:
+	${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
+
+.include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .if ${OPSYS} != "Darwin"
 # blas and lapack are not needed; numpy will use Accelerate.framework
 .include "../../math/blas/buildlink3.mk"

math/py-numpy/PLIST

@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.13 2015/04/17 00:41:38 wen Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/08/02 10:14:46 jperkin Exp $
 bin/f2py${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/numpy/__config__.py
 ${PYSITELIB}/numpy/__config__.pyc
 ${PYSITELIB}/numpy/__config__.pyo
@@ -28,7 +31,6 @@ ${PYSITELIB}/numpy/compat/setup.pyo
 ${PYSITELIB}/numpy/core/__init__.py
 ${PYSITELIB}/numpy/core/__init__.pyc
 ${PYSITELIB}/numpy/core/__init__.pyo
-${PYSITELIB}/numpy/core/_dotblas.so
 ${PYSITELIB}/numpy/core/_dummy.so
 ${PYSITELIB}/numpy/core/_internal.py
 ${PYSITELIB}/numpy/core/_internal.pyc
@@ -107,7 +109,6 @@ ${PYSITELIB}/numpy/core/operand_flag_tests.so
 ${PYSITELIB}/numpy/core/records.py
 ${PYSITELIB}/numpy/core/records.pyc
 ${PYSITELIB}/numpy/core/records.pyo
-${PYSITELIB}/numpy/core/scalarmath.so
 ${PYSITELIB}/numpy/core/setup.py
 ${PYSITELIB}/numpy/core/setup.pyc
 ${PYSITELIB}/numpy/core/setup.pyo
@@ -124,23 +125,24 @@ ${PYSITELIB}/numpy/core/tests/data/recarray_from_file.fits
 ${PYSITELIB}/numpy/core/tests/test_abc.py
 ${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_deprecations.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_extint128.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_indexerrors.py
 ${PYSITELIB}/numpy/core/tests/test_indexing.py
 ${PYSITELIB}/numpy/core/tests/test_item_selection.py
+${PYSITELIB}/numpy/core/tests/test_longdouble.py
 ${PYSITELIB}/numpy/core/tests/test_machar.py
+${PYSITELIB}/numpy/core/tests/test_mem_overlap.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
@@ -320,6 +322,12 @@ ${PYSITELIB}/numpy/distutils/mingw32ccompiler.pyo
 ${PYSITELIB}/numpy/distutils/misc_util.py
 ${PYSITELIB}/numpy/distutils/misc_util.pyc
 ${PYSITELIB}/numpy/distutils/misc_util.pyo
+${PYSITELIB}/numpy/distutils/msvc9compiler.py
+${PYSITELIB}/numpy/distutils/msvc9compiler.pyc
+${PYSITELIB}/numpy/distutils/msvc9compiler.pyo
+${PYSITELIB}/numpy/distutils/msvccompiler.py
+${PYSITELIB}/numpy/distutils/msvccompiler.pyc
+${PYSITELIB}/numpy/distutils/msvccompiler.pyo
 ${PYSITELIB}/numpy/distutils/npy_pkg_config.py
 ${PYSITELIB}/numpy/distutils/npy_pkg_config.pyc
 ${PYSITELIB}/numpy/distutils/npy_pkg_config.pyo
@@ -335,38 +343,12 @@ ${PYSITELIB}/numpy/distutils/setup.pyo
 ${PYSITELIB}/numpy/distutils/system_info.py
 ${PYSITELIB}/numpy/distutils/system_info.pyc
 ${PYSITELIB}/numpy/distutils/system_info.pyo
-${PYSITELIB}/numpy/distutils/tests/f2py_ext/__init__.py
-${PYSITELIB}/numpy/distutils/tests/f2py_ext/setup.py
-${PYSITELIB}/numpy/distutils/tests/f2py_ext/src/fib1.f
-${PYSITELIB}/numpy/distutils/tests/f2py_ext/src/fib2.pyf
-${PYSITELIB}/numpy/distutils/tests/f2py_ext/tests/test_fib2.py
-${PYSITELIB}/numpy/distutils/tests/f2py_f90_ext/__init__.py
-${PYSITELIB}/numpy/distutils/tests/f2py_f90_ext/include/body.f90
-${PYSITELIB}/numpy/distutils/tests/f2py_f90_ext/setup.py
-${PYSITELIB}/numpy/distutils/tests/f2py_f90_ext/src/foo_free.f90
-${PYSITELIB}/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py
-${PYSITELIB}/numpy/distutils/tests/gen_ext/__init__.py
-${PYSITELIB}/numpy/distutils/tests/gen_ext/setup.py
-${PYSITELIB}/numpy/distutils/tests/gen_ext/tests/test_fib3.py
-${PYSITELIB}/numpy/distutils/tests/pyrex_ext/__init__.py
-${PYSITELIB}/numpy/distutils/tests/pyrex_ext/primes.pyx
-${PYSITELIB}/numpy/distutils/tests/pyrex_ext/setup.py
-${PYSITELIB}/numpy/distutils/tests/pyrex_ext/tests/test_primes.py
-${PYSITELIB}/numpy/distutils/tests/setup.py
-${PYSITELIB}/numpy/distutils/tests/swig_ext/__init__.py
-${PYSITELIB}/numpy/distutils/tests/swig_ext/setup.py
-${PYSITELIB}/numpy/distutils/tests/swig_ext/src/example.c
-${PYSITELIB}/numpy/distutils/tests/swig_ext/src/example.i
-${PYSITELIB}/numpy/distutils/tests/swig_ext/src/zoo.cc
-${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
 ${PYSITELIB}/numpy/distutils/tests/test_npy_pkg_config.py
+${PYSITELIB}/numpy/distutils/tests/test_system_info.py
 ${PYSITELIB}/numpy/distutils/unixccompiler.py
 ${PYSITELIB}/numpy/distutils/unixccompiler.pyc
 ${PYSITELIB}/numpy/distutils/unixccompiler.pyo
@@ -391,30 +373,15 @@ ${PYSITELIB}/numpy/doc/creation.pyo
 ${PYSITELIB}/numpy/doc/glossary.py
 ${PYSITELIB}/numpy/doc/glossary.pyc
 ${PYSITELIB}/numpy/doc/glossary.pyo
-${PYSITELIB}/numpy/doc/howtofind.py
-${PYSITELIB}/numpy/doc/howtofind.pyc
-${PYSITELIB}/numpy/doc/howtofind.pyo
 ${PYSITELIB}/numpy/doc/indexing.py
 ${PYSITELIB}/numpy/doc/indexing.pyc
 ${PYSITELIB}/numpy/doc/indexing.pyo
 ${PYSITELIB}/numpy/doc/internals.py
 ${PYSITELIB}/numpy/doc/internals.pyc
 ${PYSITELIB}/numpy/doc/internals.pyo
-${PYSITELIB}/numpy/doc/io.py
-${PYSITELIB}/numpy/doc/io.pyc
-${PYSITELIB}/numpy/doc/io.pyo
-${PYSITELIB}/numpy/doc/jargon.py
-${PYSITELIB}/numpy/doc/jargon.pyc
-${PYSITELIB}/numpy/doc/jargon.pyo
-${PYSITELIB}/numpy/doc/methods_vs_functions.py
-${PYSITELIB}/numpy/doc/methods_vs_functions.pyc
-${PYSITELIB}/numpy/doc/methods_vs_functions.pyo
 ${PYSITELIB}/numpy/doc/misc.py
 ${PYSITELIB}/numpy/doc/misc.pyc
 ${PYSITELIB}/numpy/doc/misc.pyo
-${PYSITELIB}/numpy/doc/performance.py
-${PYSITELIB}/numpy/doc/performance.pyc
-${PYSITELIB}/numpy/doc/performance.pyo
 ${PYSITELIB}/numpy/doc/structured_arrays.py
 ${PYSITELIB}/numpy/doc/structured_arrays.pyc
 ${PYSITELIB}/numpy/doc/structured_arrays.pyo
@@ -430,6 +397,9 @@ ${PYSITELIB}/numpy/dual.pyo
 ${PYSITELIB}/numpy/f2py/__init__.py
 ${PYSITELIB}/numpy/f2py/__init__.pyc
 ${PYSITELIB}/numpy/f2py/__init__.pyo
+${PYSITELIB}/numpy/f2py/__main__.py
+${PYSITELIB}/numpy/f2py/__main__.pyc
+${PYSITELIB}/numpy/f2py/__main__.pyo
 ${PYSITELIB}/numpy/f2py/__version__.py
 ${PYSITELIB}/numpy/f2py/__version__.pyc
 ${PYSITELIB}/numpy/f2py/__version__.pyo
@@ -526,7 +496,6 @@ ${PYSITELIB}/numpy/fft/tests/test_helper.py
 ${PYSITELIB}/numpy/lib/__init__.py
 ${PYSITELIB}/numpy/lib/__init__.pyc
 ${PYSITELIB}/numpy/lib/__init__.pyo
-${PYSITELIB}/numpy/lib/_compiled_base.so
 ${PYSITELIB}/numpy/lib/_datasource.py
 ${PYSITELIB}/numpy/lib/_datasource.pyc
 ${PYSITELIB}/numpy/lib/_datasource.pyo
@@ -584,6 +553,10 @@ ${PYSITELIB}/numpy/lib/shape_base.pyo
 ${PYSITELIB}/numpy/lib/stride_tricks.py
 ${PYSITELIB}/numpy/lib/stride_tricks.pyc
 ${PYSITELIB}/numpy/lib/stride_tricks.pyo
+${PYSITELIB}/numpy/lib/tests/data/py2-objarr.npy
+${PYSITELIB}/numpy/lib/tests/data/py2-objarr.npz
+${PYSITELIB}/numpy/lib/tests/data/py3-objarr.npy
+${PYSITELIB}/numpy/lib/tests/data/py3-objarr.npz
 ${PYSITELIB}/numpy/lib/tests/data/python3.npy
 ${PYSITELIB}/numpy/lib/tests/data/win64python2.npy
 ${PYSITELIB}/numpy/lib/tests/test__datasource.py
@@ -598,6 +571,7 @@ ${PYSITELIB}/numpy/lib/tests/test_function_base.py
 ${PYSITELIB}/numpy/lib/tests/test_index_tricks.py
 ${PYSITELIB}/numpy/lib/tests/test_io.py
 ${PYSITELIB}/numpy/lib/tests/test_nanfunctions.py
+${PYSITELIB}/numpy/lib/tests/test_packbits.py
 ${PYSITELIB}/numpy/lib/tests/test_polynomial.py
 ${PYSITELIB}/numpy/lib/tests/test_recfunctions.py
 ${PYSITELIB}/numpy/lib/tests/test_regression.py
@@ -713,9 +687,6 @@ ${PYSITELIB}/numpy/polynomial/legendre.pyo
 ${PYSITELIB}/numpy/polynomial/polynomial.py
 ${PYSITELIB}/numpy/polynomial/polynomial.pyc
 ${PYSITELIB}/numpy/polynomial/polynomial.pyo
-${PYSITELIB}/numpy/polynomial/polytemplate.py
-${PYSITELIB}/numpy/polynomial/polytemplate.pyc
-${PYSITELIB}/numpy/polynomial/polytemplate.pyo
 ${PYSITELIB}/numpy/polynomial/polyutils.py
 ${PYSITELIB}/numpy/polynomial/polyutils.pyc
 ${PYSITELIB}/numpy/polynomial/polyutils.pyo
@@ -773,6 +744,8 @@ ${PYSITELIB}/numpy/testing/utils.pyc
 ${PYSITELIB}/numpy/testing/utils.pyo
 ${PYSITELIB}/numpy/tests/test_ctypeslib.py
 ${PYSITELIB}/numpy/tests/test_matlib.py
+${PYSITELIB}/numpy/tests/test_numpy_version.py
+${PYSITELIB}/numpy/tests/test_scripts.py
 ${PYSITELIB}/numpy/version.py
 ${PYSITELIB}/numpy/version.pyc
 ${PYSITELIB}/numpy/version.pyo

math/py-numpy/distinfo

@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.14 2015/04/17 00:41:38 wen Exp $
+$NetBSD: distinfo,v 1.16 2016/07/24 15:25:22 kamil Exp $
 
-SHA1 (numpy-1.9.2.tar.gz) = 86b4414cd01c4244141c59ea476ca8fdad8e9be2
-RMD160 (numpy-1.9.2.tar.gz) = f95c73c0260c2623d0a3ab08b09c241c06b86898
-Size (numpy-1.9.2.tar.gz) = 3986067 bytes
-SHA1 (patch-aa) = 6c1716e1963533721f06853127573f5c271330f9
-SHA1 (patch-ab) = 74196abcc2eab4d409e8d3c0d8fb65dc99f2920b
-SHA1 (patch-numpy_core_setup.py) = 44393bc9f0b2eecbfb428b2d98989f0dfde68736
-SHA1 (patch-numpy_distutils_ccompiler.py) = 4505895b7dc817fe58ecdd02b241085f84f1542f
+SHA1 (numpy-1.11.1.tar.gz) = ccb5bed5d868a9f97caf2a294ddbf00d77af80bd
+RMD160 (numpy-1.11.1.tar.gz) = e0ee4f4076e757308b84489c060d50dcd4c5b696
+SHA512 (numpy-1.11.1.tar.gz) = b8c3e90c59c070bb1ab0ea10110e106f6a392609cf249d4e23c1f669abb680d9ea89d002444f15d30529b553d85a30877e2c3564cac74718171f4e4009567ec0
+Size (numpy-1.11.1.tar.gz) = 4380877 bytes
+SHA1 (patch-aa) = c964fa13fb120b1b0f9d0bf5bc713507cd60b945
+SHA1 (patch-ab) = b421455fdbb666c8075d8bffbeb59533434d23e6
+SHA1 (patch-numpy_core_include_numpy___numpyconfig.h.in) = 03abdf987d56076516978658c1c2d8d9ebe3a9a1
+SHA1 (patch-numpy_core_include_numpy_npy__endian.h) = 0dcc33ecf66d71d450ec5d87717f374693ba5691
+SHA1 (patch-numpy_core_setup.py) = 1a7799e0cd8f33563074d6bf48000fbbac5e0f5a
+SHA1 (patch-numpy_core_src_multiarray_numpyos.c) = acd97c7bae3419be4cb2e706d1989abe7e02c807
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = e1e10a711f93588246a7b3cd606b247cb1c62113
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 7b4b521471d0c84b06ef0fc900ba9b4613de8432

math/py-numpy/patches/patch-aa

@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2014/02/28 09:43:10 adam Exp $
+$NetBSD: patch-aa,v 1.5 2016/07/24 15:25:22 kamil Exp $
+
+Recognize g95
 
 --- numpy/distutils/fcompiler/__init__.py.orig	2013-04-07 05:04:05.000000000 +0000
 +++ numpy/distutils/fcompiler/__init__.py

math/py-numpy/patches/patch-ab

@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2015/04/17 00:41:38 wen Exp $
+$NetBSD: patch-ab,v 1.4 2016/07/24 15:25:22 kamil Exp $
+
+Add function definition for FNAME(MAIN_).
 
 --- numpy/linalg/lapack_litemodule.c.orig	2015-04-16 14:14:55.000000000 +0000
 +++ numpy/linalg/lapack_litemodule.c

math/py-numpy/patches/patch-numpy_core_include_numpy___numpyconfig.h.in

@@ -0,0 +1,14 @@
+$NetBSD: patch-numpy_core_include_numpy___numpyconfig.h.in,v 1.1 2016/07/24 15:25:22 kamil Exp $
+
+Handle NetBSD specific <sys/endian.h>
+
+--- numpy/core/include/numpy/_numpyconfig.h.in.orig	2016-06-25 15:38:34.000000000 +0000
++++ numpy/core/include/numpy/_numpyconfig.h.in
+@@ -43,6 +43,7 @@
+ #define NPY_API_VERSION @NPY_API_VERSION@
+ 
+ @DEFINE_NPY_HAVE_ENDIAN_H@
++@DEFINE_NPY_HAVE_SYS_ENDIAN_H@
+ 
+ /* Ugly, but we can't test this in a proper manner without requiring a C++
+  * compiler at the configuration stage of numpy ? */

math/py-numpy/patches/patch-numpy_core_include_numpy_npy__endian.h

@@ -0,0 +1,22 @@
+$NetBSD: patch-numpy_core_include_numpy_npy__endian.h,v 1.1 2016/07/24 15:25:22 kamil Exp $
+
+Handle NetBSD specific <sys/endian.h>
+
+--- numpy/core/include/numpy/npy_endian.h.orig	2016-06-25 15:38:34.000000000 +0000
++++ numpy/core/include/numpy/npy_endian.h
+@@ -6,9 +6,14 @@
+  * endian.h
+  */
+ 
+-#ifdef NPY_HAVE_ENDIAN_H
++#if defined(NPY_HAVE_ENDIAN_H) || defined(NPY_HAVE_SYS_ENDIAN_H)
+     /* Use endian.h if available */
++
++    #if defined(NPY_HAVE_ENDIAN_H)
+     #include <endian.h>
++    #elif defined(NPY_HAVE_SYS_ENDIAN_H)
++    #include <sys/endian.h>
++    #endif
+ 
+     #if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && defined(LITTLE_ENDIAN)
+         #define NPY_BYTE_ORDER    BYTE_ORDER

math/py-numpy/patches/patch-numpy_core_setup.py

@@ -1,13 +1,17 @@
-$NetBSD: patch-numpy_core_setup.py,v 1.2 2015/04/17 00:41:38 wen Exp $
-Do not require Atlas to make 'dotblas' module; libblas should be sufficient.
---- numpy/core/setup.py.orig	2015-02-01 16:38:25.000000000 +0000
+$NetBSD: patch-numpy_core_setup.py,v 1.3 2016/07/24 15:25:22 kamil Exp $
+
+Handle NetBSD specific <sys/endian.h>
+
+--- numpy/core/setup.py.orig	2016-06-25 15:38:34.000000000 +0000
 +++ numpy/core/setup.py
-@@ -953,8 +953,6 @@ def configuration(parent_package='',top_
-     #blas_info = {}
-     def get_dotblas_sources(ext, build_dir):
-         if blas_info:
--            if ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', []):
--                return None # dotblas needs ATLAS, Fortran compiled blas will not be sufficient.
-             return ext.depends[:3]
-         return None # no extension module will be built
+@@ -272,6 +272,10 @@ def check_types(config_cmd, ext, build_d
+     if res:
+         private_defines.append(('HAVE_ENDIAN_H', 1))
+         public_defines.append(('NPY_HAVE_ENDIAN_H', 1))
++    res = config_cmd.check_header("sys/endian.h")
++    if res:
++        private_defines.append(('HAVE_SYS_ENDIAN_H', 1))
++        public_defines.append(('NPY_HAVE_SYS_ENDIAN_H', 1))
  
+     # Check basic types sizes
+     for type in ('short', 'int', 'long'):

math/py-numpy/patches/patch-numpy_core_src_multiarray_numpyos.c

@@ -0,0 +1,17 @@
+$NetBSD: patch-numpy_core_src_multiarray_numpyos.c,v 1.1 2016/07/24 15:25:22 kamil Exp $
+
+Don't include <xlocale.h> for NetBSD.
+
+--- numpy/core/src/multiarray/numpyos.c.orig	2016-06-25 15:38:34.000000000 +0000
++++ numpy/core/src/multiarray/numpyos.c
+@@ -15,8 +15,10 @@
+ 
+ #ifdef HAVE_STRTOLD_L
+ #include <stdlib.h>
++#if !defined(__NetBSD__)
+ #include <xlocale.h>
+ #endif
++#endif
+ 
+ 
+ 

math/py-numpy/patches/patch-numpy_distutils_ccompiler.py

@@ -1,14 +0,0 @@
-$NetBSD: patch-numpy_distutils_ccompiler.py,v 1.2 2015/04/17 00:41:38 wen Exp $
-
-Hack: use compiler with CFLAGS for linking executables.
-
---- numpy/distutils/ccompiler.py.orig	2015-02-01 16:38:21.000000000 +0000
-+++ numpy/distutils/ccompiler.py
-@@ -201,6 +201,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)
- 

math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py

@@ -1,22 +1,31 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.7 2015/04/17 00:41:38 wen Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.8 2016/07/24 15:25:22 kamil Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
 On OS X, do not use '-bundle' and 'dynamic_lookup' (to avoid Python.framework).
 Do not run a shell command when it is "None".
 
---- numpy/distutils/fcompiler/gnu.py.orig	2015-02-01 16:38:21.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2016-06-25 15:38:34.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -72,7 +72,7 @@ class GnuFCompiler(FCompiler):
+@@ -57,7 +57,7 @@ class GnuFCompiler(FCompiler):
+                     return ('gfortran', m.group(1))
+         else:
+             # Output probably from --version, try harder:
+-            m = re.search(r'GNU Fortran\s+95.*?([0-9-.]+)', version_string)
++            m = re.search(r'95.*?([0-9-.]+)', version_string)
+             if m:
+                 return ('gfortran', m.group(1))
+             m = re.search(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)
+@@ -87,7 +87,7 @@ class GnuFCompiler(FCompiler):
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
-         'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
+         'compiler_f90' : None,  # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
 +        'linker_so'    : [None, "-g", "-Wall", "-shared", ""],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
-@@ -127,7 +127,7 @@ class GnuFCompiler(FCompiler):
+@@ -134,7 +134,7 @@ class GnuFCompiler(FCompiler):
                      s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
                      warnings.warn(s)
  
@@ -25,7 +34,7 @@ Do not run a shell command when it is "None".
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -261,7 +261,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -263,7 +263,7 @@ class Gnu95FCompiler(GnuFCompiler):
                            "-fno-second-underscore"] + _EXTRAFLAGS,
          'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
@@ -34,7 +43,7 @@ Do not run a shell command when it is "None".
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -274,7 +274,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -276,7 +276,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""