math/dbcsr: Update 2.0.1 -> 2.1.0

Reported by:	portscout

5 files changed, 29 insertions, 26 deletions

diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile
index 68cec3303f39..b80fd655042d 100644
--- a/math/dbcsr/Makefile
+++ b/math/dbcsr/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	dbcsr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.1
-PORTREVISION=	4
+DISTVERSION=	2.1.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,18 +13,21 @@ BUILD_DEPENDS=	fypp:devel/py-fypp@${PY_FLAVOR}
 
 USES=		blaslapack:openblas cmake:noninja compiler:c++14-lang fortran \
 		python:build
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	cp2k
-USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lopenblas
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING
-CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS"
+CMAKE_ARGS=	-DBLA_VENDOR:STRING="OpenBLAS" -DPython_EXECUTABLE=${PYTHON_CMD}
 
 TEST_TARGET=	test # tests hang: https://github.com/cp2k/dbcsr/issues/72
 
+BINARY_ALIAS=	git=false # with git sonames get messed up
+
 OPTIONS_DEFINE=		MPI OPENMP C_API # libxsmm is supposed to be supported, but cmake build lacks the corresponding option: https://github.com/cp2k/dbcsr/issues/73
 OPTIONS_DEFAULT=	MPI OPENMP C_API
 OPTIONS_SUB=		yes
@@ -46,7 +48,7 @@ CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS} -fallow-argument-mismatch" # -fall
 CMAKE_ARGS+=	-DCMAKE_Fortran_FLAGS="${FFLAGS}"
 .  endif
 
-do-test: # tests are broken: https://github.com/cp2k/dbcsr/issues/150
+do-test: # tests are broken: https://github.com/cp2k/dbcsr/issues/456
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
diff --git a/math/dbcsr/distinfo b/math/dbcsr/distinfo
index e235bf4fc52d..3e8a793500ef 100644
--- a/math/dbcsr/distinfo
+++ b/math/dbcsr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578116346
-SHA256 (cp2k-dbcsr-v2.0.1_GH0.tar.gz) = 1e283a3b9ce90bda321d77f4fa611b09a7eaad167d7bc579b2e9311f7b97b5ec
-SIZE (cp2k-dbcsr-v2.0.1_GH0.tar.gz) = 2414379
+TIMESTAMP = 1621835538
+SHA256 (cp2k-dbcsr-v2.1.0_GH0.tar.gz) = 1757eee1fe00b407bca10aef2364ab09db73e351216bf444c0e73b564631dc6a
+SIZE (cp2k-dbcsr-v2.1.0_GH0.tar.gz) = 2588234
diff --git a/math/dbcsr/files/patch-CMakeLists.txt b/math/dbcsr/files/patch-CMakeLists.txt
index 672c7badc36a..1504a8e07e75 100644
--- a/math/dbcsr/files/patch-CMakeLists.txt
+++ b/math/dbcsr/files/patch-CMakeLists.txt
@@ -1,13 +1,10 @@
---- CMakeLists.txt.orig	2019-04-09 04:46:02 UTC
+--- CMakeLists.txt.orig	2021-05-24 06:39:54 UTC
 +++ CMakeLists.txt
-@@ -23,7 +23,9 @@ set(WITH_GPU "P100" CACHE STRING "Set th
- set_property(CACHE WITH_GPU PROPERTY STRINGS K20X K40 K80 P100)
+@@ -385,6 +385,6 @@ if (WITH_EXAMPLES)
+   add_subdirectory(examples)
+ endif ()
  
- enable_language(Fortran)
--enable_testing() # enables the `make test` target
-+if (BUILD_TESTING)
-+  enable_testing() # enables the `make test` target
-+endif()
+-add_subdirectory(docs)
++#add_subdirectory(docs)
  
- if (WITH_C_API AND WITH_EXAMPLES)
-   enable_language(CXX)
+ include(CustomTargets)
diff --git a/math/dbcsr/files/patch-cmake_CompilerConfiguration.cmake b/math/dbcsr/files/patch-cmake_CompilerConfiguration.cmake
index 9befa35c7598..613b85d985d3 100644
--- a/math/dbcsr/files/patch-cmake_CompilerConfiguration.cmake
+++ b/math/dbcsr/files/patch-cmake_CompilerConfiguration.cmake
@@ -1,11 +1,9 @@
-Same change as https://github.com/cp2k/dbcsr/pull/388 PR for the current master branch.
-
---- cmake/CompilerConfiguration.cmake.orig	2020-11-15 21:12:10 UTC
+--- cmake/CompilerConfiguration.cmake.orig	2021-05-24 06:47:19 UTC
 +++ cmake/CompilerConfiguration.cmake
 @@ -1,5 +1,5 @@
  if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
--  set(CMAKE_Fortran_FLAGS          "-ffree-form -ffree-line-length-none -std=f2008ts")
-+  set(CMAKE_Fortran_FLAGS          "${CMAKE_Fortran_FLAGS} -ffree-form -ffree-line-length-none -std=f2008ts")
-   set(CMAKE_Fortran_FLAGS_RELEASE  "-O3 -funroll-loops")
-   set(CMAKE_Fortran_FLAGS_DEBUG    "-O0 -ggdb")
-   set(CMAKE_Fortran_FLAGS_COVERAGE "-O0 -fprofile-arcs -ftest-coverage")
+-  set(CMAKE_Fortran_FLAGS          "-ffree-form -std=f2008ts -fimplicit-none -Werror=aliasing -Werror=ampersand -Werror=c-binding-type -Werror=intrinsic-shadow -Werror=intrinsics-std -Werror=line-truncation -Werror=tabs -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-parameter -Werror=unused-but-set-variable -Werror=unused-variable -Werror=unused-dummy-argument -Werror=conversion -Werror=zerotrip -Werror=uninitialized -Wno-maybe-uninitialized -Werror=unused-parameter")
++  set(CMAKE_Fortran_FLAGS          "${CMAKE_Fortran_FLAGS} -ffree-form -std=f2008ts -fimplicit-none -Werror=aliasing -Werror=ampersand -Werror=c-binding-type -Werror=intrinsic-shadow -Werror=intrinsics-std -Werror=line-truncation -Werror=tabs -Werror=target-lifetime -Werror=underflow -Werror=unused-but-set-parameter -Werror=unused-but-set-variable -Werror=unused-variable -Werror=unused-dummy-argument -Werror=conversion -Werror=zerotrip -Werror=uninitialized -Wno-maybe-uninitialized -Werror=unused-parameter")
+   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10)
+     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Werror=argument-mismatch")  # gcc 10+ has this automatically
+   endif ()
diff --git a/math/dbcsr/pkg-plist b/math/dbcsr/pkg-plist
index f19bd4800476..7f4f87932aa6 100644
--- a/math/dbcsr/pkg-plist
+++ b/math/dbcsr/pkg-plist
@@ -1,8 +1,14 @@
 %%C_API%%include/dbcsr.h
 include/dbcsr_api.mod
+include/dbcsr_tensor.h
+include/dbcsr_tensor_api.mod
 lib/cmake/dbcsr/DBCSRConfig.cmake
 lib/cmake/dbcsr/DBCSRConfigVersion.cmake
 lib/cmake/dbcsr/DBCSRTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/dbcsr/DBCSRTargets.cmake
 lib/libdbcsr.so
+lib/libdbcsr.so.2.1
+lib/libdbcsr.so.2.1.0
 %%C_API%%lib/libdbcsr_c.so
+%%C_API%%lib/libdbcsr_c.so.2.1
+%%C_API%%lib/libdbcsr_c.so.2.1.0