UPDATE: devel/cmake 3.16.0

Hi all,

here is a relatively straightforward update to the latest stable
version. As always, we need brave people to test this diff
in a bulk build.

I'd be very happy if this could go forward.

Rafael

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.177
diff -u -p -u -p -r1.177 Makefile
--- Makefile 20 Sep 2019 14:37:24 -0000 1.177
+++ Makefile 29 Nov 2019 14:43:39 -0000
@@ -4,7 +4,7 @@ DPB_PROPERTIES = parallel

COMMENT = portable build system

-VER = 3.15.3
+VER = 3.16.0
EPOCH = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 distinfo
--- distinfo 20 Sep 2019 14:37:25 -0000 1.55
+++ distinfo 29 Nov 2019 14:43:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.15.3.tar.gz) = E5WCQ6ATZbBWUvoBsh1A+oNPcKnjDvppwCYE5k9YuPU=
-SIZE (cmake-3.15.3.tar.gz) = 9270184
+SHA256 (cmake-3.16.0.tar.gz) = baVlVsY8q26aPhZW6HY+1KhBrJhZ/vtjy+eUcuZ+jF8=
+SIZE (cmake-3.16.0.tar.gz) = 9107654
Index: patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-Modules_CMakeDetermineJavaCompiler_cmake
--- patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 21 Apr 2017 18:37:43 -0000 1.14
+++ patches/patch-Modules_CMakeDetermineJavaCompiler_cmake 29 Nov 2019 14:43:39 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.14 2017/04/21 18:37:43 kurt Exp $
---- Modules/CMakeDetermineJavaCompiler.cmake.orig Fri Jan 13 09:05:41 2017
-+++ Modules/CMakeDetermineJavaCompiler.cmake Fri Apr 21 09:49:56 2017
+Index: Modules/CMakeDetermineJavaCompiler.cmake
+--- Modules/CMakeDetermineJavaCompiler.cmake.orig
++++ Modules/CMakeDetermineJavaCompiler.cmake
@@ -6,6 +6,8 @@
# NOTE, a generator may set CMAKE_Java_COMPILER before
# loading this file to force a compiler.
@@ -39,7 +40,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
- /usr/local/jdk-1.6.0/bin
- )
+ if(MODJAVA_VER)
-+ set(Java_BIN_PATH ${LOCALBASE}/jdk-1.8.0/bin)
++ set(Java_BIN_PATH /usr/local/jdk-1.8.0/bin)
+ else(MODJAVA_VER)
+ set(Java_BIN_PATH
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
@@ -62,7 +63,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJa
+ /usr/java/j2sdk1.4.2_09/bin
+ /usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
-+ ${LOCALBASE}/jdk-1.8.0/bin
++ /usr/local/jdk-1.8.0/bin
+ )
+ endif(MODJAVA_VER)
# if no compiler has been specified yet, then look for one
Index: patches/patch-Modules_Compiler_GNU_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake 21 Aug 2019 05:47:40 -0000 1.13
+++ patches/patch-Modules_Compiler_GNU_cmake 29 Nov 2019 14:43:39 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU_cma
Index: Modules/Compiler/GNU.cmake
--- Modules/Compiler/GNU.cmake.orig
+++ Modules/Compiler/GNU.cmake
-@@ -49,9 +49,9 @@ macro(__compiler_gnu lang)
+@@ -54,9 +54,9 @@ macro(__compiler_gnu lang)
# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 21 Aug 2019 05:47:40 -0000 1.24
+++ patches/patch-Modules_FindJNI_cmake 29 Nov 2019 14:43:39 -0000
@@ -102,7 +102,7 @@ Index: Modules/FindJNI.cmake
+
if (WIN32)
set (_JNI_HINTS)
- execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK
@@ -209,10 +267,10 @@ set(_JNI_JAVA_DIRECTORIES_BASE
/usr/lib/jvm/java-7-openjdk-{libarch} # Ubuntu 15.10
/usr/lib/jvm/java-6-openjdk-{libarch} # Ubuntu 15.10
Index: patches/patch-Modules_FindOpenMP_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindOpenMP_cmake,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Modules_FindOpenMP_cmake
--- patches/patch-Modules_FindOpenMP_cmake 21 Aug 2019 05:47:40 -0000 1.1
+++ patches/patch-Modules_FindOpenMP_cmake 29 Nov 2019 14:43:39 -0000
@@ -5,7 +5,7 @@ Add libs and paths. Ensure the lib is us
Index: Modules/FindOpenMP.cmake
--- Modules/FindOpenMP.cmake.orig
+++ Modules/FindOpenMP.cmake
-@@ -84,8 +84,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+@@ -95,8 +95,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
if(NOT OpenMP_${LANG}_FLAG)
unset(OpenMP_FLAG_CANDIDATES)

@@ -16,12 +16,3 @@ Index: Modules/FindOpenMP.cmake
set(OMP_FLAG_AppleClang "-Xclang -fopenmp")
set(OMP_FLAG_HP "+Oopenmp")
if(WIN32)
-@@ -127,7 +127,7 @@ set(OpenMP_C_CXX_TEST_SOURCE
- int main(void) {
- #ifdef _OPENMP
- omp_get_max_threads();
-- return 0;
-+ return 0*omp_get_num_threads();
- #else
- breaks_on_purpose
-