Restore basic g95 support. Bump revision.

3 files changed, 14 insertions, 10 deletions

diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 7de3daa714b..6815729c307 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2017/03/20 13:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2017/03/24 15:12:30 joerg Exp $
 
 DISTNAME=	numpy-1.12.1
 GITHUB_PROJECT=	numpy
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_GITHUB:=numpy/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/math/py-numpy/distinfo b/math/py-numpy/distinfo
index e0518186988..3fe17582e42 100644
--- a/math/py-numpy/distinfo
+++ b/math/py-numpy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2017/03/20 13:50:01 wiz Exp $
+$NetBSD: distinfo,v 1.21 2017/03/24 15:12:30 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) = c964fa13fb120b1b0f9d0bf5bc713507cd60b945
 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) = 04638ffc8e9e38f3a84bef7d253d92cacb1e6724
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = c959c00bd9aa4ee8c22f773c8cc3030933577d30
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 b98d4a8a45b..20888a47979 100644
--- a/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
+++ b/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -1,22 +1,25 @@
-$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.9 2017/01/22 14:43:25 wiz Exp $
+$NetBSD: patch-numpy_distutils_fcompiler_gnu.py,v 1.10 2017/03/24 15:12:30 joerg 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	2017-01-15 19:49:32.000000000 +0000
+--- numpy/distutils/fcompiler/gnu.py.orig	2017-03-18 15:29:25.000000000 +0000
 +++ numpy/distutils/fcompiler/gnu.py
-@@ -57,7 +57,7 @@ class GnuFCompiler(FCompiler):
+@@ -57,8 +57,10 @@ class GnuFCompiler(FCompiler):
                      return ('gfortran', m.group(1))
          else:
              # Output probably from --version, try harder:
 -            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"]:
++                    self.g2c = "f95"
                  return ('gfortran', m.group(1))
              m = re.search(r'GNU Fortran.*?\-?([0-9-.]+)', version_string)
-@@ -87,7 +87,7 @@ class GnuFCompiler(FCompiler):
+             if m:
+@@ -87,7 +89,7 @@ class GnuFCompiler(FCompiler):
          'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
          'compiler_f90' : None,  # Use --fcompiler=gnu95 for f90 codes
          'compiler_fix' : None,
@@ -25,7 +28,7 @@ Do not run a shell command when it is "None".
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-g", "-Wall"]
-@@ -139,7 +139,7 @@ class GnuFCompiler(FCompiler):
+@@ -139,7 +141,7 @@ class GnuFCompiler(FCompiler):
                      s = 'Env. variable MACOSX_DEPLOYMENT_TARGET set to 10.3'
                      warnings.warn(s, stacklevel=2)
  
@@ -34,7 +37,7 @@ Do not run a shell command when it is "None".
          else:
              opt.append("-shared")
          if sys.platform.startswith('sunos'):
-@@ -270,7 +270,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -270,7 +272,7 @@ class Gnu95FCompiler(GnuFCompiler):
                            "-fno-second-underscore"] + _EXTRAFLAGS,
          'compiler_fix' : [None, "-Wall",  "-g","-ffixed-form",
                            "-fno-second-underscore"] + _EXTRAFLAGS,
@@ -43,7 +46,7 @@ Do not run a shell command when it is "None".
          'archiver'     : ["ar", "-cr"],
          'ranlib'       : ["ranlib"],
          'linker_exe'   : [None, "-Wall"]
-@@ -283,7 +283,7 @@ class Gnu95FCompiler(GnuFCompiler):
+@@ -283,7 +285,7 @@ class Gnu95FCompiler(GnuFCompiler):
  
      def _universal_flags(self, cmd):
          """Return a list of -arch flags for every supported architecture."""