diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index ed7af8d9d5f7..72a13cdae2d9 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -1,73 +1,79 @@
 PORTNAME=	libflame
 DISTVERSION=	5.2.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	FLAME dense linear algebra library
 WWW=		https://github.com/flame/libflame
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 powerpc64le powerpcspe
 ONLY_FOR_ARCHS_REASON=	make system does not support other architectures yet
 
 BUILD_DEPENDS=	bash:shells/bash
 
 GNU_CONFIGURE=	yes
-USES=		compiler:c11 gmake python:3.8
+USES=		compiler:c11 gmake python:build shebangfix
+SHEBANG_FILES=	build/flatten-headers.py
 USE_CSTD=	c99
+OPENMP_CFLAGS?=	-fopenmp
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	flame
 USE_LDCONFIG=	yes
 
 OPTIONS_RADIO=	PARALLELIZATION
 OPTIONS_RADIO_PARALLELIZATION=	NONE THREADS OPENMP
 OPTIONS_DEFAULT=	THREADS
 NONE_DESC=		serial libflame
 THREADS_DESC=		pthread based parallelization
 OPENMP_DESC=		OpenMP based parallelization
 
 # enable dynamic build always
 CONFIGURE_ARGS=		--enable-dynamic-build
 # our shell is also prone to the argument list too long bug
 CONFIGURE_ARGS+=	--enable-max-arg-list-hack
 # use libflame as a LAPACK
 CONFIGURE_ARGS+=	--enable-lapack2flame
 # add our CFLAGS to theirs
 CONFIGURE_ARGS+=	--with-extra-cflags="${CFLAGS}"
 # enable supermatrix
 CONFIGURE_ARGS+=	--enable-supermatrix
 # disable ldim alignment (we cannot assume input to be aligned)
 CONFIGURE_ARGS+=	--disable-ldim-alignment
 
 .for b in M K N
 .if defined(${b}_BLOCKSIZE)
 CONFIGURE_ARGS+=	--enable-default-${b:tl}-blocksize=${${b}_BLOCKSIZE}
 .endif
 .endfor
 
-.include <bsd.port.options.mk>
+MAKE_ENV+=	PYTHON=${PYTHON_CMD}
+
+.include <bsd.port.pre.mk>
+
 .if ${PORT_OPTIONS:MOPENMP}
 .if ${CHOSEN_COMPILER_TYPE} == clang
 IGNORE=		clang does not support OPENMP, use THREADS instead
 .endif
-OPENMP_CFLAGS ?=	-fopenmp
 CFLAGS+=		${OPENMP_CFLAGS}
 LDFLAGS+=		${OPENMP_CFLAGS}
 CONFIGURE_ARGS+=	--enable-multithreading=openmp
 .elif ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=	--enable-multithreading=pthreads
 .elif ${PORT_OPTIONS:MNONE}
 CONFIGURE_ARGS+=	--enable-multithreading=no
 .endif
 
 .if !(defined(USE_GCC) || !empty(CC:M*gcc4*))
 CONFIGURE_ARGS+=	--disable-autodetect-f77-ldflags \
 			--disable-autodetect-f77-name-mangling
 .endif
 
 #post-install:
 #	@${MKDIR} ${STAGEDIR}${PREFIX}/include/libflame
 #	${INSTALL_DATA} ${WRKSRC}/include_local/* ${STAGEDIR}/${PREFIX}/include/libflame/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/libflame/files/patch-build_flatten-headers_py.diff b/math/libflame/files/patch-build_flatten-headers_py.diff
deleted file mode 100644
index 6739683a4280..000000000000
--- a/math/libflame/files/patch-build_flatten-headers_py.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- build/flatten-headers.py.orig	2020-05-02 16:30:41.773805000 -0500
-+++ build/flatten-headers.py	2020-05-02 16:30:49.511257000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3.8
- #
- #  BLIS    
- #  An object-based framework for developing high-performance BLAS-like