Changes 1.8.0:

* New, no 2to3, Python 2 and Python 3 are supported by a common code base.
* New, gufuncs for linear algebra, enabling operations on stacked arrays.
* New, inplace fancy indexing for ufuncs with the ``.at`` method.
* New, ``partition`` function, partial sorting via selection for fast median.
* New, ``nanmean``, ``nanvar``, and ``nanstd`` functions skipping NaNs.
* New, ``full`` and ``full_like`` functions to create value initialized arrays.
* New, ``PyUFunc_RegisterLoopForDescr``, better ufunc support for user dtypes.
* Numerous performance improvements in many areas.
* Support for Python versions 2.4 and 2.5 has been dropped.
* Support for SCons has been removed.

9 files changed, 101 insertions, 104 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index a1292aeccb2..3edec86295c 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:13 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/02/28 09:43:10 adam Exp $
 
-DISTNAME=	numpy-1.7.1
+DISTNAME=	numpy-1.8.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=numpy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://numpy.scipy.org/
+HOMEPAGE=	http://www.numpy.org/
 COMMENT=	Array processing for numbers, strings, records, and objects
 LICENSE=	modified-bsd
 
@@ -14,6 +14,7 @@ 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
@@ -29,13 +30,13 @@ 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
 
 SUBST_CLASSES+=		numpy
 SUBST_STAGE.numpy=	post-patch
-SUBST_FILES.numpy=	numpy/f2py/setup.py numpy/f2py/setupscons.py
-SUBST_SED.numpy=	-e 's:/usr/bin/env %s:${PYTHONBIN}:'
-SUBST_SED.numpy+=	-e 's:%(os.path.basename(sys.executable))::'
+SUBST_FILES.numpy=	numpy/f2py/setup.py
+SUBST_SED.numpy=	-e 's:%(os.path.basename(sys.executable))::'
 
 # XXX Avoid picking up other compilers when installed
 .include "../../mk/compiler.mk"
@@ -61,18 +62,15 @@ 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()"
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
+.if ${OPSYS} != "Darwin"
+# blas and lapack are not needed; numpy will use Accelerate.framework
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST
index a16420f352a..6e761984e3a 100644
--- a/math/py-numpy/PLIST
+++ b/math/py-numpy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2013/05/20 05:59:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/02/28 09:43:10 adam Exp $
 bin/f2py${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/numpy/__config__.py
@@ -25,12 +25,10 @@ ${PYSITELIB}/numpy/compat/py3k.pyo
 ${PYSITELIB}/numpy/compat/setup.py
 ${PYSITELIB}/numpy/compat/setup.pyc
 ${PYSITELIB}/numpy/compat/setup.pyo
-${PYSITELIB}/numpy/compat/setupscons.py
-${PYSITELIB}/numpy/compat/setupscons.pyc
-${PYSITELIB}/numpy/compat/setupscons.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
@@ -67,10 +65,10 @@ ${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_1_7_deprecated_api.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
@@ -102,25 +100,22 @@ ${PYSITELIB}/numpy/core/numeric.pyo
 ${PYSITELIB}/numpy/core/numerictypes.py
 ${PYSITELIB}/numpy/core/numerictypes.pyc
 ${PYSITELIB}/numpy/core/numerictypes.pyo
+${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/scons_support.py
-${PYSITELIB}/numpy/core/scons_support.pyc
-${PYSITELIB}/numpy/core/scons_support.pyo
 ${PYSITELIB}/numpy/core/setup.py
 ${PYSITELIB}/numpy/core/setup.pyc
 ${PYSITELIB}/numpy/core/setup.pyo
 ${PYSITELIB}/numpy/core/setup_common.py
 ${PYSITELIB}/numpy/core/setup_common.pyc
 ${PYSITELIB}/numpy/core/setup_common.pyo
-${PYSITELIB}/numpy/core/setupscons.py
-${PYSITELIB}/numpy/core/setupscons.pyc
-${PYSITELIB}/numpy/core/setupscons.pyo
 ${PYSITELIB}/numpy/core/shape_base.py
 ${PYSITELIB}/numpy/core/shape_base.pyc
 ${PYSITELIB}/numpy/core/shape_base.pyo
+${PYSITELIB}/numpy/core/struct_ufunc_test.so
+${PYSITELIB}/numpy/core/test_rational.so
 ${PYSITELIB}/numpy/core/tests/data/astype_copy.pkl
 ${PYSITELIB}/numpy/core/tests/data/recarray_from_file.fits
 ${PYSITELIB}/numpy/core/tests/test_api.py
@@ -128,6 +123,7 @@ ${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
@@ -148,6 +144,7 @@ ${PYSITELIB}/numpy/core/tests/test_print.py
 ${PYSITELIB}/numpy/core/tests/test_records.py
 ${PYSITELIB}/numpy/core/tests/test_regression.py
 ${PYSITELIB}/numpy/core/tests/test_scalarmath.py
+${PYSITELIB}/numpy/core/tests/test_scalarprint.py
 ${PYSITELIB}/numpy/core/tests/test_shape_base.py
 ${PYSITELIB}/numpy/core/tests/test_ufunc.py
 ${PYSITELIB}/numpy/core/tests/test_umath.py
@@ -221,9 +218,6 @@ ${PYSITELIB}/numpy/distutils/command/install_data.pyo
 ${PYSITELIB}/numpy/distutils/command/install_headers.py
 ${PYSITELIB}/numpy/distutils/command/install_headers.pyc
 ${PYSITELIB}/numpy/distutils/command/install_headers.pyo
-${PYSITELIB}/numpy/distutils/command/scons.py
-${PYSITELIB}/numpy/distutils/command/scons.pyc
-${PYSITELIB}/numpy/distutils/command/scons.pyo
 ${PYSITELIB}/numpy/distutils/command/sdist.py
 ${PYSITELIB}/numpy/distutils/command/sdist.pyc
 ${PYSITELIB}/numpy/distutils/command/sdist.pyo
@@ -305,9 +299,6 @@ ${PYSITELIB}/numpy/distutils/info.pyo
 ${PYSITELIB}/numpy/distutils/intelccompiler.py
 ${PYSITELIB}/numpy/distutils/intelccompiler.pyc
 ${PYSITELIB}/numpy/distutils/intelccompiler.pyo
-${PYSITELIB}/numpy/distutils/interactive.py
-${PYSITELIB}/numpy/distutils/interactive.pyc
-${PYSITELIB}/numpy/distutils/interactive.pyo
 ${PYSITELIB}/numpy/distutils/lib2def.py
 ${PYSITELIB}/numpy/distutils/lib2def.pyc
 ${PYSITELIB}/numpy/distutils/lib2def.pyo
@@ -336,9 +327,6 @@ ${PYSITELIB}/numpy/distutils/pathccompiler.pyo
 ${PYSITELIB}/numpy/distutils/setup.py
 ${PYSITELIB}/numpy/distutils/setup.pyc
 ${PYSITELIB}/numpy/distutils/setup.pyo
-${PYSITELIB}/numpy/distutils/setupscons.py
-${PYSITELIB}/numpy/distutils/setupscons.pyc
-${PYSITELIB}/numpy/distutils/setupscons.pyo
 ${PYSITELIB}/numpy/distutils/system_info.py
 ${PYSITELIB}/numpy/distutils/system_info.pyc
 ${PYSITELIB}/numpy/distutils/system_info.pyo
@@ -531,9 +519,6 @@ ${PYSITELIB}/numpy/f2py/rules.pyo
 ${PYSITELIB}/numpy/f2py/setup.py
 ${PYSITELIB}/numpy/f2py/setup.pyc
 ${PYSITELIB}/numpy/f2py/setup.pyo
-${PYSITELIB}/numpy/f2py/setupscons.py
-${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
@@ -578,9 +563,6 @@ ${PYSITELIB}/numpy/fft/info.pyo
 ${PYSITELIB}/numpy/fft/setup.py
 ${PYSITELIB}/numpy/fft/setup.pyc
 ${PYSITELIB}/numpy/fft/setup.pyo
-${PYSITELIB}/numpy/fft/setupscons.py
-${PYSITELIB}/numpy/fft/setupscons.pyc
-${PYSITELIB}/numpy/fft/setupscons.pyo
 ${PYSITELIB}/numpy/fft/tests/test_fftpack.py
 ${PYSITELIB}/numpy/fft/tests/test_helper.py
 ${PYSITELIB}/numpy/lib/__init__.py
@@ -602,11 +584,6 @@ ${PYSITELIB}/numpy/lib/arraysetops.pyo
 ${PYSITELIB}/numpy/lib/arrayterator.py
 ${PYSITELIB}/numpy/lib/arrayterator.pyc
 ${PYSITELIB}/numpy/lib/arrayterator.pyo
-${PLIST.py2x}${PYSITELIB}/numpy/lib/benchmarks/benchmark.py
-${PLIST.py2x}${PYSITELIB}/numpy/lib/benchmarks/casting.py
-${PLIST.py2x}${PYSITELIB}/numpy/lib/benchmarks/creating.py
-${PLIST.py2x}${PYSITELIB}/numpy/lib/benchmarks/simpleindex.py
-${PLIST.py2x}${PYSITELIB}/numpy/lib/benchmarks/sorting.py
 ${PYSITELIB}/numpy/lib/financial.py
 ${PYSITELIB}/numpy/lib/financial.pyc
 ${PYSITELIB}/numpy/lib/financial.pyo
@@ -622,6 +599,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/nanfunctions.py
+${PYSITELIB}/numpy/lib/nanfunctions.pyc
+${PYSITELIB}/numpy/lib/nanfunctions.pyo
 ${PYSITELIB}/numpy/lib/npyio.py
 ${PYSITELIB}/numpy/lib/npyio.pyc
 ${PYSITELIB}/numpy/lib/npyio.pyo
@@ -637,9 +617,6 @@ ${PYSITELIB}/numpy/lib/scimath.pyo
 ${PYSITELIB}/numpy/lib/setup.py
 ${PYSITELIB}/numpy/lib/setup.pyc
 ${PYSITELIB}/numpy/lib/setup.pyo
-${PYSITELIB}/numpy/lib/setupscons.py
-${PYSITELIB}/numpy/lib/setupscons.pyc
-${PYSITELIB}/numpy/lib/setupscons.pyo
 ${PYSITELIB}/numpy/lib/shape_base.py
 ${PYSITELIB}/numpy/lib/shape_base.pyc
 ${PYSITELIB}/numpy/lib/shape_base.pyo
@@ -656,6 +633,7 @@ ${PYSITELIB}/numpy/lib/tests/test_format.py
 ${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_polynomial.py
 ${PYSITELIB}/numpy/lib/tests/test_recfunctions.py
 ${PYSITELIB}/numpy/lib/tests/test_regression.py
@@ -683,6 +661,7 @@ ${PYSITELIB}/numpy/lib/utils.pyo
 ${PYSITELIB}/numpy/linalg/__init__.py
 ${PYSITELIB}/numpy/linalg/__init__.pyc
 ${PYSITELIB}/numpy/linalg/__init__.pyo
+${PYSITELIB}/numpy/linalg/_umath_linalg.so
 ${PYSITELIB}/numpy/linalg/info.py
 ${PYSITELIB}/numpy/linalg/info.pyc
 ${PYSITELIB}/numpy/linalg/info.pyo
@@ -693,10 +672,8 @@ ${PYSITELIB}/numpy/linalg/linalg.pyo
 ${PYSITELIB}/numpy/linalg/setup.py
 ${PYSITELIB}/numpy/linalg/setup.pyc
 ${PYSITELIB}/numpy/linalg/setup.pyo
-${PYSITELIB}/numpy/linalg/setupscons.py
-${PYSITELIB}/numpy/linalg/setupscons.pyc
-${PYSITELIB}/numpy/linalg/setupscons.pyo
 ${PYSITELIB}/numpy/linalg/tests/test_build.py
+${PYSITELIB}/numpy/linalg/tests/test_deprecations.py
 ${PYSITELIB}/numpy/linalg/tests/test_linalg.py
 ${PYSITELIB}/numpy/linalg/tests/test_regression.py
 ${PYSITELIB}/numpy/ma/__init__.py
@@ -717,9 +694,6 @@ ${PYSITELIB}/numpy/ma/mrecords.pyo
 ${PYSITELIB}/numpy/ma/setup.py
 ${PYSITELIB}/numpy/ma/setup.pyc
 ${PYSITELIB}/numpy/ma/setup.pyo
-${PYSITELIB}/numpy/ma/setupscons.py
-${PYSITELIB}/numpy/ma/setupscons.pyc
-${PYSITELIB}/numpy/ma/setupscons.pyo
 ${PYSITELIB}/numpy/ma/tests/test_core.py
 ${PYSITELIB}/numpy/ma/tests/test_extras.py
 ${PYSITELIB}/numpy/ma/tests/test_mrecords.py
@@ -747,9 +721,6 @@ ${PYSITELIB}/numpy/matrixlib/defmatrix.pyo
 ${PYSITELIB}/numpy/matrixlib/setup.py
 ${PYSITELIB}/numpy/matrixlib/setup.pyc
 ${PYSITELIB}/numpy/matrixlib/setup.pyo
-${PYSITELIB}/numpy/matrixlib/setupscons.py
-${PYSITELIB}/numpy/matrixlib/setupscons.pyc
-${PYSITELIB}/numpy/matrixlib/setupscons.pyo
 ${PYSITELIB}/numpy/matrixlib/tests/test_defmatrix.py
 ${PYSITELIB}/numpy/matrixlib/tests/test_multiarray.py
 ${PYSITELIB}/numpy/matrixlib/tests/test_numeric.py
@@ -812,9 +783,6 @@ ${PYSITELIB}/numpy/numarray/session.pyo
 ${PYSITELIB}/numpy/numarray/setup.py
 ${PYSITELIB}/numpy/numarray/setup.pyc
 ${PYSITELIB}/numpy/numarray/setup.pyo
-${PYSITELIB}/numpy/numarray/setupscons.py
-${PYSITELIB}/numpy/numarray/setupscons.pyc
-${PYSITELIB}/numpy/numarray/setupscons.pyo
 ${PYSITELIB}/numpy/numarray/ufuncs.py
 ${PYSITELIB}/numpy/numarray/ufuncs.pyc
 ${PYSITELIB}/numpy/numarray/ufuncs.pyo
@@ -878,9 +846,6 @@ ${PYSITELIB}/numpy/oldnumeric/rng_stats.pyo
 ${PYSITELIB}/numpy/oldnumeric/setup.py
 ${PYSITELIB}/numpy/oldnumeric/setup.pyc
 ${PYSITELIB}/numpy/oldnumeric/setup.pyo
-${PYSITELIB}/numpy/oldnumeric/setupscons.py
-${PYSITELIB}/numpy/oldnumeric/setupscons.pyc
-${PYSITELIB}/numpy/oldnumeric/setupscons.pyo
 ${PYSITELIB}/numpy/oldnumeric/tests/test_oldnumeric.py
 ${PYSITELIB}/numpy/oldnumeric/tests/test_regression.py
 ${PYSITELIB}/numpy/oldnumeric/typeconv.py
@@ -942,17 +907,11 @@ ${PYSITELIB}/numpy/random/randomkit.h
 ${PYSITELIB}/numpy/random/setup.py
 ${PYSITELIB}/numpy/random/setup.pyc
 ${PYSITELIB}/numpy/random/setup.pyo
-${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/testing/__init__.py
 ${PYSITELIB}/numpy/testing/__init__.pyc
 ${PYSITELIB}/numpy/testing/__init__.pyo
@@ -965,9 +924,6 @@ ${PYSITELIB}/numpy/testing/noseclasses.pyo
 ${PYSITELIB}/numpy/testing/nosetester.py
 ${PYSITELIB}/numpy/testing/nosetester.pyc
 ${PYSITELIB}/numpy/testing/nosetester.pyo
-${PYSITELIB}/numpy/testing/nulltester.py
-${PYSITELIB}/numpy/testing/nulltester.pyc
-${PYSITELIB}/numpy/testing/nulltester.pyo
 ${PYSITELIB}/numpy/testing/numpytest.py
 ${PYSITELIB}/numpy/testing/numpytest.pyc
 ${PYSITELIB}/numpy/testing/numpytest.pyo
@@ -977,9 +933,6 @@ ${PYSITELIB}/numpy/testing/print_coercion_tables.pyo
 ${PYSITELIB}/numpy/testing/setup.py
 ${PYSITELIB}/numpy/testing/setup.pyc
 ${PYSITELIB}/numpy/testing/setup.pyo
-${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
diff --git a/math/py-numpy/buildlink3.mk b/math/py-numpy/buildlink3.mk
index 03fbb7f60df..a538273f854 100644
--- a/math/py-numpy/buildlink3.mk
+++ b/math/py-numpy/buildlink3.mk
@@ -1,17 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2014/02/28 09:43:10 adam Exp $
 
-BUILDLINK_TREE+=	pynumpy
+BUILDLINK_TREE+=	py-numpy
 
 .if !defined(PY_NUMPY_BUILDLINK3_MK)
 PY_NUMPY_BUILDLINK3_MK:=
 
 .include "../../lang/python/pyversion.mk"
 
-BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.0
-BUILDLINK_PKGSRCDIR.pynumpy?=	../../math/py-numpy
+BUILDLINK_API_DEPENDS.py-numpy+=	${PYPKGPREFIX}-numpy>=1.0
+BUILDLINK_PKGSRCDIR.py-numpy?=		../../math/py-numpy
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
 .include "../../math/blas/buildlink3.mk"
 .include "../../math/lapack/buildlink3.mk"
+.endif
 .endif # PY_NUMPY_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-pynumpy
+BUILDLINK_TREE+=	-py-numpy
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index 33c1e85b26d..6fd226b0659 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.11 2013/05/20 05:59:58 adam Exp $
+$NetBSD: distinfo,v 1.12 2014/02/28 09:43:10 adam Exp $
 
-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 (numpy-1.8.0.tar.gz) = a2c02c5fb2ab8cf630982cddc6821e74f5769974
+RMD160 (numpy-1.8.0.tar.gz) = 814344fb350d213a50489b33c7c50de60f4619bc
+Size (numpy-1.8.0.tar.gz) = 3779617 bytes
+SHA1 (patch-aa) = 6c1716e1963533721f06853127573f5c271330f9
 SHA1 (patch-ab) = c500abba63c1f2464c4db1b04c9a72f41744d5ae
+SHA1 (patch-numpy_core_setup.py) = 3bab3384a9240b75458a4e07a5625c9b405bc74d
 SHA1 (patch-numpy_distutils_ccompiler.py) = 7e14f10537abbb63dacddd818f66c66e202da95e
-SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 25453ef02b0fa46897e974761eb6137a647794bf
+SHA1 (patch-numpy_distutils_fcompiler_g95.py) = ce81705fac0463d1ec808dfc9a5848b944ec5cab
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = ab79cd60a75cc2eb50f312ce50dc39a71b99af35
+SHA1 (patch-numpy_distutils_fcompiler_intel.py) = 0d1d64a6309773886a4e512a0f1fedbf1cdfb741
diff --git a/math/py-numpy/patches/patch-aa b/math/py-numpy/patches/patch-aa
index 15d3e8756f2..8ae446ed5aa 100644
--- a/math/py-numpy/patches/patch-aa
+++ b/math/py-numpy/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2013/05/20 05:59:58 adam Exp $
+$NetBSD: patch-aa,v 1.4 2014/02/28 09:43:10 adam Exp $
 
 --- numpy/distutils/fcompiler/__init__.py.orig	2013-04-07 05:04:05.000000000 +0000
 +++ numpy/distutils/fcompiler/__init__.py
-@@ -713,7 +713,7 @@ _default_compilers = (
-     ('irix.*', ('mips','gnu','gnu95',)),
-     ('aix.*', ('ibm','gnu','gnu95',)),
+@@ -715,7 +715,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', ('gnu95','gnu','pg')),
+-    ('posix', ('gnu', 'gnu95',)),
++    ('posix', ('gnu', 'gnu95', 'g95',)),
+     ('nt', ('gnu', 'gnu95',)),
+     ('mac', ('gnu95', 'gnu', 'pg')),
      )
diff --git a/math/py-numpy/patches/patch-numpy_core_setup.py b/math/py-numpy/patches/patch-numpy_core_setup.py
new file mode 100644
index 00000000000..a88a270e184
--- /dev/null
+++ b/math/py-numpy/patches/patch-numpy_core_setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-numpy_core_setup.py,v 1.1 2014/02/28 09:43:11 adam Exp $
+
+Do not require Atlas to make 'dotblas' module; libblas should be sufficient.
+
+--- numpy/core/setup.py.orig	2014-02-28 09:14:32.000000000 +0000
++++ numpy/core/setup.py
+@@ -929,8 +929,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[:1]
+         return None # no extension module will be built
+ 
diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py
index ac5fb6aecae..c29b02bbd5f 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-numpy_distutils_fcompiler_g95.py,v 1.1 2011/12/20 16:38:30 joerg Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_g95.py,v 1.2 2014/02/28 09:43:11 adam Exp $
 
 Band aid to make sure that pic_flags is actually used.
 
 --- numpy/distutils/fcompiler/g95.py.orig	2010-04-18 10:06:17.000000000 +0000
 +++ numpy/distutils/fcompiler/g95.py
-@@ -18,9 +18,9 @@ class G95FCompiler(FCompiler):
+@@ -19,9 +19,9 @@ class G95FCompiler(FCompiler):
  
      executables = {
          'version_cmd'  : ["<F90>", "--version"],
@@ -14,6 +14,6 @@ Band aid to make sure that pic_flags is actually used.
 +        'compiler_f77' : ["g95", "-ffixed-form", "-fpic"],
 +        'compiler_fix' : ["g95", "-ffixed-form", "-fpic"],
 +        'compiler_f90' : ["g95", "-fpic"],
-         'linker_so'    : ["<F90>","-shared"],
+         'linker_so'    : ["<F90>", "-shared"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"]
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 c24e838e9c2..a46b684540d 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,30 +1,40 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.4 2013/02/21 10:59:39 jperkin Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.5 2014/02/28 09:43:11 adam Exp $
 
-Do not run a shell command when it is "None".
 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	2011-09-13 20:39:16.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2013-10-30 18:31:40.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -70,7 +70,7 @@ class GnuFCompiler(FCompiler):
+@@ -72,7 +72,7 @@ class GnuFCompiler(FCompiler):
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
          'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
 -        'linker_so'    : [None, "-g", "-Wall"],
-+        'linker_so'    : [None, "-g", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
++        'linker_so'    : [None, "-g", "-Wall", "-shared", "-m64"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
-@@ -255,7 +255,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -127,7 +127,7 @@ class GnuFCompiler(FCompiler):
+                     s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
+                     warnings.warn(s)
+ 
+-            opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
++            opt.extend(['-undefined'])
+         else:
+             opt.append("-shared")
+         if sys.platform.startswith('sunos'):
+@@ -257,7 +257,7 @@ class Gnu95FCompiler(GnuFCompiler):
          'compiler_f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS,
          'compiler_fix' : [None, "-Wall", "-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
 -        'linker_so'    : ["<F90>", "-Wall"],
-+        'linker_so'    : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"],
++        'linker_so'    : ["<F90>", "-Wall", "-shared", "-m64"],
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -268,7 +268,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -270,7 +270,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""
diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py
new file mode 100644
index 00000000000..de585f89333
--- /dev/null
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-numpy_distutils_fcompiler_intel.py,v 1.1 2014/02/28 09:43:11 adam Exp $
+
+On OS X, don't link against Python.framework, since we use Python from pkgsrc.
+
+--- numpy/distutils/fcompiler/intel.py.orig	2014-02-28 07:25:23.000000000 +0000
++++ numpy/distutils/fcompiler/intel.py
+@@ -68,7 +68,7 @@ class IntelFCompiler(BaseIntelFCompiler)
+                 opt.remove('-shared')
+             except ValueError:
+                 idx = 0
+-            opt[idx:idx] = ['-dynamiclib', '-Wl,-undefined,dynamic_lookup', '-Wl,-framework,Python']
++            opt[idx:idx] = ['-dynamiclib', '-Wl,-undefined,dynamic_lookup',]
+         return opt
+ 
+ class IntelItaniumFCompiler(IntelFCompiler):