Index: Makefile =================================================================== --- Makefile (revision 492867) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= numpy -PORTVERSION= 1.15.4 -PORTREVISION= 1 +PORTVERSION= 1.16.1 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP \ Index: distinfo =================================================================== --- distinfo (revision 492867) +++ distinfo (working copy) @@ -1,7 +1,7 @@ -TIMESTAMP = 1541439997 -SHA256 (numpy-1.15.4.zip) = 3d734559db35aa3697dadcea492a423118c5c55d176da2f3be9c98d4803fc2a7 -SIZE (numpy-1.15.4.zip) = 4473522 -SHA256 (numpy-ref-1.15.4.pdf) = c05f5f70172018541d6159f8797e06e38ed3ca1de9dafc85964754b7ae2a7ccc -SIZE (numpy-ref-1.15.4.pdf) = 4843444 -SHA256 (numpy-user-1.15.4.pdf) = a2827d1c1756c511566b66d2a1c00dec292e47ae98b1a7882a9fe4104ea3820d -SIZE (numpy-user-1.15.4.pdf) = 596191 +TIMESTAMP = 1550099777 +SHA256 (numpy-1.16.1.zip) = 31d3fe5b673e99d33d70cfee2ea8fe8dccd60f265c3ed990873a88647e3dd288 +SIZE (numpy-1.16.1.zip) = 5070040 +SHA256 (numpy-ref-1.16.1.pdf) = 5296c4949c92d00ae2c94ce65b78369b8081995dc72447bb20b6518bfaed3552 +SIZE (numpy-ref-1.16.1.pdf) = 5175448 +SHA256 (numpy-user-1.16.1.pdf) = aa8c591eee4c537768854f19e3cf4b861280828c19eb9d2e6194ea230570ea75 +SIZE (numpy-user-1.16.1.pdf) = 592508 Index: files/patch-numpy-distutils-system_info.py =================================================================== --- files/patch-numpy-distutils-system_info.py (revision 492867) +++ files/patch-numpy-distutils-system_info.py (working copy) @@ -1,6 +1,20 @@ ---- numpy/distutils/system_info.py.orig 2016-10-03 23:42:24 UTC -+++ numpy/distutils/system_info.py -@@ -1038,8 +1038,8 @@ class atlas_info(system_info): +--- numpy/distutils/system_info.py.orig 2019-01-31 10:31:08.000000000 +0800 ++++ numpy/distutils/system_info.py 2019-02-14 07:26:14.275787000 +0800 +@@ -169,9 +169,10 @@ + Convert a python string into a literal suitable for inclusion into C code + """ + # only these three characters are forbidden in C strings +- s = s.replace('\\', r'\\') +- s = s.replace('"', r'\"') +- s = s.replace('\n', r'\n') ++ if s: ++ s = s.replace('\\', r'\\') ++ s = s.replace('"', r'\"') ++ s = s.replace('\n', r'\n') + return '"{}"'.format(s) + + +@@ -1109,8 +1110,8 @@ dir_env_var = 'ATLAS' _lib_names = ['f77blas', 'cblas'] if sys.platform[:7] == 'freebsd': @@ -11,15 +25,15 @@ else: _lib_atlas = ['atlas'] _lib_lapack = ['lapack'] -@@ -1574,11 +1574,6 @@ class blas_opt_info(system_info): - self.set_info(**blas_mkl_info) - return - +@@ -1628,11 +1629,6 @@ + blis_info = get_info('blis') + if blis_info: + self.set_info(**blis_info) +- return +- - openblas_info = get_info('openblas') - if openblas_info: - self.set_info(**openblas_info) -- return -- + return + atlas_info = get_info('atlas_3_10_blas_threads') - if not atlas_info: - atlas_info = get_info('atlas_3_10_blas') Index: files/patch-numpy_f2py_setup.py =================================================================== --- files/patch-numpy_f2py_setup.py (revision 492867) +++ files/patch-numpy_f2py_setup.py (nonexistent) @@ -1,11 +0,0 @@ ---- 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' - if f2py_exe[-4:] == '.exe': - f2py_exe = f2py_exe[:-4] + '.py' - if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': Property changes on: files/patch-numpy_f2py_setup.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property