math/lapack, blas, cblas, lapacke: update to version 3.9.1

This includes a rework of the build system patches, which I'll try
to push upstream …

12 files changed, 124 insertions, 182 deletions

diff --git a/math/blas/Makefile b/math/blas/Makefile
index aff10fcda34..8ddf2abcf24 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2020/10/12 21:51:57 bacon Exp $
+# $NetBSD: Makefile,v 1.39 2021/05/12 14:32:52 thor Exp $
 
 .include "../../math/lapack/Makefile.common"
 
-PKGREVISION=	1
-
 COMMENT=	Basic Linear Algebra System (Netlib reference implementation)
 
 LAPACK_COMPONENT=	blas
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index d4d8070becd..0b60a88fa32 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2021/03/25 08:32:48 thor Exp $
+# $NetBSD: Makefile,v 1.43 2021/05/12 14:32:51 thor Exp $
 
 MAINTAINER=	thomas.orgis@uni-hamburg.de
 COMMENT=	Linear Algebra PACKage (Netlib reference implementation)
-PKGREVISION=	2
 
 LAPACK_COMPONENT=	lapack
 LAPACK_COMPONENT_CMAKE_ARGS= \
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 87807c1bda4..4f23308fb46 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.24 2021/04/21 13:53:18 ryoon Exp $
+$NetBSD: distinfo,v 1.25 2021/05/12 14:32:51 thor Exp $
 
-SHA1 (lapack-3.9.0.tar.gz) = 0451d180eed2b12b94aaae77e772d7573e87bec4
-RMD160 (lapack-3.9.0.tar.gz) = 333bf17b3e2503c26cdd2139566fdc788be1d0c3
-SHA512 (lapack-3.9.0.tar.gz) = 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
-Size (lapack-3.9.0.tar.gz) = 7534567 bytes
-SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7
-SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f
-SHA1 (patch-CBLAS_src_CMakeLists.txt) = ee309360ff4ad487be60156900c62c960d07daf3
-SHA1 (patch-CMakeLists.txt) = ea2bec54dd2c283a96862ef760826bf6e633613e
-SHA1 (patch-LAPACKE_CMakeLists.txt) = b5d4fb36550e1ae47e7e68ffec0e10afa3ac8864
-SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f
-SHA1 (patch-SRC_CMakeLists.txt) = 2908cdeb0d94f51ec16b02b8a6426dd6cde7e10f
-SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 84d4cde8fef49c6efc9f50a3219b0299375934d5
+SHA1 (lapack-3.9.1.tar.gz) = ccb1e9cb6e7fa7db8a680292457d7d990f25d286
+RMD160 (lapack-3.9.1.tar.gz) = 380a2072eb7d8358ec8bf100e3d114600fc71444
+SHA512 (lapack-3.9.1.tar.gz) = 1c70892ce22eb1f5c0be1e0384d00dc876622e6254e853616eb7c0379c5d1ecf2f1f94d06389dbfba06b78484daf625d899306a9dc0b31a0646320c814022fdb
+Size (lapack-3.9.1.tar.gz) = 7543209 bytes
+SHA1 (patch-BLAS_SRC_CMakeLists.txt) = 8773f93b1f907ed02d41677a3819f5bb655a331a
+SHA1 (patch-CBLAS_cblas.pc.in) = cc97fbab08024220739929b5ad95c266965da06d
+SHA1 (patch-CBLAS_src_CMakeLists.txt) = c174bb5d790e5f7e50226d0b7a758d0417d90100
+SHA1 (patch-CMakeLists.txt) = 3c8e9125f164625198fb7197982746f43bf4aab5
+SHA1 (patch-LAPACKE_CMakeLists.txt) = 13e4662585088aa53f61f7079d103fdfcf985c4e
+SHA1 (patch-LAPACKE_lapacke.pc.in) = 6bbd72205120501cd60daf0b22b00ef7979fb329
+SHA1 (patch-SRC_CMakeLists.txt) = 4031bb41100f1fde71c70aa53fc55bee7a852fb7
+SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 07946678945dba3a7752849791f12e0666345983
diff --git a/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt b/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt
index 206893b7887..7f56ff66d50 100644
--- a/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt
+++ b/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt
@@ -1,18 +1,20 @@
-$NetBSD: patch-BLAS_SRC_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-BLAS_SRC_CMakeLists.txt,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Support combined build of shared and static libraries.
 
---- BLAS/SRC/CMakeLists.txt.orig	2017-11-13 04:15:54.000000000 +0000
+--- BLAS/SRC/CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
 +++ BLAS/SRC/CMakeLists.txt
-@@ -104,3 +104,11 @@ set_target_properties(
+@@ -104,3 +104,13 @@ set_target_properties(
    SOVERSION ${LAPACK_MAJOR_VERSION}
    )
- lapack_install_library(blas)
+ lapack_install_library(${BLASLIB})
 +if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  add_library(blas_static STATIC ${SOURCES})
++  add_library(${BLASLIB}_static STATIC ${SOURCES})
 +  set_target_properties(
-+    blas_static PROPERTIES
-+    OUTPUT_NAME blas
++     ${BLASLIB}_static PROPERTIES
++     OUTPUT_NAME ${BLASLIB}
 +    )
-+  lapack_install_library(blas_static)
++  lapack_install_library(${BLASLIB}_static)
 +endif()
++
++
diff --git a/math/lapack/patches/patch-CBLAS_cblas.pc.in b/math/lapack/patches/patch-CBLAS_cblas.pc.in
index 3f2d601778f..42c10ce4977 100644
--- a/math/lapack/patches/patch-CBLAS_cblas.pc.in
+++ b/math/lapack/patches/patch-CBLAS_cblas.pc.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-CBLAS_cblas.pc.in,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-CBLAS_cblas.pc.in,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Install BLAS libs here rather than from a separate package
 
---- CBLAS/cblas.pc.in.orig	2019-03-27 14:34:40.823289167 +0000
+--- CBLAS/cblas.pc.in.orig	2021-03-25 18:25:15.000000000 +0000
 +++ CBLAS/cblas.pc.in
 @@ -6,5 +6,5 @@ Description: C Standard Interface to BLA
  Version: @LAPACK_VERSION@
  URL: http://www.netlib.org/blas/#_cblas
- Libs: -L${libdir} -lcblas
+ Libs: -L${libdir} -l@CBLASLIB@
 +Libs.private: @BLAS_LIBRARIES@
  Cflags: -I${includedir}
--Requires.private: blas
+-Requires.private: @BLASLIB@
diff --git a/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt b/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
index 270e73fb440..a0e804e3534 100644
--- a/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
+++ b/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
@@ -1,32 +1,26 @@
-$NetBSD: patch-CBLAS_src_CMakeLists.txt,v 1.2 2021/04/21 13:53:19 ryoon Exp $
+$NetBSD: patch-CBLAS_src_CMakeLists.txt,v 1.3 2021/05/12 14:32:51 thor Exp $
 
 Support combined build of shared and static libraries.
 
---- CBLAS/src/CMakeLists.txt.orig	2019-11-21 07:57:43.000000000 +0000
+--- CBLAS/src/CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
 +++ CBLAS/src/CMakeLists.txt
-@@ -116,7 +116,6 @@ list(REMOVE_DUPLICATES SOURCES)
- add_library(cblas ${SOURCES})
- set_target_properties(
-   cblas PROPERTIES
--  LINKER_LANGUAGE C
-   VERSION ${LAPACK_VERSION}
-   SOVERSION ${LAPACK_MAJOR_VERSION}
-   )
-@@ -126,3 +125,17 @@ target_include_directories(cblas PUBLIC
+@@ -129,3 +129,19 @@ target_include_directories(${CBLASLIB} P
  )
- target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES})
- lapack_install_library(cblas)
+ target_link_libraries(${CBLASLIB} PRIVATE ${BLAS_LIBRARIES})
+ lapack_install_library(${CBLASLIB})
 +
 +if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  add_library(cblas_static STATIC ${SOURCES})
++  add_library(${CBLASLIB}_static STATIC ${SOURCES})
 +  set_target_properties(
-+    cblas_static PROPERTIES
-+    OUTPUT_NAME cblas
++    ${CBLASLIB}_static PROPERTIES
++    LINKER_LANGUAGE C
++    OUTPUT_NAME ${CBLASLIB}
 +    )
-+  target_include_directories(cblas_static PUBLIC
++  target_include_directories(${CBLASLIB}_static PUBLIC
 +    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 +    $<INSTALL_INTERFACE:include>
 +  )
-+  target_link_libraries(cblas_static PRIVATE ${BLAS_LIBRARIES})
-+  lapack_install_library(cblas_static)
++  target_link_libraries(${CBLASLIB}_static PRIVATE ${BLAS_LIBRARIES})
++  lapack_install_library(${CBLASLIB}_static)
 +endif()
++
diff --git a/math/lapack/patches/patch-CMakeLists.txt b/math/lapack/patches/patch-CMakeLists.txt
index 6fa11d49f9c..c14846adc72 100644
--- a/math/lapack/patches/patch-CMakeLists.txt
+++ b/math/lapack/patches/patch-CMakeLists.txt
@@ -1,24 +1,22 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Avoid installation of LAPACK CMake and pkg-config files when not installing
 LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only
 packaging.
 
---- CMakeLists.txt.orig	2020-03-03 15:36:43.155560348 +0100
-+++ CMakeLists.txt	2020-03-03 15:36:34.827560837 +0100
-@@ -112,8 +112,10 @@
+--- CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
++++ CMakeLists.txt
+@@ -160,6 +160,9 @@ endif()
  
  
  # --------------------------------------------------
--set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
- 
++
 +if(LAPACK)
 +
-+set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
+ set(LAPACK_INSTALL_EXPORT_NAME ${LAPACKLIB}-targets)
+ 
  macro(lapack_install_library lib)
-   install(TARGETS ${lib}
-     EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
-@@ -123,6 +125,18 @@
+@@ -171,6 +174,18 @@ macro(lapack_install_library lib)
    )
  endmacro()
  
@@ -37,7 +35,7 @@ packaging.
  set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
  
  # --------------------------------------------------
-@@ -252,6 +266,10 @@
+@@ -301,6 +316,10 @@ endif()
  
  option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
  
@@ -48,7 +46,7 @@ packaging.
  # --------------------------------------------------
  # LAPACK
  # User did not provide a LAPACK Library but specified to search for one
-@@ -293,6 +311,8 @@
+@@ -342,6 +361,8 @@ else()
      CACHE STRING "Linker flags for shared libs" FORCE)
  endif()
  
@@ -57,26 +55,26 @@ packaging.
  if(BUILD_TESTING)
    add_subdirectory(TESTING)
  endif()
-@@ -374,14 +394,18 @@
-   set(ALL_TARGETS ${ALL_TARGETS} blas)
+@@ -450,14 +471,18 @@ if(NOT BLAS_FOUND)
+   set(ALL_TARGETS ${ALL_TARGETS} ${BLASLIB})
  endif()
  
 +if(LAPACK)
  if(NOT LATESTLAPACK_FOUND)
-   set(ALL_TARGETS ${ALL_TARGETS} lapack)
+   set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKLIB})
 +  set(BUILD_LAPACK ON)
 +endif()
  endif()
  
  if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-   set(ALL_TARGETS ${ALL_TARGETS} tmglib)
+   set(ALL_TARGETS ${ALL_TARGETS} ${TMGLIB})
  endif()
  
 +if(LAPACK)
  # Export lapack targets, not including lapacke, from the
  # install tree, if any.
  set(_lapack_config_install_guard_target "")
-@@ -395,6 +419,7 @@
+@@ -471,6 +496,7 @@ if(ALL_TARGETS)
    # lapack-config.cmake to load targets from the install tree.
    list(GET ALL_TARGETS 0 _lapack_config_install_guard_target)
  endif()
@@ -84,70 +82,22 @@ packaging.
  
  # Include cblas in targets exported from the build tree.
  if(CBLAS)
-@@ -406,6 +431,7 @@
-   set(ALL_TARGETS ${ALL_TARGETS} lapacke)
+@@ -482,6 +508,8 @@ if(LAPACKE)
+   set(ALL_TARGETS ${ALL_TARGETS} ${LAPACKELIB})
  endif()
  
-+if(LAPACK)
++if(BUILD_LAPACK)
++
  # Export lapack and lapacke targets from the build tree, if any.
  set(_lapack_config_build_guard_target "")
  if(ALL_TARGETS)
-@@ -415,32 +441,34 @@
-   # for lapack-config.cmake to load targets from the build tree.
-   list(GET ALL_TARGETS 0 _lapack_config_build_guard_target)
- endif()
-+endif()
- 
--configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
--  ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
--
-+if(BUILD_LAPACK)
-+  configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-+    ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
- 
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
-   install(FILES
--  ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
--  DESTINATION ${PKG_CONFIG_DIR}
--  COMPONENT Development
--  )
-+    ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
-+    DESTINATION ${PKG_CONFIG_DIR}
-+    COMPONENT Development
-+    )
- 
--configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
-+  configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
-+    ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
- 
--include(CMakePackageConfigHelpers)
--write_basic_package_version_file(
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  VERSION ${LAPACK_VERSION}
--  COMPATIBILITY SameMajorVersion
--  )
-+  include(CMakePackageConfigHelpers)
-+  write_basic_package_version_file(
-+    ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
-+    VERSION ${LAPACK_VERSION}
-+    COMPATIBILITY SameMajorVersion
-+    )
- 
--install(FILES
--  ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
--  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
--  COMPONENT Development
--  )
--  
-\ Kein Zeilenumbruch am Dateiende.
-+  install(FILES
-+    ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
-+    ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION}
-+    COMPONENT Development
-+    )
-+endif()
-+  
+@@ -519,6 +547,9 @@ install(FILES
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKLIB}-${LAPACK_VERSION}
+   COMPONENT Development
+   )
++
++endif() # BUILD_LAPACK
++
+ if (LAPACK++)
+   install(
+   DIRECTORY "${LAPACK_BINARY_DIR}/lib/"
diff --git a/math/lapack/patches/patch-LAPACKE_CMakeLists.txt b/math/lapack/patches/patch-LAPACKE_CMakeLists.txt
index a198f12bef7..aedfafb553e 100644
--- a/math/lapack/patches/patch-LAPACKE_CMakeLists.txt
+++ b/math/lapack/patches/patch-LAPACKE_CMakeLists.txt
@@ -1,46 +1,45 @@
-$NetBSD: patch-LAPACKE_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-LAPACKE_CMakeLists.txt,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Support combined build of shared and static libraries.
 
---- LAPACKE/CMakeLists.txt.orig	2020-01-03 19:33:52.766364829 +0100
-+++ LAPACKE/CMakeLists.txt	2020-01-03 19:49:05.115280246 +0100
-@@ -94,6 +94,26 @@
- target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES})
- 
- lapack_install_library(lapacke)
-+
+--- LAPACKE/CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
++++ LAPACKE/CMakeLists.txt
+@@ -99,6 +99,25 @@ install(
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+   COMPONENT Development
+   )
 +if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  add_library(lapacke_static STATIC ${SOURCES})
++  add_library(${LAPACKELIB}_static STATIC ${SOURCES})
 +  set_target_properties(
-+    lapacke_static PROPERTIES
-+    OUTPUT_NAME lapacke
++    ${LAPACKELIB}_static PROPERTIES
++    LINKER_LANGUAGE C
++    OUTPUT_NAME ${LAPACKELIB}
 +    )
-+   target_include_directories(lapacke_static PUBLIC
++   target_include_directories(${LAPACKELIB}_static PUBLIC
 +    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 +    $<INSTALL_INTERFACE:include>
 +  )
 +
 +  if(LAPACKE_WITH_TMG)
-+    target_link_libraries(lapacke_static PRIVATE tmglib)
++    target_link_libraries(${LAPACKELIB}_static PRIVATE tmglib)
 +  endif()
-+  target_link_libraries(lapacke_static PRIVATE ${LAPACK_LIBRARIES})
++  target_link_libraries(${LAPACKELIB}_static PRIVATE ${LAPACK_LIBRARIES})
 +
-+  lapack_install_library(lapacke_static)
++  lapack_install_library(${LAPACKELIB}_static)
 +endif()
-+
- install(
-   FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-@@ -126,7 +146,8 @@
+ 
+ if(BUILD_TESTING)
+   add_subdirectory(example)
+@@ -126,7 +145,8 @@ install(FILES
    COMPONENT Development
    )
  
--install(EXPORT lapacke-targets
--  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
+-install(EXPORT ${LAPACKELIB}-targets
+-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 -  COMPONENT Development
 -  )
-+#install(EXPORT lapacke-targets
-+#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION}
++# What is broken here? CMake erros out with unknown lapacke-targets.
++#install(EXPORT ${LAPACKELIB}-targets
++#  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LAPACKELIB}-${LAPACK_VERSION}
 +#  COMPONENT Development
 +#  )
-+
diff --git a/math/lapack/patches/patch-LAPACKE_lapacke.pc.in b/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
index 956abb7300d..ff4ec2b6065 100644
--- a/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
+++ b/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-LAPACKE_lapacke.pc.in,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-LAPACKE_lapacke.pc.in,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Install libs here rather than from a separate package
 
---- LAPACKE/lapacke.pc.in.orig	2019-03-27 14:35:14.016006535 +0000
+--- LAPACKE/lapacke.pc.in.orig	2021-03-25 18:25:15.000000000 +0000
 +++ LAPACKE/lapacke.pc.in
 @@ -6,5 +6,5 @@ Description: C Standard Interface to LAP
  Version: @LAPACK_VERSION@
  URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack
- Libs: -L${libdir} -llapacke
+ Libs: -L${libdir} -l@LAPACKELIB@
 +Libs.private: @LAPACK_LIBRARIES@ @BLAS_LIBRARIES@
  Cflags: -I${includedir}
--Requires.private: lapack
+-Requires.private: @LAPACKLIB@
diff --git a/math/lapack/patches/patch-SRC_CMakeLists.txt b/math/lapack/patches/patch-SRC_CMakeLists.txt
index 7b0501f8293..94bf6e6f748 100644
--- a/math/lapack/patches/patch-SRC_CMakeLists.txt
+++ b/math/lapack/patches/patch-SRC_CMakeLists.txt
@@ -1,30 +1,30 @@
-$NetBSD: patch-SRC_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-SRC_CMakeLists.txt,v 1.2 2021/05/12 14:32:51 thor Exp $
 
 Support combined build of shared and static libraries.
 
---- SRC/CMakeLists.txt.orig	2019-11-21 08:57:43.000000000 +0100
-+++ SRC/CMakeLists.txt	2020-01-03 19:53:12.452257316 +0100
-@@ -518,3 +518,23 @@
+--- SRC/CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
++++ SRC/CMakeLists.txt
+@@ -518,3 +518,23 @@ if(_is_coverage_build)
  endif()
  
- lapack_install_library(lapack)
-+
+ lapack_install_library(${LAPACKLIB})
 +if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  add_library(lapack_static STATIC ${SOURCES})
++  add_library(${LAPACKLIB}_static STATIC ${SOURCES})
 +  set_target_properties(
-+    lapack_static PROPERTIES
++    ${LAPACKLIB}_static PROPERTIES
 +    OUTPUT_NAME lapack
 +    )
 +
 +  if(USE_XBLAS)
-+    target_link_libraries(lapack_static PRIVATE ${XBLAS_LIBRARY})
++    target_link_libraries(${LAPACKLIB}_static PRIVATE ${XBLAS_LIBRARY})
 +  endif()
-+  target_link_libraries(lapack_static PRIVATE ${BLAS_LIBRARIES})
++  target_link_libraries(${LAPACKLIB}_static PRIVATE ${BLAS_LIBRARIES})
 +
 +  if (_is_coverage_build)
-+    target_link_libraries(lapack_static PRIVATE gcov)
-+    add_coverage(lapack_static)
++    target_link_libraries(${LAPACKLIB}_static PRIVATE gcov)
++    add_coverage(${LAPACKLIB}_static)
 +  endif()
 +
-+  lapack_install_library(lapack_static)
++  lapack_install_library(${LAPACKLIB}_static)
 +endif()
++
diff --git a/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt b/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt
index 59032354410..9a5a553122a 100644
--- a/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt
+++ b/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt
@@ -1,19 +1,19 @@
-$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.2 2020/10/12 21:51:57 bacon Exp $
+$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.3 2021/05/12 14:32:51 thor Exp $
 
 Support combined build of shared and static libraries.
 
---- TESTING/MATGEN/CMakeLists.txt.orig	2017-11-13 04:15:54.000000000 +0000
+--- TESTING/MATGEN/CMakeLists.txt.orig	2021-03-25 18:25:15.000000000 +0000
 +++ TESTING/MATGEN/CMakeLists.txt
-@@ -50,3 +50,12 @@ list(REMOVE_DUPLICATES SOURCES)
- add_library(tmglib ${SOURCES})
- target_link_libraries(tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
- lapack_install_library(tmglib)
+@@ -57,3 +57,12 @@ set_target_properties(
+ 
+ target_link_libraries(${TMGLIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ lapack_install_library(${TMGLIB})
 +if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
-+  add_library(tmglib_static STATIC ${SOURCES})
++  add_library(${TMGLIB}_static STATIC ${SOURCES})
 +  set_target_properties(
-+    tmglib_static PROPERTIES
++    ${TMGLIB}_static PROPERTIES
 +    OUTPUT_NAME tmglib
 +  )
-+  target_link_libraries(tmglib_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+  lapack_install_library(tmglib_static)
++  target_link_libraries(${TMGLIB}_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++  lapack_install_library(${TMGLIB}_static)
 +endif()
diff --git a/math/lapack/version.mk b/math/lapack/version.mk
index 5bc9ebdc678..d6516de9b22 100644
--- a/math/lapack/version.mk
+++ b/math/lapack/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.1 2020/10/12 21:51:57 bacon Exp $
+# $NetBSD: version.mk,v 1.2 2021/05/12 14:32:51 thor Exp $
 
-NETLIB_BLAS_VERSION=	3.9.0
+NETLIB_BLAS_VERSION=	3.9.1