CVS commit: pkgsrc/math/py-numpy

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Mar 24 19:22:28 UTC 2017

Modified Files:
        pkgsrc/math/py-numpy: Makefile distinfo
        pkgsrc/math/py-numpy/patches: patch-numpy_distutils_fcompiler_gnu.py

Log Message:
Check the version number part of the matched string and not the whole
string, otherwise the result is somewhat random. Bump revision again.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.40 pkgsrc/math/py-numpy/Makefile:1.41
--- pkgsrc/math/py-numpy/Makefile:1.40  Fri Mar 24 15:12:30 2017
+++ pkgsrc/math/py-numpy/Makefile       Fri Mar 24 19:22:27 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2017/03/24 15:12:30 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2017/03/24 19:22:27 joerg Exp $
 
 DISTNAME=      numpy-1.12.1
 GITHUB_PROJECT=        numpy
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=numpy/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.21 pkgsrc/math/py-numpy/distinfo:1.22
--- pkgsrc/math/py-numpy/distinfo:1.21  Fri Mar 24 15:12:30 2017
+++ pkgsrc/math/py-numpy/distinfo       Fri Mar 24 19:22:27 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/03/24 15:12:30 joerg Exp $
+$NetBSD: distinfo,v 1.22 2017/03/24 19:22:27 joerg Exp $
 
 SHA1 (numpy-1.12.1.tar.gz) = d7664803ffcbb07db9275d08cf9e0a55dad327d3
 RMD160 (numpy-1.12.1.tar.gz) = 059590c2379bb403fc03cc511dc8fb5e22042f93
@@ -8,4 +8,4 @@ SHA1 (patch-aa) = c964fa13fb120b1b0f9d0b
 SHA1 (patch-ab) = b421455fdbb666c8075d8bffbeb59533434d23e6
 SHA1 (patch-numpy_core_src_multiarray_numpyos.c) = acd97c7bae3419be4cb2e706d1989abe7e02c807
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = c959c00bd9aa4ee8c22f773c8cc3030933577d30
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 4342b48051dd424df99e95032f8a870a05114302

Index: pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
diff -u pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.10 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.11
--- pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py:1.10    Fri Mar 24 15:12:30 2017
+++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py Fri Mar 24 19:22:28 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.10 2017/03/24 15:12:30 joerg Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.11 2017/03/24 19:22:28 joerg Exp $
 
 Linker needs -shared explictly (at least with GCC 4.7 on SunOS), plus
 any ABI flags as appropriate.
@@ -14,7 +14,7 @@ Do not run a shell command when it is "N
 -            m = re.search(r'GNU Fortran\s+95.*?([0-9-.]+)', version_string)
 +            m = re.search(r'95.*?([0-9-.]+)', version_string)
              if m:
-+                if version_string.split(".") < ["4", "2"]:
++                if m.group(1).split(".") < ["4", "2"]:
 +                    self.g2c = "f95"
                  return ('gfortran', m.group(1))
              m = re.search(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)