Index: head/math/py-pynleq2/Makefile
===================================================================
--- head/math/py-pynleq2/Makefile	(revision 565257)
+++ head/math/py-pynleq2/Makefile	(revision 565258)
@@ -1,40 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	pynleq2
 DISTVERSION=	0.0.2
-PORTREVISION=	5
+PORTREVISION=	7
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for NLEQ2 algorithm's fortran implementation
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
 
-USES=		fortran:flang python:3.6+
+USES=		fortran python:3.6+
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	nodefault
-GH_TUPLE=	PySCeS:pysces:0.9.6:fortran
+GH_TUPLE=	PySCeS:pysces:0.9.8:fortran
 
-BINARY_ALIAS=	gfortran6=flang # it keeps using gfortran6 regardless of the environment variables and arguments
-
 FORTRAN_FILES=	linalg_nleq2.f nleq2.f wnorm.f zibconst.f zibmon.f zibsec.f
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/setup.py
 
 pre-build: # compile fortran files into a static library because distutils fails while doing this
 	@${MKDIR} ${WRKDIR}/.fbuild && \
 		cd ${WRKDIR}/.fbuild && \
-		flang -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \
+		${FC} -c ${CFLAGS} -fPIC ${FORTRAN_FILES:C,^,${WRKSRC_fortran}/pysces/nleq2/,} && \
 		${AR} -qc libff.a ${FORTRAN_FILES:S/.f/.o/}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/nleq2*.so
 
 .include <bsd.port.mk>
Index: head/math/py-pynleq2/distinfo
===================================================================
--- head/math/py-pynleq2/distinfo	(revision 565257)
+++ head/math/py-pynleq2/distinfo	(revision 565258)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1524415019
+TIMESTAMP = 1589502332
 SHA256 (pynleq2-0.0.2.tar.gz) = b9be75bb7def34cd7a82aed87b70f6c3c9f4602cbe9e8d4fcf43a4aae241112d
 SIZE (pynleq2-0.0.2.tar.gz) = 6219
-SHA256 (PySCeS-pysces-0.9.6_GH0.tar.gz) = 0888488fa9a8d11c4885e084af0c5825d9c37d1fb8a133899a657d79bc503fa4
-SIZE (PySCeS-pysces-0.9.6_GH0.tar.gz) = 2673710
+SHA256 (PySCeS-pysces-0.9.8_GH0.tar.gz) = a97af5afe50fe994e84d33455ded5821f694d809f6a36adc9b486bb209d58a72
+SIZE (PySCeS-pysces-0.9.8_GH0.tar.gz) = 2655864
Index: head/math/py-pynleq2/files/patch-setup.py
===================================================================
--- head/math/py-pynleq2/files/patch-setup.py	(revision 565257)
+++ head/math/py-pynleq2/files/patch-setup.py	(revision 565258)
@@ -1,27 +1,27 @@
 --- setup.py.orig	2015-10-20 14:54:08 UTC
 +++ setup.py
 @@ -75,19 +75,21 @@ if len(sys.argv) > 1 and '--help' not in
  
      for src, md5sum in zip(sources, md5sums):
          srcpath = os.path.join('nleq2', src)
 -        if not os.path.exists(srcpath):
 +        if False and not os.path.exists(srcpath):
              NLEQ2_URL = os.environ.get('PYNLEQ2_NLEQ2_ROOT_URL', None)
              if NLEQ2_URL:
                  download(NLEQ2_URL+src, srcpath)
              else:
                  fmtstr = "Could not find: %s ($PYNLEQ2_NLEQ2_ROOT_URL not set)"
                  raise ValueError(fmtstr % src)
 -        if md5_of_file(srcpath).hexdigest() != md5sum:
 +        if False and md5_of_file(srcpath).hexdigest() != md5sum:
              raise ValueError("Mismatching MD5 sum for %s" % srcpath)
  
      ext_modules = [
          Extension('pynleq2.nleq2', [os.path.join('nleq2', f)
 -                                    for f in ('nleq2.pyf',) + sources])
 +                                    for f in ('nleq2.pyf',)]
-+                                   , libraries=['ff', 'flang', 'execinfo']
-+                                   , library_dirs=['../.fbuild', '/usr/local/flang/lib'])
++                                   , libraries=['ff', 'execinfo']
++                                   , library_dirs=['../.fbuild'])
      ]
  
  PYNLEQ2_RELEASE_VERSION = os.environ.get('PYNLEQ2_RELEASE_VERSION', '')