diff options
| -rw-r--r-- | math/py-numpy/Makefile | 17 | ||||
| -rw-r--r-- | math/py-numpy/PLIST | 202 | ||||
| -rw-r--r-- | math/py-numpy/distinfo | 19 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-ab | 10 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-numpy_core_setup.py | 10 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-numpy_distutils_ccompiler.py | 6 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py | 4 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py | 20 | ||||
| -rw-r--r-- | math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py | 15 |
9 files changed, 53 insertions, 250 deletions
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 3edec86295c..f30e8d21a1f 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2014/02/28 09:43:10 adam Exp $ +# $NetBSD: Makefile,v 1.28 2015/04/17 00:41:38 wen Exp $ -DISTNAME= numpy-1.8.0 +DISTNAME= numpy-1.9.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=numpy/} @@ -18,6 +18,7 @@ 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 @@ -33,11 +34,6 @@ 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 -SUBST_SED.numpy= -e 's:%(os.path.basename(sys.executable))::' - # XXX Avoid picking up other compilers when installed .include "../../mk/compiler.mk" @@ -53,13 +49,6 @@ PYSETUPBUILDARGS+= --fcompiler=gnu # linking, so ensure that we pass through requisite options. LDFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} -# This package also does its own linking of dependent packages, so we need -# to ensure that linker is called with the correct arguments. -SUBST_CLASSES+= linkabi -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" # needs devel/py-nose diff --git a/math/py-numpy/PLIST b/math/py-numpy/PLIST index 6e761984e3a..5ad77e72981 100644 --- a/math/py-numpy/PLIST +++ b/math/py-numpy/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2014/02/28 09:43:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.13 2015/04/17 00:41:38 wen Exp $ bin/f2py${PYVERSSUFFIX} ${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/numpy/__config__.py @@ -39,6 +39,9 @@ ${PYSITELIB}/numpy/core/_methods.pyo ${PYSITELIB}/numpy/core/arrayprint.py ${PYSITELIB}/numpy/core/arrayprint.pyc ${PYSITELIB}/numpy/core/arrayprint.pyo +${PYSITELIB}/numpy/core/cversions.py +${PYSITELIB}/numpy/core/cversions.pyc +${PYSITELIB}/numpy/core/cversions.pyo ${PYSITELIB}/numpy/core/defchararray.py ${PYSITELIB}/numpy/core/defchararray.pyc ${PYSITELIB}/numpy/core/defchararray.pyo @@ -118,6 +121,7 @@ ${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_abc.py ${PYSITELIB}/numpy/core/tests/test_api.py ${PYSITELIB}/numpy/core/tests/test_arrayprint.py ${PYSITELIB}/numpy/core/tests/test_blasdot.py @@ -143,6 +147,7 @@ ${PYSITELIB}/numpy/core/tests/test_numerictypes.py ${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_scalarinherit.py ${PYSITELIB}/numpy/core/tests/test_scalarmath.py ${PYSITELIB}/numpy/core/tests/test_scalarprint.py ${PYSITELIB}/numpy/core/tests/test_shape_base.py @@ -449,55 +454,6 @@ ${PYSITELIB}/numpy/f2py/crackfortran.pyo ${PYSITELIB}/numpy/f2py/diagnose.py ${PYSITELIB}/numpy/f2py/diagnose.pyc ${PYSITELIB}/numpy/f2py/diagnose.pyo -${PYSITELIB}/numpy/f2py/docs/FAQ.txt -${PYSITELIB}/numpy/f2py/docs/HISTORY.txt -${PYSITELIB}/numpy/f2py/docs/OLDNEWS.txt -${PYSITELIB}/numpy/f2py/docs/README.txt -${PYSITELIB}/numpy/f2py/docs/TESTING.txt -${PYSITELIB}/numpy/f2py/docs/THANKS.txt -${PYSITELIB}/numpy/f2py/docs/default.css -${PYSITELIB}/numpy/f2py/docs/docutils.conf -${PYSITELIB}/numpy/f2py/docs/hello.f -${PYSITELIB}/numpy/f2py/docs/pyforttest.pyf -${PYSITELIB}/numpy/f2py/docs/pytest.py -${PYSITELIB}/numpy/f2py/docs/simple.f -${PYSITELIB}/numpy/f2py/docs/simple_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/allocarr.f90 -${PYSITELIB}/numpy/f2py/docs/usersguide/allocarr_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/array.f -${PYSITELIB}/numpy/f2py/docs/usersguide/array_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/calculate.f -${PYSITELIB}/numpy/f2py/docs/usersguide/calculate_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/callback.f -${PYSITELIB}/numpy/f2py/docs/usersguide/callback2.pyf -${PYSITELIB}/numpy/f2py/docs/usersguide/callback_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/common.f -${PYSITELIB}/numpy/f2py/docs/usersguide/common_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/compile_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/default.css -${PYSITELIB}/numpy/f2py/docs/usersguide/docutils.conf -${PYSITELIB}/numpy/f2py/docs/usersguide/extcallback.f -${PYSITELIB}/numpy/f2py/docs/usersguide/extcallback_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/fib1.f -${PYSITELIB}/numpy/f2py/docs/usersguide/fib1.pyf -${PYSITELIB}/numpy/f2py/docs/usersguide/fib2.pyf -${PYSITELIB}/numpy/f2py/docs/usersguide/fib3.f -${PYSITELIB}/numpy/f2py/docs/usersguide/ftype.f -${PYSITELIB}/numpy/f2py/docs/usersguide/ftype_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/index.txt -${PYSITELIB}/numpy/f2py/docs/usersguide/moddata.f90 -${PYSITELIB}/numpy/f2py/docs/usersguide/moddata_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/run_main_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/scalar.f -${PYSITELIB}/numpy/f2py/docs/usersguide/scalar_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/setup_example.py -${PYSITELIB}/numpy/f2py/docs/usersguide/spam.pyf -${PYSITELIB}/numpy/f2py/docs/usersguide/spam_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/string.f -${PYSITELIB}/numpy/f2py/docs/usersguide/string_session.dat -${PYSITELIB}/numpy/f2py/docs/usersguide/var.pyf -${PYSITELIB}/numpy/f2py/docs/usersguide/var_session.dat -${PYSITELIB}/numpy/f2py/f2py.1 ${PYSITELIB}/numpy/f2py/f2py2e.py ${PYSITELIB}/numpy/f2py/f2py2e.pyc ${PYSITELIB}/numpy/f2py/f2py2e.pyo @@ -531,12 +487,14 @@ ${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/regression/inout.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_regression.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 @@ -575,6 +533,9 @@ ${PYSITELIB}/numpy/lib/_datasource.pyo ${PYSITELIB}/numpy/lib/_iotools.py ${PYSITELIB}/numpy/lib/_iotools.pyc ${PYSITELIB}/numpy/lib/_iotools.pyo +${PYSITELIB}/numpy/lib/_version.py +${PYSITELIB}/numpy/lib/_version.pyc +${PYSITELIB}/numpy/lib/_version.pyo ${PYSITELIB}/numpy/lib/arraypad.py ${PYSITELIB}/numpy/lib/arraypad.pyc ${PYSITELIB}/numpy/lib/arraypad.pyo @@ -623,8 +584,11 @@ ${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/python3.npy +${PYSITELIB}/numpy/lib/tests/data/win64python2.npy ${PYSITELIB}/numpy/lib/tests/test__datasource.py ${PYSITELIB}/numpy/lib/tests/test__iotools.py +${PYSITELIB}/numpy/lib/tests/test__version.py ${PYSITELIB}/numpy/lib/tests/test_arraypad.py ${PYSITELIB}/numpy/lib/tests/test_arraysetops.py ${PYSITELIB}/numpy/lib/tests/test_arrayterator.py @@ -725,141 +689,12 @@ ${PYSITELIB}/numpy/matrixlib/tests/test_defmatrix.py ${PYSITELIB}/numpy/matrixlib/tests/test_multiarray.py ${PYSITELIB}/numpy/matrixlib/tests/test_numeric.py ${PYSITELIB}/numpy/matrixlib/tests/test_regression.py -${PYSITELIB}/numpy/numarray/__init__.py -${PYSITELIB}/numpy/numarray/__init__.pyc -${PYSITELIB}/numpy/numarray/__init__.pyo -${PYSITELIB}/numpy/numarray/_capi.so -${PYSITELIB}/numpy/numarray/alter_code1.py -${PYSITELIB}/numpy/numarray/alter_code1.pyc -${PYSITELIB}/numpy/numarray/alter_code1.pyo -${PYSITELIB}/numpy/numarray/alter_code2.py -${PYSITELIB}/numpy/numarray/alter_code2.pyc -${PYSITELIB}/numpy/numarray/alter_code2.pyo -${PYSITELIB}/numpy/numarray/compat.py -${PYSITELIB}/numpy/numarray/compat.pyc -${PYSITELIB}/numpy/numarray/compat.pyo -${PYSITELIB}/numpy/numarray/convolve.py -${PYSITELIB}/numpy/numarray/convolve.pyc -${PYSITELIB}/numpy/numarray/convolve.pyo -${PYSITELIB}/numpy/numarray/fft.py -${PYSITELIB}/numpy/numarray/fft.pyc -${PYSITELIB}/numpy/numarray/fft.pyo -${PYSITELIB}/numpy/numarray/functions.py -${PYSITELIB}/numpy/numarray/functions.pyc -${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 -${PYSITELIB}/numpy/numarray/ma.py -${PYSITELIB}/numpy/numarray/ma.pyc -${PYSITELIB}/numpy/numarray/ma.pyo -${PYSITELIB}/numpy/numarray/matrix.py -${PYSITELIB}/numpy/numarray/matrix.pyc -${PYSITELIB}/numpy/numarray/matrix.pyo -${PYSITELIB}/numpy/numarray/mlab.py -${PYSITELIB}/numpy/numarray/mlab.pyc -${PYSITELIB}/numpy/numarray/mlab.pyo -${PYSITELIB}/numpy/numarray/nd_image.py -${PYSITELIB}/numpy/numarray/nd_image.pyc -${PYSITELIB}/numpy/numarray/nd_image.pyo -${PYSITELIB}/numpy/numarray/numerictypes.py -${PYSITELIB}/numpy/numarray/numerictypes.pyc -${PYSITELIB}/numpy/numarray/numerictypes.pyo -${PYSITELIB}/numpy/numarray/random_array.py -${PYSITELIB}/numpy/numarray/random_array.pyc -${PYSITELIB}/numpy/numarray/random_array.pyo -${PYSITELIB}/numpy/numarray/session.py -${PYSITELIB}/numpy/numarray/session.pyc -${PYSITELIB}/numpy/numarray/session.pyo -${PYSITELIB}/numpy/numarray/setup.py -${PYSITELIB}/numpy/numarray/setup.pyc -${PYSITELIB}/numpy/numarray/setup.pyo -${PYSITELIB}/numpy/numarray/ufuncs.py -${PYSITELIB}/numpy/numarray/ufuncs.pyc -${PYSITELIB}/numpy/numarray/ufuncs.pyo -${PYSITELIB}/numpy/numarray/util.py -${PYSITELIB}/numpy/numarray/util.pyc -${PYSITELIB}/numpy/numarray/util.pyo -${PYSITELIB}/numpy/oldnumeric/__init__.py -${PYSITELIB}/numpy/oldnumeric/__init__.pyc -${PYSITELIB}/numpy/oldnumeric/__init__.pyo -${PYSITELIB}/numpy/oldnumeric/alter_code1.py -${PYSITELIB}/numpy/oldnumeric/alter_code1.pyc -${PYSITELIB}/numpy/oldnumeric/alter_code1.pyo -${PYSITELIB}/numpy/oldnumeric/alter_code2.py -${PYSITELIB}/numpy/oldnumeric/alter_code2.pyc -${PYSITELIB}/numpy/oldnumeric/alter_code2.pyo -${PYSITELIB}/numpy/oldnumeric/array_printer.py -${PYSITELIB}/numpy/oldnumeric/array_printer.pyc -${PYSITELIB}/numpy/oldnumeric/array_printer.pyo -${PYSITELIB}/numpy/oldnumeric/arrayfns.py -${PYSITELIB}/numpy/oldnumeric/arrayfns.pyc -${PYSITELIB}/numpy/oldnumeric/arrayfns.pyo -${PYSITELIB}/numpy/oldnumeric/compat.py -${PYSITELIB}/numpy/oldnumeric/compat.pyc -${PYSITELIB}/numpy/oldnumeric/compat.pyo -${PYSITELIB}/numpy/oldnumeric/fft.py -${PYSITELIB}/numpy/oldnumeric/fft.pyc -${PYSITELIB}/numpy/oldnumeric/fft.pyo -${PYSITELIB}/numpy/oldnumeric/fix_default_axis.py -${PYSITELIB}/numpy/oldnumeric/fix_default_axis.pyc -${PYSITELIB}/numpy/oldnumeric/fix_default_axis.pyo -${PYSITELIB}/numpy/oldnumeric/functions.py -${PYSITELIB}/numpy/oldnumeric/functions.pyc -${PYSITELIB}/numpy/oldnumeric/functions.pyo -${PYSITELIB}/numpy/oldnumeric/linear_algebra.py -${PYSITELIB}/numpy/oldnumeric/linear_algebra.pyc -${PYSITELIB}/numpy/oldnumeric/linear_algebra.pyo -${PYSITELIB}/numpy/oldnumeric/ma.py -${PYSITELIB}/numpy/oldnumeric/ma.pyc -${PYSITELIB}/numpy/oldnumeric/ma.pyo -${PYSITELIB}/numpy/oldnumeric/matrix.py -${PYSITELIB}/numpy/oldnumeric/matrix.pyc -${PYSITELIB}/numpy/oldnumeric/matrix.pyo -${PYSITELIB}/numpy/oldnumeric/misc.py -${PYSITELIB}/numpy/oldnumeric/misc.pyc -${PYSITELIB}/numpy/oldnumeric/misc.pyo -${PYSITELIB}/numpy/oldnumeric/mlab.py -${PYSITELIB}/numpy/oldnumeric/mlab.pyc -${PYSITELIB}/numpy/oldnumeric/mlab.pyo -${PYSITELIB}/numpy/oldnumeric/precision.py -${PYSITELIB}/numpy/oldnumeric/precision.pyc -${PYSITELIB}/numpy/oldnumeric/precision.pyo -${PYSITELIB}/numpy/oldnumeric/random_array.py -${PYSITELIB}/numpy/oldnumeric/random_array.pyc -${PYSITELIB}/numpy/oldnumeric/random_array.pyo -${PYSITELIB}/numpy/oldnumeric/rng.py -${PYSITELIB}/numpy/oldnumeric/rng.pyc -${PYSITELIB}/numpy/oldnumeric/rng.pyo -${PYSITELIB}/numpy/oldnumeric/rng_stats.py -${PYSITELIB}/numpy/oldnumeric/rng_stats.pyc -${PYSITELIB}/numpy/oldnumeric/rng_stats.pyo -${PYSITELIB}/numpy/oldnumeric/setup.py -${PYSITELIB}/numpy/oldnumeric/setup.pyc -${PYSITELIB}/numpy/oldnumeric/setup.pyo -${PYSITELIB}/numpy/oldnumeric/tests/test_oldnumeric.py -${PYSITELIB}/numpy/oldnumeric/tests/test_regression.py -${PYSITELIB}/numpy/oldnumeric/typeconv.py -${PYSITELIB}/numpy/oldnumeric/typeconv.pyc -${PYSITELIB}/numpy/oldnumeric/typeconv.pyo -${PYSITELIB}/numpy/oldnumeric/ufuncs.py -${PYSITELIB}/numpy/oldnumeric/ufuncs.pyc -${PYSITELIB}/numpy/oldnumeric/ufuncs.pyo -${PYSITELIB}/numpy/oldnumeric/user_array.py -${PYSITELIB}/numpy/oldnumeric/user_array.pyc -${PYSITELIB}/numpy/oldnumeric/user_array.pyo ${PYSITELIB}/numpy/polynomial/__init__.py ${PYSITELIB}/numpy/polynomial/__init__.pyc ${PYSITELIB}/numpy/polynomial/__init__.pyo +${PYSITELIB}/numpy/polynomial/_polybase.py +${PYSITELIB}/numpy/polynomial/_polybase.pyc +${PYSITELIB}/numpy/polynomial/_polybase.pyo ${PYSITELIB}/numpy/polynomial/chebyshev.py ${PYSITELIB}/numpy/polynomial/chebyshev.pyc ${PYSITELIB}/numpy/polynomial/chebyshev.pyo @@ -924,9 +759,6 @@ ${PYSITELIB}/numpy/testing/noseclasses.pyo ${PYSITELIB}/numpy/testing/nosetester.py ${PYSITELIB}/numpy/testing/nosetester.pyc ${PYSITELIB}/numpy/testing/nosetester.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 diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo index 7a1b07ea16e..0bf24fd34b1 100644 --- a/math/py-numpy/distinfo +++ b/math/py-numpy/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.13 2015/02/17 14:23:50 jperkin Exp $ +$NetBSD: distinfo,v 1.14 2015/04/17 00:41:38 wen Exp $ -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 (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) = c500abba63c1f2464c4db1b04c9a72f41744d5ae -SHA1 (patch-numpy_core_setup.py) = 3bab3384a9240b75458a4e07a5625c9b405bc74d -SHA1 (patch-numpy_distutils_ccompiler.py) = 7e14f10537abbb63dacddd818f66c66e202da95e -SHA1 (patch-numpy_distutils_fcompiler_g95.py) = ce81705fac0463d1ec808dfc9a5848b944ec5cab -SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 286826bd1b2e849a040879ebdf07c9e529656c80 -SHA1 (patch-numpy_distutils_fcompiler_intel.py) = 0d1d64a6309773886a4e512a0f1fedbf1cdfb741 +SHA1 (patch-ab) = 74196abcc2eab4d409e8d3c0d8fb65dc99f2920b +SHA1 (patch-numpy_core_setup.py) = 44393bc9f0b2eecbfb428b2d98989f0dfde68736 +SHA1 (patch-numpy_distutils_ccompiler.py) = 4505895b7dc817fe58ecdd02b241085f84f1542f +SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed +SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = e1e10a711f93588246a7b3cd606b247cb1c62113 diff --git a/math/py-numpy/patches/patch-ab b/math/py-numpy/patches/patch-ab index 6a062c418b8..59229dc4748 100644 --- a/math/py-numpy/patches/patch-ab +++ b/math/py-numpy/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2013/05/20 05:59:58 adam Exp $ +$NetBSD: patch-ab,v 1.3 2015/04/17 00:41:38 wen Exp $ ---- numpy/linalg/lapack_litemodule.c.orig 2008-05-26 19:39:50.000000000 +1200 +--- numpy/linalg/lapack_litemodule.c.orig 2015-04-16 14:14:55.000000000 +0000 +++ numpy/linalg/lapack_litemodule.c @@ -17,6 +17,8 @@ typedef struct { float r, i; } f2c_compl typedef struct { double r, i; } f2c_doublecomplex; @@ -8,6 +8,6 @@ $NetBSD: patch-ab,v 1.2 2013/05/20 05:59:58 adam Exp $ +int FNAME(MAIN_)() { return 0; } + - extern int FNAME(dgeev)(char *jobvl, char *jobvr, int *n, - double a[], int *lda, double wr[], double wi[], - double vl[], int *ldvl, double vr[], int *ldvr, + extern int FNAME(dgelsd)(int *m, int *n, int *nrhs, + double a[], int *lda, double b[], int *ldb, + double s[], double *rcond, int *rank, diff --git a/math/py-numpy/patches/patch-numpy_core_setup.py b/math/py-numpy/patches/patch-numpy_core_setup.py index a88a270e184..b16075ffb6f 100644 --- a/math/py-numpy/patches/patch-numpy_core_setup.py +++ b/math/py-numpy/patches/patch-numpy_core_setup.py @@ -1,15 +1,13 @@ -$NetBSD: patch-numpy_core_setup.py,v 1.1 2014/02/28 09:43:11 adam Exp $ - +$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 2014-02-28 09:14:32.000000000 +0000 +--- numpy/core/setup.py.orig 2015-02-01 16:38:25.000000000 +0000 +++ numpy/core/setup.py -@@ -929,8 +929,6 @@ def configuration(parent_package='',top_ +@@ -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[:1] + return ext.depends[:3] return None # no extension module will be built diff --git a/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py b/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py index a9c0780b96a..f235559fdac 100644 --- a/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py +++ b/math/py-numpy/patches/patch-numpy_distutils_ccompiler.py @@ -1,10 +1,10 @@ -$NetBSD: patch-numpy_distutils_ccompiler.py,v 1.1 2013/05/20 05:59:58 adam Exp $ +$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 2013-05-19 19:28:28.000000000 +0000 +--- numpy/distutils/ccompiler.py.orig 2015-02-01 16:38:21.000000000 +0000 +++ numpy/distutils/ccompiler.py -@@ -199,6 +199,7 @@ def CCompiler_compile(self, sources, out +@@ -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: 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 c29b02bbd5f..eaf6a2c029c 100644 --- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py +++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_g95.py @@ -1,8 +1,8 @@ -$NetBSD: patch-numpy_distutils_fcompiler_g95.py,v 1.2 2014/02/28 09:43:11 adam Exp $ +$NetBSD: patch-numpy_distutils_fcompiler_g95.py,v 1.3 2015/04/17 00:41:38 wen 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.orig 2014-10-26 14:36:14.000000000 +0000 +++ numpy/distutils/fcompiler/g95.py @@ -19,9 +19,9 @@ class G95FCompiler(FCompiler): 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 3b41e8ee7b0..eee6e76c250 100644 --- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py +++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py @@ -1,18 +1,18 @@ -$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.6 2015/02/17 14:23:51 jperkin Exp $ +$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.7 2015/04/17 00:41:38 wen 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 2013-10-30 18:31:40.000000000 +0000 +--- numpy/distutils/fcompiler/gnu.py.orig 2015-02-01 16:38:21.000000000 +0000 +++ numpy/distutils/fcompiler/gnu.py @@ -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", ""], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [None, "-g", "-Wall"] @@ -25,21 +25,21 @@ Do not run a shell command when it is "None". 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", +@@ -261,7 +261,7 @@ class Gnu95FCompiler(GnuFCompiler): "-fno-second-underscore"] + _EXTRAFLAGS, -- 'linker_so' : ["<F90>", "-Wall"], -+ 'linker_so' : ["<F90>", "-Wall", "-shared", "@COMPILER_ABI_FLAG@"], + 'compiler_fix' : [None, "-Wall", "-g","-ffixed-form", + "-fno-second-underscore"] + _EXTRAFLAGS, +- 'linker_so' : ["<F90>", "-Wall", "-g"], ++ 'linker_so' : ["<F90>", "-Wall", "-g", "-shared", ""], 'archiver' : ["ar", "-cr"], 'ranlib' : ["ranlib"], 'linker_exe' : [None, "-Wall"] -@@ -270,7 +270,7 @@ class Gnu95FCompiler(GnuFCompiler): +@@ -274,7 +274,7 @@ class Gnu95FCompiler(GnuFCompiler): def _universal_flags(self, cmd): """Return a list of -arch flags for every supported architecture.""" - if not sys.platform == 'darwin': -+ if not sys.platform == 'darwin' or cmd == None: ++ if not sys.platform == 'darwin' or cmd==None: return [] arch_flags = [] # get arches the C compiler gets. diff --git a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py deleted file mode 100644 index de585f89333..00000000000 --- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_intel.py +++ /dev/null @@ -1,15 +0,0 @@ -$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): |