math/lapack: +math/blas et al., upgrade to 3.9.1

- Upgrade math/blas, math/cblas, math/lapack, math/lapacke and math/xlapack
  to 3.9.1;
  Latest release notes at <http://www.netlib.org/lapack/lapack-3.9.1.html>

- Chase this upgrade in biology/treekin;

- Add a test target;

- Remove a conflict with math/openblas (PR 244296);

- Fix the build with Gcc10 (PR 247485).

PR:		247542
Approved by:	expr-run by antoine@

17 files changed, 586 insertions, 680 deletions

diff --git a/math/blas/Makefile b/math/blas/Makefile
index 436b921d9ae1..2e9fc06434eb 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,7 +1,6 @@
 # Created by: ljo
 
 PORTNAME=	blas
-PORTREVISION=	6
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Basic Linear Algebra Subroutines
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index d94a4bd5af01..eb7ff101ecb0 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -1,136 +1,13 @@
 # Created by: bf@FreeBSD.org
 
 PORTNAME=	cblas
-PORTVERSION=	1.0
-PORTREVISION=	12
-CATEGORIES=	math
-MASTER_SITES=	NL/blas/blast-forum/ LOCAL/bf
-DISTFILES=	cblas.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Reference implementation of the C interface to the legacy Fortran BLAS
 
-LICENSE=	BLAS
-LICENSE_NAME=	BLAS License
-LICENSE_TEXT=	http://www.netlib.org/blas/#_licensing
-LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+DESCR=	${.CURDIR}/pkg-descr
+CBLAS_SLAVEPORT=	yes
 
-USES=		fortran
+MASTERDIR=	${.CURDIR}/../lapack
 
-CONFLICTS_INSTALL=	atlas-[0-9]* atlas-devel-[0-9]*
-
-OPTIONS_DEFINE=	PROFILE SHARED STATIC DOCS
-OPTIONS_DEFAULT=	SHARED STATIC
-PROFILE_DESC=	Build profiling libraries
-SHARED_DESC=	Build shared libraries and PIC archives
-STATIC_DESC=	Build (non-PIC) archives
-
-PLIST_FILES=	include/cblas.h include/cblas_f77.h
-PLIST_SUB=	SVERSION="${SVERSION}"
-
-SVERSION=	2
-
-WRKSRC=			${WRKDIR}/CBLAS
-WRKSRC_PROFILE=		${WRKSRC}_PROFILE
-WRKSRC_SHARED=		${WRKSRC}_SHARED
-WRKSRC_STATIC=		${WRKSRC}
-
-.include <bsd.port.options.mk>
-
-.if make(makesum) || ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	blas-report.pdf
-EXTRACT_ONLY=	cblas.tgz
-.endif
-
-MANGLING?=	-DADD_
-CFLAGS+=	${MANGLING}
-
-.if ${ARCH} == "sparc64"
-PICFLAG?=	-fPIC
-.else
-PICFLAG?=	-fpic
-.endif
-
-FLAGS_PROFILE?=	-pg
-FLAGS_SHARED ?=	${PICFLAG}
-
-.if ${PORT_OPTIONS:MSHARED}
-PLIST_FILES+=	lib/libcblas_pic.a lib/libcblas.so lib/libcblas.so.${SVERSION}
-TESTS ?=	test-shared
-USE_LDCONFIG=	yes
-.endif
-.if ${PORT_OPTIONS:MSTATIC}
-PLIST_FILES+=	lib/libcblas.a
-TESTS ?=	test-static
-.endif
-.if ${PORT_OPTIONS:MPROFILE}
-PLIST_FILES+=	lib/libcblas_p.a
-TESTS ?=	test-profile
-.endif
-
-post-patch:
-	@${SED} -Ee '\@^CBLIB[[:blank:]]*=@s@cblas.*\.a@libcblas.a@; \
-		\@^((BL|RAN)LIB|CC|FC)[[:blank:]]*=@d; \
-		\@^((C|F)FLAGS)[[:blank:]]*=@s@=.*@+= $${EXTRAFLAGS}@; \
-		\@^LOADER@{x; s|^|LOADFLAGS = $${LDFLAGS} $${EXTRAFLAGS}|; G;};' \
-			${WRKSRC}/Makefile.LINUX > ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's@$$(ARCH)@$$(AR)@' ${WRKSRC}/src/Makefile
-.for o in PROFILE SHARED
-.if ${PORT_OPTIONS:M${o}}
-	@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
-.endif
-.endfor
-
-do-build: build-profile build-shared build-static
-
-.for o in PROFILE SHARED STATIC
-build-${o:tl}: patch
-.if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
-	@cd ${WRKSRC_${o}}/src; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all
-
-.endif
-.endfor
-
-post-build:
-.if ${PORT_OPTIONS:MSHARED}
-	cd ${WRKSRC_SHARED}/lib ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
-	-o libcblas.so.${SVERSION} -Wl,-x -Wl,-soname,libcblas.so.${SVERSION} \
-	-Wl,--whole-archive libcblas.a -Wl,--no-whole-archive
-.endif
-
-.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-BLAS?=			-L${LOCALBASE}/lib -lblas
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libblas.so:math/blas
-MAKE_ENV+=		BLLIB="${BLAS}"
-
-check regression-test test: ${TESTS}
-
-.for o in PROFILE SHARED STATIC
-test-${o:tl}: build-${o:tl}
-.if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
-	@cd ${WRKSRC_${o}}/testing; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all run
-	@${CAT} ${WRKSRC_${o}}/testing/*.out
-
-.endif
-.endfor
-.endif
-
-do-install:
-	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
-.if ${PORT_OPTIONS:MSTATIC}
-	@${INSTALL_DATA} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib
-.endif
-.if ${PORT_OPTIONS:MSHARED}
-	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a
-	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
-	@${LN} -sf libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libcblas.so
-.endif
-.if ${PORT_OPTIONS:MPROFILE}
-	@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/math/cblas/distinfo b/math/cblas/distinfo
deleted file mode 100644
index 0edbbbb80dfd..000000000000
--- a/math/cblas/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (cblas.tgz) = 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3
-SIZE (cblas.tgz) = 197468
-SHA256 (blas-report.pdf) = 7874962ae4dc753fcdd483ff0c69931227846632251f79a68f4f879348f321a6
-SIZE (blas-report.pdf) = 2412966
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 852d9cecfd3d..712daaeee879 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,224 +1,170 @@
 # Created by: jmz
 
 PORTNAME?=	lapack
-PORTVERSION=	3.5.0
-PORTREVISION?=	8	# Never remove this line, keep PORTREVISION?=0 in case.
+PORTVERSION=	3.9.1
+PORTREVISION?=	0	# Never remove this line, keep PORTREVISION?=0 in case.
 CATEGORIES=	math
 MASTER_SITES=	NL/lapack/
-DISTFILES=	lapack-${PORTVERSION}.tgz
+DISTFILES=	v${PORTVERSION}${EXTRACT_SUFX}
 .if make(makesum) || !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT))
-DISTFILES+=		manpages-${PORTVERSION}.tgz
+DISTFILES+=	manpages.tgz
 .endif
 DIST_SUBDIR=	lapack
 
 MAINTAINER?=	fortran@FreeBSD.org
-COMMENT?=	Library of Fortran 77 subroutines for linear algebra
+COMMENT?=	Linear Algebra PACKage
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		fortran
-
-OPTIONS_DEFINE=	PROFILE SHARED STATIC
-OPTIONS_DEFAULT=	SHARED STATIC
-PROFILE_DESC=	Build profiling libraries
-SHARED_DESC=	Build shared libraries and PIC archives
-STATIC_DESC=	Build (non-PIC) archives
-
-MAKE_ENV=	BLASLIB="${BLASLIB}"
-FFLAGS+=	-std=legacy
-PLIST_SUB=	SVERSION="${SVERSION}"
+USES=		cmake:testing fortran
+WRKSRC=		${WRKDIR}/lapack-${PORTVERSION}
+# The actual math/scilab needs deprecated functions - to be removed later
+CMAKE_ON=	BUILD_SHARED_LIBS BUILD_DEPRECATED
+USE_LDCONFIG=	yes
 
-WRKSRC=			${WRKDIR}/lapack-${PORTVERSION}
-WRKSRC_PROFILE=		${WRKSRC}_PROFILE
-WRKSRC_SHARED=		${WRKSRC}_SHARED
-WRKSRC_STATIC=		${WRKSRC}
+SVERSION=	${PORTVERSION:R:R}
+PLIST_SUB=	SVERSION="${SVERSION}" VER=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
 .if defined(BLAS_SLAVEPORT)
-ALL_TARGET=		blaslib
-BLASLIB=		../../libblas.a
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/BLAS/SRC
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
+BLASLIB=		libblas.a
 LIBS=			blas
-PLIST_SUB+=		BLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment "
-SVERSION=		2
-TEST_TARGET=		blas_testing
+PLIST_SUB+=		BLAS="" CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment "
+.elif defined(CBLAS_SLAVEPORT)
+BUILD_DEPENDS+=		lapack>0:math/lapack
+LIB_DEPENDS+=		libblas.so:math/blas
+CMAKE_ON+=		CBLAS
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/CBLAS
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
+CBLASLIB=		libcblas.a
+LIBS=			cblas
+PLIST_SUB+=		BLAS="@comment " CBLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment "
 .elif defined(LAPACKE_SLAVEPORT)
-ALL_TARGET=		lapackelib
+USES+=			blaslapack
+CMAKE_ON+=		USE_OPTIMIZED_BLAS USE_OPTIMIZED_LAPACK LAPACKE
+CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"		\
+			-DLAPACK_LIBRARIES="${LOCALBASE}/lib/liblapack.so"
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}/LAPACKE
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
 LAPACKELIB=		liblapacke.a
-LAPACKETMGLIB=		liblapacke_tmg.a
-MAKE_ENV+=	LAPACKELIB="${LAPACKELIB}" LAPACKETMGLIB="${LAPACKETMGLIB}"
-LIB_DEPENDS+=		libblas.so:math/blas \
-			liblapack.so:math/lapack
-LIBS=			lapacke lapacke_tmg
-INCLS=			lapacke lapacke_utils lapacke_mangling
-PLIST_SUB+=		BLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE=""
-SVERSION=		1
+PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE=""
+.elif defined(XLAPACK_SLAVEPORT)
+LIB_DEPENDS+=		libblas.so:math/blas		\
+			liblapack.so:math/lapack	\
+			libxblas.so:math/xblas
+FFLAGS+=		-fallow-argument-mismatch
+CMAKE_ON+=		USE_OPTIMIZED_BLAS USE_XBLAS  BUILD_TESTING
+CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"
+PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment "
 .else
-ALL_TARGET=		lib
-BLASLIB?=		-L${LOCALBASE}/lib -lblas
+# Upstream recommand to use an optimized BLAS, but it would cause conflicts
+# among the dependencies: for an optimized lapack switch to OpenBLAS.
+# BUILD_TESTING to get tmglib.
 LIB_DEPENDS+=		libblas.so:math/blas
-LIBS=			lapack tmglib
-SVERSION=		4
-TEST_TARGET=		lapack_testing
-.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
-S=			${PYTHON_CMD}
-USES+=			python:build
-.else
-S=			\#
-.endif
-.if defined(XLAPACK_SLAVEPORT)
-LIB_DEPENDS+=		libxblas.so:math/xblas
-MAKE_ENV+=		USEXBLAS=yes XBLASLIB="${XBLASLIB}"
-P=			x
-PLIST_SUB+=		BLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment "
-XBLASLIB?=		-L${LOCALBASE}/lib -lxblas
-.else
+. if defined(MAINTAINER_MODE)
+USES+=			python:3.6+,build,test
+. endif
+CMAKE_ON+=		USE_OPTIMIZED_BLAS BUILD_TESTING
+CMAKE_ARGS+=		-DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so"
+LIBS=			lapack
 PLIST_FILES+=		${MAN3L:S|^|man/man3/|:S|$|.gz|}
-PLIST_SUB+=		BLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment "
-.if defined(MAINTAINER_MODE)
-BUILD_DEPENDS +=	doxygen:devel/doxygen
-MAN_TARGET=		build-manpages
-.endif
-.endif
-.endif
-
-.if ${ARCH} == "sparc64"
-PICFLAG?=	-fPIC
-.else
-PICFLAG?=	-fpic
+PLIST_SUB+=		BLAS="@comment " CBLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment "
 .endif
 
-FFLAGS_PROFILE?=	-pg
-FFLAGS_SHARED ?=	${PICFLAG}
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MPROFILE}
-LDFLAGS+= -static
-.endif
-
-.if ${PORT_OPTIONS:MPROFILE} && !exists(/usr/lib/libc_p.a)
-IGNORE=	you have chosen WITH_PROFILE, but have not installed the\
-base system profiling libraries
-.endif
-
-.if ${PORT_OPTIONS:MSHARED}
-USE_LDCONFIG=	yes
-.endif
-
-.for o in PROFILE SHARED STATIC
-.if ${PORT_OPTIONS:M${o}}
-PLIST_SUB+=	${o}=""
-.else
-PLIST_SUB+=	${o}="@comment "
-.endif
-.endfor
-
-post-patch:
-	@${SED} -Ee '\
+pre-configure:
+	${SED} -Ee '\
 		s@^(FORTRAN|LOADER)([[:blank:]]*=)(.*)@\1\2 $${FC}@; \
 		s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \
 		s@^NOOPT[[:blank:]]*=.*@& $${EXTRAFLAGS}@; \
 		s@^(LOADOPTS[[:blank:]]*=)(.*)@\1 $${LDFLAGS} $${EXTRAFLAGS}@; \
 		s@^(CC[[:blank:]]*=)(.*)@@; \
+		s@^(FC[[:blank:]]*=)(.*)@@; \
 		s@^(CFLAGS[[:blank:]]*)(=)(.*)@\1 += $${EXTRAFLAGS}@; \
+		s@^(FFLAGS[[:blank:]]*=)(.*)@@; \
+		s@^(LDFLAGS[[:blank:]]*=)(.*)@@; \
 		\@(BLAS|LAPACKE|RAN)LIB[[:blank:]]*=@d;' \
 			${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc
-	@${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \
+	${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \
 		${WRKSRC}/Makefile
-.for o in PROFILE SHARED
-.if ${PORT_OPTIONS:M${o}}
-	@${CP} -a ${WRKSRC} ${WRKSRC_${o}}
-.endif
-.endfor
-
-do-build: ${MAN_TARGET} build-profile build-shared build-static
-
-.for o in PROFILE SHARED STATIC
-build-${o:tl}: patch
-.if ${PORT_OPTIONS:M${o}}
-	${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
-	cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${ALL_TARGET}
-
-.endif
-.endfor
-
-.if defined (MAINTAINER_MODE)
-build-manpages: patch
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
-	${MAKE_ARGS} man
-
+	${FIND} ${WRKSRC} -name Makefile | ${XARGS}	\
+		${SED} -i ".bak" -e 's|^ifdef|.ifdef|;s|^endif|.endif|'
+.if defined(MAINTAINER_MODE)
+	${REINPLACE_CMD} -e 's|PythonInterp 2.7|PythonInterp ${PYTHON_VER}|'	\
+		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-build:
-.if ${PORT_OPTIONS:MSHARED}
-.for L in ${LIBS}
-	cd ${WRKSRC_SHARED} ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \
-	-o lib${P}${L}.so.${SVERSION} -Wl,-x -Wl,-soname,lib${P}${L}.so.${SVERSION} \
-	-Wl,--whole-archive lib${L}.a -Wl,--no-whole-archive
-.endfor
-.endif
-
-.if ${PORT_OPTIONS:MSHARED}
-TESTS ?=	test-shared
-.elif ${PORT_OPTIONS:MSTATIC}
-TESTS ?=	test-static
-.elif ${PORT_OPTIONS:MPROFILE}
-TESTS ?=	test-profile
-.endif
-
-.if !defined(LAPACKE_SLAVEPORT)
-check regression-test test: ${TESTS}
-.for o in PROFILE SHARED STATIC
-test-${o:tl}: build-${o:tl}
-.if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
-	@cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${TEST_TARGET}
 .if defined(BLAS_SLAVEPORT)
-	@${CAT} ${WRKSRC_${o}}/BLAS/*.out
-.endif
-.endif
-.endfor
-.endif
-
-do-install:
-.for L in ${LIBS}
-.if ${PORT_OPTIONS:MSTATIC}
-	@${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.a
-.endif
-.if ${PORT_OPTIONS:MSHARED}
-	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_pic.a
-	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
-	@${LN} -sf lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.so
-.endif
-.if ${PORT_OPTIONS:MPROFILE}
-	@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_p.a
-.endif
-.endfor
-.if defined(LAPACKE_SLAVEPORT)
-.for I in ${INCLS}
-	@${INSTALL_DATA} ${WRKSRC}/lapacke/include/${I}.h ${STAGEDIR}${PREFIX}/include
-.endfor
+	${SED} -e 's|%%LIB%%|blas|g;s|cd SRC|cd BLAS/SRC|;s|SRC/lib|BLAS/SRC/lib|'	\
+		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/CMakeFiles/blas.dir/build.make
+	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f BLAS/SRC/CMakeFiles/blas.dir/build.make build-static)
+.elif defined(CBLAS_SLAVEPORT)
+	${SED} -e 's|%%LIB%%|cblas|g;s|cd SRC|cd CBLAS/src|;s|SRC/lib|CBLAS/src/lib|'	\
+		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/src/CMakeFiles/cblas.dir/build.make
+	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f CBLAS/src/CMakeFiles/cblas.dir/build.make build-static)
+.elif defined(LAPACKE_SLAVEPORT)
+	${SED} -e 's|%%LIB%%|lapacke|g;s|cd SRC|cd LAPACKE|' ${FILESDIR}/static.mk	\
+		>> ${BUILD_WRKSRC}/CMakeFiles/lapacke.dir/build.make
+	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f LAPACKE/CMakeFiles/lapacke.dir/build.make build-static)
+.else # xlapack + Lapack + tmglib
+	${SED} -e 's|%%LIB%%|lapack|g' ${FILESDIR}/static.mk	\
+		>> ${BUILD_WRKSRC}/SRC/CMakeFiles/lapack.dir/build.make
+	(cd ${CONFIGURE_WRKSRC} && ${MAKE} -f SRC/CMakeFiles/lapack.dir/build.make build-static)
+	${SED} -e 's|%%LIB%%|tmglib|g;s|cd SRC|cd TESTING/MATGEN|;s|SRC/lib|TESTING/MATGEN/lib|'	\
+		${FILESDIR}/static.mk >> ${BUILD_WRKSRC}/TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make
+	(cd ${BUILD_WRKSRC} && ${MAKE} -f TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make build-static)
 .endif
 
-.include  <bsd.port.pre.mk>
-
-.if !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT))
-
 .include "${FILESDIR}/manpages"
 
 post-install:
-	@cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \
+.if defined(BLAS_SLAVEPORT)
+	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/SRC/${BLASLIB} ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/blas.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+.elif defined(CBLAS_SLAVEPORT)
+	# Avoid conflict with OpenBLAS
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/cblas
+	${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/cblas/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/src/${CBLASLIB} ${STAGEDIR}${PREFIX}/lib
+.elif defined(LAPACKE_SLAVEPORT)
+	# Avoid conflict with OpenBLAS
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/lapacke
+	${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/lapacke/
+	${INSTALL_DATA} ${CONFIGURE_WRKSRC}/LAPACKE/${LAPACKELIB} ${STAGEDIR}${PREFIX}/lib
+.elif defined(XLAPACK_SLAVEPORT)
+	${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib/libxlapack.a
+	${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a	\
+		${STAGEDIR}${PREFIX}/lib/libxtmglib.a
+	${MV} ${STAGEDIR}${PREFIX}/lib/liblapack.so	\
+		${STAGEDIR}${PREFIX}/lib/libxlapack.so.${PORTVERSION}
+	${LN} -sf libxlapack.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxlapack.so
+	${LN} -sf libxlapack.so.${PORTVERSION}	\
+		${STAGEDIR}${PREFIX}/lib/libxlapack.so.${SVERSION}
+	${MV} ${STAGEDIR}${PREFIX}/lib/libtmglib.so	\
+		${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${PORTVERSION}
+	${LN} -sf libxtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxtmglib.so
+	${LN} -sf libxtmglib.so.${PORTVERSION}	\
+		${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${SVERSION}
+	${SED} -e 's|lapack|xlapack|g;s|LAPACK|XLAPACK|'		\
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc	\
+		> ${STAGEDIR}${PREFIX}/libdata/pkgconfig/xlapack.pc
+	${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc
+.else # Lapack
+	${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a ${STAGEDIR}${PREFIX}/lib
+	${MV} ${STAGEDIR}${PREFIX}/lib/libtmglib.so	\
+		${STAGEDIR}${PREFIX}/lib/libtmglib.so.${PORTVERSION}
+	${LN} -sf libtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtmglib.so
+	${LN} -sf libtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtmglib.so.${SVERSION}
+.endif
+.if !(defined(BLAS_SLAVEPORT) || defined(CBLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT))
+	cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \
 	| ${XARGS} -J @ ${INSTALL_MAN} @ ${STAGEDIR}${MAN3PREFIX}/man/man3
-
-.if defined(MAINTAINER_MODE)
-package-manpages: build-manpages
-	@${RM} ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \
-	cd ${WRKSRC}/DOCS/man; \
-	${TAR} -czvf ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz \
-	${MAN3L:S|^|man3/|}
-
-.endif
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 1ba4007bc3fe..fbf3bb754930 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,4 +1,5 @@
-SHA256 (lapack/lapack-3.5.0.tgz) = 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352
-SIZE (lapack/lapack-3.5.0.tgz) = 6313139
-SHA256 (lapack/manpages-3.5.0.tgz) = 055da7402ea807cc16f6c50b71ac63d290f83a5f2885aa9f679b7ad11dd8903d
-SIZE (lapack/manpages-3.5.0.tgz) = 1394730
+TIMESTAMP = 1623226962
+SHA256 (lapack/v3.9.1.tar.gz) = d0085d2caf997ff39299c05d4bacb6f3d27001d25a4cc613d48c1f352b73e7e0
+SIZE (lapack/v3.9.1.tar.gz) = 7543209
+SHA256 (lapack/manpages.tgz) = a65b84821765cfd4bb8bf8c05e4279a9d81130da4eb8741ef2690064c57610cf
+SIZE (lapack/manpages.tgz) = 2391904
diff --git a/math/lapack/files/manpages b/math/lapack/files/manpages
index 7005df85d75f..bc4adae7b1d4 100644
--- a/math/lapack/files/manpages
+++ b/math/lapack/files/manpages
@@ -1,10 +1,6 @@
 MAN3L= \
-INSTALL_ilaver.f.3 \
-INSTALL_lsame.f.3 \
-LAPACK_version.f.3 \
-SRC_ilaver.f.3 \
-SRC_xerbla.f.3 \
-SRC_xerbla_array.f.3 \
+BLAS_SRC_xerbla_array.f.3 \
+BLAS_SRC_xerbla.f.3 \
 caxpy.f.3 \
 cbbcsd.f.3 \
 cbdsqr.f.3 \
@@ -35,24 +31,28 @@ cgees.f.3 \
 cgeesx.f.3 \
 cgeev.f.3 \
 cgeevx.f.3 \
-cgegs.f.3 \
-cgegv.f.3 \
 cgehd2.f.3 \
 cgehrd.f.3 \
+cgejsv.f.3 \
+cgelq.f.3 \
 cgelq2.f.3 \
 cgelqf.f.3 \
+cgelqt.f.3 \
+cgelqt3.f.3 \
 cgels.f.3 \
 cgelsd.f.3 \
 cgelss.f.3 \
-cgelsx.f.3 \
 cgelsy.f.3 \
+cgemlq.f.3 \
+cgemlqt.f.3 \
 cgemm.f.3 \
+cgemqr.f.3 \
 cgemqrt.f.3 \
 cgemv.f.3 \
 cgeql2.f.3 \
 cgeqlf.f.3 \
 cgeqp3.f.3 \
-cgeqpf.f.3 \
+cgeqr.f.3 \
 cgeqr2.f.3 \
 cgeqr2p.f.3 \
 cgeqrf.f.3 \
@@ -70,26 +70,37 @@ cgesc2.f.3 \
 cgesdd.f.3 \
 cgesv.f.3 \
 cgesvd.f.3 \
+cgesvdq.f.3 \
+cgesvdx.f.3 \
+cgesvj.f.3 \
 cgesvx.f.3 \
 cgesvxx.f.3 \
 cgetc2.f.3 \
 cgetf2.f.3 \
 cgetrf.f.3 \
+cgetrf2.f.3 \
 cgetri.f.3 \
 cgetrs.f.3 \
+cgetsls.f.3 \
+cgetsqrhrt.f.3 \
 cggbak.f.3 \
 cggbal.f.3 \
 cgges.f.3 \
+cgges3.f.3 \
 cggesx.f.3 \
 cggev.f.3 \
+cggev3.f.3 \
 cggevx.f.3 \
 cggglm.f.3 \
+cgghd3.f.3 \
 cgghrd.f.3 \
 cgglse.f.3 \
 cggqrf.f.3 \
 cggrqf.f.3 \
-cggsvd.f.3 \
-cggsvp.f.3 \
+cggsvd3.f.3 \
+cggsvp3.f.3 \
+cgsvj0.f.3 \
+cgsvj1.f.3 \
 cgtcon.f.3 \
 cgtrfs.f.3 \
 cgtsv.f.3 \
@@ -97,8 +108,12 @@ cgtsvx.f.3 \
 cgttrf.f.3 \
 cgttrs.f.3 \
 cgtts2.f.3 \
+chb2st_kernels.f.3 \
+chbev_2stage.f.3 \
 chbev.f.3 \
+chbevd_2stage.f.3 \
 chbevd.f.3 \
+chbevx_2stage.f.3 \
 chbevx.f.3 \
 chbgst.f.3 \
 chbgv.f.3 \
@@ -106,14 +121,21 @@ chbgvd.f.3 \
 chbgvx.f.3 \
 chbmv.f.3 \
 chbtrd.f.3 \
+checon_3.f.3 \
+checon_rook.f.3 \
 checon.f.3 \
 cheequb.f.3 \
+cheev_2stage.f.3 \
 cheev.f.3 \
+cheevd_2stage.f.3 \
 cheevd.f.3 \
+cheevr_2stage.f.3 \
 cheevr.f.3 \
+cheevx_2stage.f.3 \
 cheevx.f.3 \
 chegs2.f.3 \
 chegst.f.3 \
+chegv_2stage.f.3 \
 chegv.f.3 \
 chegvd.f.3 \
 chegvx.f.3 \
@@ -125,17 +147,36 @@ cher2k.f.3 \
 cherfs.f.3 \
 cherfsx.f.3 \
 cherk.f.3 \
+chesv_aa_2stage.f.3 \
+chesv_aa.f.3 \
+chesv_rk.f.3 \
+chesv_rook.f.3 \
 chesv.f.3 \
 chesvx.f.3 \
 chesvxx.f.3 \
 cheswapr.f.3 \
 chetd2.f.3 \
+chetf2_rk.f.3 \
+chetf2_rook.f.3 \
 chetf2.f.3 \
+chetrd_2stage.f.3 \
+chetrd_he2hb.f.3 \
 chetrd.f.3 \
+chetrf_aa_2stage.f.3 \
+chetrf_aa.f.3 \
+chetrf_rk.f.3 \
+chetrf_rook.f.3 \
 chetrf.f.3 \
+chetri_3.f.3 \
+chetri_3x.f.3 \
+chetri_rook.f.3 \
 chetri.f.3 \
 chetri2.f.3 \
 chetri2x.f.3 \
+chetrs_3.f.3 \
+chetrs_aa_2stage.f.3 \
+chetrs_aa.f.3 \
+chetrs_rook.f.3 \
 chetrs.f.3 \
 chetrs2.f.3 \
 chfrk.f.3 \
@@ -205,14 +246,18 @@ claev2.f.3 \
 clag2z.f.3 \
 clags2.f.3 \
 clagtm.f.3 \
+clahef_aa.f.3 \
+clahef_rk.f.3 \
+clahef_rook.f.3 \
 clahef.f.3 \
 clahqr.f.3 \
 clahr2.f.3 \
-clahrd.f.3 \
 claic1.f.3 \
 clals0.f.3 \
 clalsa.f.3 \
 clalsd.f.3 \
+clamswlq.f.3 \
+clamtsqr.f.3 \
 clangb.f.3 \
 clange.f.3 \
 clangt.f.3 \
@@ -251,11 +296,13 @@ clar1v.f.3 \
 clar2v.f.3 \
 clarcm.f.3 \
 clarf.f.3 \
+clarfb_gett.f.3 \
 clarfb.f.3 \
 clarfg.f.3 \
 clarfgp.f.3 \
 clarft.f.3 \
 clarfx.f.3 \
+clarfy.f.3 \
 clargv.f.3 \
 clarnv.f.3 \
 clarrv.f.3 \
@@ -270,7 +317,11 @@ clascl2.f.3 \
 claset.f.3 \
 clasr.f.3 \
 classq.f.3 \
+claswlq.f.3 \
 claswp.f.3 \
+clasyf_aa.f.3 \
+clasyf_rk.f.3 \
+clasyf_rook.f.3 \
 clasyf.f.3 \
 clatbs.f.3 \
 clatdf.f.3 \
@@ -278,7 +329,9 @@ clatps.f.3 \
 clatrd.f.3 \
 clatrs.f.3 \
 clatrz.f.3 \
-clatzm.f.3 \
+clatsqr.f.3 \
+claunhr_col_getrfnp.f.3 \
+claunhr_col_getrfnp2.f.3 \
 clauu2.f.3 \
 clauum.f.3 \
 cpbcon.f.3 \
@@ -303,6 +356,7 @@ cposvx.f.3 \
 cposvxx.f.3 \
 cpotf2.f.3 \
 cpotrf.f.3 \
+cpotrf2.f.3 \
 cpotri.f.3 \
 cpotrs.f.3 \
 cppcon.f.3 \
@@ -344,8 +398,12 @@ cstein.f.3 \
 cstemr.f.3 \
 csteqr.f.3 \
 cswap.f.3 \
+csycon_3.f.3 \
+csycon_rook.f.3 \
 csycon.f.3 \
 csyconv.f.3 \
+csyconvf_rook.f.3 \
+csyconvf.f.3 \
 csyequb.f.3 \
 csymm.f.3 \
 csymv.f.3 \
@@ -354,15 +412,32 @@ csyr2k.f.3 \
 csyrfs.f.3 \
 csyrfsx.f.3 \
 csyrk.f.3 \
+csysv_aa_2stage.f.3 \
+csysv_aa.f.3 \
+csysv_rk.f.3 \
+csysv_rook.f.3 \
 csysv.f.3 \
 csysvx.f.3 \
 csysvxx.f.3 \
 csyswapr.f.3 \
+csytf2_rk.f.3 \
+csytf2_rook.f.3 \
 csytf2.f.3 \
+csytrf_aa_2stage.f.3 \
+csytrf_aa.f.3 \
+csytrf_rk.f.3 \
+csytrf_rook.f.3 \
 csytrf.f.3 \
+csytri_3.f.3 \
+csytri_3x.f.3 \
+csytri_rook.f.3 \
 csytri.f.3 \
 csytri2.f.3 \
 csytri2x.f.3 \
+csytrs_3.f.3 \
+csytrs_aa_2stage.f.3 \
+csytrs_aa.f.3 \
+csytrs_rook.f.3 \
 csytrs.f.3 \
 csytrs2.f.3 \
 ctbcon.f.3 \
@@ -383,6 +458,9 @@ ctgsna.f.3 \
 ctgsy2.f.3 \
 ctgsyl.f.3 \
 ctpcon.f.3 \
+ctplqt.f.3 \
+ctplqt2.f.3 \
+ctpmlqt.f.3 \
 ctpmqrt.f.3 \
 ctpmv.f.3 \
 ctpqrt.f.3 \
@@ -396,6 +474,7 @@ ctpttf.f.3 \
 ctpttr.f.3 \
 ctrcon.f.3 \
 ctrevc.f.3 \
+ctrevc3.f.3 \
 ctrexc.f.3 \
 ctrmm.f.3 \
 ctrmv.f.3 \
@@ -410,10 +489,16 @@ ctrtri.f.3 \
 ctrtrs.f.3 \
 ctrttf.f.3 \
 ctrttp.f.3 \
-ctzrqf.f.3 \
 ctzrzf.f.3 \
 cunbdb.f.3 \
+cunbdb1.f.3 \
+cunbdb2.f.3 \
+cunbdb3.f.3 \
+cunbdb4.f.3 \
+cunbdb5.f.3 \
+cunbdb6.f.3 \
 cuncsd.f.3 \
+cuncsd2by1.f.3 \
 cung2l.f.3 \
 cung2r.f.3 \
 cungbr.f.3 \
@@ -425,6 +510,10 @@ cungqr.f.3 \
 cungr2.f.3 \
 cungrq.f.3 \
 cungtr.f.3 \
+cungtsqr_row.f.3 \
+cungtsqr.f.3 \
+cunhr_col.f.3 \
+cunm22.f.3 \
 cunm2l.f.3 \
 cunm2r.f.3 \
 cunmbr.f.3 \
@@ -445,7 +534,9 @@ daxpy.f.3 \
 dbbcsd.f.3 \
 dbdsdc.f.3 \
 dbdsqr.f.3 \
+dbdsvdx.f.3 \
 dcabs1.f.3 \
+dcombssq.f.3 \
 dcopy.f.3 \
 ddisna.f.3 \
 ddot.f.3 \
@@ -473,25 +564,28 @@ dgees.f.3 \
 dgeesx.f.3 \
 dgeev.f.3 \
 dgeevx.f.3 \
-dgegs.f.3 \
-dgegv.f.3 \
 dgehd2.f.3 \
 dgehrd.f.3 \
 dgejsv.f.3 \
+dgelq.f.3 \
 dgelq2.f.3 \
 dgelqf.f.3 \
+dgelqt.f.3 \
+dgelqt3.f.3 \
 dgels.f.3 \
 dgelsd.f.3 \
 dgelss.f.3 \
-dgelsx.f.3 \
 dgelsy.f.3 \
+dgemlq.f.3 \
+dgemlqt.f.3 \
 dgemm.f.3 \
+dgemqr.f.3 \
 dgemqrt.f.3 \
 dgemv.f.3 \
 dgeql2.f.3 \
 dgeqlf.f.3 \
 dgeqp3.f.3 \
-dgeqpf.f.3 \
+dgeqr.f.3 \
 dgeqr2.f.3 \
 dgeqr2p.f.3 \
 dgeqrf.f.3 \
@@ -508,27 +602,35 @@ dgesc2.f.3 \
 dgesdd.f.3 \
 dgesv.f.3 \
 dgesvd.f.3 \
+dgesvdq.f.3 \
+dgesvdx.f.3 \
 dgesvj.f.3 \
 dgesvx.f.3 \
 dgesvxx.f.3 \
 dgetc2.f.3 \
 dgetf2.f.3 \
 dgetrf.f.3 \
+dgetrf2.f.3 \
 dgetri.f.3 \
 dgetrs.f.3 \
+dgetsls.f.3 \
+dgetsqrhrt.f.3 \
 dggbak.f.3 \
 dggbal.f.3 \
 dgges.f.3 \
+dgges3.f.3 \
 dggesx.f.3 \
 dggev.f.3 \
+dggev3.f.3 \
 dggevx.f.3 \
 dggglm.f.3 \
+dgghd3.f.3 \
 dgghrd.f.3 \
 dgglse.f.3 \
 dggqrf.f.3 \
 dggrqf.f.3 \
-dggsvd.f.3 \
-dggsvp.f.3 \
+dggsvd3.f.3 \
+dggsvp3.f.3 \
 dgsvj0.f.3 \
 dgsvj1.f.3 \
 dgtcon.f.3 \
@@ -590,17 +692,15 @@ dlagts.f.3 \
 dlagv2.f.3 \
 dlahqr.f.3 \
 dlahr2.f.3 \
-dlahrd.f.3 \
 dlaic1.f.3 \
 dlaisnan.f.3 \
 dlaln2.f.3 \
 dlals0.f.3 \
 dlalsa.f.3 \
 dlalsd.f.3 \
-dlamch.f.3 \
-dlamchf77.f.3 \
-dlamchtst.f.3 \
 dlamrg.f.3 \
+dlamswlq.f.3 \
+dlamtsqr.f.3 \
 dlaneg.f.3 \
 dlangb.f.3 \
 dlange.f.3 \
@@ -615,6 +715,8 @@ dlantb.f.3 \
 dlantp.f.3 \
 dlantr.f.3 \
 dlanv2.f.3 \
+dlaorhr_col_getrfnp.f.3 \
+dlaorhr_col_getrfnp2.f.3 \
 dlapll.f.3 \
 dlapmr.f.3 \
 dlapmt.f.3 \
@@ -637,11 +739,13 @@ dlaqtr.f.3 \
 dlar1v.f.3 \
 dlar2v.f.3 \
 dlarf.f.3 \
+dlarfb_gett.f.3 \
 dlarfb.f.3 \
 dlarfg.f.3 \
 dlarfgp.f.3 \
 dlarft.f.3 \
 dlarfx.f.3 \
+dlarfy.f.3 \
 dlargv.f.3 \
 dlarnv.f.3 \
 dlarra.f.3 \
@@ -689,8 +793,12 @@ dlasr.f.3 \
 dlasrt.f.3 \
 dlassq.f.3 \
 dlasv2.f.3 \
+dlaswlq.f.3 \
 dlaswp.f.3 \
 dlasy2.f.3 \
+dlasyf_aa.f.3 \
+dlasyf_rk.f.3 \
+dlasyf_rook.f.3 \
 dlasyf.f.3 \
 dlat2s.f.3 \
 dlatbs.f.3 \
@@ -699,14 +807,21 @@ dlatps.f.3 \
 dlatrd.f.3 \
 dlatrs.f.3 \
 dlatrz.f.3 \
-dlatzm.f.3 \
+dlatsqr.f.3 \
 dlauu2.f.3 \
 dlauum.f.3 \
 dnrm2.f.3 \
 dopgtr.f.3 \
 dopmtr.f.3 \
 dorbdb.f.3 \
+dorbdb1.f.3 \
+dorbdb2.f.3 \
+dorbdb3.f.3 \
+dorbdb4.f.3 \
+dorbdb5.f.3 \
+dorbdb6.f.3 \
 dorcsd.f.3 \
+dorcsd2by1.f.3 \
 dorg2l.f.3 \
 dorg2r.f.3 \
 dorgbr.f.3 \
@@ -718,6 +833,10 @@ dorgqr.f.3 \
 dorgr2.f.3 \
 dorgrq.f.3 \
 dorgtr.f.3 \
+dorgtsqr_row.f.3 \
+dorgtsqr.f.3 \
+dorhr_col.f.3 \
+dorm22.f.3 \
 dorm2l.f.3 \
 dorm2r.f.3 \
 dormbr.f.3 \
@@ -753,6 +872,7 @@ dposvx.f.3 \
 dposvxx.f.3 \
 dpotf2.f.3 \
 dpotrf.f.3 \
+dpotrf2.f.3 \
 dpotri.f.3 \
 dpotrs.f.3 \
 dppcon.f.3 \
@@ -778,8 +898,12 @@ drotg.f.3 \
 drotm.f.3 \
 drotmg.f.3 \
 drscl.f.3 \
+dsb2st_kernels.f.3 \
+dsbev_2stage.f.3 \
 dsbev.f.3 \
+dsbevd_2stage.f.3 \
 dsbevd.f.3 \
+dsbevx_2stage.f.3 \
 dsbevx.f.3 \
 dsbgst.f.3 \
 dsbgv.f.3 \
@@ -789,12 +913,6 @@ dsbmv.f.3 \
 dsbtrd.f.3 \
 dscal.f.3 \
 dsdot.f.3 \
-dsecnd_EXT_ETIME.f.3 \
-dsecnd_EXT_ETIME_.f.3 \
-dsecnd_INT_CPU_TIME.f.3 \
-dsecnd_INT_ETIME.f.3 \
-dsecnd_NONE.f.3 \
-dsecndtst.f.3 \
 dsfrk.f.3 \
 dsgesv.f.3 \
 dspcon.f.3 \
@@ -828,15 +946,24 @@ dstevd.f.3 \
 dstevr.f.3 \
 dstevx.f.3 \
 dswap.f.3 \
+dsycon_3.f.3 \
+dsycon_rook.f.3 \
 dsycon.f.3 \
 dsyconv.f.3 \
+dsyconvf_rook.f.3 \
+dsyconvf.f.3 \
 dsyequb.f.3 \
+dsyev_2stage.f.3 \
 dsyev.f.3 \
+dsyevd_2stage.f.3 \
 dsyevd.f.3 \
+dsyevr_2stage.f.3 \
 dsyevr.f.3 \
+dsyevx_2stage.f.3 \
 dsyevx.f.3 \
 dsygs2.f.3 \
 dsygst.f.3 \
+dsygv_2stage.f.3 \
 dsygv.f.3 \
 dsygvd.f.3 \
 dsygvx.f.3 \
@@ -848,17 +975,36 @@ dsyr2k.f.3 \
 dsyrfs.f.3 \
 dsyrfsx.f.3 \
 dsyrk.f.3 \
+dsysv_aa_2stage.f.3 \
+dsysv_aa.f.3 \
+dsysv_rk.f.3 \
+dsysv_rook.f.3 \
 dsysv.f.3 \
 dsysvx.f.3 \
 dsysvxx.f.3 \
 dsyswapr.f.3 \
 dsytd2.f.3 \
+dsytf2_rk.f.3 \
+dsytf2_rook.f.3 \
 dsytf2.f.3 \
+dsytrd_2stage.f.3 \
+dsytrd_sy2sb.f.3 \
 dsytrd.f.3 \
+dsytrf_aa_2stage.f.3 \
+dsytrf_aa.f.3 \
+dsytrf_rk.f.3 \
+dsytrf_rook.f.3 \
 dsytrf.f.3 \
+dsytri_3.f.3 \
+dsytri_3x.f.3 \
+dsytri_rook.f.3 \
 dsytri.f.3 \
 dsytri2.f.3 \
 dsytri2x.f.3 \
+dsytrs_3.f.3 \
+dsytrs_aa_2stage.f.3 \
+dsytrs_aa.f.3 \
+dsytrs_rook.f.3 \
 dsytrs.f.3 \
 dsytrs2.f.3 \
 dtbcon.f.3 \
@@ -879,6 +1025,9 @@ dtgsna.f.3 \
 dtgsy2.f.3 \
 dtgsyl.f.3 \
 dtpcon.f.3 \
+dtplqt.f.3 \
+dtplqt2.f.3 \
+dtpmlqt.f.3 \
 dtpmqrt.f.3 \
 dtpmv.f.3 \
 dtpqrt.f.3 \
@@ -892,6 +1041,7 @@ dtpttf.f.3 \
 dtpttr.f.3 \
 dtrcon.f.3 \
 dtrevc.f.3 \
+dtrevc3.f.3 \
 dtrexc.f.3 \
 dtrmm.f.3 \
 dtrmv.f.3 \
@@ -906,11 +1056,15 @@ dtrtri.f.3 \
 dtrtrs.f.3 \
 dtrttf.f.3 \
 dtrttp.f.3 \
-dtzrqf.f.3 \
 dtzrzf.f.3 \
 dzasum.f.3 \
 dznrm2.f.3 \
 dzsum1.f.3 \
+example_DGELS_colmajor.c.3 \
+example_DGELS_rowmajor.c.3 \
+example_DGESV_colmajor.c.3 \
+example_DGESV_rowmajor.c.3 \
+example_user.c.3 \
 icamax.f.3 \
 icmax1.f.3 \
 idamax.f.3 \
@@ -921,6 +1075,7 @@ iladiag.f.3 \
 iladlc.f.3 \
 iladlr.f.3 \
 ilaenv.f.3 \
+ilaenv2stage.f.3 \
 ilaprec.f.3 \
 ilaslc.f.3 \
 ilaslr.f.3 \
@@ -932,27 +1087,24 @@ iparmq.f.3 \
 isamax.f.3 \
 izamax.f.3 \
 izmax1.f.3 \
+lsame.f.3 \
 lsamen.f.3 \
-lsametst.f.3 \
 sasum.f.3 \
 saxpy.f.3 \
 sbbcsd.f.3 \
 sbdsdc.f.3 \
 sbdsqr.f.3 \
+sbdsvdx.f.3 \
 scabs1.f.3 \
 scasum.f.3 \
+sceil.f.3 \
 scnrm2.f.3 \
+scombssq.f.3 \
 scopy.f.3 \
 scsum1.f.3 \
 sdisna.f.3 \
 sdot.f.3 \
 sdsdot.f.3 \
-second_EXT_ETIME.f.3 \
-second_EXT_ETIME_.f.3 \
-second_INT_CPU_TIME.f.3 \
-second_INT_ETIME.f.3 \
-second_NONE.f.3 \
-secondtst.f.3 \
 sgbbrd.f.3 \
 sgbcon.f.3 \
 sgbequ.f.3 \
@@ -977,25 +1129,28 @@ sgees.f.3 \
 sgeesx.f.3 \
 sgeev.f.3 \
 sgeevx.f.3 \
-sgegs.f.3 \
-sgegv.f.3 \
 sgehd2.f.3 \
 sgehrd.f.3 \
 sgejsv.f.3 \
+sgelq.f.3 \
 sgelq2.f.3 \
 sgelqf.f.3 \
+sgelqt.f.3 \
+sgelqt3.f.3 \
 sgels.f.3 \
 sgelsd.f.3 \
 sgelss.f.3 \
-sgelsx.f.3 \
 sgelsy.f.3 \
+sgemlq.f.3 \
+sgemlqt.f.3 \
 sgemm.f.3 \
+sgemqr.f.3 \
 sgemqrt.f.3 \
 sgemv.f.3 \
 sgeql2.f.3 \
 sgeqlf.f.3 \
 sgeqp3.f.3 \
-sgeqpf.f.3 \
+sgeqr.f.3 \
 sgeqr2.f.3 \
 sgeqr2p.f.3 \
 sgeqrf.f.3 \
@@ -1012,27 +1167,35 @@ sgesc2.f.3 \
 sgesdd.f.3 \
 sgesv.f.3 \
 sgesvd.f.3 \
+sgesvdq.f.3 \
+sgesvdx.f.3 \
 sgesvj.f.3 \
 sgesvx.f.3 \
 sgesvxx.f.3 \
 sgetc2.f.3 \
 sgetf2.f.3 \
 sgetrf.f.3 \
+sgetrf2.f.3 \
 sgetri.f.3 \
 sgetrs.f.3 \
+sgetsls.f.3 \
+sgetsqrhrt.f.3 \
 sggbak.f.3 \
 sggbal.f.3 \
 sgges.f.3 \
+sgges3.f.3 \
 sggesx.f.3 \
 sggev.f.3 \
+sggev3.f.3 \
 sggevx.f.3 \
 sggglm.f.3 \
+sgghd3.f.3 \
 sgghrd.f.3 \
 sgglse.f.3 \
 sggqrf.f.3 \
 sggrqf.f.3 \
-sggsvd.f.3 \
-sggsvp.f.3 \
+sggsvd3.f.3 \
+sggsvp3.f.3 \
 sgsvj0.f.3 \
 sgsvj1.f.3 \
 sgtcon.f.3 \
@@ -1094,17 +1257,15 @@ slagts.f.3 \
 slagv2.f.3 \
 slahqr.f.3 \
 slahr2.f.3 \
-slahrd.f.3 \
 slaic1.f.3 \
 slaisnan.f.3 \
 slaln2.f.3 \
 slals0.f.3 \
 slalsa.f.3 \
 slalsd.f.3 \
-slamch.f.3 \
-slamchf77.f.3 \
-slamchtst.f.3 \
 slamrg.f.3 \
+slamswlq.f.3 \
+slamtsqr.f.3 \
 slaneg.f.3 \
 slangb.f.3 \
 slange.f.3 \
@@ -1119,6 +1280,8 @@ slantb.f.3 \
 slantp.f.3 \
 slantr.f.3 \
 slanv2.f.3 \
+slaorhr_col_getrfnp.f.3 \
+slaorhr_col_getrfnp2.f.3 \
 slapll.f.3 \
 slapmr.f.3 \
 slapmt.f.3 \
@@ -1141,11 +1304,13 @@ slaqtr.f.3 \
 slar1v.f.3 \
 slar2v.f.3 \
 slarf.f.3 \
+slarfb_gett.f.3 \
 slarfb.f.3 \
 slarfg.f.3 \
 slarfgp.f.3 \
 slarft.f.3 \
 slarfx.f.3 \
+slarfy.f.3 \
 slargv.f.3 \
 slarnv.f.3 \
 slarra.f.3 \
@@ -1193,8 +1358,12 @@ slasr.f.3 \
 slasrt.f.3 \
 slassq.f.3 \
 slasv2.f.3 \
+slaswlq.f.3 \
 slaswp.f.3 \
 slasy2.f.3 \
+slasyf_aa.f.3 \
+slasyf_rk.f.3 \
+slasyf_rook.f.3 \
 slasyf.f.3 \
 slatbs.f.3 \
 slatdf.f.3 \
@@ -1202,14 +1371,21 @@ slatps.f.3 \
 slatrd.f.3 \
 slatrs.f.3 \
 slatrz.f.3 \
-slatzm.f.3 \
+slatsqr.f.3 \
 slauu2.f.3 \
 slauum.f.3 \
 snrm2.f.3 \
 sopgtr.f.3 \
 sopmtr.f.3 \
 sorbdb.f.3 \
+sorbdb1.f.3 \
+sorbdb2.f.3 \
+sorbdb3.f.3 \
+sorbdb4.f.3 \
+sorbdb5.f.3 \
+sorbdb6.f.3 \
 sorcsd.f.3 \
+sorcsd2by1.f.3 \
 sorg2l.f.3 \
 sorg2r.f.3 \
 sorgbr.f.3 \
@@ -1221,6 +1397,10 @@ sorgqr.f.3 \
 sorgr2.f.3 \
 sorgrq.f.3 \
 sorgtr.f.3 \
+sorgtsqr_row.f.3 \
+sorgtsqr.f.3 \
+sorhr_col.f.3 \
+sorm22.f.3 \
 sorm2l.f.3 \
 sorm2r.f.3 \
 sormbr.f.3 \
@@ -1256,6 +1436,7 @@ sposvx.f.3 \
 sposvxx.f.3 \
 spotf2.f.3 \
 spotrf.f.3 \
+spotrf2.f.3 \
 spotri.f.3 \
 spotrs.f.3 \
 sppcon.f.3 \
@@ -1276,13 +1457,19 @@ sptsvx.f.3 \
 spttrf.f.3 \
 spttrs.f.3 \
 sptts2.f.3 \
+SRC_xerbla_array.f.3 \
+SRC_xerbla.f.3 \
 srot.f.3 \
 srotg.f.3 \
 srotm.f.3 \
 srotmg.f.3 \
 srscl.f.3 \
+ssb2st_kernels.f.3 \
+ssbev_2stage.f.3 \
 ssbev.f.3 \
+ssbevd_2stage.f.3 \
 ssbevd.f.3 \
+ssbevx_2stage.f.3 \
 ssbevx.f.3 \
 ssbgst.f.3 \
 ssbgv.f.3 \
@@ -1322,15 +1509,24 @@ sstevd.f.3 \
 sstevr.f.3 \
 sstevx.f.3 \
 sswap.f.3 \
+ssycon_3.f.3 \
+ssycon_rook.f.3 \
 ssycon.f.3 \
 ssyconv.f.3 \
+ssyconvf_rook.f.3 \
+ssyconvf.f.3 \
 ssyequb.f.3 \
+ssyev_2stage.f.3 \
 ssyev.f.3 \
+ssyevd_2stage.f.3 \
 ssyevd.f.3 \
+ssyevr_2stage.f.3 \
 ssyevr.f.3 \
+ssyevx_2stage.f.3 \
 ssyevx.f.3 \
 ssygs2.f.3 \
 ssygst.f.3 \
+ssygv_2stage.f.3 \
 ssygv.f.3 \
 ssygvd.f.3 \
 ssygvx.f.3 \
@@ -1342,17 +1538,36 @@ ssyr2k.f.3 \
 ssyrfs.f.3 \
 ssyrfsx.f.3 \
 ssyrk.f.3 \
+ssysv_aa_2stage.f.3 \
+ssysv_aa.f.3 \
+ssysv_rk.f.3 \
+ssysv_rook.f.3 \
 ssysv.f.3 \
 ssysvx.f.3 \
 ssysvxx.f.3 \
 ssyswapr.f.3 \
 ssytd2.f.3 \
+ssytf2_rk.f.3 \
+ssytf2_rook.f.3 \
 ssytf2.f.3 \
+ssytrd_2stage.f.3 \
+ssytrd_sy2sb.f.3 \
 ssytrd.f.3 \
+ssytrf_aa_2stage.f.3 \
+ssytrf_aa.f.3 \
+ssytrf_rk.f.3 \
+ssytrf_rook.f.3 \
 ssytrf.f.3 \
+ssytri_3.f.3 \
+ssytri_3x.f.3 \
+ssytri_rook.f.3 \
 ssytri.f.3 \
 ssytri2.f.3 \
 ssytri2x.f.3 \
+ssytrs_3.f.3 \
+ssytrs_aa_2stage.f.3 \
+ssytrs_aa.f.3 \
+ssytrs_rook.f.3 \
 ssytrs.f.3 \
 ssytrs2.f.3 \
 stbcon.f.3 \
@@ -1373,6 +1588,9 @@ stgsna.f.3 \
 stgsy2.f.3 \
 stgsyl.f.3 \
 stpcon.f.3 \
+stplqt.f.3 \
+stplqt2.f.3 \
+stpmlqt.f.3 \
 stpmqrt.f.3 \
 stpmv.f.3 \
 stpqrt.f.3 \
@@ -1386,6 +1604,7 @@ stpttf.f.3 \
 stpttr.f.3 \
 strcon.f.3 \
 strevc.f.3 \
+strevc3.f.3 \
 strexc.f.3 \
 strmm.f.3 \
 strmv.f.3 \
@@ -1400,9 +1619,31 @@ strtri.f.3 \
 strtrs.f.3 \
 strttf.f.3 \
 strttp.f.3 \
-stzrqf.f.3 \
 stzrzf.f.3 \
-tstiee.f.3 \
+VARIANTS_cholesky_RL_cpotrf.f.3 \
+VARIANTS_cholesky_RL_dpotrf.f.3 \
+VARIANTS_cholesky_RL_spotrf.f.3 \
+VARIANTS_cholesky_RL_zpotrf.f.3 \
+VARIANTS_cholesky_TOP_cpotrf.f.3 \
+VARIANTS_cholesky_TOP_dpotrf.f.3 \
+VARIANTS_cholesky_TOP_spotrf.f.3 \
+VARIANTS_cholesky_TOP_zpotrf.f.3 \
+VARIANTS_lu_CR_cgetrf.f.3 \
+VARIANTS_lu_CR_dgetrf.f.3 \
+VARIANTS_lu_CR_sgetrf.f.3 \
+VARIANTS_lu_CR_zgetrf.f.3 \
+VARIANTS_lu_LL_cgetrf.f.3 \
+VARIANTS_lu_LL_dgetrf.f.3 \
+VARIANTS_lu_LL_sgetrf.f.3 \
+VARIANTS_lu_LL_zgetrf.f.3 \
+VARIANTS_lu_REC_cgetrf.f.3 \
+VARIANTS_lu_REC_dgetrf.f.3 \
+VARIANTS_lu_REC_sgetrf.f.3 \
+VARIANTS_lu_REC_zgetrf.f.3 \
+VARIANTS_qr_LL_cgeqrf.f.3 \
+VARIANTS_qr_LL_dgeqrf.f.3 \
+VARIANTS_qr_LL_sgeqrf.f.3 \
+VARIANTS_qr_LL_zgeqrf.f.3 \
 zaxpy.f.3 \
 zbbcsd.f.3 \
 zbdsqr.f.3 \
@@ -1438,24 +1679,28 @@ zgees.f.3 \
 zgeesx.f.3 \
 zgeev.f.3 \
 zgeevx.f.3 \
-zgegs.f.3 \
-zgegv.f.3 \
 zgehd2.f.3 \
 zgehrd.f.3 \
+zgejsv.f.3 \
+zgelq.f.3 \
 zgelq2.f.3 \
 zgelqf.f.3 \
+zgelqt.f.3 \
+zgelqt3.f.3 \
 zgels.f.3 \
 zgelsd.f.3 \
 zgelss.f.3 \
-zgelsx.f.3 \
 zgelsy.f.3 \
+zgemlq.f.3 \
+zgemlqt.f.3 \
 zgemm.f.3 \
+zgemqr.f.3 \
 zgemqrt.f.3 \
 zgemv.f.3 \
 zgeql2.f.3 \
 zgeqlf.f.3 \
 zgeqp3.f.3 \
-zgeqpf.f.3 \
+zgeqr.f.3 \
 zgeqr2.f.3 \
 zgeqr2p.f.3 \
 zgeqrf.f.3 \
@@ -1473,26 +1718,37 @@ zgesc2.f.3 \
 zgesdd.f.3 \
 zgesv.f.3 \
 zgesvd.f.3 \
+zgesvdq.f.3 \
+zgesvdx.f.3 \
+zgesvj.f.3 \
 zgesvx.f.3 \
 zgesvxx.f.3 \
 zgetc2.f.3 \
 zgetf2.f.3 \
 zgetrf.f.3 \
+zgetrf2.f.3 \
 zgetri.f.3 \
 zgetrs.f.3 \
+zgetsls.f.3 \
+zgetsqrhrt.f.3 \
 zggbak.f.3 \
 zggbal.f.3 \
 zgges.f.3 \
+zgges3.f.3 \
 zggesx.f.3 \
 zggev.f.3 \
+zggev3.f.3 \
 zggevx.f.3 \
 zggglm.f.3 \
+zgghd3.f.3 \
 zgghrd.f.3 \
 zgglse.f.3 \
 zggqrf.f.3 \
 zggrqf.f.3 \
-zggsvd.f.3 \
-zggsvp.f.3 \
+zggsvd3.f.3 \
+zggsvp3.f.3 \
+zgsvj0.f.3 \
+zgsvj1.f.3 \
 zgtcon.f.3 \
 zgtrfs.f.3 \
 zgtsv.f.3 \
@@ -1500,8 +1756,12 @@ zgtsvx.f.3 \
 zgttrf.f.3 \
 zgttrs.f.3 \
 zgtts2.f.3 \
+zhb2st_kernels.f.3 \
+zhbev_2stage.f.3 \
 zhbev.f.3 \
+zhbevd_2stage.f.3 \
 zhbevd.f.3 \
+zhbevx_2stage.f.3 \
 zhbevx.f.3 \
 zhbgst.f.3 \
 zhbgv.f.3 \
@@ -1509,14 +1769,21 @@ zhbgvd.f.3 \
 zhbgvx.f.3 \
 zhbmv.f.3 \
 zhbtrd.f.3 \
+zhecon_3.f.3 \
+zhecon_rook.f.3 \
 zhecon.f.3 \
 zheequb.f.3 \
+zheev_2stage.f.3 \
 zheev.f.3 \
+zheevd_2stage.f.3 \
 zheevd.f.3 \
+zheevr_2stage.f.3 \
 zheevr.f.3 \
+zheevx_2stage.f.3 \
 zheevx.f.3 \
 zhegs2.f.3 \
 zhegst.f.3 \
+zhegv_2stage.f.3 \
 zhegv.f.3 \
 zhegvd.f.3 \
 zhegvx.f.3 \
@@ -1528,17 +1795,36 @@ zher2k.f.3 \
 zherfs.f.3 \
 zherfsx.f.3 \
 zherk.f.3 \
+zhesv_aa_2stage.f.3 \
+zhesv_aa.f.3 \
+zhesv_rk.f.3 \
+zhesv_rook.f.3 \
 zhesv.f.3 \
 zhesvx.f.3 \
 zhesvxx.f.3 \
 zheswapr.f.3 \
 zhetd2.f.3 \
+zhetf2_rk.f.3 \
+zhetf2_rook.f.3 \
 zhetf2.f.3 \
+zhetrd_2stage.f.3 \
+zhetrd_he2hb.f.3 \
 zhetrd.f.3 \
+zhetrf_aa_2stage.f.3 \
+zhetrf_aa.f.3 \
+zhetrf_rk.f.3 \
+zhetrf_rook.f.3 \
 zhetrf.f.3 \
+zhetri_3.f.3 \
+zhetri_3x.f.3 \
+zhetri_rook.f.3 \
 zhetri.f.3 \
 zhetri2.f.3 \
 zhetri2x.f.3 \
+zhetrs_3.f.3 \
+zhetrs_aa_2stage.f.3 \
+zhetrs_aa.f.3 \
+zhetrs_rook.f.3 \
 zhetrs.f.3 \
 zhetrs2.f.3 \
 zhfrk.f.3 \
@@ -1607,14 +1893,18 @@ zlaev2.f.3 \
 zlag2c.f.3 \
 zlags2.f.3 \
 zlagtm.f.3 \
+zlahef_aa.f.3 \
+zlahef_rk.f.3 \
+zlahef_rook.f.3 \
 zlahef.f.3 \
 zlahqr.f.3 \
 zlahr2.f.3 \
-zlahrd.f.3 \
 zlaic1.f.3 \
 zlals0.f.3 \
 zlalsa.f.3 \
 zlalsd.f.3 \
+zlamswlq.f.3 \
+zlamtsqr.f.3 \
 zlangb.f.3 \
 zlange.f.3 \
 zlangt.f.3 \
@@ -1653,11 +1943,13 @@ zlar1v.f.3 \
 zlar2v.f.3 \
 zlarcm.f.3 \
 zlarf.f.3 \
+zlarfb_gett.f.3 \
 zlarfb.f.3 \
 zlarfg.f.3 \
 zlarfgp.f.3 \
 zlarft.f.3 \
 zlarfx.f.3 \
+zlarfy.f.3 \
 zlargv.f.3 \
 zlarnv.f.3 \
 zlarrv.f.3 \
@@ -1672,7 +1964,11 @@ zlascl2.f.3 \
 zlaset.f.3 \
 zlasr.f.3 \
 zlassq.f.3 \
+zlaswlq.f.3 \
 zlaswp.f.3 \
+zlasyf_aa.f.3 \
+zlasyf_rk.f.3 \
+zlasyf_rook.f.3 \
 zlasyf.f.3 \
 zlat2c.f.3 \
 zlatbs.f.3 \
@@ -1681,7 +1977,9 @@ zlatps.f.3 \
 zlatrd.f.3 \
 zlatrs.f.3 \
 zlatrz.f.3 \
-zlatzm.f.3 \
+zlatsqr.f.3 \
+zlaunhr_col_getrfnp.f.3 \
+zlaunhr_col_getrfnp2.f.3 \
 zlauu2.f.3 \
 zlauum.f.3 \
 zpbcon.f.3 \
@@ -1706,6 +2004,7 @@ zposvx.f.3 \
 zposvxx.f.3 \
 zpotf2.f.3 \
 zpotrf.f.3 \
+zpotrf2.f.3 \
 zpotri.f.3 \
 zpotrs.f.3 \
 zppcon.f.3 \
@@ -1744,8 +2043,12 @@ zstein.f.3 \
 zstemr.f.3 \
 zsteqr.f.3 \
 zswap.f.3 \
+zsycon_3.f.3 \
+zsycon_rook.f.3 \
 zsycon.f.3 \
 zsyconv.f.3 \
+zsyconvf_rook.f.3 \
+zsyconvf.f.3 \
 zsyequb.f.3 \
 zsymm.f.3 \
 zsymv.f.3 \
@@ -1754,15 +2057,32 @@ zsyr2k.f.3 \
 zsyrfs.f.3 \
 zsyrfsx.f.3 \
 zsyrk.f.3 \
+zsysv_aa_2stage.f.3 \
+zsysv_aa.f.3 \
+zsysv_rk.f.3 \
+zsysv_rook.f.3 \
 zsysv.f.3 \
 zsysvx.f.3 \
 zsysvxx.f.3 \
 zsyswapr.f.3 \
+zsytf2_rk.f.3 \
+zsytf2_rook.f.3 \
 zsytf2.f.3 \
+zsytrf_aa_2stage.f.3 \
+zsytrf_aa.f.3 \
+zsytrf_rk.f.3 \
+zsytrf_rook.f.3 \
 zsytrf.f.3 \
+zsytri_3.f.3 \
+zsytri_3x.f.3 \
+zsytri_rook.f.3 \
 zsytri.f.3 \
 zsytri2.f.3 \
 zsytri2x.f.3 \
+zsytrs_3.f.3 \
+zsytrs_aa_2stage.f.3 \
+zsytrs_aa.f.3 \
+zsytrs_rook.f.3 \
 zsytrs.f.3 \
 zsytrs2.f.3 \
 ztbcon.f.3 \
@@ -1783,6 +2103,9 @@ ztgsna.f.3 \
 ztgsy2.f.3 \
 ztgsyl.f.3 \
 ztpcon.f.3 \
+ztplqt.f.3 \
+ztplqt2.f.3 \
+ztpmlqt.f.3 \
 ztpmqrt.f.3 \
 ztpmv.f.3 \
 ztpqrt.f.3 \
@@ -1796,6 +2119,7 @@ ztpttf.f.3 \
 ztpttr.f.3 \
 ztrcon.f.3 \
 ztrevc.f.3 \
+ztrevc3.f.3 \
 ztrexc.f.3 \
 ztrmm.f.3 \
 ztrmv.f.3 \
@@ -1810,10 +2134,16 @@ ztrtri.f.3 \
 ztrtrs.f.3 \
 ztrttf.f.3 \
 ztrttp.f.3 \
-ztzrqf.f.3 \
 ztzrzf.f.3 \
 zunbdb.f.3 \
+zunbdb1.f.3 \
+zunbdb2.f.3 \
+zunbdb3.f.3 \
+zunbdb4.f.3 \
+zunbdb5.f.3 \
+zunbdb6.f.3 \
 zuncsd.f.3 \
+zuncsd2by1.f.3 \
 zung2l.f.3 \
 zung2r.f.3 \
 zungbr.f.3 \
@@ -1825,6 +2155,10 @@ zungqr.f.3 \
 zungr2.f.3 \
 zungrq.f.3 \
 zungtr.f.3 \
+zungtsqr_row.f.3 \
+zungtsqr.f.3 \
+zunhr_col.f.3 \
+zunm22.f.3 \
 zunm2l.f.3 \
 zunm2r.f.3 \
 zunmbr.f.3 \
diff --git a/math/lapack/files/patch-Makefile b/math/lapack/files/patch-Makefile
deleted file mode 100644
index b3321821b4ad..000000000000
--- a/math/lapack/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2012-09-09 00:53:46.000000000 +0900
-+++ Makefile	2012-09-09 00:53:57.000000000 +0900
-@@ -23,7 +23,7 @@
- lapacklib:	lapack_install
- 	( cd SRC; $(MAKE) )
- 
--lapackelib: lapacklib
-+lapackelib: 
- 	( cd lapacke; $(MAKE) )
- 
- lapacke_example: lapackelib
diff --git a/math/lapack/files/patch-SRC+Makefile b/math/lapack/files/patch-SRC+Makefile
deleted file mode 100644
index c4a0a8250472..000000000000
--- a/math/lapack/files/patch-SRC+Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
---- SRC/Makefile.orig	2015-01-15 16:32:42.000000000 +0100
-+++ SRC/Makefile	2015-01-15 16:33:52.000000000 +0100
-@@ -159,7 +159,7 @@
- 
- DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o 
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
-    sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o			\
-    sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
-@@ -167,7 +167,7 @@
-    sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
-    sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
-    slascl2.o sla_wwaddw.o
--endif
-+.endif
- 
- CLASRC = \
-    cbdsqr.o cgbbrd.o cgbcon.o cgbequ.o cgbrfs.o cgbsv.o  cgbsvx.o \
-@@ -238,7 +238,7 @@
-    cgeqrt.o cgeqrt2.o cgeqrt3.o cgemqrt.o \
-    ctpqrt.o ctpqrt2.o ctpmqrt.o ctprfb.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- CXLASRC = cgesvxx.o cgerfsx.o cla_gerfsx_extended.o cla_geamv.o \
-    cla_gercond_c.o cla_gercond_x.o cla_gerpvgrw.o \
-    csysvxx.o csyrfsx.o cla_syrfsx_extended.o cla_syamv.o \
-@@ -250,7 +250,7 @@
-    chesvxx.o cherfsx.o cla_herfsx_extended.o cla_heamv.o \
-    cla_hercond_c.o cla_hercond_x.o cla_herpvgrw.o \
-    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
--endif
-+.endif
- 
- ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
- 
-@@ -318,7 +318,7 @@
-    dgeqrt.o dgeqrt2.o dgeqrt3.o dgemqrt.o \
-    dtpqrt.o dtpqrt2.o dtpmqrt.o dtprfb.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
-    dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o			\
-    dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
-@@ -326,7 +326,7 @@
-    dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
-    dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
-    dlascl2.o dla_wwaddw.o
--endif
-+.endif
- 
- ZLASRC = \
-    zbdsqr.o zgbbrd.o zgbcon.o zgbequ.o zgbrfs.o zgbsv.o  zgbsvx.o \
-@@ -402,7 +402,7 @@
-    zgeqrt.o zgeqrt2.o zgeqrt3.o zgemqrt.o \
-    ztpqrt.o ztpqrt2.o ztpmqrt.o ztprfb.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
-    zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o	\
-    zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
-@@ -412,14 +412,14 @@
-    zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
-    zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
-    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
--endif
-+.endif
- 
- ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
-    $(SCLAUX) $(DZLAUX) $(ALLAUX)
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
--endif
-+.endif
- 
- all: ../$(LAPACKLIB)
- 
-@@ -456,12 +456,12 @@
- $(ZLASRC): $(FRC)
- $(ZCLASRC): $(FRC)
- $(DSLASRC): $(FRC)
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- $(SXLASRC): $(FRC)
- $(CXLASRC): $(FRC)
- $(DXLASRC): $(FRC)
- $(ZXLASRC): $(FRC)
--endif
-+.endif
- 
- FRC:
- 	@FRC=$(FRC)
diff --git a/math/lapack/files/patch-TESTING+LIN+Makefile b/math/lapack/files/patch-TESTING+LIN+Makefile
deleted file mode 100644
index b674e1557667..000000000000
--- a/math/lapack/files/patch-TESTING+LIN+Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
---- TESTING/LIN/Makefile.orig	2015-01-15 16:35:28.000000000 +0100
-+++ TESTING/LIN/Makefile	2015-01-15 16:36:26.000000000 +0100
-@@ -34,11 +34,6 @@
- #
- #######################################################################
- 
--ifneq ($(strip $(VARLIB)),)
--    LAPACKLIB :=  $(VARLIB) ../../$(LAPACKLIB)
--endif
--
--
- ALINTST = \
-    aladhd.o alaerh.o alaesm.o alahd.o alareq.o \
-    alasum.o alasvm.o chkxer.o icopy.o ilaenv.o xlaenv.o xerbla.o
-@@ -76,13 +71,13 @@
-    strt02.o strt03.o strt05.o strt06.o \
-    stzt01.o stzt02.o sgennd.o sqrt04.o sqrt05.o schkqrt.o serrqrt.o schkqrtp.o serrqrtp.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- SLINTST += serrvxx.o sdrvgex.o sdrvsyx.o serrgex.o sdrvgbx.o sdrvpox.o \
-            sebchvxx.o serrsyx.o serrpox.o
--else
-+.else
- SLINTST += serrvx.o sdrvge.o sdrvsy.o serrge.o sdrvgb.o sdrvpo.o \
-            serrsy.o serrpo.o
--endif
-+.endif
- 
- CLINTST = cchkaa.o \
-    cchkeq.o cchkgb.o cchkge.o cchkgt.o \
-@@ -117,13 +112,13 @@
-    ctzt01.o ctzt02.o sget06.o cgennd.o \
-    cqrt04.o cqrt05.o cchkqrt.o cerrqrt.o cchkqrtp.o cerrqrtp.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- CLINTST += cerrvxx.o cdrvgex.o cdrvsyx.o cdrvgbx.o cerrgex.o cdrvpox.o \
-            cdrvhex.o cerrpox.o cebchvxx.o cerrsyx.o cerrhex.o
--else
-+.else
- CLINTST += cerrvx.o cdrvge.o cdrvsy.o cdrvgb.o cerrge.o cdrvpo.o \
-            cdrvhe.o cerrpo.o cerrsy.o cerrhe.o
--endif
-+.endif
- 
- DLINTST = dchkaa.o \
-    dchkeq.o dchkgb.o dchkge.o dchkgt.o \
-@@ -155,13 +150,13 @@
-    dtzt01.o dtzt02.o dgennd.o \
-    dqrt04.o dqrt05.o dchkqrt.o derrqrt.o dchkqrtp.o derrqrtp.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- DLINTST += derrvxx.o ddrvgex.o ddrvsyx.o ddrvgbx.o derrgex.o ddrvpox.o derrpox.o \
-            debchvxx.o derrsyx.o
--else
-+.else
- DLINTST += derrvx.o ddrvge.o ddrvsy.o ddrvgb.o derrge.o ddrvpo.o derrpo.o \
-            derrsy.o
--endif
-+.endif
- 
- ZLINTST = zchkaa.o \
-    zchkeq.o zchkgb.o zchkge.o zchkgt.o \
-@@ -196,13 +191,13 @@
-    ztzt01.o ztzt02.o dget06.o zgennd.o \
-    zqrt04.o zqrt05.o zchkqrt.o zerrqrt.o zchkqrtp.o zerrqrtp.o
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- ZLINTST += zerrvxx.o zdrvgex.o zdrvsyx.o zdrvgbx.o zerrgex.o zdrvpox.o zdrvhex.o \
-            zerrpox.o zebchvxx.o zerrsyx.o zerrhex.o
--else
-+.else
- ZLINTST += zerrvx.o zdrvge.o zdrvsy.o zdrvgb.o zerrge.o zdrvpo.o \
-            zdrvhe.o zerrpo.o zerrsy.o zerrhe.o
--endif
-+.endif
- 
- DSLINTST = dchkab.o \
- 	ddrvab.o ddrvac.o derrab.o derrac.o dget08.o          \
diff --git a/math/lapack/files/patch-TESTING+Makefile b/math/lapack/files/patch-TESTING+Makefile
deleted file mode 100644
index df95a720c5de..000000000000
--- a/math/lapack/files/patch-TESTING+Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- TESTING/Makefile.orig	2015-01-15 16:34:38.000000000 +0100
-+++ TESTING/Makefile	2015-01-15 16:35:05.000000000 +0100
-@@ -37,11 +37,6 @@
- 
- include ../make.inc
- 
--ifneq ($(strip $(VARLIB)),)
--    LAPACKLIB :=  $(VARLIB) ../$(LAPACKLIB)
--endif
--
--
- all:     single complex double complex16 singleproto doubleproto complexproto complex16proto
- 
- SEIGTST= snep.out \
diff --git a/math/lapack/files/patch-lapacke+Makefile b/math/lapack/files/patch-lapacke+Makefile
deleted file mode 100644
index ff585e9e0937..000000000000
--- a/math/lapack/files/patch-lapacke+Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- lapacke/Makefile.orig	2012-09-09 00:48:05.000000000 +0900
-+++ lapacke/Makefile	2012-09-09 00:48:54.000000000 +0900
-@@ -45,20 +45,20 @@
- all: lapacke 
- 
- lapacke:
--	cd include && cp lapacke_mangling_with_flags.h lapacke_mangling.h
--	cd src && $(MAKE)
--	cd utils && $(MAKE)
-+	cd ${.CURDIR}/include && cp lapacke_mangling_with_flags.h lapacke_mangling.h
-+	cd ${.CURDIR}/src && $(MAKE)
-+	cd ${.CURDIR}/utils && $(MAKE)
- 
- lapacke_example:
--	cd example && $(MAKE)
-+	cd ${.CURDIR}/example && $(MAKE)
- 	
- clean: cleanlib
- 
- cleanlib:
--	cd src && $(MAKE) clean
--	cd utils && $(MAKE) clean
-+	cd ${.CURDIR}/src && $(MAKE) clean
-+	cd ${.CURDIR}/utils && $(MAKE) clean
- 
- cleanall: clean
- 	rm -f $(LAPACKE)
--	cd example && $(MAKE) clean
-+	cd ${.CURDIR}/example && $(MAKE) clean
- 
diff --git a/math/lapack/files/patch-lapacke+src+Makefile b/math/lapack/files/patch-lapacke+src+Makefile
deleted file mode 100644
index 9eb3ab5ef89e..000000000000
--- a/math/lapack/files/patch-lapacke+src+Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- lapacke/src/Makefile.orig	2012-04-03 05:16:32.000000000 +0900
-+++ lapacke/src/Makefile	2012-09-09 01:28:00.000000000 +0900
-@@ -2042,19 +2042,23 @@
- 
- ALLOBJ = $(SRC_OBJ) $(MATGEN_OBJ) 
- 
--ifdef USEXBLAS
-+.ifdef USEXBLAS
- ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
--endif
-+.endif
- 
- 
- OBJ_FILES := $(C_FILES:.o=.o)
- 
--all: ../../$(LAPACKELIB)
-+all: ../../$(LAPACKELIB) ../../$(LAPACKETMGLIB)
- 
- ../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ)
- 	$(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ)
- 	$(RANLIB) ../../$(LAPACKELIB)
- 
-+../../$(LAPACKETMGLIB): $(MATGEN_OBJ)
-+	$(ARCH) $(ARCHFLAGS) ../../$(LAPACKETMGLIB) $(MATGEN_OBJ)
-+	$(RANLIB) ../../$(LAPACKETMGLIB)
-+
- .c.o:
- 	$(CC) -c $(CFLAGS) -I ../include -o $@ $<
- 
diff --git a/math/lapack/files/static.mk b/math/lapack/files/static.mk
new file mode 100644
index 000000000000..704423c2fe45
--- /dev/null
+++ b/math/lapack/files/static.mk
@@ -0,0 +1,3 @@
+build-static:
+	cd SRC && $(AR) $(ARFLAGS) lib%%LIB%%.a $(%%LIB%%_OBJECTS)
+	$(RANLIB) SRC/lib%%LIB%%.a
diff --git a/math/lapack/pkg-descr b/math/lapack/pkg-descr
index c77b58aa19ac..7dee855006a6 100644
--- a/math/lapack/pkg-descr
+++ b/math/lapack/pkg-descr
@@ -8,3 +8,4 @@ To view an HTML version of the Users' Guide please refer to the URL:
 http://www.netlib.org/lapack/lug/
 
 WWW: http://www.netlib.org/lapack/
+WWW: https://github.com/Reference-LAPACK/lapack
diff --git a/math/lapack/pkg-plist b/math/lapack/pkg-plist
index 8b84a6fb6256..d5f632f5c414 100644
--- a/math/lapack/pkg-plist
+++ b/math/lapack/pkg-plist
@@ -1,38 +1,54 @@
-%%BLAS%%%%STATIC%%lib/libblas.a
-%%BLAS%%%%SHARED%%lib/libblas_pic.a
-%%BLAS%%%%SHARED%%lib/libblas.so
-%%BLAS%%%%SHARED%%lib/libblas.so.%%SVERSION%%
-%%BLAS%%%%PROFILE%%lib/libblas_p.a
-%%LAPACK%%%%STATIC%%lib/liblapack.a
-%%LAPACK%%%%SHARED%%lib/liblapack_pic.a
-%%LAPACK%%%%SHARED%%lib/liblapack.so
-%%LAPACK%%%%SHARED%%lib/liblapack.so.%%SVERSION%%
-%%LAPACK%%%%PROFILE%%lib/liblapack_p.a
-%%LAPACK%%%%STATIC%%lib/libtmglib.a
-%%LAPACK%%%%SHARED%%lib/libtmglib_pic.a
-%%LAPACK%%%%SHARED%%lib/libtmglib.so
-%%LAPACK%%%%SHARED%%lib/libtmglib.so.%%SVERSION%%
-%%LAPACK%%%%PROFILE%%lib/libtmglib_p.a
-%%XLAPACK%%%%STATIC%%lib/libxlapack.a
-%%XLAPACK%%%%SHARED%%lib/libxlapack_pic.a
-%%XLAPACK%%%%SHARED%%lib/libxlapack.so
-%%XLAPACK%%%%SHARED%%lib/libxlapack.so.%%SVERSION%%
-%%XLAPACK%%%%PROFILE%%lib/libxlapack_p.a
-%%XLAPACK%%%%STATIC%%lib/libxtmglib.a
-%%XLAPACK%%%%SHARED%%lib/libxtmglib_pic.a
-%%XLAPACK%%%%SHARED%%lib/libxtmglib.so
-%%XLAPACK%%%%SHARED%%lib/libxtmglib.so.%%SVERSION%%
-%%XLAPACK%%%%PROFILE%%lib/libxtmglib_p.a
-%%LAPACKE%%include/lapacke.h
-%%LAPACKE%%include/lapacke_utils.h
-%%LAPACKE%%include/lapacke_mangling.h
-%%LAPACKE%%%%STATIC%%lib/liblapacke.a
-%%LAPACKE%%%%SHARED%%lib/liblapacke_pic.a
-%%LAPACKE%%%%SHARED%%lib/liblapacke.so
-%%LAPACKE%%%%SHARED%%lib/liblapacke.so.%%SVERSION%%
-%%LAPACKE%%%%PROFILE%%lib/liblapacke_p.a
-%%LAPACKE%%%%STATIC%%lib/liblapacke_tmg.a
-%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg_pic.a
-%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so
-%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so.%%SVERSION%%
-%%LAPACKE%%%%PROFILE%%lib/liblapacke_tmg_p.a
+%%CBLAS%%include/cblas/cblas.h
+%%CBLAS%%include/cblas/cblas_f77.h
+%%CBLAS%%include/cblas/cblas_mangling.h
+%%CBLAS%%include/cblas/cblas_test.h
+%%LAPACKE%%include/lapacke/lapack.h
+%%LAPACKE%%include/lapacke/lapacke.h
+%%LAPACKE%%include/lapacke/lapacke_config.h
+%%LAPACKE%%include/lapacke/lapacke_mangling.h
+%%LAPACKE%%include/lapacke/lapacke_utils.h
+%%BLAS%%lib/libblas.a
+%%BLAS%%lib/libblas.so
+%%BLAS%%lib/libblas.so.%%SVERSION%%
+%%BLAS%%lib/libblas.so.%%VER%%
+%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-config-version.cmake
+%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-config.cmake
+%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-targets-%%CMAKE_BUILD_TYPE%%.cmake
+%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-targets.cmake
+%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-config-version.cmake
+%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-config.cmake
+%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-targets-%%CMAKE_BUILD_TYPE%%.cmake
+%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-targets.cmake
+%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-config-version.cmake
+%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-config.cmake
+%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-targets-%%CMAKE_BUILD_TYPE%%.cmake
+%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-targets.cmake
+%%CBLAS%%lib/libcblas.a
+%%CBLAS%%lib/libcblas.so
+%%CBLAS%%lib/libcblas.so.%%SVERSION%%
+%%CBLAS%%lib/libcblas.so.%%VER%%
+%%LAPACK%%lib/liblapack.a
+%%LAPACK%%lib/liblapack.so
+%%LAPACK%%lib/liblapack.so.%%SVERSION%%
+%%LAPACK%%lib/liblapack.so.%%VER%%
+%%LAPACK%%lib/libtmglib.a
+%%LAPACK%%lib/libtmglib.so
+%%LAPACK%%lib/libtmglib.so.%%SVERSION%%
+%%LAPACK%%lib/libtmglib.so.%%VER%%
+%%XLAPACK%%lib/libxlapack.a
+%%XLAPACK%%lib/libxlapack.so
+%%XLAPACK%%lib/libxlapack.so.%%SVERSION%%
+%%XLAPACK%%lib/libxlapack.so.%%VER%%
+%%XLAPACK%%lib/libxtmglib.a
+%%XLAPACK%%lib/libxtmglib.so
+%%XLAPACK%%lib/libxtmglib.so.%%SVERSION%%
+%%XLAPACK%%lib/libxtmglib.so.%%VER%%
+%%LAPACKE%%lib/liblapacke.a
+%%LAPACKE%%lib/liblapacke.so
+%%LAPACKE%%lib/liblapacke.so.%%SVERSION%%
+%%LAPACKE%%lib/liblapacke.so.%%VER%%
+%%BLAS%%libdata/pkgconfig/blas.pc
+%%CBLAS%%libdata/pkgconfig/cblas.pc
+%%LAPACK%%libdata/pkgconfig/lapack.pc
+%%LAPACKE%%libdata/pkgconfig/lapacke.pc
+%%XLAPACK%%libdata/pkgconfig/xlapack.pc
diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index cc668db51d8b..2d58b693c587 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -22,8 +22,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 fortran gmake perl5 pkgconfig
 
-CONFLICTS_INSTALL=	cblas lapacke
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	xianyi
 GH_PROJECT=	OpenBLAS
diff --git a/math/xlapack/Makefile b/math/xlapack/Makefile
index d8c2e8d816b8..d74ef7f647dc 100644
--- a/math/xlapack/Makefile
+++ b/math/xlapack/Makefile
@@ -1,7 +1,6 @@
 # Created by: bf@FreeBSD.org
 
 PORTNAME=	xlapack
-PORTREVISION=	6
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Extended Precision LAPACK