Update cmake to 3.15.2

Highlights:

- Stop building cmake itself with ninja. Upstream has decided not to
  support this anymore. I see no benefit and it's getting harder and
  harder to take care of.
- Use cmake's internel libuv, json-cpp etc. to build the bootstrap
  cmake (only bootstrap).
- Fix SONAME in cmake ports

Notable port changes:

- Fix COMPILER, it's not possible to build the old and the new cmake
  version with base-gcc, isn't.
- It doesn't make any sense to keep the m88k XXX tags. CMake don't build
  under m88k.
- Tech cmake to detect/provide system JDK11, lua and new ruby version
  (of course upcoming ruby 2.7)
- I took some pre-configure commands from the FreeBSDs port.
- Add --docdir to avoid warnings and sort CONFIGURE_ARGS

Bulk build by naddy@ on amd64. Thanks a lot!
Successful test by Martin Reindl on macppc and arm64. Thanks!

devel/cmake/Makefile

@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.175 2019/07/12 20:44:05 sthen Exp $
+# $OpenBSD: Makefile,v 1.176 2019/08/21 05:47:40 rsadowski Exp $
 
-DPB_PROPERTIES =parallel
+DPB_PROPERTIES =	parallel
 
 COMMENT =	portable build system
 
-VER =		3.10.2
+VER =		3.15.2
 EPOCH =		0
-REVISION =	3
 DISTNAME =	cmake-${VER}
 CATEGORIES =	devel
 
 HOMEPAGE =	https://www.cmake.org/
 
-MASTER_SITES =	${HOMEPAGE}files/v${VER:R}/
+MASTER_SITES =	https://www.cmake.org/files/v${VER:R}/
 
 # BSD
 PERMIT_PACKAGE =	Yes
@@ -20,12 +19,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += ${COMPILER_LIBCXX} archive c curl curses expat form
 WANTLIB += jsoncpp m rhash uv z
 
-COMPILER =		base-clang ports-gcc base-gcc
-
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
-BUILD_DEPENDS =		devel/ninja>=1.5.1
-.endif
+COMPILER =		base-clang ports-gcc
 
 BUILD_DEPENDS +=	textproc/py-sphinx>=1.4
 
@@ -36,12 +30,13 @@ LIB_DEPENDS =		archivers/libarchive \
 			security/rhash
 
 CONFIGURE_STYLE =	simple
-CONFIGURE_ARGS =	--prefix=${PREFIX} \
-			--datadir=share/cmake \
+
+CONFIGURE_ARGS =	--datadir=share/cmake \
 			--docdir=share/doc/cmake \
 			--mandir=man \
 			--no-qt-gui \
 			--parallel=${MAKE_JOBS} \
+			--prefix=${PREFIX} \
 			--sphinx-build=${LOCALBASE}/bin/sphinx-build \
 			--sphinx-html \
 			--sphinx-man \
@@ -50,44 +45,38 @@ CONFIGURE_ARGS =	--prefix=${PREFIX} \
 
 CONFIGURE_ENV +=	MAKE=${MAKE_PROGRAM}
 
+MAKE_FLAGS +=		VERBOSE=1
+
 PORTHOME =		${WRKDIR}
 
 SEPARATE_BUILD =	Yes
 
 TEST_TARGET =		test
 
-MAKE_FLAGS +=		VERBOSE=1
+TEST_DEPENDS +=		devel/git
+
+SUBST_FILES =	${WRKSRC}/Source/cmLocalGenerator.cxx \
+		${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \
+		${WRKSRC}/bootstrap
+
+post-patch:
+	(find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+	find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+	xargs -0 perl -e 's,/usr/local,${LOCALBASE},g; \
+	s,/usr/X11R6,${LOCALBASE},g'
+	perl -e 's,/usr/local,${LOCALBASE},g' \
+		${SUBST_FILES}
+	perl -e 's,/usr/include,${LOCALBASE}/include,' \
+		${WRKSRC}/Modules/FindDCMTK.cmake \
 
 pre-configure:
 	cp ${FILESDIR}/*.cmake ${WRKSRC}/Modules/
-	${SUBST_CMD} ${WRKSRC}/Modules/CMakeDetermineJavaCompiler.cmake \
-		${WRKSRC}/Modules/FindJNI.cmake \
-		${WRKSRC}/Modules/FindJava.cmake \
-		${WRKSRC}/Modules/FindMPEG.cmake \
-		${WRKSRC}/Modules/FindMPEG2.cmake \
-		${WRKSRC}/Modules/FindQt.cmake \
-		${WRKSRC}/Modules/FindQt4.cmake \
-		${WRKSRC}/Modules/FindSDL.cmake \
-		${WRKSRC}/Modules/FindTCL.cmake
-
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} != "m88k"
-do-build:
-	cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ninja -v -j \
-		${MAKE_JOBS} ${ALL_TARGET}
-
-do-install:
-	cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
-		${FAKE_SETUP} ninja -v -j ${MAKE_JOBS} ${FAKE_TARGET}
-
-do-test:
-	cd ${WRKBUILD} && exec ${SETENV} ${ALL_TEST_ENV} ninja -v -j \
-		${MAKE_JOBS} ${TEST_FLAGS} ${TEST_TARGET}
-.endif
+	(find ${WRKSRC}/Modules -name "*.cmake" -print0; \
+	find ${WRKSRC}/Tests -name "CMakeLists.txt" -print0) | \
+	xargs -0 ${SUBST_CMD}
+	${SUBST_CMD} ${SUBST_FILES}
 
 post-install:
-	rm ${WRKINST}${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} \
-		${WRKINST}${LOCALBASE}/share/cmake/Modules/Compiler/*.orig \
-		${WRKINST}${LOCALBASE}/share/cmake/Modules/Platform/*.orig
+	@find ${WRKINST}${LOCALBASE} \( -name "*.bak" -o -name "*.orig" -o -name "*.beforesubst" \) -exec rm {} \;
 
 .include <bsd.port.mk>

devel/cmake/cmake.port.mk

@@ -1,4 +1,4 @@
-# $OpenBSD: cmake.port.mk,v 1.64 2018/09/11 12:12:31 bcallah Exp $
+# $OpenBSD: cmake.port.mk,v 1.65 2019/08/21 05:47:40 rsadowski Exp $
 
 BUILD_DEPENDS+=	devel/cmake
 
@@ -9,11 +9,6 @@ MAKE_ENV+=LIB${_n}_VERSION=${_v}
 
 USE_NINJA ?= Yes
 
-# XXX: Ninja is broken on m88k
-.if ${MACHINE_ARCH} == "m88k"
-USE_NINJA = No
-.endif
-
 .if ${USE_NINJA:L} == "yes"
 BUILD_DEPENDS += devel/ninja>=1.5.1
 NINJA ?= ninja
@@ -82,15 +77,15 @@ MODCMAKE_configure=	cd ${WRKBUILD} && ${SETENV} \
 	CC="${CC}" CFLAGS="${CFLAGS}" \
 	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 	${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
-		-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY:Bool=True \
+		-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
 		-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
 
 .if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
 .  if ${MODCMAKE_DEBUG:L} == "yes"
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Debug
 MODCMAKE_BUILD_SUFFIX =	-debug.cmake
 .  else
-CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Release
+CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release
 MODCMAKE_BUILD_SUFFIX =	-release.cmake
 .  endif
 .endif

devel/cmake/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+SHA256 (cmake-3.15.2.tar.gz) = U5CIyymmjm1qj7pcAJUeXlsaksaPo4qD4e0vNVkz92g=
+SIZE (cmake-3.15.2.tar.gz) = 9269449

devel/cmake/files/FindLua.cmake

@@ -0,0 +1,211 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+# XXX
+# FindLua.cmake from 3.10.2
+
+#.rst:
+# FindLua
+# -------
+#
+#
+#
+# Locate Lua library This module defines
+#
+# ::
+#
+#   LUA_FOUND          - if false, do not try to link to Lua
+#   LUA_LIBRARIES      - both lua and lualib
+#   LUA_INCLUDE_DIR    - where to find lua.h
+#   LUA_VERSION_STRING - the version of Lua found
+#   LUA_VERSION_MAJOR  - the major version of Lua
+#   LUA_VERSION_MINOR  - the minor version of Lua
+#   LUA_VERSION_PATCH  - the patch version of Lua
+#
+#
+#
+# Note that the expected include convention is
+#
+# ::
+#
+#   #include "lua.h"
+#
+# and not
+#
+# ::
+#
+#   #include <lua/lua.h>
+#
+# This is because, the lua location is not standardized and may exist in
+# locations other than lua/
+
+unset(_lua_include_subdirs)
+unset(_lua_library_names)
+unset(_lua_append_versions)
+
+set(MODLUA_VERSION $ENV{MODLUA_VERSION})
+set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
+
+# this is a function only to have all the variables inside go away automatically
+function(_lua_set_version_vars)
+    if(MODLUA_VERSION)
+        set(LUA_VERSIONS5 ${MODLUA_VERSION})
+    else()
+        set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+    endif()
+
+    if (Lua_FIND_VERSION_EXACT)
+        if (Lua_FIND_VERSION_COUNT GREATER 1)
+            set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
+        endif ()
+    elseif (Lua_FIND_VERSION)
+        # once there is a different major version supported this should become a loop
+        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
+            if (Lua_FIND_VERSION_COUNT EQUAL 1)
+                set(_lua_append_versions ${LUA_VERSIONS5})
+            else ()
+                foreach (subver IN LISTS LUA_VERSIONS5)
+                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
+                        list(APPEND _lua_append_versions ${subver})
+                    endif ()
+                endforeach ()
+            endif ()
+        endif ()
+    else ()
+        # once there is a different major version supported this should become a loop
+        set(_lua_append_versions ${LUA_VERSIONS5})
+    endif ()
+
+    list(APPEND _lua_include_subdirs "include/lua" "include")
+
+    foreach (ver IN LISTS _lua_append_versions)
+        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
+        list(APPEND _lua_include_subdirs
+             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
+             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
+        )
+    endforeach ()
+
+    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
+    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
+endfunction(_lua_set_version_vars)
+
+function(_lua_check_header_version _hdr_file)
+    # At least 5.[012] have different ways to express the version
+    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
+    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
+    file(STRINGS "${_hdr_file}" lua_version_strings
+         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
+
+    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
+    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
+        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
+        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
+        set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
+    else ()
+        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
+        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
+            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
+        endif ()
+        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
+        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
+        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
+    endif ()
+    foreach (ver IN LISTS _lua_append_versions)
+        if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
+            set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
+            set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
+            set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
+            set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
+            return()
+        endif ()
+    endforeach ()
+endfunction(_lua_check_header_version)
+
+_lua_set_version_vars()
+
+if(MODLUA_INCL_DIR)
+    set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
+endif()
+
+if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+    _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
+endif ()
+
+if (NOT LUA_VERSION_STRING)
+    foreach (subdir IN LISTS _lua_include_subdirs)
+        unset(LUA_INCLUDE_PREFIX CACHE)
+        find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
+          HINTS
+            ENV LUA_DIR
+          PATHS
+          ~/Library/Frameworks
+          /Library/Frameworks
+          /sw # Fink
+          /opt/local # DarwinPorts
+          /opt/csw # Blastwave
+          /opt
+        )
+        if (LUA_INCLUDE_PREFIX)
+            _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
+            if (LUA_VERSION_STRING)
+                set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
+                break()
+            endif ()
+        endif ()
+    endforeach ()
+endif ()
+unset(_lua_include_subdirs)
+unset(_lua_append_versions)
+
+if (LUA_VERSION_STRING)
+    set(_lua_library_names
+        lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
+        lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+        lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
+    )
+endif ()
+
+find_library(LUA_LIBRARY
+  NAMES ${_lua_library_names} lua
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+unset(_lua_library_names)
+
+if (LUA_LIBRARY)
+    # include the math library for Unix
+    if (UNIX AND NOT APPLE AND NOT BEOS)
+        find_library(LUA_MATH_LIBRARY m)
+        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
+
+        # include dl library for statically-linked Lua library
+        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
+        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
+          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
+        endif()
+
+    # For Windows and Mac, don't need to explicitly include the math library
+    else ()
+        set(LUA_LIBRARIES "${LUA_LIBRARY}")
+    endif ()
+endif ()
+
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

devel/cmake/patches/patch-CMakeLists_txt

@@ -1,50 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
-     CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
-   endif()
- 
-+  if($ENV{LOCALBASE})
-+    set(OPENBSD_LOCALBASE $ENV{LOCALBASE})
-+  else()
-+    set(OPENBSD_LOCALBASE "/usr/local")
-+  endif()
-+
-+  # to find expat and curl
-+  link_directories("${OPENBSD_LOCALBASE}/lib")
-+
-   #---------------------------------------------------------------------
-   # Setup third-party libraries.
-   # Everything in the tree should be able to include files from the
-@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
-       message(FATAL_ERROR
-         "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
-     endif()
--    set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
-+    set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
-+    set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
-   else()
-     set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
-     add_subdirectory(Utilities/cmlibrhash)
-@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
-       message(FATAL_ERROR
-         "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
-     endif()
--    set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp)
-+    set(CMAKE_JSONCPP_INCLUDES ${JsonCpp_INCLUDE_DIRS})
-+    set(CMAKE_JSONCPP_LIBRARIES ${JsonCpp_LIBRARIES})
-   else()
-     set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
-     add_subdirectory(Utilities/cmjsoncpp)
-@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
-       message(FATAL_ERROR
-         "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
-     endif()
--    set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV)
-+    set(CMAKE_LIBUV_INCLUDES ${LibUV_INCLUDE_DIRS})
-+    set(CMAKE_LIBUV_LIBRARIES ${LibUV_LIBRARIES})
-   else()
-     set(CMAKE_LIBUV_LIBRARIES cmlibuv)
-     add_subdirectory(Utilities/cmlibuv)

devel/cmake/patches/patch-Modules_CMakeCInformation_cmake

@@ -1,13 +0,0 @@
-$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.8 2018/06/14 17:04:45 sthen Exp $
-Index: Modules/CMakeCInformation.cmake
---- Modules/CMakeCInformation.cmake.orig
-+++ Modules/CMakeCInformation.cmake
-@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
- # create a C shared library
- if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
-   set(CMAKE_C_CREATE_SHARED_LIBRARY
--      "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+      "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
- 
- # create a C shared module just copy the shared library rule

devel/cmake/patches/patch-Modules_CMakeCXXInformation_cmake

@@ -1,23 +0,0 @@
-$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeCXXInformation.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCXXInformation.cmake	Fri Nov 25 22:31:44 2016
-@@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
-   set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
- endif()
- 
--if(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG)
--  set(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
--endif()
--
- if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
-   set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
- endif()
-@@ -253,7 +249,7 @@ include(CMakeCommonLanguageInclude)
- # create a shared C++ library
- if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
-   set(CMAKE_CXX_CREATE_SHARED_LIBRARY
--      "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+      "<CMAKE_CXX_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
- 
- # create a c++ shared module copy the shared library rule by default

devel/cmake/patches/patch-Modules_CMakeFortranInformation_cmake

@@ -1,23 +0,0 @@
-$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeFortranInformation.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeFortranInformation.cmake	Fri Nov 25 22:31:44 2016
-@@ -115,10 +115,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
-   set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
- endif()
- 
--if(NOT DEFINED CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG)
--  set(CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
--endif()
--
- # for most systems a module is the same as a shared library
- # so unless the variable CMAKE_MODULE_EXISTS is set just
- # copy the values from the LIBRARY variables
-@@ -182,7 +178,7 @@ include(CMakeCommonLanguageInclude)
- # create a Fortran shared library
- if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
-   set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
--      "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+      "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
- endif()
- 
- # create a Fortran shared module just copy the shared library rule

devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.7 2018/03/14 12:24:54 rsadowski Exp $
+$OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.8 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/Compiler/GNU-Fortran.cmake
 --- Modules/Compiler/GNU-Fortran.cmake.orig
 +++ Modules/Compiler/GNU-Fortran.cmake
-@@ -9,10 +9,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
+@@ -12,10 +12,6 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form")
  
  set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed")
  

devel/cmake/patches/patch-Modules_Compiler_GNU_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.12 2017/08/26 17:53:35 dcoppa Exp $
+$OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.13 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/Compiler/GNU.cmake
 --- Modules/Compiler/GNU.cmake.orig
 +++ Modules/Compiler/GNU.cmake
-@@ -39,9 +39,9 @@ macro(__compiler_gnu lang)
+@@ -49,9 +49,9 @@ macro(__compiler_gnu lang)
    # Initial configuration flags.
    string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
    string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")

devel/cmake/patches/patch-Modules_FindJNI_cmake

@@ -1,17 +1,17 @@
-$OpenBSD: patch-Modules_FindJNI_cmake,v 1.23 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJNI_cmake,v 1.24 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindJNI.cmake
 --- Modules/FindJNI.cmake.orig
 +++ Modules/FindJNI.cmake
-@@ -25,6 +25,8 @@
- #   JAVA_INCLUDE_PATH2    = the include path to jni_md.h
- #   JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
+@@ -45,6 +45,8 @@ The following cache variables are also available to se
+   the include path to jawt.h
+ #]=======================================================================]
  
 +set(MODJAVA_VER $ENV{MODJAVA_VER})
 +
- # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+ # Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
  macro(java_append_library_directories _var)
      # Determine java arch-specific library subdir
-@@ -70,8 +72,10 @@ macro(java_append_library_directories _var)
+@@ -93,8 +95,10 @@ macro(java_append_library_directories _var)
  
      # Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
      # system is non-Linux (where the code above has not been well tested)
@@ -24,7 +24,7 @@ Index: Modules/FindJNI.cmake
      endif()
  
      # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -130,17 +134,71 @@ if(_JAVA_HOME_EXPLICIT)
    set(CMAKE_FIND_FRAMEWORK NEVER)
  endif()
  
@@ -40,10 +40,9 @@ Index: Modules/FindJNI.cmake
 -    ${_JAVA_HOME}
 +    ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
 +    ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++    ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++    ${LOCALBASE}/jre-11/lib/{libarch}
      )
--endif()
--get_filename_component(java_install_version
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
 +else(MODJAVA_VER)
 +  set(JAVA_AWT_LIBRARY_DIRECTORIES)
 +  if(_JAVA_HOME)
@@ -54,178 +53,68 @@ Index: Modules/FindJNI.cmake
 +      ${_JAVA_HOME}/lib
 +      ${_JAVA_HOME}
 +      )
-+  endif()
-+  get_filename_component(java_install_version
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
- 
--list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
--  )
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
--  /usr/lib
--  /usr/local/lib
--  /usr/lib/jvm/java/lib
--  /usr/lib/java/jre/lib/{libarch}
--  /usr/lib/jvm/jre/lib/{libarch}
--  /usr/local/lib/java/jre/lib/{libarch}
--  /usr/local/share/java/jre/lib/{libarch}
--  /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
--  /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
--  /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
--  /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
--  /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
--  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
--  /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
--  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
--  # Debian specific paths for default JVM
--  /usr/lib/jvm/default-java/jre/lib/{libarch}
--  /usr/lib/jvm/default-java/jre/lib
--  /usr/lib/jvm/default-java/lib
--  # Arch Linux specific paths for default JVM
--  /usr/lib/jvm/default/jre/lib/{libarch}
--  /usr/lib/jvm/default/lib/{libarch}
--  # Ubuntu specific paths for default JVM
--  /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
--  /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
--  /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
--  # OpenBSD specific paths for default JVM
--  /usr/local/jdk-1.7.0/jre/lib/{libarch}
--  /usr/local/jre-1.7.0/lib/{libarch}
--  /usr/local/jdk-1.6.0/jre/lib/{libarch}
--  /usr/local/jre-1.6.0/lib/{libarch}
--  # SuSE specific paths for default JVM
--  /usr/lib64/jvm/java/jre/lib/{libarch}
--  /usr/lib64/jvm/jre/lib/{libarch}
--  )
-+  list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-+    )
-+  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
-+    /usr/lib
-+    /usr/local/lib
-+    /usr/lib/jvm/java/lib
-+    /usr/lib/java/jre/lib/{libarch}
-+    /usr/lib/jvm/jre/lib/{libarch}
-+    /usr/local/lib/java/jre/lib/{libarch}
-+    /usr/local/share/java/jre/lib/{libarch}
-+    /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-+    /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-+    /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-+    /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-+    /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-+    /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
-+    /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-+    /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
-+    # Debian specific paths for default JVM
-+    /usr/lib/jvm/default-java/jre/lib/{libarch}
-+    /usr/lib/jvm/default-java/jre/lib
-+    /usr/lib/jvm/default-java/lib
-+    # Arch Linux specific paths for default JVM
-+    /usr/lib/jvm/default/jre/lib/{libarch}
-+    /usr/lib/jvm/default/lib/{libarch}
-+    # Ubuntu specific paths for default JVM
-+    /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+    /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+    /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
-+    # OpenBSD specific paths for default JVM
-+    ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+    ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+    # SuSE specific paths for default JVM
-+    /usr/lib64/jvm/java/jre/lib/{libarch}
-+    /usr/lib64/jvm/jre/lib/{libarch}
-+    )
+ endif()
++list(APPEND JAVA_AWT_LIBRARY_DIRECTORIES
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
++  )
++JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
++  /usr/lib
++  /usr/local/lib
++  /usr/lib/jvm/java/lib
++  /usr/lib/java/jre/lib/{libarch}
++  /usr/lib/jvm/jre/lib/{libarch}
++  /usr/local/lib/java/jre/lib/{libarch}
++  /usr/local/share/java/jre/lib/{libarch}
++  /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
++  /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
++  /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
++  /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
++  /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
++  /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed ac
++  /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
++  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
++  # Debian specific paths for default JVM
++  /usr/lib/jvm/default-java/jre/lib/{libarch}
++  /usr/lib/jvm/default-java/jre/lib
++  /usr/lib/jvm/default-java/lib
++  # Arch Linux specific paths for default JVM
++  /usr/lib/jvm/default/jre/lib/{libarch}
++  /usr/lib/jvm/default/lib/{libarch}
++  # Ubuntu specific paths for default JVM
++  /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
++  /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
++  /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
++  # OpenBSD specific paths for default JVM
++  ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
++  ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++  ${LOCALBASE}/jdk-11/jre/lib/{libarch}
++  ${LOCALBASE}/jre-11/lib/{libarch}
++  # SuSE specific paths for default JVM
++  /usr/lib64/jvm/java/jre/lib/{libarch}
++  /usr/lib64/jvm/jre/lib/{libarch}
++  )
 +endif(MODJAVA_VER)
  
- set(JAVA_JVM_LIBRARY_DIRECTORIES)
- foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-     )
- endforeach()
- 
--set(JAVA_AWT_INCLUDE_DIRECTORIES)
--if(_JAVA_HOME)
--  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
--endif()
--list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
--  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
--)
--
--JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
--  /usr/include
--  /usr/local/include
--  /usr/lib/java/include
--  /usr/local/lib/java/include
--  /usr/lib/jvm/java/include
--  /usr/lib/jvm/java-6-sun/include
--  /usr/lib/jvm/java-1.5.0-sun/include
--  /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
--  /usr/lib/jvm/java-6-openjdk/include
--  /usr/lib/jvm/java-8-openjdk-{libarch}/include  # ubuntu 15.10
--  /usr/lib/jvm/java-7-openjdk-{libarch}/include  # ubuntu 15.10
--  /usr/lib/jvm/java-6-openjdk-{libarch}/include  # ubuntu 15.10
--  /usr/local/share/java/include
--  /usr/lib/j2sdk1.4-sun/include
--  /usr/lib/j2sdk1.5-sun/include
--  /opt/sun-jdk-1.5.0.04/include
--  # Debian specific path for default JVM
--  /usr/lib/jvm/default-java/include
--  # Arch specific path for default JVM
--  /usr/lib/jvm/default/include
--  # OpenBSD specific path for default JVM
--  /usr/local/jdk-1.7.0/include
--  /usr/local/jdk-1.6.0/include
--  # SuSE specific paths for default JVM
--  /usr/lib64/jvm/java/include
-+if(MODJAVA_VER)
-+  set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+    ${LOCALBASE}/jdk-1.8.0/include
-+    )
-+else(MODJAVA_VER)
-+  set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+  if(_JAVA_HOME)
-+    list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-+  endif()
-+  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-+    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-   )
++get_filename_component(java_install_version
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
 +
-+  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+    /usr/include
-+    /usr/local/include
-+    /usr/lib/java/include
-+    /usr/local/lib/java/include
-+    /usr/lib/jvm/java/include
-+    /usr/lib/jvm/java-6-sun/include
-+    /usr/lib/jvm/java-1.5.0-sun/include
-+    /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
-+    /usr/lib/jvm/java-6-openjdk/include
-+    /usr/lib/jvm/java-8-openjdk-{libarch}/include  # ubuntu 15.10
-+    /usr/lib/jvm/java-7-openjdk-{libarch}/include  # ubuntu 15.10
-+    /usr/lib/jvm/java-6-openjdk-{libarch}/include  # ubuntu 15.10
-+    /usr/local/share/java/include
-+    /usr/lib/j2sdk1.4-sun/include
-+    /usr/lib/j2sdk1.5-sun/include
-+    /opt/sun-jdk-1.5.0.04/include
-+    # Debian specific path for default JVM
-+    /usr/lib/jvm/default-java/include
-+    # Arch specific path for default JVM
-+    /usr/lib/jvm/default/include
-+    # OpenBSD specific path for default JVM
-+    ${LOCALBASE}/jdk-1.8.0/include
-+    # SuSE specific paths for default JVM
-+    /usr/lib64/jvm/java/include
-+    )
-+endif(MODJAVA_VER)
- 
- foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
-   get_filename_component(jpath "${JAVA_PROG}" PATH)
+ if (WIN32)
+   set (_JNI_HINTS)
+   execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+@@ -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
+   # OpenBSD specific paths for default JVM
+-  /usr/local/jdk-1.7.0
+-  /usr/local/jre-1.7.0
+-  /usr/local/jdk-1.6.0
+-  /usr/local/jre-1.6.0
++  ${LOCALBASE}/jdk-1.8.0
++  ${LOCALBASE}/jre-1.8.0
++  ${LOCALBASE}/jdk-11
++  ${LOCALBASE}/jre-11
+   # SuSE specific paths for default JVM
+   /usr/lib64/jvm/java
+   /usr/lib64/jvm/jre

devel/cmake/patches/patch-Modules_FindJava_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindJava_cmake,v 1.24 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJava_cmake,v 1.25 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindJava.cmake
 --- Modules/FindJava.cmake.orig
 +++ Modules/FindJava.cmake
-@@ -72,6 +72,8 @@
+@@ -78,6 +78,8 @@ Example Usages:
  
  include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
  
@@ -11,8 +11,8 @@ Index: Modules/FindJava.cmake
  # The HINTS option should only be used for values computed from the system.
  set(_JAVA_HINTS)
  if(_JAVA_HOME)
-@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
-   )
+@@ -133,19 +135,22 @@ endif()
+ 
  # Hard-coded guesses should still go in PATHS. This ensures that the user
  # environment can always override hard guesses.
 -set(_JAVA_PATHS

devel/cmake/patches/patch-Modules_FindKDE3_cmake

@@ -1,16 +1,17 @@
-$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.6 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.7 2019/08/21 05:47:40 rsadowski Exp $
+
 Index: Modules/FindKDE3.cmake
 --- Modules/FindKDE3.cmake.orig
 +++ Modules/FindKDE3.cmake
 @@ -294,12 +294,6 @@ if(KDE3_FOUND)
-       set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
-    endif ()
+     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+   endif ()
  
--   # if no special buildtype is selected, add -O2 as default optimization
--   if (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
--      set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
--      set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
--   endif ()
+-  # if no special buildtype is selected, add -O2 as default optimization
+-  if (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
+-    set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -O2")
+-    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+-  endif ()
 -
  #set(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
  #set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")

devel/cmake/patches/patch-Modules_FindLua_cmake

@@ -1,8 +1,9 @@
-$OpenBSD: patch-Modules_FindLua_cmake,v 1.6 2017/08/26 17:53:35 dcoppa Exp $
+$OpenBSD: patch-Modules_FindLua_cmake,v 1.7 2019/08/21 05:47:40 rsadowski Exp $
+
 Index: Modules/FindLua.cmake
 --- Modules/FindLua.cmake.orig
 +++ Modules/FindLua.cmake
-@@ -40,9 +40,16 @@ unset(_lua_include_subdirs)
+@@ -46,9 +46,16 @@ unset(_lua_include_subdirs)
  unset(_lua_library_names)
  unset(_lua_append_versions)
  
@@ -10,24 +11,23 @@ Index: Modules/FindLua.cmake
 +set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
 +
  # this is a function only to have all the variables inside go away automatically
- function(_lua_set_version_vars)
+ function(_lua_get_versions)
 -    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
 +    if(MODLUA_VERSION)
-+        set(LUA_VERSIONS5 ${MODLUA_VERSION})
++         set(LUA_VERSIONS5 ${MODLUA_VERSION})
 +    else()
-+        set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
++         set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
 +    endif()
  
      if (Lua_FIND_VERSION_EXACT)
          if (Lua_FIND_VERSION_COUNT GREATER 1)
-@@ -114,6 +121,10 @@ function(_lua_check_header_version _hdr_file)
- endfunction(_lua_check_header_version)
+@@ -145,6 +152,9 @@ endfunction(_lua_get_header_version)
  
- _lua_set_version_vars()
-+
-+if(MODLUA_INCL_DIR)
-+    set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+endif()
+ function(_lua_find_header)
+   _lua_set_version_vars()
++  if(MODLUA_INCL_DIR)
++      set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
++  endif()
  
- if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-     _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
+   # Initialize as local variable
+   set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})

devel/cmake/patches/patch-Modules_FindMPEG2_cmake

@@ -1,37 +1,8 @@
-$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.10 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.11 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindMPEG2.cmake
 --- Modules/FindMPEG2.cmake.orig
 +++ Modules/FindMPEG2.cmake
-@@ -23,24 +23,19 @@
- #   MPEG2_vo_LIBRARY, where to find the vo library.
- 
- find_path(MPEG2_INCLUDE_DIR
--  NAMES mpeg2.h mpeg2dec/mpeg2.h
--  PATHS /usr/local/livid
-+  NAMES mpeg2dec/mpeg2.h
-+  PATHS ${LOCALBASE}/include
- )
- 
- find_library(MPEG2_mpeg2_LIBRARY mpeg2
--  /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+  ${LOCALBASE}/lib
- )
- 
--find_library( MPEG2_vo_LIBRARY vo
--  /usr/local/livid/mpeg2dec/libvo/.libs
--)
--
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
- 
- if(MPEG2_FOUND)
--  set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
--                        ${MPEG2_vo_LIBRARY})
-+  set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
- 
-   #some native mpeg2 installations will depend
-   #on libSDL, if found, add it in.
-@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
+@@ -47,4 +47,4 @@ if(MPEG2_FOUND)
    endif()
  endif()
  

devel/cmake/patches/patch-Modules_FindMPEG_cmake

@@ -1,33 +1,18 @@
-$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.12 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindMPEG.cmake
 --- Modules/FindMPEG.cmake.orig
 +++ Modules/FindMPEG.cmake
-@@ -22,23 +22,19 @@
- #   MPEG_mpeg2_LIBRARY, where to find the MPEG library.
- #   MPEG_vo_LIBRARY, where to find the vo library.
+@@ -28,8 +28,6 @@ find_path(MPEG_INCLUDE_DIR
  
--find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
--  /usr/local/livid
-+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
-+  ${LOCALBASE}/include
- )
+ find_library(MPEG_mpeg2_LIBRARY mpeg2)
  
- find_library(MPEG_mpeg2_LIBRARY mpeg2
--  /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+  ${LOCALBASE}/lib
- )
- 
--find_library( MPEG_vo_LIBRARY vo
--  /usr/local/livid/mpeg2dec/libvo/.libs
--)
+-find_library(MPEG_vo_LIBRARY vo)
 -
  include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
  
- if(MPEG_FOUND)
--  set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
-+  set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
+@@ -40,4 +38,4 @@ if(MPEG_FOUND)
+   endif()
  endif()
  
 -mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)

devel/cmake/patches/patch-Modules_FindOpenMP_cmake

@@ -0,0 +1,27 @@
+$OpenBSD: patch-Modules_FindOpenMP_cmake,v 1.1 2019/08/21 05:47:40 rsadowski Exp $
+
+Add libs and paths. Ensure the lib is used for the C case.
+
+Index: Modules/FindOpenMP.cmake
+--- Modules/FindOpenMP.cmake.orig
++++ Modules/FindOpenMP.cmake
+@@ -84,8 +84,8 @@ function(_OPENMP_FLAG_CANDIDATES LANG)
+   if(NOT OpenMP_${LANG}_FLAG)
+     unset(OpenMP_FLAG_CANDIDATES)
+ 
+-    set(OMP_FLAG_GNU "-fopenmp")
+-    set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp")
++    set(OMP_FLAG_GNU "-fopenmp -lgomp")
++    set(OMP_FLAG_Clang "-fopenmp -I${LOCALBASE}/include -Wl,-L${LOCALBASE}/lib,-lomp")
+     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
+ #endif

devel/cmake/patches/patch-Modules_FindPythonInterp_cmake

@@ -1,16 +1,17 @@
-$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindPythonInterp.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindPythonInterp.cmake	Fri Nov 25 22:31:44 2016
-@@ -36,6 +36,8 @@
- # get the currently active Python version by default with a consistent version
- # of PYTHON_LIBRARIES.
+$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.12 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindPythonInterp.cmake
+--- Modules/FindPythonInterp.cmake.orig
++++ Modules/FindPythonInterp.cmake
+@@ -41,6 +41,8 @@ get the currently active Python version by default wit
+ of PYTHON_LIBRARIES.
+ #]=======================================================================]
  
 +set(MODPY_VERSION $ENV{MODPY_VERSION})
 +
  unset(_Python_NAMES)
  
  set(_PYTHON1_VERSIONS 1.6 1.5)
-@@ -68,19 +70,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+@@ -73,19 +75,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
  
  # Set up the versions we know about, in the order we will search. Always add
  # the user supplied additional versions to the front.

devel/cmake/patches/patch-Modules_FindPythonLibs_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.17 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.18 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindPythonLibs.cmake
 --- Modules/FindPythonLibs.cmake.orig
 +++ Modules/FindPythonLibs.cmake
-@@ -72,6 +72,9 @@ endif()
+@@ -77,6 +77,9 @@ endif()
  # To avoid picking up the system Python.h pre-maturely.
  set(CMAKE_FIND_FRAMEWORK LAST)
  
@@ -11,8 +11,8 @@ Index: Modules/FindPythonLibs.cmake
 +
  set(_PYTHON1_VERSIONS 1.6 1.5)
  set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- set(_PYTHON3_VERSIONS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-@@ -106,11 +109,15 @@ endif()
+ set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+@@ -111,11 +114,15 @@ endif()
  # If FindPythonInterp has already found the major and minor version,
  # insert that version between the user supplied versions and the stock
  # version list.
@@ -33,10 +33,11 @@ Index: Modules/FindPythonLibs.cmake
  
  unset(_PYTHON_FIND_OTHER_VERSIONS)
  unset(_PYTHON1_VERSIONS)
-@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+@@ -234,25 +241,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+           ${dir}/Versions/${_CURRENT_VERSION}/include)
        endforeach()
      endif()
- 
+-
 -    find_path(PYTHON_INCLUDE_DIR
 -      NAMES Python.h
 -      HINTS
@@ -44,7 +45,11 @@ Index: Modules/FindPythonLibs.cmake
 -      PATHS
 -        ${PYTHON_FRAMEWORK_INCLUDES}
 -        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+-        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
+-        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
 -        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+-        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH}\\InstallPath]/include
+-        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}-${_PYTHON_ARCH2}\\InstallPath]/include
 -      PATH_SUFFIXES
 -        python${_CURRENT_VERSION}mu
 -        python${_CURRENT_VERSION}m

devel/cmake/patches/patch-Modules_FindQt3_cmake

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_FindQt3_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindQt3.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindQt3.cmake	Fri Nov 25 22:31:45 2016
-@@ -151,7 +151,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
+$OpenBSD: patch-Modules_FindQt3_cmake,v 1.12 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindQt3.cmake
+--- Modules/FindQt3.cmake.orig
++++ Modules/FindQt3.cmake
+@@ -140,7 +140,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
  
  # Qt 3 should prefer QTDIR over the PATH
  find_program(QT_MOC_EXECUTABLE
@@ -10,7 +11,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
    HINTS
      ENV QTDIR
    PATHS
-@@ -176,7 +176,7 @@ endif()
+@@ -160,7 +160,7 @@ endif()
  
  # Qt 3 should prefer QTDIR over the PATH
  find_program(QT_UIC_EXECUTABLE

devel/cmake/patches/patch-Modules_FindQt4_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindQt4_cmake,v 1.30 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindQt4_cmake,v 1.31 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindQt4.cmake
 --- Modules/FindQt4.cmake.orig
 +++ Modules/FindQt4.cmake
-@@ -516,7 +516,12 @@ endfunction()
+@@ -518,7 +518,12 @@ endfunction()
  
  set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
  
@@ -16,7 +16,7 @@ Index: Modules/FindQt4.cmake
  _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
  
  if (QT_QMAKE_EXECUTABLE AND
-@@ -696,6 +701,8 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -694,6 +699,8 @@ if (QT_QMAKE_EXECUTABLE AND
  
    # Set QT_INCLUDES
    set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
@@ -25,7 +25,7 @@ Index: Modules/FindQt4.cmake
  
  
    # ask qmake for the documentation directory
-@@ -1139,17 +1146,17 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -1133,17 +1140,17 @@ if (QT_QMAKE_EXECUTABLE AND
      endif()
    endmacro()
  

devel/cmake/patches/patch-Modules_FindQt_cmake

@@ -1,8 +1,9 @@
-$OpenBSD: patch-Modules_FindQt_cmake,v 1.7 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindQt.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindQt.cmake	Fri Nov 25 22:31:45 2016
-@@ -34,6 +34,12 @@
- #   QT3_INSTALLED is set to TRUE if qt3 is found.
+$OpenBSD: patch-Modules_FindQt_cmake,v 1.8 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindQt.cmake
+--- Modules/FindQt.cmake.orig
++++ Modules/FindQt.cmake
+@@ -43,6 +43,12 @@ if(_findqt_testing)
+ endif()
  
  # look for signs of qt3 installations
 +file(GLOB GLOB_TEMP_VAR ${LOCALBASE}/lib/qt3/bin/qmake)
@@ -14,7 +15,7 @@ $OpenBSD: patch-Modules_FindQt_cmake,v 1.7 2016/11/28 09:15:13 dcoppa Exp $
  file(GLOB GLOB_TEMP_VAR /usr/lib*/qt-3*/bin/qmake /usr/lib*/qt3*/bin/qmake)
  if(GLOB_TEMP_VAR)
    set(QT3_INSTALLED TRUE)
-@@ -53,6 +59,12 @@ endif()
+@@ -62,6 +68,12 @@ endif()
  set(GLOB_TEMP_VAR)
  
  # look for qt4 installations

devel/cmake/patches/patch-Modules_FindRuby_cmake

@@ -1,49 +1,42 @@
-$OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindRuby.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindRuby.cmake	Fri Nov 25 22:31:45 2016
-@@ -42,35 +42,53 @@
+$OpenBSD: patch-Modules_FindRuby_cmake,v 1.17 2019/08/21 05:47:40 rsadowski Exp $
+
+Index: Modules/FindRuby.cmake
+--- Modules/FindRuby.cmake.orig
++++ Modules/FindRuby.cmake
+@@ -42,7 +42,17 @@ Also:
+ 
  # uncomment the following line to get debug output for this file
  # set(_RUBY_DEBUG_OUTPUT TRUE)
- 
 +set(MODRUBY_REV $ENV{MODRUBY_REV})
-+
+ 
 +if(MODRUBY_REV AND MODRUBY_REV MATCHES "^[0-9]+\\.[0-9]$")
 +   string(REPLACE "." "" MODRUBY_REV_NO_DOTS ${MODRUBY_REV})
 +   string(REPLACE "." ";" MODRUBY_REV_LIST ${MODRUBY_REV})
 +   list(GET MODRUBY_REV_LIST 0 MODRUBY_REV_MAJOR)
 +   list(GET MODRUBY_REV_LIST 1 MODRUBY_REV_MINOR)
 +endif()
++
++
 +
  # Determine the list of possible names of the ruby executable depending
  # on which version of ruby is required
--set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+set(_RUBY_POSSIBLE_EXECUTABLE_NAMES)
- 
- # if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
- if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
-    set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
-    # we can't construct that if only major version is given
-    set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
--       ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
-        ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+       ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
-        ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
- else()
--   set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+   if(MODRUBY_REV_NO_DOTS)
-+      set(Ruby_FIND_VERSION_SHORT_NODOT "${MODRUBY_REV_NO_DOTS}")
-+   else(MODRUBY_REV_NO_DOTS)
-+      set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+   endif(MODRUBY_REV_NO_DOTS)
+ set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
+@@ -60,12 +70,16 @@ else()
  endif()
  
  if(NOT Ruby_FIND_VERSION_EXACT)
+-  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
+-  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
+-  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
 -  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
 -  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
 -  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+  if(MODRUBY_REV AND MODRUBY_REV_NO_DOTS)
-+    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby${MODRUBY_REV_NO_DOTS} ruby${MODRUBY_REV})
-+  endif()
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby28 ruby2.8)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby27 ruby2.7)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby26 ruby2.6)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.5)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
 +  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby22 ruby2.2)
 +  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
 +  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
@@ -51,43 +44,34 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
  
    # if we want a version below 1.9, also look for ruby 1.8
    if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
--    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-+    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby18 ruby1.8)
+@@ -189,6 +203,26 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
+     set(RUBY_VERSION_MAJOR 2)
+     set(RUBY_VERSION_MINOR 4)
    endif()
--
--  list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
- endif()
- 
-+list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
-+
- find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
- 
- if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
-@@ -155,6 +173,10 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-    set(RUBY_VERSION_MAJOR 1)
-    set(RUBY_VERSION_MINOR 8)
-    set(RUBY_VERSION_PATCH 0)
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby${MODRUBY_REV_NO_DOTS}")
-+      set(RUBY_VERSION_MAJOR ${MODRUBY_REV_MAJOR})
-+      set(RUBY_VERSION_MINOR ${MODRUBY_REV_MINOR})
-+   endif()
-    # check whether we found 1.9.x
-    if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
-       set(RUBY_VERSION_MAJOR 1)
-@@ -170,6 +192,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-       set(RUBY_VERSION_MAJOR 2)
-       set(RUBY_VERSION_MINOR 1)
-    endif()
-+   # check whether we found 2.2.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2.?2")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 2)
-+   endif()
++  # check whether we found 2.5.x
++  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
++    set(RUBY_VERSION_MAJOR 2)
++    set(RUBY_VERSION_MINOR 5)
++  endif()
++  # check whether we found 2.6.x
++  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?6")
++    set(RUBY_VERSION_MAJOR 2)
++    set(RUBY_VERSION_MINOR 6)
++  endif()
++  # check whether we found 2.7.x
++  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?7")
++    set(RUBY_VERSION_MAJOR 2)
++    set(RUBY_VERSION_MINOR 7)
++  endif()
++  # check whether we found 2.8.x
++  if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?8")
++    set(RUBY_VERSION_MAJOR 2)
++    set(RUBY_VERSION_MINOR 8)
++  endif()
  endif()
  
  if(RUBY_VERSION_MAJOR)
-@@ -203,7 +230,7 @@ endif()
+@@ -223,7 +257,7 @@ endif()
  
  
  # Determine the list of possible names for the ruby library
@@ -95,4 +79,4 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
 +set(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT_NODOT} ruby${_RUBY_VERSION_SHORT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION} ruby ruby-static)
  
  if(WIN32)
-    set( _RUBY_MSVC_RUNTIME "" )
+   set( _RUBY_MSVC_RUNTIME "" )

devel/cmake/patches/patch-Modules_FindSDL_cmake

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_FindSDL_cmake,v 1.10 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindSDL.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindSDL.cmake	Fri Nov 25 22:31:45 2016
-@@ -85,6 +85,11 @@ else()
+$OpenBSD: patch-Modules_FindSDL_cmake,v 1.11 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindSDL.cmake
+--- Modules/FindSDL.cmake.orig
++++ Modules/FindSDL.cmake
+@@ -86,6 +86,11 @@ else()
    set(VC_LIB_PATH_SUFFIX lib/x86)
  endif()
  

devel/cmake/patches/patch-Modules_FindTCL_cmake

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindTCL.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindTCL.cmake	Fri Nov 25 22:31:45 2016
-@@ -48,19 +48,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
+$OpenBSD: patch-Modules_FindTCL_cmake,v 1.16 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindTCL.cmake
+--- Modules/FindTCL.cmake.orig
++++ Modules/FindTCL.cmake
+@@ -49,19 +49,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
  include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
  include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)
  
@@ -42,7 +43,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
  
  get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
  get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -75,19 +92,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -76,15 +93,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
  string(REGEX REPLACE
    "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
  
@@ -53,11 +54,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
 -  "${TK_LIBRARY_PATH}"
 -  "${TCL_TCLSH_PATH_PARENT}/lib"
 -  "${TK_WISH_PATH_PARENT}/lib"
--  /usr/local/lib/tcl/tcl8.5
--  /usr/local/lib/tcl/tk8.5
--  /usr/local/lib/tcl/tcl8.4
--  /usr/local/lib/tcl/tk8.4
--  )
+-)
 +set(TCLTK_OPENBSD_LIB_PATHS)
  
 +if(MODTCL_LIBDIR)
@@ -89,82 +86,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
 +    )
 +endif()
 +
- if(WIN32)
-   get_filename_component(
-     ActiveTcl_CurrentVersion
-@@ -107,31 +142,47 @@ if(WIN32)
-     )
- endif()
- 
--find_library(TCL_LIBRARY
--  NAMES
--  tcl
--  tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
--  tcl86 tcl8.6
--  tcl85 tcl8.5
--  tcl84 tcl8.4
--  tcl83 tcl8.3
--  tcl82 tcl8.2
--  tcl80 tcl8.0
--  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
--  )
-+if(MODTCL_LIB)
-+  find_library(TCL_LIBRARY
-+    NAMES
-+    ${MODTCL_LIB}
-+    PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+    )
-+else(MODTCL_LIB)
-+  find_library(TCL_LIBRARY
-+    NAMES
-+    tcl
-+    tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
-+    tcl86 tcl8.6
-+    tcl85 tcl8.5
-+    tcl84 tcl8.4
-+    tcl83 tcl8.3
-+    tcl82 tcl8.2
-+    tcl80 tcl8.0
-+    PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+    )
-+endif(MODTCL_LIB)
- 
--find_library(TK_LIBRARY
--  NAMES
--  tk
--  tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
--  tk86 tk8.6
--  tk85 tk8.5
--  tk84 tk8.4
--  tk83 tk8.3
--  tk82 tk8.2
--  tk80 tk8.0
--  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
--  )
-+if(MODTK_LIB)
-+  find_library(TK_LIBRARY
-+    NAMES
-+    ${MODTK_LIB}
-+    PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+    )
-+else(MODTK_LIB)
-+  find_library(TK_LIBRARY
-+    NAMES
-+    tk
-+    tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
-+    tk86 tk8.6
-+    tk85 tk8.5
-+    tk84 tk8.4
-+    tk83 tk8.3
-+    tk82 tk8.2
-+    tk80 tk8.0
-+    PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+    )
-+endif(MODTK_LIB)
- 
- CMAKE_FIND_FRAMEWORKS(Tcl)
- CMAKE_FIND_FRAMEWORKS(Tk)
-@@ -155,30 +206,46 @@ if(Tk_FRAMEWORKS)
+ set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
+   lib/tcl/tcl8.7
+   lib/tcl/tk8.7
+@@ -167,16 +206,6 @@ if(Tk_FRAMEWORKS)
    endif()
  endif()
  
@@ -177,21 +102,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
 -  ${TK_FRAMEWORK_INCLUDES}
 -  "${TCL_TCLSH_PATH_PARENT}/include"
 -  "${TK_WISH_PATH_PARENT}/include"
--  /usr/include/tcl${TK_LIBRARY_VERSION}
--  /usr/include/tcl${TCL_LIBRARY_VERSION}
--  /usr/include/tcl8.6
--  /usr/include/tcl8.5
--  /usr/include/tcl8.4
--  /usr/include/tcl8.3
--  /usr/include/tcl8.2
--  /usr/include/tcl8.0
--  /usr/local/include/tcl8.6
--  /usr/local/include/tk8.6
--  /usr/local/include/tcl8.5
--  /usr/local/include/tk8.5
--  /usr/local/include/tcl8.4
--  /usr/local/include/tk8.4
 -  )
+ 
+ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+   include/tcl${TK_LIBRARY_VERSION}
+@@ -193,6 +222,46 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+   include/tcl8.2
+   include/tcl8.0
+   )
 +set(TCLTK_OPENBSD_INCLUDE_PATHS)
 +
 +if(MODTCL_INCDIR)

devel/cmake/patches/patch-Modules_FindTclStub_cmake

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.6 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindTclStub.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindTclStub.cmake	Fri Nov 25 22:31:45 2016
-@@ -48,13 +48,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
+$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.7 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindTclStub.cmake
+--- Modules/FindTclStub.cmake.orig
++++ Modules/FindTclStub.cmake
+@@ -49,13 +49,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
  
  get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
  get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}" PATH)
@@ -27,7 +28,7 @@ $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.6 2016/11/28 09:15:13 dcoppa Exp $
  
  get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
  get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -69,14 +77,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -70,14 +78,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
  string(REGEX REPLACE
    "^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
  

devel/cmake/patches/patch-Modules_FindTclsh_cmake

@@ -1,9 +1,10 @@
-$OpenBSD: patch-Modules_FindTclsh_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindTclsh.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindTclsh.cmake	Fri Nov 25 22:31:45 2016
-@@ -19,14 +19,21 @@
- # In cygwin, look for the cygwin version first.  Don't look for it later
- # to avoid finding the cygwin version on a Win32 build.
+$OpenBSD: patch-Modules_FindTclsh_cmake,v 1.6 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindTclsh.cmake
+--- Modules/FindTclsh.cmake.orig
++++ Modules/FindTclsh.cmake
+@@ -20,14 +20,21 @@ In cygwin, look for the cygwin version first.  Don't l
+ to avoid finding the cygwin version on a Win32 build.
+ #]=======================================================================]
  
 +set(MODTCL_VERSION $ENV{MODTCL_VERSION})
 +set(MODTK_VERSION $ENV{MODTK_VERSION})
@@ -25,36 +26,3 @@ $OpenBSD: patch-Modules_FindTclsh_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
  
  get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
  get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -65,16 +72,22 @@ if(WIN32)
-     )
- endif()
- 
--set(TCL_TCLSH_NAMES
--  tclsh
--  tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
--  tclsh86 tclsh8.6
--  tclsh85 tclsh8.5
--  tclsh84 tclsh8.4
--  tclsh83 tclsh8.3
--  tclsh82 tclsh8.2
--  tclsh80 tclsh8.0
--  )
-+if(MODTCL_VERSION)
-+  set(TCL_TCLSH_NAMES
-+    tclsh${MODTCL_VERSION}
-+    )
-+else(MODTCL_VERSION)
-+  set(TCL_TCLSH_NAMES
-+    tclsh
-+    tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
-+    tclsh86 tclsh8.6
-+    tclsh85 tclsh8.5
-+    tclsh84 tclsh8.4
-+    tclsh83 tclsh8.3
-+    tclsh82 tclsh8.2
-+    tclsh80 tclsh8.0
-+    )
-+endif(MODTCL_VERSION)
- 
- find_program(TCL_TCLSH
-   NAMES ${TCL_TCLSH_NAMES}

devel/cmake/patches/patch-Modules_FindWish_cmake

@@ -1,9 +1,10 @@
-$OpenBSD: patch-Modules_FindWish_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindWish.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/FindWish.cmake	Fri Nov 25 22:31:45 2016
-@@ -19,14 +19,21 @@
- #
- # if UNIX is defined, then it will look for the cygwin version first
+$OpenBSD: patch-Modules_FindWish_cmake,v 1.6 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/FindWish.cmake
+--- Modules/FindWish.cmake.orig
++++ Modules/FindWish.cmake
+@@ -20,14 +20,21 @@ library is.  This code sets the following variables:
+ if UNIX is defined, then it will look for the cygwin version first
+ #]=======================================================================]
  
 +set(MODTCL_VERSION $ENV{MODTCL_VERSION})
 +set(MODTK_VERSION $ENV{MODTK_VERSION})
@@ -25,7 +26,7 @@ $OpenBSD: patch-Modules_FindWish_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
  
  get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
  get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -65,16 +72,22 @@ if(WIN32)
+@@ -66,16 +73,22 @@ if(WIN32)
      )
  endif()
  

devel/cmake/patches/patch-Modules_FindXMLRPC_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.8 2018/03/14 12:24:54 rsadowski Exp $
+$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.9 2019/08/21 05:47:40 rsadowski Exp $
 Index: Modules/FindXMLRPC.cmake
 --- Modules/FindXMLRPC.cmake.orig
 +++ Modules/FindXMLRPC.cmake
-@@ -97,6 +97,8 @@ if(XMLRPC_C_FOUND)
+@@ -98,6 +98,8 @@ if(XMLRPC_C_FOUND)
        endif()
      endforeach()
  

devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake

@@ -1,11 +0,0 @@
-$OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.14 2014/12/31 11:06:02 dcoppa Exp $
---- Modules/Platform/OpenBSD.cmake.orig	Mon Dec 15 14:07:43 2014
-+++ Modules/Platform/OpenBSD.cmake	Thu Dec 18 05:37:12 2014
-@@ -1,5 +1,7 @@
- include(Platform/NetBSD)
- 
-+unset(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG)
-+
- # On OpenBSD, the compile time linker does not share it's configuration with
- # the runtime linker.  This will extract the library search paths from the
- # system's ld.so.hints file which will allow CMake to set the appropriate

devel/cmake/patches/patch-Modules_Qt4ConfigDependentSettings_cmake

@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/Qt4ConfigDependentSettings.cmake.orig	Fri Nov 11 15:37:13 2016
-+++ Modules/Qt4ConfigDependentSettings.cmake	Fri Nov 25 22:31:45 2016
-@@ -21,6 +21,10 @@
+$OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.12 2019/08/21 05:47:40 rsadowski Exp $
+Index: Modules/Qt4ConfigDependentSettings.cmake
+--- Modules/Qt4ConfigDependentSettings.cmake.orig
++++ Modules/Qt4ConfigDependentSettings.cmake
+@@ -22,6 +22,10 @@ This file is included by FindQt4.cmake, don't include 
  # if a user needs the dependencies, and they couldn't be found, they can set
  # the variables themselves.
  
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.11 2016/11/28 09:15
  set(QT_QTGUI_LIB_DEPENDENCIES "")
  set(QT_QTCORE_LIB_DEPENDENCIES "")
  set(QT_QTNETWORK_LIB_DEPENDENCIES "")
-@@ -55,10 +59,6 @@ if(Q_WS_WIN  AND  NOT QT_IS_STATIC)
+@@ -56,10 +60,6 @@ if(Q_WS_WIN  AND  NOT QT_IS_STATIC)
    set(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_DLL)
  endif()
  
@@ -23,7 +24,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.11 2016/11/28 09:15
  # QtOpenGL dependencies
  find_package(OpenGL)
  set (QT_QTOPENGL_LIB_DEPENDENCIES ${OPENGL_glu_LIBRARY} ${OPENGL_gl_LIBRARY})
-@@ -88,6 +88,15 @@ if(QT_QCONFIG MATCHES "system-mng")
+@@ -89,6 +89,15 @@ if(QT_QCONFIG MATCHES "system-mng")
    set(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} ${MNG_LIBRARY})
  endif()
  
@@ -39,7 +40,7 @@ $OpenBSD: patch-Modules_Qt4ConfigDependentSettings_cmake,v 1.11 2016/11/28 09:15
  # for X11, get X11 library directory
  if(Q_WS_X11)
    find_package(X11)
-@@ -175,6 +184,23 @@ if(QT_QCONFIG MATCHES "system-zlib")
+@@ -176,6 +185,23 @@ if(QT_QCONFIG MATCHES "system-zlib")
    set(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} ${ZLIB_LIBRARIES})
  endif()
  

devel/cmake/patches/patch-Source_CMakeLists_txt

@@ -1,22 +0,0 @@
-$OpenBSD: patch-Source_CMakeLists_txt,v 1.12 2018/06/14 17:04:45 sthen Exp $
-Index: Source/CMakeLists.txt
---- Source/CMakeLists.txt.orig
-+++ Source/CMakeLists.txt
-@@ -81,6 +81,9 @@ include_directories(
-   "${CMake_SOURCE_DIR}/Source/LexerParser"
-   ${CMAKE_ZLIB_INCLUDES}
-   ${CMAKE_EXPAT_INCLUDES}
-+  ${CMAKE_LIBRHASH_INCLUDES}
-+  ${CMAKE_JSONCPP_INCLUDES}
-+  ${CMAKE_LIBUV_INCLUDES}
-   ${CMAKE_TAR_INCLUDES}
-   ${CMAKE_COMPRESS_INCLUDES}
-   ${CMake_HAIKU_INCLUDE_DIRS}
-@@ -273,7 +276,6 @@ set(SRCS
-   cmRulePlaceholderExpander.cxx
-   cmRulePlaceholderExpander.h
-   cmLocalUnixMakefileGenerator3.cxx
--  cmLocale.h
-   ${MACH_SRCS}
-   cmMakefile.cxx
-   cmMakefile.h

devel/cmake/patches/patch-Source_Modules_FindLibUV_cmake

@@ -1,14 +0,0 @@
-$OpenBSD: patch-Source_Modules_FindLibUV_cmake,v 1.1 2019/01/04 08:54:42 pascal Exp $
-
-Index: Source/Modules/FindLibUV.cmake
---- Source/Modules/FindLibUV.cmake.orig
-+++ Source/Modules/FindLibUV.cmake
-@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
- if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
-+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
- else()

devel/cmake/patches/patch-Source_cmArchiveWrite_cxx

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmArchiveWrite_cxx,v 1.2 2017/09/08 06:32:29 dcoppa Exp $
+$OpenBSD: patch-Source_cmArchiveWrite_cxx,v 1.3 2019/08/21 05:47:40 rsadowski Exp $
 
 Get rid of cmLocaleRAII.
 
@@ -37,7 +37,7 @@ Index: Source/cmArchiveWrite.cxx
  #include "cmSystemTools.h"
  #include "cm_get_date.h"
  #include "cm_libarchive.h"
-@@ -211,9 +210,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t 
+@@ -232,9 +231,6 @@ bool cmArchiveWrite::AddFile(const char* file, size_t 
      return true;
    }
    const char* out = file + skip;

devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx

@@ -1,9 +1,9 @@
-$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.22 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.23 2019/08/21 05:47:40 rsadowski Exp $
 Index: Source/cmComputeLinkInformation.cxx
 --- Source/cmComputeLinkInformation.cxx.orig
 +++ Source/cmComputeLinkInformation.cxx
-@@ -366,8 +366,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
-     this->Target->GetLinkDirectories());
+@@ -364,8 +364,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+   this->OrderRuntimeSearchPath->AddUserDirectories(directories);
  
    // Set up the implicit link directories.
 -  this->LoadImplicitLinkInfo();
@@ -13,7 +13,7 @@ Index: Source/cmComputeLinkInformation.cxx
    this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
    if (this->OrderDependentRPath) {
      this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
+@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
  
  bool cmComputeLinkInformation::Compute()
  {
@@ -40,7 +40,7 @@ Index: Source/cmComputeLinkInformation.cxx
    // Restore the target link type so the correct system runtime
    // libraries are found.
    const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -637,10 +647,16 @@ void cmComputeLinkInformation::AddItem(std::string con
+@@ -640,10 +650,16 @@ void cmComputeLinkInformation::AddItem(std::string con
          // This is a directory.
          this->AddDirectoryItem(item);
        } else {
@@ -60,7 +60,7 @@ Index: Source/cmComputeLinkInformation.cxx
        }
      } else {
        // This is a library or option specified by the user.
-@@ -982,11 +998,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -983,11 +999,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
      this->SharedLibrariesLinked.insert(target);
    }
  
@@ -84,7 +84,7 @@ Index: Source/cmComputeLinkInformation.cxx
    }
  
    // If this platform wants a flag before the full path, add it.
-@@ -1539,6 +1562,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+@@ -1540,6 +1563,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
    if (const char* implicitDirs =
          this->Makefile->GetDefinition(implicitDirVar)) {
      cmSystemTools::ExpandListArgument(implicitDirs, implicitDirVec);

devel/cmake/patches/patch-Source_cmComputeLinkInformation_h

@@ -1,9 +1,9 @@
-$OpenBSD: patch-Source_cmComputeLinkInformation_h,v 1.3 2017/08/26 17:53:35 dcoppa Exp $
+$OpenBSD: patch-Source_cmComputeLinkInformation_h,v 1.4 2019/08/21 05:47:40 rsadowski Exp $
 
 Index: Source/cmComputeLinkInformation.h
 --- Source/cmComputeLinkInformation.h.orig
 +++ Source/cmComputeLinkInformation.h
-@@ -162,6 +162,7 @@ class cmComputeLinkInformation (private)
+@@ -158,6 +158,7 @@ class cmComputeLinkInformation (private)
  
    // Implicit link libraries and directories for linker language.
    void LoadImplicitLinkInfo();

devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx

@@ -1,24 +1,9 @@
-$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.10 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.11 2019/08/21 05:47:40 rsadowski Exp $
+
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -1195,11 +1195,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
- 
- bool cmGeneratorTarget::HasSOName(const std::string& config) const
- {
-+#if !defined(__OpenBSD__)
-   // soname is supported only for shared libraries and modules,
-   // and then only when the platform supports an soname flag.
-   return ((this->GetType() == cmStateEnums::SHARED_LIBRARY) &&
-           !this->GetPropertyAsBool("NO_SONAME") &&
-           this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
-+#else
-+  return false;
-+#endif
- }
- 
- bool cmGeneratorTarget::NeedRelinkBeforeInstall(
-@@ -2974,9 +2978,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3759,9 +3759,16 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
    // Check for library version properties.
    const char* version = this->GetProperty("VERSION");
    const char* soversion = this->GetProperty("SOVERSION");
@@ -28,23 +13,24 @@ Index: Source/cmGeneratorTarget.cxx
 +#else
    if (!this->HasSOName(config) ||
        this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
--      this->IsFrameworkOnApple()) {
+       this->IsFrameworkOnApple()) {
 +      this->IsFrameworkOnApple())
 +#endif
 +  {
      // Versioning is supported only for shared libraries and modules,
      // and then only when the platform supports an soname flag.
      version = nullptr;
-@@ -3002,6 +3012,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
-   // The library name.
-   name = prefix + base + suffix;
+@@ -3785,6 +3792,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
  
+   // The library name.
+   targetNames.Output = prefix + targetNames.Base + suffix;
++
 +#if defined(__OpenBSD__)
 +  // Override shared library version using LIBxxx_VERSION
 +  // environment variable. Needed for OpenBSD ports system.
 +  if (this->GetType() == cmStateEnums::SHARED_LIBRARY ||
 +      this->GetType() == cmStateEnums::MODULE_LIBRARY) {
-+    std::string env_name = "LIB" + base + "_VERSION";
++    std::string env_name = "LIB" + targetNames.Base + "_VERSION";
 +    char *env_vers_cstr = getenv(env_name.c_str());
 +
 +    if (env_vers_cstr && strlen(env_vers_cstr) > 0) {
@@ -59,48 +45,14 @@ Index: Source/cmGeneratorTarget.cxx
 +        msg += env_name;
 +        msg += " specification: ";
 +        msg += env_vers;
-+        this->LocalGenerator->IssueMessage(cmake::INTERNAL_ERROR, msg);
++        this->LocalGenerator->IssueMessage(MessageType::INTERNAL_ERROR, msg);
 +      } else {
 +        version = env_vers_cstr;
++        soversion = env_vers_cstr;
 +      }
 +    }
 +  }
-+#endif
-+
-   if (this->IsFrameworkOnApple()) {
-     realName = prefix;
-     if (!this->Makefile->PlatformIsAppleIos()) {
-@@ -3013,7 +3051,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
-     soName = realName;
-   } else {
-     // The library's soname.
-+#if !defined(__OpenBSD__)
-     this->ComputeVersionedName(soName, prefix, base, suffix, name, soversion);
-+#else
-+    this->ComputeVersionedName(soName, prefix, base, suffix, name, version);
 +#endif
  
-     // The library's real name on disk.
-     this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
-@@ -4142,7 +4184,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
-   vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name;
-   if (version) {
-     vName += ".";
-+#if defined(__OpenBSD__)
-+    // OpenBSD-style versioning for shared libraries.
-+    // Convert libname.so.X.X.X to libname.so.X.X
-+    int j = 0;
-+    for (int i = 0; i < (int)strlen(version); i++) {
-+      if (version[i] == '.') {
-+        j++;
-+        if (j == 2)
-+          break;
-+      }
-+      vName += version[i];
-+    }
-+#else
-     vName += version;
-+#endif
-   }
-   vName += this->Makefile->IsOn("APPLE") ? suffix : std::string();
- }
+   if (this->IsFrameworkOnApple()) {
+     targetNames.Real = prefix;

devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx

@@ -1,15 +1,15 @@
-$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.9 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.10 2019/08/21 05:47:40 rsadowski Exp $
 
 Index: Source/cmGlobalGenerator.cxx
 --- Source/cmGlobalGenerator.cxx.orig
 +++ Source/cmGlobalGenerator.cxx
-@@ -2227,6 +2227,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
-     cmCustomCommandLine singleLine;
-     singleLine.push_back(cmSystemTools::GetCTestCommand());
-     singleLine.push_back("--force-new-ctest-process");
-+    // Skip tests requiring internet access
-+    singleLine.push_back("--exclude-regex");
-+    singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
-     if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
-       singleLine.push_back("-C");
-       singleLine.push_back(cmakeCfgIntDir);
+@@ -2435,6 +2435,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+   cmCustomCommandLine singleLine;
+   singleLine.push_back(cmSystemTools::GetCTestCommand());
+   singleLine.push_back("--force-new-ctest-process");
++  // Skip tests requiring internet access
++  singleLine.push_back("--exclude-regex");
++  singleLine.push_back("\"CMake.FileDownload|CTestTestUpload|RunCMake.ctest_submit\"");
+   if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
+     singleLine.push_back("-C");
+     singleLine.push_back(cmakeCfgIntDir);

devel/cmake/patches/patch-Source_cmInstallCommand_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.14 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.15 2019/08/21 05:47:40 rsadowski Exp $
 Index: Source/cmInstallCommand.cxx
 --- Source/cmInstallCommand.cxx.orig
 +++ Source/cmInstallCommand.cxx
-@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -378,6 +378,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
    }
  
    // Select the mode for installing symlinks to versioned shared libraries.
@@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
    cmInstallTargetGenerator::NamelinkModeType namelinkMode =
      cmInstallTargetGenerator::NamelinkModeNone;
    if (libraryArgs.GetNamelinkOnly()) {
-@@ -325,6 +328,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -385,6 +388,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
    } else if (libraryArgs.GetNamelinkSkip()) {
      namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
    }
@@ -22,4 +22,4 @@ Index: Source/cmInstallCommand.cxx
 +#endif
  
    // Check if there is something to do.
-   if (targetList.GetVector().empty()) {
+   if (targetList.empty()) {

devel/cmake/patches/patch-Source_cmMessenger_cxx

@@ -1,23 +1,24 @@
-$OpenBSD: patch-Source_cmMessenger_cxx,v 1.1 2016/11/28 09:15:13 dcoppa Exp $
---- Source/cmMessenger.cxx.orig	Fri Nov 25 23:06:59 2016
-+++ Source/cmMessenger.cxx	Fri Nov 25 23:08:39 2016
-@@ -68,7 +68,7 @@ static bool printMessagePreamble(cmake::MessageType t,
-   if (t == cmake::FATAL_ERROR) {
+$OpenBSD: patch-Source_cmMessenger_cxx,v 1.2 2019/08/21 05:47:40 rsadowski Exp $
+Index: Source/cmMessenger.cxx
+--- Source/cmMessenger.cxx.orig
++++ Source/cmMessenger.cxx
+@@ -67,7 +67,7 @@ static bool printMessagePreamble(MessageType t, std::o
+   if (t == MessageType::FATAL_ERROR) {
      msg << "CMake Error";
-   } else if (t == cmake::INTERNAL_ERROR) {
+   } else if (t == MessageType::INTERNAL_ERROR) {
 -    msg << "CMake Internal Error (please report a bug)";
 +    msg << "CMake Internal Error";
-   } else if (t == cmake::LOG) {
+   } else if (t == MessageType::LOG) {
      msg << "CMake Debug Log";
-   } else if (t == cmake::DEPRECATION_ERROR) {
-@@ -107,19 +107,6 @@ void displayMessage(cmake::MessageType t, std::ostring
+   } else if (t == MessageType::DEPRECATION_ERROR) {
+@@ -106,19 +106,6 @@ void displayMessage(MessageType t, std::ostringstream&
  
    // Add a terminating blank line.
    msg << "\n";
 -
 -#if defined(CMAKE_BUILD_WITH_CMAKE)
 -  // Add a C++ stack trace to internal errors.
--  if (t == cmake::INTERNAL_ERROR) {
+-  if (t == MessageType::INTERNAL_ERROR) {
 -    std::string stack = cmsys::SystemInformation::GetProgramStack(0, 0);
 -    if (!stack.empty()) {
 -      if (cmHasLiteralPrefix(stack, "WARNING:")) {
@@ -29,4 +30,4 @@ $OpenBSD: patch-Source_cmMessenger_cxx,v 1.1 2016/11/28 09:15:13 dcoppa Exp $
 -#endif
  
    // Output the message.
-   if (t == cmake::FATAL_ERROR || t == cmake::INTERNAL_ERROR ||
+   if (t == MessageType::FATAL_ERROR || t == MessageType::INTERNAL_ERROR ||

devel/cmake/patches/patch-Source_cmSystemTools_cxx

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.12 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.13 2019/08/21 05:47:40 rsadowski Exp $
 
 Get rid of cmLocaleRAII.
 
@@ -29,17 +29,9 @@ the invalid use of the interface.
 Index: Source/cmSystemTools.cxx
 --- Source/cmSystemTools.cxx.orig
 +++ Source/cmSystemTools.cxx
-@@ -8,7 +8,6 @@
- 
- #if defined(CMAKE_BUILD_WITH_CMAKE)
- #include "cmArchiveWrite.h"
--#include "cmLocale.h"
- #include "cm_libarchive.h"
- #ifndef __LA_INT64_T
- #define __LA_INT64_T la_int64_t
-@@ -1671,8 +1670,6 @@ long copy_data(struct archive* ar, struct archive* aw)
- 
- bool extract_tar(const char* outFileName, bool verbose, bool extract)
+@@ -1764,8 +1764,6 @@ bool extract_tar(const std::string& outFileName,
+                  const std::vector<std::string>& files, bool verbose,
+                  bool extract)
  {
 -  cmLocaleRAII localeRAII;
 -  static_cast<void>(localeRAII);

devel/cmake/patches/patch-Source_cmTarget_cxx

@@ -1,13 +1,14 @@
-$OpenBSD: patch-Source_cmTarget_cxx,v 1.34 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmTarget_cxx,v 1.35 2019/08/21 05:47:40 rsadowski Exp $
+
 Index: Source/cmTarget.cxx
 --- Source/cmTarget.cxx.orig
 +++ Source/cmTarget.cxx
-@@ -227,7 +227,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
-     this->SetPropertyDefault("BUILD_RPATH", nullptr);
-     this->SetPropertyDefault("INSTALL_NAME_DIR", nullptr);
-     this->SetPropertyDefault("INSTALL_RPATH", "");
--    this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
-+    this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "ON");
-     this->SetPropertyDefault("INTERPROCEDURAL_OPTIMIZATION", nullptr);
-     this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
-     this->SetPropertyDefault("BUILD_WITH_INSTALL_RPATH", "OFF");
+@@ -269,7 +269,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
+     InitProperty("BUILD_RPATH_USE_ORIGIN", nullptr);
+     InitProperty("INSTALL_NAME_DIR", nullptr);
+     InitProperty("INSTALL_RPATH", "");
+-    InitProperty("INSTALL_RPATH_USE_LINK_PATH", "OFF");
++    InitProperty("INSTALL_RPATH_USE_LINK_PATH", "ON");
+     InitProperty("INTERPROCEDURAL_OPTIMIZATION", nullptr);
+     InitProperty("SKIP_BUILD_RPATH", "OFF");
+     InitProperty("BUILD_WITH_INSTALL_RPATH", "OFF");

devel/cmake/patches/patch-Source_cmake_cxx

@@ -1,28 +0,0 @@
-$OpenBSD: patch-Source_cmake_cxx,v 1.17 2018/06/14 17:04:45 sthen Exp $
-
-Revert 4e3c7725d0d724d7a8a0e8305d15713e01b20503: we want to build
-CMake using Ninja
-
-Index: Source/cmake.cxx
---- Source/cmake.cxx.orig
-+++ Source/cmake.cxx
-@@ -76,9 +76,7 @@
- #include "cmGlobalWatcomWMakeGenerator.h"
- #endif
- #include "cmGlobalUnixMakefileGenerator3.h"
--#if defined(CMAKE_BUILD_WITH_CMAKE)
- #include "cmGlobalNinjaGenerator.h"
--#endif
- #include "cmExtraCodeLiteGenerator.h"
- 
- #if !defined(CMAKE_BOOT_MINGW)
-@@ -1662,9 +1660,7 @@ void cmake::AddDefaultGenerators()
-   this->Generators.push_back(cmGlobalMinGWMakefileGenerator::NewFactory());
- #endif
-   this->Generators.push_back(cmGlobalUnixMakefileGenerator3::NewFactory());
--#if defined(CMAKE_BUILD_WITH_CMAKE)
-   this->Generators.push_back(cmGlobalNinjaGenerator::NewFactory());
--#endif
- #if defined(CMAKE_USE_WMAKE)
-   this->Generators.push_back(cmGlobalWatcomWMakeGenerator::NewFactory());
- #endif

devel/cmake/patches/patch-Source_kwsys_CMakeLists_txt

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_kwsys_CMakeLists_txt,v 1.5 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_kwsys_CMakeLists_txt,v 1.6 2019/08/21 05:47:40 rsadowski Exp $
 
 patch to disable libexecinfo / execinfo.h; seems it can be picked up
 on ports-gcc arches.
@@ -6,7 +6,7 @@ on ports-gcc arches.
 Index: Source/kwsys/CMakeLists.txt
 --- Source/kwsys/CMakeLists.txt.orig
 +++ Source/kwsys/CMakeLists.txt
-@@ -558,7 +558,7 @@ IF(KWSYS_USE_SystemInformation)
+@@ -587,7 +587,7 @@ IF(KWSYS_USE_SystemInformation)
      SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY
        COMPILE_DEFINITIONS KWSYS_CXX_HAS__ATOI64=1)
    ENDIF()

devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx

@@ -1,18 +1,18 @@
-$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.24 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.25 2019/08/21 05:47:40 rsadowski Exp $
 
 Don't spam systrace by attempting to create dirs which already exist
 
 Index: Source/kwsys/SystemTools.cxx
 --- Source/kwsys/SystemTools.cxx.orig
 +++ Source/kwsys/SystemTools.cxx
-@@ -279,12 +279,14 @@ inline void Realpath(const std::string& path, std::str
+@@ -292,12 +292,14 @@ inline void Realpath(const std::string& path, std::str
  }
  #else
- #include <sys/types.h>
-+#include <sys/stat.h>
+ #  include <sys/types.h>
++#  include <sys/stat.h>
  
- #include <fcntl.h>
- #include <unistd.h>
+ #  include <fcntl.h>
+ #  include <unistd.h>
  inline int Mkdir(const std::string& dir)
  {
 -  return mkdir(dir.c_str(), 00777);

devel/cmake/patches/patch-Tests_RunCMake_CMakeLists_txt

@@ -1,12 +0,0 @@
-$OpenBSD: patch-Tests_RunCMake_CMakeLists_txt,v 1.6 2018/06/14 17:04:45 sthen Exp $
-Index: Tests/RunCMake/CMakeLists.txt
---- Tests/RunCMake/CMakeLists.txt.orig
-+++ Tests/RunCMake/CMakeLists.txt
-@@ -93,7 +93,6 @@ add_RunCMake_test(CMP0054)
- add_RunCMake_test(CMP0055)
- add_RunCMake_test(CMP0057)
- add_RunCMake_test(CMP0059)
--add_RunCMake_test(CMP0060)
- add_RunCMake_test(CMP0064)
- if(CMAKE_SYSTEM_NAME MATCHES Darwin AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
-   add_RunCMake_test(CMP0068)

devel/cmake/patches/patch-Tests_RuntimePath_CMakeLists_txt

@@ -1,15 +0,0 @@
-$OpenBSD: patch-Tests_RuntimePath_CMakeLists_txt,v 1.2 2014/09/11 14:45:13 dcoppa Exp $
-
-Fix typo
-
---- Tests/RuntimePath/CMakeLists.txt.orig	Wed May 29 16:14:21 2013
-+++ Tests/RuntimePath/CMakeLists.txt	Wed May 29 16:14:31 2013
-@@ -8,7 +8,7 @@ set_property(TARGET foo1 PROPERTY LIBRARY_OUTPUT_DIREC
- 
- add_library(bar1 SHARED bar1.c)
- set_property(TARGET bar1 PROPERTY OUTPUT_NAME bar)
--set_property(TARGET bar1 PROPERTY VERSION 1)
-+set_property(TARGET bar1 PROPERTY VERSION 1.0)
- set_property(TARGET bar1 PROPERTY LIBRARY_OUTPUT_DIRECTORY B)
- target_link_libraries(bar1 foo1)
- 

devel/cmake/patches/patch-Utilities_cmjsoncpp_include_json_value_h

@@ -1,27 +0,0 @@
-$OpenBSD: patch-Utilities_cmjsoncpp_include_json_value_h,v 1.1 2018/03/14 12:24:54 rsadowski Exp $
-
-Index: Utilities/cmjsoncpp/include/json/value.h
---- Utilities/cmjsoncpp/include/json/value.h.orig
-+++ Utilities/cmjsoncpp/include/json/value.h
-@@ -321,10 +321,6 @@ Json::Value obj_value(Json::objectValue); // {}
-   Value(bool value);
-   /// Deep copy.
-   Value(const Value& other);
--#if JSON_HAS_RVALUE_REFERENCES
--  /// Move constructor
--  Value(Value&& other);
--#endif
-   ~Value();
- 
-   /// Deep copy, then swap(other).
-@@ -450,10 +446,6 @@ Json::Value obj_value(Json::objectValue); // {}
-   ///
-   /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-   Value& append(const Value& value);
--
--#if JSON_HAS_RVALUE_REFERENCES
--  Value& append(Value&& value);
--#endif
- 
-   /// Access an object value by name, create a null member if it does not exist.
-   /// \note Because of our implementation, keys are limited to 2^30 -1 chars.

devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib_json_json_value_cpp

@@ -1,31 +0,0 @@
-$OpenBSD: patch-Utilities_cmjsoncpp_src_lib_json_json_value_cpp,v 1.1 2018/03/14 12:24:54 rsadowski Exp $
-
-Index: Utilities/cmjsoncpp/src/lib_json/json_value.cpp
---- Utilities/cmjsoncpp/src/lib_json/json_value.cpp.orig
-+++ Utilities/cmjsoncpp/src/lib_json/json_value.cpp
-@@ -485,14 +485,6 @@ Value::Value(Value const& other)
-   }
- }
- 
--#if JSON_HAS_RVALUE_REFERENCES
--// Move constructor
--Value::Value(Value&& other) {
--  initBasic(nullValue);
--  swap(other);
--}
--#endif
--
- Value::~Value() {
-   switch (type_) {
-   case nullValue:
-@@ -1146,10 +1138,6 @@ Value const& Value::operator[](CppTL::ConstString cons
- #endif
- 
- Value& Value::append(const Value& value) { return (*this)[size()] = value; }
--
--#if JSON_HAS_RVALUE_REFERENCES
--  Value& Value::append(Value&& value) { return (*this)[size()] = value; }
--#endif
- 
- Value Value::get(char const* key, char const* cend, Value const& defaultValue) const
- {

devel/cmake/patches/patch-bootstrap

@@ -1,92 +0,0 @@
-$OpenBSD: patch-bootstrap,v 1.18 2018/06/14 17:04:45 sthen Exp $
-
-Use Ninja to build CMake
-XXX: broken on m88k
-
-Index: bootstrap
---- bootstrap.orig
-+++ bootstrap
-@@ -165,7 +165,11 @@ if ${cmake_system_mingw}; then
-   cmake_bootstrap_generator="MSYS Makefiles"
- else
-   # Bootstrapping from a standard UNIX prompt.
--  cmake_bootstrap_generator="Unix Makefiles"
-+  if arch -s | grep -q '^m88k'; then
-+    cmake_bootstrap_generator="Unix Makefiles"
-+  else
-+    cmake_bootstrap_generator="Ninja"
-+  fi
- fi
- 
- # Choose tools and extensions for this platform.
-@@ -224,9 +228,9 @@ cmake_doc_dir_default="`cmake_install_dest_default DOC
- cmake_man_dir_default="`cmake_install_dest_default MAN ${cmake_man_dir_keyword}`"
- cmake_xdgdata_dir_default="`cmake_install_dest_default XDGDATA ${cmake_xdgdata_dir_keyword}`"
- 
--CMAKE_KNOWN_C_COMPILERS="cc gcc xlc icc tcc"
--CMAKE_KNOWN_CXX_COMPILERS="aCC xlC CC g++ c++ icc como "
--CMAKE_KNOWN_MAKE_PROCESSORS="gmake make"
-+CMAKE_KNOWN_C_COMPILERS="cc"
-+CMAKE_KNOWN_CXX_COMPILERS="c++"
-+CMAKE_KNOWN_MAKE_PROCESSORS="make"
- 
- CMAKE_PROBLEMATIC_FILES="\
-   CMakeCache.txt \
-@@ -310,6 +314,7 @@ CMAKE_CXX_SOURCES="\
-   cmFindPathCommand \
-   cmFindProgramCommand \
-   cmForEachCommand \
-+  cmFortranParserImpl \
-   cmFunctionCommand \
-   cmGeneratedFileStream \
-   cmGeneratorExpression \
-@@ -330,6 +335,7 @@ CMAKE_CXX_SOURCES="\
-   cmGetTestPropertyCommand \
-   cmGlobalCommonGenerator \
-   cmGlobalGenerator \
-+  cmGlobalNinjaGenerator \
-   cmGlobalUnixMakefileGenerator3 \
-   cmHexFileConverter \
-   cmIfCommand \
-@@ -350,10 +356,12 @@ CMAKE_CXX_SOURCES="\
-   cmInstalledFile \
-   cmLinkDirectoriesCommand \
-   cmLinkLineComputer \
-+  cmLinkLineDeviceComputer \
-   cmListCommand \
-   cmListFileCache \
-   cmLocalCommonGenerator \
-   cmLocalGenerator \
-+  cmLocalNinjaGenerator \
-   cmLocalUnixMakefileGenerator3 \
-   cmMSVC60LinkLineComputer \
-   cmMacroCommand \
-@@ -368,6 +376,10 @@ CMAKE_CXX_SOURCES="\
-   cmMessageCommand \
-   cmMessenger \
-   cmNewLineStyle \
-+  cmNinjaLinkLineComputer \
-+  cmNinjaNormalTargetGenerator \
-+  cmNinjaTargetGenerator \
-+  cmNinjaUtilityTargetGenerator \
-   cmOSXBundleGenerator \
-   cmOptionCommand \
-   cmOrderDirectories \
-@@ -436,6 +448,8 @@ LexerParser_CXX_SOURCES="\
-   cmCommandArgumentParser \
-   cmExprLexer \
-   cmExprParser \
-+  cmFortranLexer \
-+  cmFortranParser \
- "
- 
- LexerParser_C_SOURCES="\
-@@ -1385,7 +1399,7 @@ cmake_cxx_flags="${cmake_cxx_flags} \
-   -I`cmake_escape \"${cmake_source_dir}/Source/LexerParser\"` \
-   -I`cmake_escape \"${cmake_source_dir}/Utilities\"`"
- echo "cmake: ${objs}" > "${cmake_bootstrap_dir}/Makefile"
--echo "	${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} ${libs} -o cmake" >> "${cmake_bootstrap_dir}/Makefile"
-+echo "	${cmake_cxx_compiler} ${cmake_ld_flags} ${cmake_cxx_flags} ${objs} -o cmake -L${cmake_prefix_dir}/lib -ljsoncpp" >> "${cmake_bootstrap_dir}/Makefile"
- for a in ${CMAKE_CXX_SOURCES}; do
-   src=`cmake_escape "${cmake_source_dir}/Source/${a}.cxx"`
-   src_flags=`eval echo \\${cmake_cxx_flags_\${a}}`