Re: CVS: cvs.openbsd.org: ports

Stuart Henderson Thu, 14 Jun 2018 10:07:39 -0700

On 2018/06/14 17:01, Stuart Henderson wrote:
> Guess you are busy then - I have put a backout diff together and will commit
> this evening to unbreak the ports tree unless I hear back soon.


revert is in, here's the diff (attached) to reinstate.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.170
diff -u -p -r1.170 Makefile
--- Makefile    14 Jun 2018 17:04:45 -0000      1.170
+++ Makefile    14 Jun 2018 17:05:32 -0000
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.170 2018/06/14 17:04:45 sthen Exp $
+# $OpenBSD: Makefile,v 1.169 2018/06/12 05:12:01 rsadowski Exp $
 
 DPB_PROPERTIES =parallel
 
 COMMENT =      portable build system
 
-VER =          3.10.2
+VER =          3.11.2
 EPOCH =                0
 DISTNAME =     cmake-${VER}
 CATEGORIES =   devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.53
diff -u -p -r1.53 distinfo
--- distinfo    14 Jun 2018 17:04:45 -0000      1.53
+++ distinfo    14 Jun 2018 17:05:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+SHA256 (cmake-3.11.2.tar.gz) = Xrwiu88rTHogxBkNQsCEzzhoCoWxp5gKLx1bSlK/Ukg=
+SIZE (cmake-3.11.2.tar.gz) = 7953913
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.26
diff -u -p -r1.26 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt        14 Jun 2018 17:04:45 -0000      1.26
+++ patches/patch-CMakeLists_txt        14 Jun 2018 17:05:32 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-CMakeLists_txt,v 1.25 2018/06/12 05:12:01 rsadowski Exp $
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -337,6 +337,15 @@ macro (CMAKE_BUILD_UTILITIES)
      CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward 
"${kwsys_folder}")
    endif()
  
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
    #---------------------------------------------------------------------
    # Setup third-party libraries.
    # Everything in the tree should be able to include files from the
-@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -370,7 +379,8 @@ macro (CMAKE_BUILD_UTILITIES)
        message(FATAL_ERROR
          "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
      endif()
@@ -28,7 +28,7 @@ Index: CMakeLists.txt
    else()
      set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
      add_subdirectory(Utilities/cmlibrhash)
-@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -536,7 +546,8 @@ macro (CMAKE_BUILD_UTILITIES)
        message(FATAL_ERROR
          "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
      endif()
@@ -38,7 +38,7 @@ Index: CMakeLists.txt
    else()
      set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
      add_subdirectory(Utilities/cmjsoncpp)
-@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -551,7 +562,8 @@ macro (CMAKE_BUILD_UTILITIES)
        message(FATAL_ERROR
          "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
      endif()
Index: patches/patch-Modules_CMakeCInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.8
diff -u -p -r1.8 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake       14 Jun 2018 17:04:45 
-0000      1.8
+++ patches/patch-Modules_CMakeCInformation_cmake       14 Jun 2018 17:05:32 
-0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.8 2018/06/14 17:04:45 
sthen Exp $
+$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.7 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Modules/CMakeCInformation.cmake
 --- Modules/CMakeCInformation.cmake.orig
 +++ Modules/CMakeCInformation.cmake
-@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
+@@ -142,7 +142,7 @@ include(CMakeCommonLanguageInclude)
  # create a C shared library
  if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
    set(CMAKE_C_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_CMakeCXXInformation_cmake
===================================================================
RCS file: 
/cvs/ports/devel/cmake/patches/patch-Modules_CMakeCXXInformation_cmake,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Modules_CMakeCXXInformation_cmake
--- patches/patch-Modules_CMakeCXXInformation_cmake     14 Jun 2018 17:04:45 
-0000      1.7
+++ patches/patch-Modules_CMakeCXXInformation_cmake     14 Jun 2018 17:05:32 
-0000
@@ -1,6 +1,7 @@
-$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
+$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.6 2018/06/12 05:12:01 
rsadowski Exp $
+Index: Modules/CMakeCXXInformation.cmake
+--- Modules/CMakeCXXInformation.cmake.orig
++++ Modules/CMakeCXXInformation.cmake
 @@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
    set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
  endif()
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeCXXInformat
  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)
+@@ -232,7 +228,7 @@ include(CMakeCommonLanguageInclude)
  # create a shared C++ library
  if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
    set(CMAKE_CXX_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_CMakeFortranInformation_cmake
===================================================================
RCS file: 
/cvs/ports/devel/cmake/patches/patch-Modules_CMakeFortranInformation_cmake,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Modules_CMakeFortranInformation_cmake
--- patches/patch-Modules_CMakeFortranInformation_cmake 14 Jun 2018 17:04:45 
-0000      1.7
+++ patches/patch-Modules_CMakeFortranInformation_cmake 14 Jun 2018 17:05:32 
-0000
@@ -1,7 +1,8 @@
-$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)
+$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.6 2018/06/12 
05:12:01 rsadowski Exp $
+Index: Modules/CMakeFortranInformation.cmake
+--- Modules/CMakeFortranInformation.cmake.orig
++++ Modules/CMakeFortranInformation.cmake
+@@ -110,10 +110,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
    set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
  endif()
  
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeFortranInfo
  # 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)
+@@ -168,7 +164,7 @@ include(CMakeCommonLanguageInclude)
  # create a Fortran shared library
  if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
    set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.23
diff -u -p -r1.23 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 14 Jun 2018 17:04:45 -0000      1.23
+++ patches/patch-Modules_FindJNI_cmake 14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Modules_FindJNI_cmake,v 1.23 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJNI_cmake,v 1.22 2018/06/12 05:12:01 rsadowski Exp 
$
 Index: Modules/FindJNI.cmake
 --- Modules/FindJNI.cmake.orig
 +++ Modules/FindJNI.cmake
@@ -8,10 +8,10 @@ Index: Modules/FindJNI.cmake
  
 +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)
+@@ -73,8 +75,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,13 +24,13 @@ Index: Modules/FindJNI.cmake
      endif()
  
      # Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -110,17 +114,67 @@ if(_JAVA_HOME_EXPLICIT)
    set(CMAKE_FIND_FRAMEWORK NEVER)
  endif()
  
 -set(JAVA_AWT_LIBRARY_DIRECTORIES)
 -if(_JAVA_HOME)
-+if(MODJAVA_VER)
++if (MODJAVA_VER)
 +  set(JAVA_AWT_LIBRARY_DIRECTORIES)
    JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
 -    ${_JAVA_HOME}/jre/lib/{libarch}
@@ -41,9 +41,6 @@ Index: Modules/FindJNI.cmake
 +    ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
 +    ${LOCALBASE}/jre-1.8.0/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,18 +51,59 @@ 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)
+ 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}
++  # SuSE specific paths for default JVM
++  /usr/lib64/jvm/java/jre/lib/{libarch}
++  /usr/lib64/jvm/jre/lib/{libarch}
++  )
++endif(MODJAVA_VER)
+ 
++get_filename_component(java_install_version
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit;CurrentVersion]" NAME)
++
+ if (WIN32)
+   set (_JNI_HINTS)
+   execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+@@ -165,40 +219,6 @@ if (WIN32)
+     )
+ 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}
@@ -99,50 +137,10 @@ Index: Modules/FindJNI.cmake
 -  /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(MODJAVA_VER)
  
  set(JAVA_JVM_LIBRARY_DIRECTORIES)
  foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -212,52 +232,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
      )
  endforeach()
  
@@ -150,15 +148,27 @@ Index: Modules/FindJNI.cmake
 -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"
--)
+-if (WIN32)
+-  foreach (_JNI_HINT IN LISTS _JNI_HINTS)
+-    list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${_JNI_HINT}/include")
+-  endforeach()
+-  list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.9;JavaHome]/include"
+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.8;JavaHome]/include"
+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.7;JavaHome]/include"
+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.6;JavaHome]/include"
+-    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\1.5;JavaHome]/include"
+-    "[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"
++if(MODJAVA_VER)
++  set(JAVA_AWT_INCLUDE_DIRECTORIES)
++  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
++    ${LOCALBASE}/jdk-1.8.0/include
+     )
+-endif()
 -
 -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
@@ -182,23 +192,18 @@ Index: Modules/FindJNI.cmake
 -  /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"
++    "[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_versio
++    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development 
Kit\\${java_install_versio
    )
-+
+ 
 +  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
 +    /usr/include
 +    /usr/local/include
@@ -207,7 +212,7 @@ Index: Modules/FindJNI.cmake
 +    /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-sun-1.6.0.00/include       # can this one be removed 
according to
 +    /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
@@ -226,6 +231,6 @@ Index: Modules/FindJNI.cmake
 +    /usr/lib64/jvm/java/include
 +    )
 +endif(MODJAVA_VER)
- 
  foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
    get_filename_component(jpath "${JAVA_PROG}" PATH)
+   foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.24
diff -u -p -r1.24 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake        14 Jun 2018 17:04:45 -0000      
1.24
+++ patches/patch-Modules_FindJava_cmake        14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Modules_FindJava_cmake,v 1.24 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJava_cmake,v 1.23 2018/06/12 05:12:01 rsadowski 
Exp $
 Index: Modules/FindJava.cmake
 --- Modules/FindJava.cmake.orig
 +++ Modules/FindJava.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
-   )
+@@ -127,19 +129,22 @@ endif()
+ 
  # Hard-coded guesses should still go in PATHS. This ensures that the user
  # environment can always override hard guesses.
 -set(_JAVA_PATHS
Index: patches/patch-Modules_FindKDE3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindKDE3_cmake,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Modules_FindKDE3_cmake
--- patches/patch-Modules_FindKDE3_cmake        14 Jun 2018 17:04:45 -0000      
1.6
+++ patches/patch-Modules_FindKDE3_cmake        14 Jun 2018 17:05:32 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.6 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.5 2018/06/12 05:12:01 rsadowski Exp 
$
 Index: Modules/FindKDE3.cmake
 --- Modules/FindKDE3.cmake.orig
 +++ Modules/FindKDE3.cmake
-@@ -294,12 +294,6 @@ if(KDE3_FOUND)
+@@ -293,12 +293,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 ()
  
Index: patches/patch-Modules_FindMPEG2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Modules_FindMPEG2_cmake
--- patches/patch-Modules_FindMPEG2_cmake       14 Jun 2018 17:04:45 -0000      
1.10
+++ patches/patch-Modules_FindMPEG2_cmake       14 Jun 2018 17:05:32 -0000
@@ -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.9 2018/06/12 05:12:01 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)
+@@ -46,4 +46,4 @@ if(MPEG2_FOUND)
    endif()
  endif()
  
Index: patches/patch-Modules_FindMPEG_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG_cmake,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Modules_FindMPEG_cmake
--- patches/patch-Modules_FindMPEG_cmake        14 Jun 2018 17:04:45 -0000      
1.11
+++ patches/patch-Modules_FindMPEG_cmake        14 Jun 2018 17:05:32 -0000
@@ -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.10 2018/06/12 05:12:01 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.
+@@ -27,8 +27,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} )
+@@ -39,4 +37,4 @@ if(MPEG_FOUND)
+   endif()
  endif()
  
 -mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
Index: patches/patch-Modules_FindPythonLibs_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.17
diff -u -p -r1.17 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake  14 Jun 2018 17:04:45 -0000      
1.17
+++ patches/patch-Modules_FindPythonLibs_cmake  14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.17 2018/06/14 17:04:45 sthen 
Exp $
+$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.16 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Modules/FindPythonLibs.cmake
 --- Modules/FindPythonLibs.cmake.orig
 +++ Modules/FindPythonLibs.cmake
@@ -33,7 +33,7 @@ Index: Modules/FindPythonLibs.cmake
  
  unset(_PYTHON_FIND_OTHER_VERSIONS)
  unset(_PYTHON1_VERSIONS)
-@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+@@ -190,20 +197,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
        endforeach()
      endif()
  
Index: patches/patch-Modules_FindQt3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt3_cmake,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 14 Jun 2018 17:04:45 -0000      1.11
+++ patches/patch-Modules_FindQt3_cmake 14 Jun 2018 17:05:32 -0000
@@ -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.10 2018/06/12 05:12:01 rsadowski Exp 
$
+Index: Modules/FindQt3.cmake
+--- Modules/FindQt3.cmake.orig
++++ Modules/FindQt3.cmake
+@@ -139,7 +139,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 
    HINTS
      ENV QTDIR
    PATHS
-@@ -176,7 +176,7 @@ endif()
+@@ -159,7 +159,7 @@ endif()
  
  # Qt 3 should prefer QTDIR over the PATH
  find_program(QT_UIC_EXECUTABLE
Index: patches/patch-Modules_FindQt4_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v
retrieving revision 1.30
diff -u -p -r1.30 patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 14 Jun 2018 17:04:45 -0000      1.30
+++ patches/patch-Modules_FindQt4_cmake 14 Jun 2018 17:05:32 -0000
@@ -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.29 2018/06/12 05:12:01 rsadowski Exp 
$
 Index: Modules/FindQt4.cmake
 --- Modules/FindQt4.cmake.orig
 +++ Modules/FindQt4.cmake
-@@ -516,7 +516,12 @@ endfunction()
+@@ -517,7 +517,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
+@@ -697,6 +702,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
+@@ -1140,17 +1147,17 @@ if (QT_QMAKE_EXECUTABLE AND
      endif()
    endmacro()
  
Index: patches/patch-Modules_FindRuby_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindRuby_cmake,v
retrieving revision 1.16
diff -u -p -r1.16 patch-Modules_FindRuby_cmake
--- patches/patch-Modules_FindRuby_cmake        14 Jun 2018 17:04:45 -0000      
1.16
+++ patches/patch-Modules_FindRuby_cmake        14 Jun 2018 17:05:32 -0000
@@ -1,12 +1,13 @@
-$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.15 2018/06/12 05:12:01 rsadowski 
Exp $
+Index: Modules/FindRuby.cmake
+--- Modules/FindRuby.cmake.orig
++++ Modules/FindRuby.cmake
+@@ -41,10 +41,18 @@
+ 
  # 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})
@@ -21,41 +22,24 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
  
  # 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)
+@@ -59,12 +67,9 @@ 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 ruby22 ruby2.2)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby19 ruby1.9)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.4)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
  
    # 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)
-   endif()
--
--  list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
+@@ -74,6 +79,9 @@ if(NOT Ruby_FIND_VERSION_EXACT)
+   list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
  endif()
  
 +list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
@@ -64,35 +48,25 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
  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)
+@@ -188,6 +196,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
        set(RUBY_VERSION_MAJOR 2)
-       set(RUBY_VERSION_MINOR 1)
+       set(RUBY_VERSION_MINOR 4)
     endif()
-+   # check whether we found 2.2.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2.?2")
++   # check whether we found 2.5.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
 +      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 2)
++      set(RUBY_VERSION_MINOR 4)
 +   endif()
  endif()
  
  if(RUBY_VERSION_MAJOR)
-@@ -203,7 +230,7 @@ endif()
+@@ -221,7 +234,8 @@ endif()
  
  
  # Determine the list of possible names for the ruby library
 -set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} 
ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} 
ruby-${RUBY_VERSION})
 +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 "" )
Index: patches/patch-Modules_FindTCL_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTCL_cmake,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Modules_FindTCL_cmake
--- patches/patch-Modules_FindTCL_cmake 14 Jun 2018 17:04:45 -0000      1.15
+++ patches/patch-Modules_FindTCL_cmake 14 Jun 2018 17:05:32 -0000
@@ -1,6 +1,7 @@
-$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
+$OpenBSD: patch-Modules_FindTCL_cmake,v 1.14 2018/06/12 05:12:01 rsadowski Exp 
$
+Index: Modules/FindTCL.cmake
+--- Modules/FindTCL.cmake.orig
++++ Modules/FindTCL.cmake
 @@ -48,19 +48,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 
  
  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
+@@ -75,15 +92,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 
 -  "${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,10 +86,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 
 +    )
 +endif()
 +
- if(WIN32)
-   get_filename_component(
-     ActiveTcl_CurrentVersion
-@@ -107,31 +142,47 @@ if(WIN32)
+ set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
+   lib/tcl/tcl8.6
+   lib/tcl/tk8.6
+@@ -112,33 +151,47 @@ if(WIN32)
      )
  endif()
  
@@ -100,13 +97,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 
 -  NAMES
 -  tcl
 -  tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
--  tcl86 tcl8.6
+-  tcl86 tcl8.6 tcl86t tcl8.6t
 -  tcl85 tcl8.5
 -  tcl84 tcl8.4
 -  tcl83 tcl8.3
 -  tcl82 tcl8.2
 -  tcl80 tcl8.0
 -  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+-  PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
 -  )
 +if(MODTCL_LIB)
 +  find_library(TCL_LIBRARY
@@ -133,13 +131,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 
 -  NAMES
 -  tk
 -  tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
--  tk86 tk8.6
+-  tk86 tk8.6 tk86t tk8.6t
 -  tk85 tk8.5
 -  tk84 tk8.4
 -  tk83 tk8.3
 -  tk82 tk8.2
 -  tk80 tk8.0
 -  PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
+-  PATH_SUFFIXES ${TCLTK_POSSIBLE_LIB_PATH_SUFFIXES}
 -  )
 +if(MODTK_LIB)
 +  find_library(TK_LIBRARY
@@ -164,7 +163,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 
  
  CMAKE_FIND_FRAMEWORKS(Tcl)
  CMAKE_FIND_FRAMEWORKS(Tk)
-@@ -155,30 +206,46 @@ if(Tk_FRAMEWORKS)
+@@ -162,16 +215,6 @@ if(Tk_FRAMEWORKS)
    endif()
  endif()
  
@@ -177,21 +176,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 
 -  ${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}
+@@ -186,6 +229,46 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+   include/tcl8.2
+   include/tcl8.0
+   )
 +set(TCLTK_OPENBSD_INCLUDE_PATHS)
 +
 +if(MODTCL_INCDIR)
Index: patches/patch-Source_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Source_CMakeLists_txt
--- patches/patch-Source_CMakeLists_txt 14 Jun 2018 17:04:45 -0000      1.12
+++ patches/patch-Source_CMakeLists_txt 14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_CMakeLists_txt,v 1.12 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_CMakeLists_txt,v 1.11 2018/06/12 05:12:01 rsadowski Exp 
$
 Index: Source/CMakeLists.txt
 --- Source/CMakeLists.txt.orig
 +++ Source/CMakeLists.txt
@@ -12,7 +12,7 @@ Index: Source/CMakeLists.txt
    ${CMAKE_TAR_INCLUDES}
    ${CMAKE_COMPRESS_INCLUDES}
    ${CMake_HAIKU_INCLUDE_DIRS}
-@@ -273,7 +276,6 @@ set(SRCS
+@@ -275,7 +278,6 @@ set(SRCS
    cmRulePlaceholderExpander.cxx
    cmRulePlaceholderExpander.h
    cmLocalUnixMakefileGenerator3.cxx
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: 
/cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.22
diff -u -p -r1.22 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx   14 Jun 2018 17:04:45 
-0000      1.22
+++ patches/patch-Source_cmComputeLinkInformation_cxx   14 Jun 2018 17:05:32 
-0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.22 2018/06/14 17:04:45 
sthen Exp $
+$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.21 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Source/cmComputeLinkInformation.cxx
 --- Source/cmComputeLinkInformation.cxx.orig
 +++ Source/cmComputeLinkInformation.cxx
@@ -60,7 +60,7 @@ Index: Source/cmComputeLinkInformation.c
        }
      } else {
        // This is a library or option specified by the user.
-@@ -982,11 +998,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -980,11 +996,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
      this->SharedLibrariesLinked.insert(target);
    }
  
@@ -84,7 +84,7 @@ Index: Source/cmComputeLinkInformation.c
    }
  
    // If this platform wants a flag before the full path, add it.
-@@ -1539,6 +1562,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+@@ -1537,6 +1560,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
    if (const char* implicitDirs =
          this->Makefile->GetDefinition(implicitDirVar)) {
      cmSystemTools::ExpandListArgument(implicitDirs, implicitDirVec);
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.10
diff -u -p -r1.10 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx  14 Jun 2018 17:04:45 -0000      
1.10
+++ patches/patch-Source_cmGeneratorTarget_cxx  14 Jun 2018 17:05:32 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.10 2018/06/14 17:04:45 sthen 
Exp $
+$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.9 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -1195,11 +1195,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
+@@ -1196,11 +1196,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
  
  bool cmGeneratorTarget::HasSOName(const std::string& config) const
  {
@@ -18,7 +18,7 @@ Index: Source/cmGeneratorTarget.cxx
  }
  
  bool cmGeneratorTarget::NeedRelinkBeforeInstall(
-@@ -2974,9 +2978,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -2978,9 +2982,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
    // Check for library version properties.
    const char* version = this->GetProperty("VERSION");
    const char* soversion = this->GetProperty("SOVERSION");
@@ -35,7 +35,7 @@ Index: Source/cmGeneratorTarget.cxx
      // 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
+@@ -3006,6 +3016,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
    // The library name.
    name = prefix + base + suffix;
  
@@ -69,8 +69,8 @@ Index: Source/cmGeneratorTarget.cxx
 +
    if (this->IsFrameworkOnApple()) {
      realName = prefix;
-     if (!this->Makefile->PlatformIsAppleIos()) {
-@@ -3013,7 +3051,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+     if (!this->Makefile->PlatformIsAppleEmbedded()) {
+@@ -3017,7 +3055,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
      soName = realName;
    } else {
      // The library's soname.
@@ -82,7 +82,7 @@ Index: Source/cmGeneratorTarget.cxx
  
      // The library's real name on disk.
      this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
-@@ -4142,7 +4184,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
+@@ -4146,7 +4188,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
    vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name;
    if (version) {
      vName += ".";
Index: patches/patch-Source_cmGlobalGenerator_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx  14 Jun 2018 17:04:45 -0000      
1.9
+++ patches/patch-Source_cmGlobalGenerator_cxx  14 Jun 2018 17:05:32 -0000
@@ -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.8 2018/06/12 05:12:01 
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);
+@@ -2369,6 +2369,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);
Index: patches/patch-Source_cmInstallCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmInstallCommand_cxx,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Source_cmInstallCommand_cxx
--- patches/patch-Source_cmInstallCommand_cxx   14 Jun 2018 17:04:45 -0000      
1.14
+++ patches/patch-Source_cmInstallCommand_cxx   14 Jun 2018 17:05:32 -0000
@@ -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.13 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Source/cmInstallCommand.cxx
 --- Source/cmInstallCommand.cxx.orig
 +++ Source/cmInstallCommand.cxx
-@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -319,6 +319,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
+@@ -326,6 +329,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
    } else if (libraryArgs.GetNamelinkSkip()) {
      namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
    }
Index: patches/patch-Source_cmSystemTools_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmSystemTools_cxx,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Source_cmSystemTools_cxx
--- patches/patch-Source_cmSystemTools_cxx      14 Jun 2018 17:04:45 -0000      
1.12
+++ patches/patch-Source_cmSystemTools_cxx      14 Jun 2018 17:05:32 -0000
@@ -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.11 2018/06/12 05:12:01 rsadowski 
Exp $
 
 Get rid of cmLocaleRAII.
 
@@ -29,7 +29,7 @@ the invalid use of the interface.
 Index: Source/cmSystemTools.cxx
 --- Source/cmSystemTools.cxx.orig
 +++ Source/cmSystemTools.cxx
-@@ -8,7 +8,6 @@
+@@ -9,7 +9,6 @@
  
  #if defined(CMAKE_BUILD_WITH_CMAKE)
  #include "cmArchiveWrite.h"
@@ -37,7 +37,7 @@ Index: Source/cmSystemTools.cxx
  #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)
+@@ -1729,8 +1728,6 @@ long copy_data(struct archive* ar, struct archive* aw)
  
  bool extract_tar(const char* outFileName, bool verbose, bool extract)
  {
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.34
diff -u -p -r1.34 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx   14 Jun 2018 17:04:45 -0000      1.34
+++ patches/patch-Source_cmTarget_cxx   14 Jun 2018 17:05:32 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmTarget_cxx,v 1.34 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmTarget_cxx,v 1.33 2018/06/12 05:12:01 rsadowski Exp $
 Index: Source/cmTarget.cxx
 --- Source/cmTarget.cxx.orig
 +++ Source/cmTarget.cxx
-@@ -227,7 +227,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
+@@ -229,7 +229,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
      this->SetPropertyDefault("BUILD_RPATH", nullptr);
      this->SetPropertyDefault("INSTALL_NAME_DIR", nullptr);
      this->SetPropertyDefault("INSTALL_RPATH", "");
Index: patches/patch-Source_cmake_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmake_cxx,v
retrieving revision 1.17
diff -u -p -r1.17 patch-Source_cmake_cxx
--- patches/patch-Source_cmake_cxx      14 Jun 2018 17:04:45 -0000      1.17
+++ patches/patch-Source_cmake_cxx      14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmake_cxx,v 1.17 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmake_cxx,v 1.16 2018/06/12 05:12:01 rsadowski Exp $
 
 Revert 4e3c7725d0d724d7a8a0e8305d15713e01b20503: we want to build
 CMake using Ninja
@@ -6,7 +6,7 @@ CMake using Ninja
 Index: Source/cmake.cxx
 --- Source/cmake.cxx.orig
 +++ Source/cmake.cxx
-@@ -76,9 +76,7 @@
+@@ -69,9 +69,7 @@
  #include "cmGlobalWatcomWMakeGenerator.h"
  #endif
  #include "cmGlobalUnixMakefileGenerator3.h"
@@ -16,7 +16,7 @@ Index: Source/cmake.cxx
  #include "cmExtraCodeLiteGenerator.h"
  
  #if !defined(CMAKE_BOOT_MINGW)
-@@ -1662,9 +1660,7 @@ void cmake::AddDefaultGenerators()
+@@ -1699,9 +1697,7 @@ void cmake::AddDefaultGenerators()
    this->Generators.push_back(cmGlobalMinGWMakefileGenerator::NewFactory());
  #endif
    this->Generators.push_back(cmGlobalUnixMakefileGenerator3::NewFactory());
Index: patches/patch-Source_kwsys_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Source_kwsys_CMakeLists_txt
--- patches/patch-Source_kwsys_CMakeLists_txt   14 Jun 2018 17:04:45 -0000      
1.5
+++ patches/patch-Source_kwsys_CMakeLists_txt   14 Jun 2018 17:05:32 -0000
@@ -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.4 2018/06/12 05:12:01 
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)
+@@ -583,7 +583,7 @@ IF(KWSYS_USE_SystemInformation)
      SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY
        COMPILE_DEFINITIONS KWSYS_CXX_HAS__ATOI64=1)
    ENDIF()
Index: patches/patch-Source_kwsys_SystemTools_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx,v
retrieving revision 1.24
diff -u -p -r1.24 patch-Source_kwsys_SystemTools_cxx
--- patches/patch-Source_kwsys_SystemTools_cxx  14 Jun 2018 17:04:45 -0000      
1.24
+++ patches/patch-Source_kwsys_SystemTools_cxx  14 Jun 2018 17:05:32 -0000
@@ -1,11 +1,11 @@
-$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.23 2018/06/12 05:12:01 
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
+@@ -285,12 +285,14 @@ inline void Realpath(const std::string& path, std::str
  }
  #else
  #include <sys/types.h>
Index: patches/patch-Tests_CMakeLib_CMakeLists_txt
===================================================================
RCS file: patches/patch-Tests_CMakeLib_CMakeLists_txt
diff -N patches/patch-Tests_CMakeLib_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Tests_CMakeLib_CMakeLists_txt 14 Jun 2018 17:05:32 -0000
@@ -0,0 +1,13 @@
+$OpenBSD: patch-Tests_CMakeLib_CMakeLists_txt,v 1.1 2018/06/12 05:12:01 
rsadowski Exp $
+
+Index: Tests/CMakeLib/CMakeLists.txt
+--- Tests/CMakeLib/CMakeLists.txt.orig
++++ Tests/CMakeLib/CMakeLists.txt
+@@ -2,6 +2,7 @@ include_directories(
+   ${CMAKE_CURRENT_BINARY_DIR}
+   ${CMake_BINARY_DIR}/Source
+   ${CMake_SOURCE_DIR}/Source
++  ${CMAKE_LIBUV_INCLUDES}
+   )
+ 
+ set(CMakeLib_TESTS
Index: patches/patch-Tests_CMakeServerLib_CMakeLists_txt
===================================================================
RCS file: patches/patch-Tests_CMakeServerLib_CMakeLists_txt
diff -N patches/patch-Tests_CMakeServerLib_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Tests_CMakeServerLib_CMakeLists_txt   14 Jun 2018 17:05:32 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD: patch-Tests_CMakeServerLib_CMakeLists_txt,v 1.1 2018/06/12 05:12:01 
rsadowski Exp $
+
+Index: Tests/CMakeServerLib/CMakeLists.txt
+--- Tests/CMakeServerLib/CMakeLists.txt.orig
++++ Tests/CMakeServerLib/CMakeLists.txt
+@@ -2,6 +2,7 @@ include_directories(
+   ${CMAKE_CURRENT_BINARY_DIR}
+   ${CMake_BINARY_DIR}/Source
+   ${CMake_SOURCE_DIR}/Source
++  ${CMAKE_LIBUV_INCLUDES}
+   )
+ 
+ set(CMakeServerLib_TESTS
Index: patches/patch-Tests_RunCMake_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Tests_RunCMake_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Tests_RunCMake_CMakeLists_txt
--- patches/patch-Tests_RunCMake_CMakeLists_txt 14 Jun 2018 17:04:45 -0000      
1.6
+++ patches/patch-Tests_RunCMake_CMakeLists_txt 14 Jun 2018 17:05:32 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Tests_RunCMake_CMakeLists_txt,v 1.6 2018/06/14 17:04:45 sthen 
Exp $
+$OpenBSD: patch-Tests_RunCMake_CMakeLists_txt,v 1.5 2018/06/12 05:12:01 
rsadowski Exp $
 Index: Tests/RunCMake/CMakeLists.txt
 --- Tests/RunCMake/CMakeLists.txt.orig
 +++ Tests/RunCMake/CMakeLists.txt
-@@ -93,7 +93,6 @@ add_RunCMake_test(CMP0054)
+@@ -100,7 +100,6 @@ add_RunCMake_test(CMP0054)
  add_RunCMake_test(CMP0055)
  add_RunCMake_test(CMP0057)
  add_RunCMake_test(CMP0059)
Index: patches/patch-bootstrap
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-bootstrap,v
retrieving revision 1.18
diff -u -p -r1.18 patch-bootstrap
--- patches/patch-bootstrap     14 Jun 2018 17:04:45 -0000      1.18
+++ patches/patch-bootstrap     14 Jun 2018 17:05:32 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-bootstrap,v 1.18 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-bootstrap,v 1.17 2018/06/12 05:12:01 rsadowski Exp $
 
 Use Ninja to build CMake
 XXX: broken on m88k
@@ -23,8 +23,8 @@ Index: bootstrap
  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_C_COMPILERS="cc gcc clang xlc icc tcc"
+-CMAKE_KNOWN_CXX_COMPILERS="aCC xlC CC g++ clang++ c++ icc como "
 -CMAKE_KNOWN_MAKE_PROCESSORS="gmake make"
 +CMAKE_KNOWN_C_COMPILERS="cc"
 +CMAKE_KNOWN_CXX_COMPILERS="c++"
@@ -38,9 +38,9 @@ Index: bootstrap
    cmForEachCommand \
 +  cmFortranParserImpl \
    cmFunctionCommand \
+   cmFSPermissions \
    cmGeneratedFileStream \
-   cmGeneratorExpression \
-@@ -330,6 +335,7 @@ CMAKE_CXX_SOURCES="\
+@@ -331,6 +336,7 @@ CMAKE_CXX_SOURCES="\
    cmGetTestPropertyCommand \
    cmGlobalCommonGenerator \
    cmGlobalGenerator \
@@ -48,7 +48,7 @@ Index: bootstrap
    cmGlobalUnixMakefileGenerator3 \
    cmHexFileConverter \
    cmIfCommand \
-@@ -350,10 +356,12 @@ CMAKE_CXX_SOURCES="\
+@@ -351,10 +357,12 @@ CMAKE_CXX_SOURCES="\
    cmInstalledFile \
    cmLinkDirectoriesCommand \
    cmLinkLineComputer \
@@ -61,7 +61,7 @@ Index: bootstrap
    cmLocalUnixMakefileGenerator3 \
    cmMSVC60LinkLineComputer \
    cmMacroCommand \
-@@ -368,6 +376,10 @@ CMAKE_CXX_SOURCES="\
+@@ -369,6 +377,10 @@ CMAKE_CXX_SOURCES="\
    cmMessageCommand \
    cmMessenger \
    cmNewLineStyle \
@@ -72,7 +72,7 @@ Index: bootstrap
    cmOSXBundleGenerator \
    cmOptionCommand \
    cmOrderDirectories \
-@@ -436,6 +448,8 @@ LexerParser_CXX_SOURCES="\
+@@ -438,6 +450,8 @@ LexerParser_CXX_SOURCES="\
    cmCommandArgumentParser \
    cmExprLexer \
    cmExprParser \
@@ -81,7 +81,7 @@ Index: bootstrap
  "
  
  LexerParser_C_SOURCES="\
-@@ -1385,7 +1399,7 @@ cmake_cxx_flags="${cmake_cxx_flags} \
+@@ -1406,7 +1420,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"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST
--- pkg/PLIST   14 Jun 2018 17:04:45 -0000      1.41
+++ pkg/PLIST   14 Jun 2018 17:05:33 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.41 2018/06/14 17:04:45 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.40 2018/06/12 05:12:01 rsadowski Exp $
 @bin bin/ccmake
 @bin bin/cmake
 @bin bin/cpack
@@ -179,7 +179,6 @@ share/cmake/Help/generator/CodeBlocks.rs
 share/cmake/Help/generator/CodeLite.rst
 share/cmake/Help/generator/Eclipse CDT4.rst
 share/cmake/Help/generator/Green Hills MULTI.rst
-share/cmake/Help/generator/KDevelop3.rst
 share/cmake/Help/generator/Kate.rst
 share/cmake/Help/generator/MSYS Makefiles.rst
 share/cmake/Help/generator/MinGW Makefiles.rst
@@ -299,6 +298,7 @@ share/cmake/Help/module/Documentation.rs
 share/cmake/Help/module/ExternalData.rst
 share/cmake/Help/module/ExternalProject.rst
 share/cmake/Help/module/FeatureSummary.rst
+share/cmake/Help/module/FetchContent.rst
 share/cmake/Help/module/FindALSA.rst
 share/cmake/Help/module/FindASPELL.rst
 share/cmake/Help/module/FindAVIFile.rst
@@ -347,6 +347,7 @@ share/cmake/Help/module/FindHg.rst
 share/cmake/Help/module/FindICU.rst
 share/cmake/Help/module/FindITK.rst
 share/cmake/Help/module/FindIce.rst
+share/cmake/Help/module/FindIconv.rst
 share/cmake/Help/module/FindIcotool.rst
 share/cmake/Help/module/FindImageMagick.rst
 share/cmake/Help/module/FindIntl.rst
@@ -548,6 +549,7 @@ share/cmake/Help/policy/CMP0068.rst
 share/cmake/Help/policy/CMP0069.rst
 share/cmake/Help/policy/CMP0070.rst
 share/cmake/Help/policy/CMP0071.rst
+share/cmake/Help/policy/CMP0072.rst
 share/cmake/Help/policy/DEPRECATED.txt
 share/cmake/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake/Help/prop_cache/
@@ -640,10 +642,12 @@ share/cmake/Help/prop_sf/AUTOUIC_OPTIONS
 share/cmake/Help/prop_sf/COMPILE_DEFINITIONS.rst
 share/cmake/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
 share/cmake/Help/prop_sf/COMPILE_FLAGS.rst
+share/cmake/Help/prop_sf/COMPILE_OPTIONS.rst
 share/cmake/Help/prop_sf/EXTERNAL_OBJECT.rst
 share/cmake/Help/prop_sf/Fortran_FORMAT.rst
 share/cmake/Help/prop_sf/GENERATED.rst
 share/cmake/Help/prop_sf/HEADER_FILE_ONLY.rst
+share/cmake/Help/prop_sf/INCLUDE_DIRECTORIES.rst
 share/cmake/Help/prop_sf/KEEP_EXTENSION.rst
 share/cmake/Help/prop_sf/LABELS.rst
 share/cmake/Help/prop_sf/LANGUAGE.rst
@@ -662,6 +666,8 @@ share/cmake/Help/prop_sf/VS_DEPLOYMENT_C
 share/cmake/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
 share/cmake/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
 share/cmake/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
+share/cmake/Help/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst
+share/cmake/Help/prop_sf/VS_SHADER_ENABLE_DEBUG.rst
 share/cmake/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 share/cmake/Help/prop_sf/VS_SHADER_FLAGS.rst
 share/cmake/Help/prop_sf/VS_SHADER_MODEL.rst
@@ -721,6 +727,7 @@ share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT
 share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
 share/cmake/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
 share/cmake/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
+share/cmake/Help/prop_tgt/AUTOGEN_PARALLEL.rst
 share/cmake/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
 share/cmake/Help/prop_tgt/AUTOMOC.rst
 share/cmake/Help/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst
@@ -787,6 +794,7 @@ share/cmake/Help/prop_tgt/HAS_CXX.rst
 share/cmake/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 share/cmake/Help/prop_tgt/IMPORTED.rst
 share/cmake/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
+share/cmake/Help/prop_tgt/IMPORTED_GLOBAL.rst
 share/cmake/Help/prop_tgt/IMPORTED_IMPLIB.rst
 share/cmake/Help/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst
 share/cmake/Help/prop_tgt/IMPORTED_LIBNAME.rst
@@ -935,6 +943,7 @@ share/cmake/Help/release/
 share/cmake/Help/release/3.0.rst
 share/cmake/Help/release/3.1.rst
 share/cmake/Help/release/3.10.rst
+share/cmake/Help/release/3.11.rst
 share/cmake/Help/release/3.2.rst
 share/cmake/Help/release/3.3.rst
 share/cmake/Help/release/3.4.rst
@@ -982,6 +991,7 @@ share/cmake/Help/variable/CMAKE_ARCHIVE_
 share/cmake/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake/Help/variable/CMAKE_ARGC.rst
 share/cmake/Help/variable/CMAKE_ARGV0.rst
+share/cmake/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst
 share/cmake/Help/variable/CMAKE_AUTOMOC.rst
 share/cmake/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
 share/cmake/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
@@ -1006,6 +1016,7 @@ share/cmake/Help/variable/CMAKE_CACHE_MI
 share/cmake/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
 share/cmake/Help/variable/CMAKE_CFG_INTDIR.rst
 share/cmake/Help/variable/CMAKE_CL_64.rst
+share/cmake/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst
 share/cmake/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst
 share/cmake/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
 share/cmake/Help/variable/CMAKE_COLOR_MAKEFILE.rst
@@ -1023,6 +1034,7 @@ share/cmake/Help/variable/CMAKE_CROSSCOM
 share/cmake/Help/variable/CMAKE_CTEST_COMMAND.rst
 share/cmake/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 share/cmake/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
+share/cmake/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
 share/cmake/Help/variable/CMAKE_CUDA_STANDARD.rst
 share/cmake/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
 share/cmake/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst
@@ -1087,6 +1099,7 @@ share/cmake/Help/variable/CMAKE_Fortran_
 share/cmake/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
 share/cmake/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
 share/cmake/Help/variable/CMAKE_GENERATOR.rst
+share/cmake/Help/variable/CMAKE_GENERATOR_INSTANCE.rst
 share/cmake/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
 share/cmake/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
 share/cmake/Help/variable/CMAKE_GNUtoMS.rst
@@ -1108,6 +1121,7 @@ share/cmake/Help/variable/CMAKE_INCLUDE_
 share/cmake/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
 share/cmake/Help/variable/CMAKE_INCLUDE_PATH.rst
 share/cmake/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
+share/cmake/Help/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 share/cmake/Help/variable/CMAKE_INSTALL_MESSAGE.rst
 share/cmake/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 share/cmake/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -1118,6 +1132,7 @@ share/cmake/Help/variable/CMAKE_INTERNAL
 share/cmake/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
+share/cmake/Help/variable/CMAKE_JOB_POOLS.rst
 share/cmake/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake/Help/variable/CMAKE_JOB_POOL_LINK.rst
 share/cmake/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
@@ -1147,6 +1162,8 @@ share/cmake/Help/variable/CMAKE_LANG_CRE
 share/cmake/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst
 share/cmake/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS.rst
+share/cmake/Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst
+share/cmake/Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_INIT.rst
@@ -1156,6 +1173,7 @@ share/cmake/Help/variable/CMAKE_LANG_FLA
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
 share/cmake/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst
+share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst
 share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
 share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
 share/cmake/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
@@ -1210,6 +1228,8 @@ share/cmake/Help/variable/CMAKE_MODULE_L
 share/cmake/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
 share/cmake/Help/variable/CMAKE_MODULE_PATH.rst
 share/cmake/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
+share/cmake/Help/variable/CMAKE_NETRC.rst
+share/cmake/Help/variable/CMAKE_NETRC_FILE.rst
 share/cmake/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
 share/cmake/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
 share/cmake/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
@@ -1303,11 +1323,13 @@ share/cmake/Help/variable/CMAKE_WIN32_EX
 share/cmake/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 share/cmake/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
+share/cmake/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
 share/cmake/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 share/cmake/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
 share/cmake/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst
+share/cmake/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 share/cmake/Help/variable/CPACK_INSTALL_SCRIPT.rst
 share/cmake/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 share/cmake/Help/variable/CPACK_SET_DESTDIR.rst
@@ -1369,6 +1391,7 @@ share/cmake/Help/variable/CTEST_P4_CLIEN
 share/cmake/Help/variable/CTEST_P4_COMMAND.rst
 share/cmake/Help/variable/CTEST_P4_OPTIONS.rst
 share/cmake/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
+share/cmake/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst
 share/cmake/Help/variable/CTEST_SCP_COMMAND.rst
 share/cmake/Help/variable/CTEST_SITE.rst
 share/cmake/Help/variable/CTEST_SOURCE_DIRECTORY.rst
@@ -1428,10 +1451,10 @@ share/cmake/Modules/AddFileDependencies.
 share/cmake/Modules/AndroidTestUtilities/
 share/cmake/Modules/AndroidTestUtilities.cmake
 share/cmake/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
-share/cmake/Modules/AutogenInfo.cmake.in
 share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
 share/cmake/Modules/BasicConfigVersion-ExactVersion.cmake.in
 share/cmake/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+share/cmake/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
 share/cmake/Modules/BundleUtilities.cmake
 share/cmake/Modules/CMake.cmake
 share/cmake/Modules/CMakeASM-ATTInformation.cmake
@@ -1496,9 +1519,9 @@ share/cmake/Modules/CMakeFindDependencyM
 share/cmake/Modules/CMakeFindEclipseCDT4.cmake
 share/cmake/Modules/CMakeFindFrameworks.cmake
 share/cmake/Modules/CMakeFindJavaCommon.cmake
-share/cmake/Modules/CMakeFindKDevelop3.cmake
 share/cmake/Modules/CMakeFindKate.cmake
 share/cmake/Modules/CMakeFindPackageMode.cmake
+share/cmake/Modules/CMakeFindSublimeText2.cmake
 share/cmake/Modules/CMakeFindWMake.cmake
 share/cmake/Modules/CMakeFindXCode.cmake
 share/cmake/Modules/CMakeForceCompiler.cmake
@@ -1510,6 +1533,7 @@ share/cmake/Modules/CMakeGenericSystem.c
 share/cmake/Modules/CMakeGraphVizOptions.cmake
 share/cmake/Modules/CMakeIOSInstallCombined.cmake
 share/cmake/Modules/CMakeImportBuildSettings.cmake
+share/cmake/Modules/CMakeInitializeConfigs.cmake
 share/cmake/Modules/CMakeJOMFindMake.cmake
 share/cmake/Modules/CMakeJavaCompiler.cmake.in
 share/cmake/Modules/CMakeJavaInformation.cmake
@@ -1722,6 +1746,7 @@ share/cmake/Modules/Compiler/MIPSpro-C.c
 share/cmake/Modules/Compiler/MIPSpro-CXX.cmake
 share/cmake/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 share/cmake/Modules/Compiler/MIPSpro-Fortran.cmake
+share/cmake/Modules/Compiler/MSVC-ASM.cmake
 share/cmake/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 share/cmake/Modules/Compiler/MSVC-CXX.cmake
 share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake
@@ -1797,6 +1822,9 @@ share/cmake/Modules/ExternalProject-veri
 share/cmake/Modules/ExternalProject.cmake
 share/cmake/Modules/FLTKCompatibility.cmake
 share/cmake/Modules/FeatureSummary.cmake
+share/cmake/Modules/FetchContent/
+share/cmake/Modules/FetchContent.cmake
+share/cmake/Modules/FetchContent/CMakeLists.cmake.in
 share/cmake/Modules/FindALSA.cmake
 share/cmake/Modules/FindASPELL.cmake
 share/cmake/Modules/FindAVIFile.cmake
@@ -2241,6 +2269,7 @@ share/cmake/Modules/Platform/Windows-Det
 share/cmake/Modules/Platform/Windows-Embarcadero-C.cmake
 share/cmake/Modules/Platform/Windows-Embarcadero-CXX.cmake
 share/cmake/Modules/Platform/Windows-Embarcadero.cmake
+share/cmake/Modules/Platform/Windows-Flang-Fortran.cmake
 share/cmake/Modules/Platform/Windows-G95-Fortran.cmake
 share/cmake/Modules/Platform/Windows-GNU-C-ABI.cmake
 share/cmake/Modules/Platform/Windows-GNU-C.cmake
@@ -2520,7 +2549,6 @@ share/doc/cmake/html/_sources/generator/
 share/doc/cmake/html/_sources/generator/CodeLite.txt
 share/doc/cmake/html/_sources/generator/Eclipse CDT4.txt
 share/doc/cmake/html/_sources/generator/Green Hills MULTI.txt
-share/doc/cmake/html/_sources/generator/KDevelop3.txt
 share/doc/cmake/html/_sources/generator/Kate.txt
 share/doc/cmake/html/_sources/generator/MSYS Makefiles.txt
 share/doc/cmake/html/_sources/generator/MinGW Makefiles.txt
@@ -2632,6 +2660,7 @@ share/doc/cmake/html/_sources/module/Doc
 share/doc/cmake/html/_sources/module/ExternalData.txt
 share/doc/cmake/html/_sources/module/ExternalProject.txt
 share/doc/cmake/html/_sources/module/FeatureSummary.txt
+share/doc/cmake/html/_sources/module/FetchContent.txt
 share/doc/cmake/html/_sources/module/FindALSA.txt
 share/doc/cmake/html/_sources/module/FindASPELL.txt
 share/doc/cmake/html/_sources/module/FindAVIFile.txt
@@ -2680,6 +2709,7 @@ share/doc/cmake/html/_sources/module/Fin
 share/doc/cmake/html/_sources/module/FindICU.txt
 share/doc/cmake/html/_sources/module/FindITK.txt
 share/doc/cmake/html/_sources/module/FindIce.txt
+share/doc/cmake/html/_sources/module/FindIconv.txt
 share/doc/cmake/html/_sources/module/FindIcotool.txt
 share/doc/cmake/html/_sources/module/FindImageMagick.txt
 share/doc/cmake/html/_sources/module/FindIntl.txt
@@ -2881,6 +2911,7 @@ share/doc/cmake/html/_sources/policy/CMP
 share/doc/cmake/html/_sources/policy/CMP0069.txt
 share/doc/cmake/html/_sources/policy/CMP0070.txt
 share/doc/cmake/html/_sources/policy/CMP0071.txt
+share/doc/cmake/html/_sources/policy/CMP0072.txt
 share/doc/cmake/html/_sources/prop_cache/
 share/doc/cmake/html/_sources/prop_cache/ADVANCED.txt
 share/doc/cmake/html/_sources/prop_cache/HELPSTRING.txt
@@ -2971,10 +3002,12 @@ share/doc/cmake/html/_sources/prop_sf/AU
 share/doc/cmake/html/_sources/prop_sf/COMPILE_DEFINITIONS.txt
 share/doc/cmake/html/_sources/prop_sf/COMPILE_DEFINITIONS_CONFIG.txt
 share/doc/cmake/html/_sources/prop_sf/COMPILE_FLAGS.txt
+share/doc/cmake/html/_sources/prop_sf/COMPILE_OPTIONS.txt
 share/doc/cmake/html/_sources/prop_sf/EXTERNAL_OBJECT.txt
 share/doc/cmake/html/_sources/prop_sf/Fortran_FORMAT.txt
 share/doc/cmake/html/_sources/prop_sf/GENERATED.txt
 share/doc/cmake/html/_sources/prop_sf/HEADER_FILE_ONLY.txt
+share/doc/cmake/html/_sources/prop_sf/INCLUDE_DIRECTORIES.txt
 share/doc/cmake/html/_sources/prop_sf/KEEP_EXTENSION.txt
 share/doc/cmake/html/_sources/prop_sf/LABELS.txt
 share/doc/cmake/html/_sources/prop_sf/LANGUAGE.txt
@@ -2993,6 +3026,8 @@ share/doc/cmake/html/_sources/prop_sf/VS
 share/doc/cmake/html/_sources/prop_sf/VS_DEPLOYMENT_LOCATION.txt
 share/doc/cmake/html/_sources/prop_sf/VS_INCLUDE_IN_VSIX.txt
 share/doc/cmake/html/_sources/prop_sf/VS_RESOURCE_GENERATOR.txt
+share/doc/cmake/html/_sources/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.txt
+share/doc/cmake/html/_sources/prop_sf/VS_SHADER_ENABLE_DEBUG.txt
 share/doc/cmake/html/_sources/prop_sf/VS_SHADER_ENTRYPOINT.txt
 share/doc/cmake/html/_sources/prop_sf/VS_SHADER_FLAGS.txt
 share/doc/cmake/html/_sources/prop_sf/VS_SHADER_MODEL.txt
@@ -3052,6 +3087,7 @@ share/doc/cmake/html/_sources/prop_tgt/A
 share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME.txt
 share/doc/cmake/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.txt
 share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_BUILD_DIR.txt
+share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_PARALLEL.txt
 share/doc/cmake/html/_sources/prop_tgt/AUTOGEN_TARGET_DEPENDS.txt
 share/doc/cmake/html/_sources/prop_tgt/AUTOMOC.txt
 share/doc/cmake/html/_sources/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.txt
@@ -3117,6 +3153,7 @@ share/doc/cmake/html/_sources/prop_tgt/H
 share/doc/cmake/html/_sources/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.txt
 share/doc/cmake/html/_sources/prop_tgt/IMPORTED.txt
 share/doc/cmake/html/_sources/prop_tgt/IMPORTED_CONFIGURATIONS.txt
+share/doc/cmake/html/_sources/prop_tgt/IMPORTED_GLOBAL.txt
 share/doc/cmake/html/_sources/prop_tgt/IMPORTED_IMPLIB.txt
 share/doc/cmake/html/_sources/prop_tgt/IMPORTED_IMPLIB_CONFIG.txt
 share/doc/cmake/html/_sources/prop_tgt/IMPORTED_LIBNAME.txt
@@ -3261,6 +3298,7 @@ share/doc/cmake/html/_sources/release/
 share/doc/cmake/html/_sources/release/3.0.txt
 share/doc/cmake/html/_sources/release/3.1.txt
 share/doc/cmake/html/_sources/release/3.10.txt
+share/doc/cmake/html/_sources/release/3.11.txt
 share/doc/cmake/html/_sources/release/3.2.txt
 share/doc/cmake/html/_sources/release/3.3.txt
 share/doc/cmake/html/_sources/release/3.4.txt
@@ -3307,6 +3345,7 @@ share/doc/cmake/html/_sources/variable/C
 
share/doc/cmake/html/_sources/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ARGC.txt
 share/doc/cmake/html/_sources/variable/CMAKE_ARGV0.txt
+share/doc/cmake/html/_sources/variable/CMAKE_AUTOGEN_PARALLEL.txt
 share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC.txt
 share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.txt
 share/doc/cmake/html/_sources/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.txt
@@ -3331,6 +3370,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_CACHE_PATCH_VERSION.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CFG_INTDIR.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CL_64.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CODEBLOCKS_COMPILER_ID.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CODELITE_USE_TARGETS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_COLOR_MAKEFILE.txt
@@ -3348,6 +3388,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_CTEST_COMMAND.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_EXTENSIONS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_HOST_COMPILER.txt
+share/doc/cmake/html/_sources/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD.txt
 share/doc/cmake/html/_sources/variable/CMAKE_CUDA_STANDARD_REQUIRED.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.txt
@@ -3411,6 +3452,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_Fortran_MODOUT_FLAG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_Fortran_MODULE_DIRECTORY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR.txt
+share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_INSTANCE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_PLATFORM.txt
 share/doc/cmake/html/_sources/variable/CMAKE_GENERATOR_TOOLSET.txt
 share/doc/cmake/html/_sources/variable/CMAKE_GNUtoMS.txt
@@ -3432,6 +3474,7 @@ share/doc/cmake/html/_sources/variable/C
 
share/doc/cmake/html/_sources/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_INCLUDE_PATH.txt
 share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.txt
+share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_MESSAGE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_NAME_DIR.txt
 share/doc/cmake/html/_sources/variable/CMAKE_INSTALL_PREFIX.txt
@@ -3442,6 +3485,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.txt
+share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOLS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_JOB_POOL_LINK.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.txt
@@ -3471,6 +3515,8 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_CREATE_SHARED_MODULE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS.txt
+share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG.txt
+share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_INIT.txt
@@ -3480,6 +3526,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.txt
+share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.txt
 
share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.txt
 share/doc/cmake/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.txt
@@ -3534,6 +3581,8 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MODULE_PATH.txt
 share/doc/cmake/html/_sources/variable/CMAKE_MSVCIDE_RUN_PATH.txt
+share/doc/cmake/html/_sources/variable/CMAKE_NETRC.txt
+share/doc/cmake/html/_sources/variable/CMAKE_NETRC_FILE.txt
 share/doc/cmake/html/_sources/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.txt
 share/doc/cmake/html/_sources/variable/CMAKE_NOT_USING_CONFIG_FLAGS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_NO_BUILTIN_CHRPATH.txt
@@ -3626,11 +3675,13 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.txt
 share/doc/cmake/html/_sources/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.txt
 share/doc/cmake/html/_sources/variable/CMAKE_XCODE_GENERATE_SCHEME.txt
+share/doc/cmake/html/_sources/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.txt
 share/doc/cmake/html/_sources/variable/CMAKE_XCODE_PLATFORM_TOOLSET.txt
 share/doc/cmake/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.txt
 
share/doc/cmake/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.txt
 
share/doc/cmake/html/_sources/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.txt
 share/doc/cmake/html/_sources/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.txt
+share/doc/cmake/html/_sources/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.txt
 share/doc/cmake/html/_sources/variable/CPACK_INSTALL_SCRIPT.txt
 share/doc/cmake/html/_sources/variable/CPACK_PACKAGING_INSTALL_PREFIX.txt
 share/doc/cmake/html/_sources/variable/CPACK_SET_DESTDIR.txt
@@ -3691,6 +3742,7 @@ share/doc/cmake/html/_sources/variable/C
 share/doc/cmake/html/_sources/variable/CTEST_P4_COMMAND.txt
 share/doc/cmake/html/_sources/variable/CTEST_P4_OPTIONS.txt
 share/doc/cmake/html/_sources/variable/CTEST_P4_UPDATE_OPTIONS.txt
+share/doc/cmake/html/_sources/variable/CTEST_RUN_CURRENT_SCRIPT.txt
 share/doc/cmake/html/_sources/variable/CTEST_SCP_COMMAND.txt
 share/doc/cmake/html/_sources/variable/CTEST_SITE.txt
 share/doc/cmake/html/_sources/variable/CTEST_SOURCE_DIRECTORY.txt
@@ -3920,7 +3972,6 @@ share/doc/cmake/html/generator/CodeBlock
 share/doc/cmake/html/generator/CodeLite.html
 share/doc/cmake/html/generator/Eclipse CDT4.html
 share/doc/cmake/html/generator/Green Hills MULTI.html
-share/doc/cmake/html/generator/KDevelop3.html
 share/doc/cmake/html/generator/Kate.html
 share/doc/cmake/html/generator/MSYS Makefiles.html
 share/doc/cmake/html/generator/MinGW Makefiles.html
@@ -4033,6 +4084,7 @@ share/doc/cmake/html/module/Documentatio
 share/doc/cmake/html/module/ExternalData.html
 share/doc/cmake/html/module/ExternalProject.html
 share/doc/cmake/html/module/FeatureSummary.html
+share/doc/cmake/html/module/FetchContent.html
 share/doc/cmake/html/module/FindALSA.html
 share/doc/cmake/html/module/FindASPELL.html
 share/doc/cmake/html/module/FindAVIFile.html
@@ -4081,6 +4133,7 @@ share/doc/cmake/html/module/FindHg.html
 share/doc/cmake/html/module/FindICU.html
 share/doc/cmake/html/module/FindITK.html
 share/doc/cmake/html/module/FindIce.html
+share/doc/cmake/html/module/FindIconv.html
 share/doc/cmake/html/module/FindIcotool.html
 share/doc/cmake/html/module/FindImageMagick.html
 share/doc/cmake/html/module/FindIntl.html
@@ -4283,6 +4336,7 @@ share/doc/cmake/html/policy/CMP0068.html
 share/doc/cmake/html/policy/CMP0069.html
 share/doc/cmake/html/policy/CMP0070.html
 share/doc/cmake/html/policy/CMP0071.html
+share/doc/cmake/html/policy/CMP0072.html
 share/doc/cmake/html/prop_cache/
 share/doc/cmake/html/prop_cache/ADVANCED.html
 share/doc/cmake/html/prop_cache/HELPSTRING.html
@@ -4373,10 +4427,12 @@ share/doc/cmake/html/prop_sf/AUTOUIC_OPT
 share/doc/cmake/html/prop_sf/COMPILE_DEFINITIONS.html
 share/doc/cmake/html/prop_sf/COMPILE_DEFINITIONS_CONFIG.html
 share/doc/cmake/html/prop_sf/COMPILE_FLAGS.html
+share/doc/cmake/html/prop_sf/COMPILE_OPTIONS.html
 share/doc/cmake/html/prop_sf/EXTERNAL_OBJECT.html
 share/doc/cmake/html/prop_sf/Fortran_FORMAT.html
 share/doc/cmake/html/prop_sf/GENERATED.html
 share/doc/cmake/html/prop_sf/HEADER_FILE_ONLY.html
+share/doc/cmake/html/prop_sf/INCLUDE_DIRECTORIES.html
 share/doc/cmake/html/prop_sf/KEEP_EXTENSION.html
 share/doc/cmake/html/prop_sf/LABELS.html
 share/doc/cmake/html/prop_sf/LANGUAGE.html
@@ -4395,6 +4451,8 @@ share/doc/cmake/html/prop_sf/VS_DEPLOYME
 share/doc/cmake/html/prop_sf/VS_DEPLOYMENT_LOCATION.html
 share/doc/cmake/html/prop_sf/VS_INCLUDE_IN_VSIX.html
 share/doc/cmake/html/prop_sf/VS_RESOURCE_GENERATOR.html
+share/doc/cmake/html/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.html
+share/doc/cmake/html/prop_sf/VS_SHADER_ENABLE_DEBUG.html
 share/doc/cmake/html/prop_sf/VS_SHADER_ENTRYPOINT.html
 share/doc/cmake/html/prop_sf/VS_SHADER_FLAGS.html
 share/doc/cmake/html/prop_sf/VS_SHADER_MODEL.html
@@ -4454,6 +4512,7 @@ share/doc/cmake/html/prop_tgt/ARCHIVE_OU
 share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_NAME.html
 share/doc/cmake/html/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.html
 share/doc/cmake/html/prop_tgt/AUTOGEN_BUILD_DIR.html
+share/doc/cmake/html/prop_tgt/AUTOGEN_PARALLEL.html
 share/doc/cmake/html/prop_tgt/AUTOGEN_TARGET_DEPENDS.html
 share/doc/cmake/html/prop_tgt/AUTOMOC.html
 share/doc/cmake/html/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.html
@@ -4519,6 +4578,7 @@ share/doc/cmake/html/prop_tgt/HAS_CXX.ht
 share/doc/cmake/html/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.html
 share/doc/cmake/html/prop_tgt/IMPORTED.html
 share/doc/cmake/html/prop_tgt/IMPORTED_CONFIGURATIONS.html
+share/doc/cmake/html/prop_tgt/IMPORTED_GLOBAL.html
 share/doc/cmake/html/prop_tgt/IMPORTED_IMPLIB.html
 share/doc/cmake/html/prop_tgt/IMPORTED_IMPLIB_CONFIG.html
 share/doc/cmake/html/prop_tgt/IMPORTED_LIBNAME.html
@@ -4663,6 +4723,7 @@ share/doc/cmake/html/release/
 share/doc/cmake/html/release/3.0.html
 share/doc/cmake/html/release/3.1.html
 share/doc/cmake/html/release/3.10.html
+share/doc/cmake/html/release/3.11.html
 share/doc/cmake/html/release/3.2.html
 share/doc/cmake/html/release/3.3.html
 share/doc/cmake/html/release/3.4.html
@@ -4711,6 +4772,7 @@ share/doc/cmake/html/variable/CMAKE_ARCH
 share/doc/cmake/html/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
 share/doc/cmake/html/variable/CMAKE_ARGC.html
 share/doc/cmake/html/variable/CMAKE_ARGV0.html
+share/doc/cmake/html/variable/CMAKE_AUTOGEN_PARALLEL.html
 share/doc/cmake/html/variable/CMAKE_AUTOMOC.html
 share/doc/cmake/html/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.html
 share/doc/cmake/html/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.html
@@ -4735,6 +4797,7 @@ share/doc/cmake/html/variable/CMAKE_CACH
 share/doc/cmake/html/variable/CMAKE_CACHE_PATCH_VERSION.html
 share/doc/cmake/html/variable/CMAKE_CFG_INTDIR.html
 share/doc/cmake/html/variable/CMAKE_CL_64.html
+share/doc/cmake/html/variable/CMAKE_CODEBLOCKS_COMPILER_ID.html
 share/doc/cmake/html/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.html
 share/doc/cmake/html/variable/CMAKE_CODELITE_USE_TARGETS.html
 share/doc/cmake/html/variable/CMAKE_COLOR_MAKEFILE.html
@@ -4752,6 +4815,7 @@ share/doc/cmake/html/variable/CMAKE_CROS
 share/doc/cmake/html/variable/CMAKE_CTEST_COMMAND.html
 share/doc/cmake/html/variable/CMAKE_CUDA_EXTENSIONS.html
 share/doc/cmake/html/variable/CMAKE_CUDA_HOST_COMPILER.html
+share/doc/cmake/html/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.html
 share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD.html
 share/doc/cmake/html/variable/CMAKE_CUDA_STANDARD_REQUIRED.html
 share/doc/cmake/html/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.html
@@ -4815,6 +4879,7 @@ share/doc/cmake/html/variable/CMAKE_Fort
 share/doc/cmake/html/variable/CMAKE_Fortran_MODOUT_FLAG.html
 share/doc/cmake/html/variable/CMAKE_Fortran_MODULE_DIRECTORY.html
 share/doc/cmake/html/variable/CMAKE_GENERATOR.html
+share/doc/cmake/html/variable/CMAKE_GENERATOR_INSTANCE.html
 share/doc/cmake/html/variable/CMAKE_GENERATOR_PLATFORM.html
 share/doc/cmake/html/variable/CMAKE_GENERATOR_TOOLSET.html
 share/doc/cmake/html/variable/CMAKE_GNUtoMS.html
@@ -4836,6 +4901,7 @@ share/doc/cmake/html/variable/CMAKE_INCL
 share/doc/cmake/html/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.html
 share/doc/cmake/html/variable/CMAKE_INCLUDE_PATH.html
 share/doc/cmake/html/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.html
+share/doc/cmake/html/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
 share/doc/cmake/html/variable/CMAKE_INSTALL_MESSAGE.html
 share/doc/cmake/html/variable/CMAKE_INSTALL_NAME_DIR.html
 share/doc/cmake/html/variable/CMAKE_INSTALL_PREFIX.html
@@ -4846,6 +4912,7 @@ share/doc/cmake/html/variable/CMAKE_INTE
 share/doc/cmake/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.html
 share/doc/cmake/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.html
 share/doc/cmake/html/variable/CMAKE_IOS_INSTALL_COMBINED.html
+share/doc/cmake/html/variable/CMAKE_JOB_POOLS.html
 share/doc/cmake/html/variable/CMAKE_JOB_POOL_COMPILE.html
 share/doc/cmake/html/variable/CMAKE_JOB_POOL_LINK.html
 share/doc/cmake/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.html
@@ -4875,6 +4942,8 @@ share/doc/cmake/html/variable/CMAKE_LANG
 share/doc/cmake/html/variable/CMAKE_LANG_CREATE_SHARED_MODULE.html
 share/doc/cmake/html/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS.html
+share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_CONFIG.html
+share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_DEBUG.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_INIT.html
@@ -4884,6 +4953,7 @@ share/doc/cmake/html/variable/CMAKE_LANG
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.html
 share/doc/cmake/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.html
+share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.html
 share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.html
 share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.html
 share/doc/cmake/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.html
@@ -4938,6 +5008,8 @@ share/doc/cmake/html/variable/CMAKE_MODU
 share/doc/cmake/html/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.html
 share/doc/cmake/html/variable/CMAKE_MODULE_PATH.html
 share/doc/cmake/html/variable/CMAKE_MSVCIDE_RUN_PATH.html
+share/doc/cmake/html/variable/CMAKE_NETRC.html
+share/doc/cmake/html/variable/CMAKE_NETRC_FILE.html
 share/doc/cmake/html/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.html
 share/doc/cmake/html/variable/CMAKE_NOT_USING_CONFIG_FLAGS.html
 share/doc/cmake/html/variable/CMAKE_NO_BUILTIN_CHRPATH.html
@@ -5030,11 +5102,13 @@ share/doc/cmake/html/variable/CMAKE_WIN3
 share/doc/cmake/html/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html
 share/doc/cmake/html/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.html
 share/doc/cmake/html/variable/CMAKE_XCODE_GENERATE_SCHEME.html
+share/doc/cmake/html/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.html
 share/doc/cmake/html/variable/CMAKE_XCODE_PLATFORM_TOOLSET.html
 share/doc/cmake/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html
 share/doc/cmake/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html
 share/doc/cmake/html/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.html
 share/doc/cmake/html/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.html
+share/doc/cmake/html/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
 share/doc/cmake/html/variable/CPACK_INSTALL_SCRIPT.html
 share/doc/cmake/html/variable/CPACK_PACKAGING_INSTALL_PREFIX.html
 share/doc/cmake/html/variable/CPACK_SET_DESTDIR.html
@@ -5095,6 +5169,7 @@ share/doc/cmake/html/variable/CTEST_P4_C
 share/doc/cmake/html/variable/CTEST_P4_COMMAND.html
 share/doc/cmake/html/variable/CTEST_P4_OPTIONS.html
 share/doc/cmake/html/variable/CTEST_P4_UPDATE_OPTIONS.html
+share/doc/cmake/html/variable/CTEST_RUN_CURRENT_SCRIPT.html
 share/doc/cmake/html/variable/CTEST_SCP_COMMAND.html
 share/doc/cmake/html/variable/CTEST_SITE.html
 share/doc/cmake/html/variable/CTEST_SOURCE_DIRECTORY.html

Re: CVS: cvs.openbsd.org: ports

Reply via email to