diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/py-numpy/Makefile | 5 | ||||
| -rw-r--r-- | math/py-numpy/distinfo | 4 | ||||
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py | 31 | ||||
| -rw-r--r-- | math/py-numpy/files/patch-numpy_f2py_setup.py | 18 | ||||
| -rw-r--r-- | math/py-numpy/pkg-plist | 23 |
5 files changed, 40 insertions, 41 deletions
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index e3bda7d624d4..18cdf50a1a80 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= numpy -PORTVERSION= 1.9.2 +PORTVERSION= 1.10.0 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= http://docs.scipy.org/doc/${PORTNAME}/:doc \ - SF/${PORTNAME}/NumPy/${PORTVERSION}:source + CHEESESHOP:source PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \ numpy-ref-${DOCVERSION}.pdf:doc \ @@ -90,6 +90,7 @@ post-install: .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} ${LN} -sf ${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 .endif + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo index 6858b796680f..ee2e63bf47ac 100644 --- a/math/py-numpy/distinfo +++ b/math/py-numpy/distinfo @@ -1,5 +1,5 @@ -SHA256 (numpy-1.9.2.tar.gz) = 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a -SIZE (numpy-1.9.2.tar.gz) = 3986067 +SHA256 (numpy-1.10.0.tar.gz) = 43b00f5d52b374a731444ba2724bfa1debdbc93312a1b9b28e99700498d169b6 +SIZE (numpy-1.10.0.tar.gz) = 4047636 SHA256 (numpy-ref-1.9.1.pdf) = 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SIZE (numpy-ref-1.9.1.pdf) = 5318122 SHA256 (numpy-user-1.9.1.pdf) = e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py index 8ef32286e6c0..c34798b4f9a1 100644 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py +++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py @@ -1,38 +1,35 @@ ---- numpy/distutils/fcompiler/gnu.py.orig 2013-10-30 22:31:40.000000000 +0400 -+++ numpy/distutils/fcompiler/gnu.py 2014-02-24 15:11:58.000000000 +0400 -@@ -66,7 +66,7 @@ - # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5) - # GNU Fortran (GCC) 3.4.2 (mingw-special) +--- numpy/distutils/fcompiler/gnu.py.orig 2015-09-13 16:21:27 UTC ++++ numpy/distutils/fcompiler/gnu.py +@@ -83,7 +83,7 @@ class GnuFCompiler(FCompiler): + return None + return v[1] - possible_executables = ['g77', 'f77'] + possible_executables = ['%%FC%%', 'g77', 'f77'] executables = { - 'version_cmd' : [None, "--version"], + 'version_cmd' : [None, "-dumpversion"], 'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"], -@@ -90,7 +90,7 @@ +@@ -107,11 +107,13 @@ class GnuFCompiler(FCompiler): for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: executables[key].append('-mno-cygwin') - g2c = 'g2c' + g2c = '%%FC%%' - suggested_f90_compiler = 'gnu95' -@@ -103,6 +103,8 @@ - def get_flags_linker_so(self): opt = self.linker_so[1:] + if 'FFLAGS' in os.environ: -+ opt.append(os.environ['FFLAGS']) - if sys.platform=='darwin': ++ opt.append(os.environ['FFLAGS']) + if sys.platform == 'darwin': target = os.environ.get('MACOSX_DEPLOYMENT_TARGET', None) # If MACOSX_DEPLOYMENT_TARGET is set, we simply trust the value -@@ -249,7 +251,7 @@ - # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) - # GNU Fortran (GCC) 4.3.0 20070316 (experimental) +@@ -265,7 +267,7 @@ class Gnu95FCompiler(GnuFCompiler): + self.executables[key].append('-mno-cygwin') + return v - possible_executables = ['gfortran', 'f95'] + possible_executables = ['%%FC%%', 'gfortran', 'f95'] executables = { - 'version_cmd' : ["<F90>", "--version"], - 'compiler_f77' : [None, "-Wall", "-ffixed-form", + 'version_cmd' : ["<F90>", "-dumpversion"], + 'compiler_f77' : [None, "-Wall", "-g", "-ffixed-form", diff --git a/math/py-numpy/files/patch-numpy_f2py_setup.py b/math/py-numpy/files/patch-numpy_f2py_setup.py index aa12daf506c1..cdc010a94095 100644 --- a/math/py-numpy/files/patch-numpy_f2py_setup.py +++ b/math/py-numpy/files/patch-numpy_f2py_setup.py @@ -1,19 +1,11 @@ ---- numpy/f2py/setup.py.orig Mon Oct 2 17:08:55 2006 -+++ numpy/f2py/setup.py Mon Jun 11 12:17:13 2007 -@@ -34,14 +34,13 @@ - config.add_data_dir('docs') - - config.add_data_files('src/fortranobject.c', -- 'src/fortranobject.h', -- 'f2py.1' -+ 'src/fortranobject.h' - ) - +--- numpy/f2py/setup.py.orig 2015-08-11 17:03:43 UTC ++++ numpy/f2py/setup.py +@@ -55,7 +55,7 @@ def configuration(parent_package='', top config.make_svn_version_py() def generate_f2py_py(build_dir): -- f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:] +- f2py_exe = 'f2py' + os.path.basename(sys.executable)[6:] + f2py_exe = 'f2py' - if f2py_exe[-4:]=='.exe': + if f2py_exe[-4:] == '.exe': f2py_exe = f2py_exe[:-4] + '.py' if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': diff --git a/math/py-numpy/pkg-plist b/math/py-numpy/pkg-plist index 425ae290f57b..af665b371ce2 100644 --- a/math/py-numpy/pkg-plist +++ b/math/py-numpy/pkg-plist @@ -26,7 +26,6 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/core/__init__.py %%PYTHON_SITELIBDIR%%/numpy/core/__init__.pyc %%PYTHON_SITELIBDIR%%/numpy/core/__init__.pyo -%%PYTHON_SITELIBDIR%%/numpy/core/_dotblas.so %%PYTHON_SITELIBDIR%%/numpy/core/_dummy.so %%PYTHON_SITELIBDIR%%/numpy/core/_internal.py %%PYTHON_SITELIBDIR%%/numpy/core/_internal.pyc @@ -105,7 +104,6 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/core/records.py %%PYTHON_SITELIBDIR%%/numpy/core/records.pyc %%PYTHON_SITELIBDIR%%/numpy/core/records.pyo -%%PYTHON_SITELIBDIR%%/numpy/core/scalarmath.so %%PYTHON_SITELIBDIR%%/numpy/core/setup.py %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyc %%PYTHON_SITELIBDIR%%/numpy/core/setup.pyo @@ -122,7 +120,6 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_abc.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_api.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_arrayprint.py -%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_blasdot.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_datetime.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_defchararray.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_deprecations.py @@ -318,6 +315,12 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.py %%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.pyc %%PYTHON_SITELIBDIR%%/numpy/distutils/misc_util.pyo +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.py +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.pyc +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvc9compiler.pyo +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.py +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.pyc +%%PYTHON_SITELIBDIR%%/numpy/distutils/msvccompiler.pyo %%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.py %%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.pyc %%PYTHON_SITELIBDIR%%/numpy/distutils/npy_pkg_config.pyo @@ -366,6 +369,7 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_fcompiler_intel.py %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_misc_util.py %%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_npy_pkg_config.py +%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/test_system_info.py %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.py %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyc %%PYTHON_SITELIBDIR%%/numpy/distutils/unixccompiler.pyo @@ -429,6 +433,9 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.py %%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/__init__.pyo +%%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.pyc +%%PYTHON_SITELIBDIR%%/numpy/f2py/__main__.pyo %%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.py %%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/__version__.pyo @@ -525,7 +532,6 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/lib/__init__.py %%PYTHON_SITELIBDIR%%/numpy/lib/__init__.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/__init__.pyo -%%PYTHON_SITELIBDIR%%/numpy/lib/_compiled_base.so %%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.py %%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/_datasource.pyo @@ -583,6 +589,10 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.py %%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/stride_tricks.pyo +%%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py2-objarr.npy +%%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py2-objarr.npz +%%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py3-objarr.npy +%%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/py3-objarr.npz %%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/python3.npy %%PYTHON_SITELIBDIR%%/numpy/lib/tests/data/win64python2.npy %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test__datasource.py @@ -597,6 +607,7 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_index_tricks.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_io.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_nanfunctions.py +%%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_packbits.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_polynomial.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_recfunctions.py %%PYTHON_SITELIBDIR%%/numpy/lib/tests/test_regression.py @@ -712,9 +723,6 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.py %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyc %%PYTHON_SITELIBDIR%%/numpy/polynomial/polynomial.pyo -%%PYTHON_SITELIBDIR%%/numpy/polynomial/polytemplate.py -%%PYTHON_SITELIBDIR%%/numpy/polynomial/polytemplate.pyc -%%PYTHON_SITELIBDIR%%/numpy/polynomial/polytemplate.pyo %%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.py %%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.pyc %%PYTHON_SITELIBDIR%%/numpy/polynomial/polyutils.pyo @@ -772,6 +780,7 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyo %%PYTHON_SITELIBDIR%%/numpy/tests/test_ctypeslib.py %%PYTHON_SITELIBDIR%%/numpy/tests/test_matlib.py +%%PYTHON_SITELIBDIR%%/numpy/tests/test_scripts.py %%PYTHON_SITELIBDIR%%/numpy/version.py %%PYTHON_SITELIBDIR%%/numpy/version.pyc %%PYTHON_SITELIBDIR%%/numpy/version.pyo |