diff --git devel/cmake-doc/Makefile devel/cmake-doc/Makefile
index af5c2c65422f..a59d4381ac58 100644
--- devel/cmake-doc/Makefile
+++ devel/cmake-doc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.11.4
+DISTVERSION=	3.12.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc
@@ -29,6 +29,6 @@ CMAKE_SOURCE_PATH=	${WRKSRC}/Utilities/Sphinx
 ALL_TARGET=	documentation
 INSTALL_TARGET=	install
 
-PLIST_SUB=	CMAKEVERSION="${PORTVERSION:S/.//g}"
+PLIST_SUB=	CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}"
 
 .include <bsd.port.mk>
diff --git devel/cmake-doc/pkg-plist devel/cmake-doc/pkg-plist
index 7f645c46b29f..cfd9dba37ad0 100644
--- devel/cmake-doc/pkg-plist
+++ devel/cmake-doc/pkg-plist
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch
+%%DOCSDIR%%/html/_sources/command/add_compile_definitions.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_compile_options.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_command.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_target.rst.txt
@@ -121,6 +122,7 @@
 %%DOCSDIR%%/html/_sources/envvar/ASM_DIALECTFLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CC.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CFLAGS.rst.txt
+%%DOCSDIR%%/html/_sources/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CMAKE_CONFIG_TYPE.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CMAKE_MSVCIDE_RUN_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CMAKE_OSX_ARCHITECTURES.rst.txt
@@ -135,6 +137,7 @@
 %%DOCSDIR%%/html/_sources/envvar/CXX.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/CXXFLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/DASHBOARD_TEST_FROM_CTEST.rst.txt
+%%DOCSDIR%%/html/_sources/envvar/DESTDIR.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/FC.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/FFLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/envvar/LDFLAGS.rst.txt
@@ -218,6 +221,7 @@
 %%DOCSDIR%%/html/_sources/module/CPackIFW.rst.txt
 %%DOCSDIR%%/html/_sources/module/CPackIFWConfigureFile.rst.txt
 %%DOCSDIR%%/html/_sources/module/CPackNSIS.rst.txt
+%%DOCSDIR%%/html/_sources/module/CPackNuGet.rst.txt
 %%DOCSDIR%%/html/_sources/module/CPackPackageMaker.rst.txt
 %%DOCSDIR%%/html/_sources/module/CPackProductBuild.rst.txt
 %%DOCSDIR%%/html/_sources/module/CPackRPM.rst.txt
@@ -330,6 +334,7 @@
 %%DOCSDIR%%/html/_sources/module/FindMPI.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindMatlab.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindMotif.rst.txt
+%%DOCSDIR%%/html/_sources/module/FindODBC.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindOpenACC.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindOpenAL.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindOpenCL.rst.txt
@@ -351,6 +356,9 @@
 %%DOCSDIR%%/html/_sources/module/FindPostgreSQL.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindProducer.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindProtobuf.rst.txt
+%%DOCSDIR%%/html/_sources/module/FindPython.rst.txt
+%%DOCSDIR%%/html/_sources/module/FindPython2.rst.txt
+%%DOCSDIR%%/html/_sources/module/FindPython3.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindPythonInterp.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindPythonLibs.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindQt.rst.txt
@@ -506,6 +514,9 @@
 %%DOCSDIR%%/html/_sources/policy/CMP0070.rst.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0071.rst.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0072.rst.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0073.rst.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0074.rst.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0075.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/ADVANCED.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/HELPSTRING.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/MODIFIED.rst.txt
@@ -538,6 +549,7 @@
 %%DOCSDIR%%/html/_sources/prop_dir/RULE_LAUNCH_LINK.rst.txt
 %%DOCSDIR%%/html/_sources/prop_dir/SOURCE_DIR.rst.txt
 %%DOCSDIR%%/html/_sources/prop_dir/SUBDIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/prop_dir/TESTS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_dir/TEST_INCLUDE_FILE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_dir/TEST_INCLUDE_FILES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_dir/VARIABLES.rst.txt
@@ -554,6 +566,7 @@
 %%DOCSDIR%%/html/_sources/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/DEBUG_CONFIGURATIONS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/DISABLED_FEATURES.rst.txt
+%%DOCSDIR%%/html/_sources/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/ECLIPSE_EXTRA_NATURES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/ENABLED_FEATURES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_gbl/ENABLED_LANGUAGES.rst.txt
@@ -620,6 +633,7 @@
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_ENTRYPOINT.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_FLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_MODEL.rst.txt
+%%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_OUTPUT_HEADER_FILE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_TYPE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_VARIABLE_NAME.rst.txt
@@ -643,6 +657,7 @@
 %%DOCSDIR%%/html/_sources/prop_test/MEASUREMENT.rst.txt
 %%DOCSDIR%%/html/_sources/prop_test/PASS_REGULAR_EXPRESSION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_test/PROCESSORS.rst.txt
+%%DOCSDIR%%/html/_sources/prop_test/PROCESSOR_AFFINITY.rst.txt
 %%DOCSDIR%%/html/_sources/prop_test/REQUIRED_FILES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_test/RESOURCE_LOCK.rst.txt
 %%DOCSDIR%%/html/_sources/prop_test/RUN_SERIAL.rst.txt
@@ -692,6 +707,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE_EXTENSION.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst.txt
@@ -723,11 +739,13 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/DEBUG_POSTFIX.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/DEFINE_SYMBOL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ENABLE_EXPORTS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXCLUDE_FROM_ALL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EXPORT_NAME.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/EXPORT_PROPERTIES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/EchoString.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/FOLDER.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/FRAMEWORK.rst.txt
@@ -739,6 +757,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/HAS_CXX.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_CONFIGURATIONS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_GLOBAL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_IMPLIB.rst.txt
@@ -850,6 +869,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_CONFIGURATION_TYPE.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/VS_DEBUGGER_COMMAND.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst.txt
@@ -885,6 +905,7 @@
 %%DOCSDIR%%/html/_sources/release/3.1.rst.txt
 %%DOCSDIR%%/html/_sources/release/3.10.rst.txt
 %%DOCSDIR%%/html/_sources/release/3.11.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.12.rst.txt
 %%DOCSDIR%%/html/_sources/release/3.2.rst.txt
 %%DOCSDIR%%/html/_sources/release/3.3.rst.txt
 %%DOCSDIR%%/html/_sources/release/3.4.rst.txt
@@ -996,6 +1017,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DIRECTORY_LABELS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_DL_LIBS.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst.txt
@@ -1030,6 +1052,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_FOLDER.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_FRAMEWORK_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_Fortran_FORMAT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst.txt
@@ -1186,8 +1209,14 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PREFIX_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROGRAM_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_DESCRIPTION.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_HOMEPAGE_URL.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_NAME.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_VERSION.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_VERSION_MAJOR.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_VERSION_MINOR.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_VERSION_PATCH.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_VERSION_TWEAK.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_RANLIB.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ROOT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst.txt
@@ -1217,6 +1246,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_STATIC_LINKER_FLAGS_INIT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_SUPPRESS_REGENERATION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_COMPILE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_LINK.rst.txt
@@ -1253,6 +1283,14 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_INCLUDE_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_LIBRARY_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WARN_DEPRECATED.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst.txt
@@ -1358,8 +1396,11 @@
 %%DOCSDIR%%/html/_sources/variable/MSVC80.rst.txt
 %%DOCSDIR%%/html/_sources/variable/MSVC90.rst.txt
 %%DOCSDIR%%/html/_sources/variable/MSVC_IDE.rst.txt
+%%DOCSDIR%%/html/_sources/variable/MSVC_TOOLSET_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/MSVC_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_BINARY_DIR.rst.txt
+%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_DESCRIPTION.rst.txt
+%%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_HOMEPAGE_URL.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_SOURCE_DIR.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_MAJOR.rst.txt
@@ -1368,6 +1409,7 @@
 %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_TWEAK.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_BINARY_DIR.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_DESCRIPTION.rst.txt
+%%DOCSDIR%%/html/_sources/variable/PROJECT_HOMEPAGE_URL.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_NAME.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_SOURCE_DIR.rst.txt
 %%DOCSDIR%%/html/_sources/variable/PROJECT_VERSION.rst.txt
@@ -1408,6 +1450,7 @@
 %%DOCSDIR%%/html/_static/up-pressed.png
 %%DOCSDIR%%/html/_static/up.png
 %%DOCSDIR%%/html/_static/websupport.js
+%%DOCSDIR%%/html/command/add_compile_definitions.html
 %%DOCSDIR%%/html/command/add_compile_options.html
 %%DOCSDIR%%/html/command/add_custom_command.html
 %%DOCSDIR%%/html/command/add_custom_target.html
@@ -1530,6 +1573,7 @@
 %%DOCSDIR%%/html/envvar/ASM_DIALECTFLAGS.html
 %%DOCSDIR%%/html/envvar/CC.html
 %%DOCSDIR%%/html/envvar/CFLAGS.html
+%%DOCSDIR%%/html/envvar/CMAKE_BUILD_PARALLEL_LEVEL.html
 %%DOCSDIR%%/html/envvar/CMAKE_CONFIG_TYPE.html
 %%DOCSDIR%%/html/envvar/CMAKE_MSVCIDE_RUN_PATH.html
 %%DOCSDIR%%/html/envvar/CMAKE_OSX_ARCHITECTURES.html
@@ -1544,6 +1588,7 @@
 %%DOCSDIR%%/html/envvar/CXX.html
 %%DOCSDIR%%/html/envvar/CXXFLAGS.html
 %%DOCSDIR%%/html/envvar/DASHBOARD_TEST_FROM_CTEST.html
+%%DOCSDIR%%/html/envvar/DESTDIR.html
 %%DOCSDIR%%/html/envvar/FC.html
 %%DOCSDIR%%/html/envvar/FFLAGS.html
 %%DOCSDIR%%/html/envvar/LDFLAGS.html
@@ -1628,6 +1673,7 @@
 %%DOCSDIR%%/html/module/CPackIFW.html
 %%DOCSDIR%%/html/module/CPackIFWConfigureFile.html
 %%DOCSDIR%%/html/module/CPackNSIS.html
+%%DOCSDIR%%/html/module/CPackNuGet.html
 %%DOCSDIR%%/html/module/CPackPackageMaker.html
 %%DOCSDIR%%/html/module/CPackProductBuild.html
 %%DOCSDIR%%/html/module/CPackRPM.html
@@ -1740,6 +1786,7 @@
 %%DOCSDIR%%/html/module/FindMPI.html
 %%DOCSDIR%%/html/module/FindMatlab.html
 %%DOCSDIR%%/html/module/FindMotif.html
+%%DOCSDIR%%/html/module/FindODBC.html
 %%DOCSDIR%%/html/module/FindOpenACC.html
 %%DOCSDIR%%/html/module/FindOpenAL.html
 %%DOCSDIR%%/html/module/FindOpenCL.html
@@ -1761,6 +1808,9 @@
 %%DOCSDIR%%/html/module/FindPostgreSQL.html
 %%DOCSDIR%%/html/module/FindProducer.html
 %%DOCSDIR%%/html/module/FindProtobuf.html
+%%DOCSDIR%%/html/module/FindPython.html
+%%DOCSDIR%%/html/module/FindPython2.html
+%%DOCSDIR%%/html/module/FindPython3.html
 %%DOCSDIR%%/html/module/FindPythonInterp.html
 %%DOCSDIR%%/html/module/FindPythonLibs.html
 %%DOCSDIR%%/html/module/FindQt.html
@@ -1917,6 +1967,9 @@
 %%DOCSDIR%%/html/policy/CMP0070.html
 %%DOCSDIR%%/html/policy/CMP0071.html
 %%DOCSDIR%%/html/policy/CMP0072.html
+%%DOCSDIR%%/html/policy/CMP0073.html
+%%DOCSDIR%%/html/policy/CMP0074.html
+%%DOCSDIR%%/html/policy/CMP0075.html
 %%DOCSDIR%%/html/prop_cache/ADVANCED.html
 %%DOCSDIR%%/html/prop_cache/HELPSTRING.html
 %%DOCSDIR%%/html/prop_cache/MODIFIED.html
@@ -1949,6 +2002,7 @@
 %%DOCSDIR%%/html/prop_dir/RULE_LAUNCH_LINK.html
 %%DOCSDIR%%/html/prop_dir/SOURCE_DIR.html
 %%DOCSDIR%%/html/prop_dir/SUBDIRECTORIES.html
+%%DOCSDIR%%/html/prop_dir/TESTS.html
 %%DOCSDIR%%/html/prop_dir/TEST_INCLUDE_FILE.html
 %%DOCSDIR%%/html/prop_dir/TEST_INCLUDE_FILES.html
 %%DOCSDIR%%/html/prop_dir/VARIABLES.html
@@ -1965,6 +2019,7 @@
 %%DOCSDIR%%/html/prop_gbl/CMAKE_C_KNOWN_FEATURES.html
 %%DOCSDIR%%/html/prop_gbl/DEBUG_CONFIGURATIONS.html
 %%DOCSDIR%%/html/prop_gbl/DISABLED_FEATURES.html
+%%DOCSDIR%%/html/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.html
 %%DOCSDIR%%/html/prop_gbl/ECLIPSE_EXTRA_NATURES.html
 %%DOCSDIR%%/html/prop_gbl/ENABLED_FEATURES.html
 %%DOCSDIR%%/html/prop_gbl/ENABLED_LANGUAGES.html
@@ -2031,6 +2086,7 @@
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_ENTRYPOINT.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_FLAGS.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_MODEL.html
+%%DOCSDIR%%/html/prop_sf/VS_SHADER_OBJECT_FILE_NAME.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_OUTPUT_HEADER_FILE.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_TYPE.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_VARIABLE_NAME.html
@@ -2054,6 +2110,7 @@
 %%DOCSDIR%%/html/prop_test/MEASUREMENT.html
 %%DOCSDIR%%/html/prop_test/PASS_REGULAR_EXPRESSION.html
 %%DOCSDIR%%/html/prop_test/PROCESSORS.html
+%%DOCSDIR%%/html/prop_test/PROCESSOR_AFFINITY.html
 %%DOCSDIR%%/html/prop_test/REQUIRED_FILES.html
 %%DOCSDIR%%/html/prop_test/RESOURCE_LOCK.html
 %%DOCSDIR%%/html/prop_test/RUN_SERIAL.html
@@ -2103,6 +2160,7 @@
 %%DOCSDIR%%/html/prop_tgt/BUILD_WITH_INSTALL_RPATH.html
 %%DOCSDIR%%/html/prop_tgt/BUNDLE.html
 %%DOCSDIR%%/html/prop_tgt/BUNDLE_EXTENSION.html
+%%DOCSDIR%%/html/prop_tgt/COMMON_LANGUAGE_RUNTIME.html
 %%DOCSDIR%%/html/prop_tgt/COMPATIBLE_INTERFACE_BOOL.html
 %%DOCSDIR%%/html/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.html
 %%DOCSDIR%%/html/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.html
@@ -2134,11 +2192,13 @@
 %%DOCSDIR%%/html/prop_tgt/DEBUG_POSTFIX.html
 %%DOCSDIR%%/html/prop_tgt/DEFINE_SYMBOL.html
 %%DOCSDIR%%/html/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.html
+%%DOCSDIR%%/html/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.html
 %%DOCSDIR%%/html/prop_tgt/ENABLE_EXPORTS.html
 %%DOCSDIR%%/html/prop_tgt/EXCLUDE_FROM_ALL.html
 %%DOCSDIR%%/html/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.html
 %%DOCSDIR%%/html/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/EXPORT_NAME.html
+%%DOCSDIR%%/html/prop_tgt/EXPORT_PROPERTIES.html
 %%DOCSDIR%%/html/prop_tgt/EchoString.html
 %%DOCSDIR%%/html/prop_tgt/FOLDER.html
 %%DOCSDIR%%/html/prop_tgt/FRAMEWORK.html
@@ -2150,6 +2210,7 @@
 %%DOCSDIR%%/html/prop_tgt/HAS_CXX.html
 %%DOCSDIR%%/html/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED.html
+%%DOCSDIR%%/html/prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_CONFIGURATIONS.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_GLOBAL.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_IMPLIB.html
@@ -2261,6 +2322,7 @@
 %%DOCSDIR%%/html/prop_tgt/VERSION.html
 %%DOCSDIR%%/html/prop_tgt/VISIBILITY_INLINES_HIDDEN.html
 %%DOCSDIR%%/html/prop_tgt/VS_CONFIGURATION_TYPE.html
+%%DOCSDIR%%/html/prop_tgt/VS_DEBUGGER_COMMAND.html
 %%DOCSDIR%%/html/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.html
 %%DOCSDIR%%/html/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.html
 %%DOCSDIR%%/html/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.html
@@ -2296,6 +2358,7 @@
 %%DOCSDIR%%/html/release/3.1.html
 %%DOCSDIR%%/html/release/3.10.html
 %%DOCSDIR%%/html/release/3.11.html
+%%DOCSDIR%%/html/release/3.12.html
 %%DOCSDIR%%/html/release/3.2.html
 %%DOCSDIR%%/html/release/3.3.html
 %%DOCSDIR%%/html/release/3.4.html
@@ -2409,6 +2472,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_DIRECTORY_LABELS.html
 %%DOCSDIR%%/html/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html
 %%DOCSDIR%%/html/variable/CMAKE_DL_LIBS.html
+%%DOCSDIR%%/html/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.html
 %%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.html
 %%DOCSDIR%%/html/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.html
@@ -2443,6 +2507,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.html
 %%DOCSDIR%%/html/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.html
+%%DOCSDIR%%/html/variable/CMAKE_FOLDER.html
 %%DOCSDIR%%/html/variable/CMAKE_FRAMEWORK_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_Fortran_FORMAT.html
 %%DOCSDIR%%/html/variable/CMAKE_Fortran_MODDIR_DEFAULT.html
@@ -2599,8 +2664,14 @@
 %%DOCSDIR%%/html/variable/CMAKE_PREFIX_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_PROGRAM_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_PROJECT_DESCRIPTION.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_HOMEPAGE_URL.html
 %%DOCSDIR%%/html/variable/CMAKE_PROJECT_NAME.html
 %%DOCSDIR%%/html/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_VERSION.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_VERSION_MAJOR.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_VERSION_MINOR.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_VERSION_PATCH.html
+%%DOCSDIR%%/html/variable/CMAKE_PROJECT_VERSION_TWEAK.html
 %%DOCSDIR%%/html/variable/CMAKE_RANLIB.html
 %%DOCSDIR%%/html/variable/CMAKE_ROOT.html
 %%DOCSDIR%%/html/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.html
@@ -2630,6 +2701,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_STATIC_LINKER_FLAGS_INIT.html
 %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.html
 %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.html
+%%DOCSDIR%%/html/variable/CMAKE_SUPPRESS_REGENERATION.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSROOT.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSROOT_COMPILE.html
 %%DOCSDIR%%/html/variable/CMAKE_SYSROOT_LINK.html
@@ -2666,6 +2738,14 @@
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_INCLUDE_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_LIBRARY_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.html
+%%DOCSDIR%%/html/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.html
 %%DOCSDIR%%/html/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_WARN_DEPRECATED.html
 %%DOCSDIR%%/html/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.html
@@ -2771,8 +2851,11 @@
 %%DOCSDIR%%/html/variable/MSVC80.html
 %%DOCSDIR%%/html/variable/MSVC90.html
 %%DOCSDIR%%/html/variable/MSVC_IDE.html
+%%DOCSDIR%%/html/variable/MSVC_TOOLSET_VERSION.html
 %%DOCSDIR%%/html/variable/MSVC_VERSION.html
 %%DOCSDIR%%/html/variable/PROJECT-NAME_BINARY_DIR.html
+%%DOCSDIR%%/html/variable/PROJECT-NAME_DESCRIPTION.html
+%%DOCSDIR%%/html/variable/PROJECT-NAME_HOMEPAGE_URL.html
 %%DOCSDIR%%/html/variable/PROJECT-NAME_SOURCE_DIR.html
 %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION.html
 %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_MAJOR.html
@@ -2781,6 +2864,7 @@
 %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_TWEAK.html
 %%DOCSDIR%%/html/variable/PROJECT_BINARY_DIR.html
 %%DOCSDIR%%/html/variable/PROJECT_DESCRIPTION.html
+%%DOCSDIR%%/html/variable/PROJECT_HOMEPAGE_URL.html
 %%DOCSDIR%%/html/variable/PROJECT_NAME.html
 %%DOCSDIR%%/html/variable/PROJECT_SOURCE_DIR.html
 %%DOCSDIR%%/html/variable/PROJECT_VERSION.html
diff --git devel/cmake-gui/Makefile devel/cmake-gui/Makefile
index 35473fdc5f05..52cf1251693f 100644
--- devel/cmake-gui/Makefile
+++ devel/cmake-gui/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.11.4
+DISTVERSION=	3.12.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_QT=		core gui widgets buildtools_build qmake_build
 USES=		cmake:run desktop-file-utils libarchive \
-		qt:5 shared-mime-info
+		shared-mime-info qt:5
 CMAKE_OFF=	BUILD_CursesDialog \
 		CMake_SPHINX_DEPEND_ON_EXECUTABLES
 CMAKE_ON=	BUILD_QtDialog \
diff --git devel/cmake-gui/files/patch-Source_Modules_FindLibUV.cmake devel/cmake-gui/files/patch-Source_Modules_FindLibUV.cmake
deleted file mode 100644
index f2c13733eca2..000000000000
--- devel/cmake-gui/files/patch-Source_Modules_FindLibUV.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-Sent upstream: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169
-
-commit 6ad09a5d14ef497cca653d303c3849f83aa0aca3
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sat Jun 23 20:30:07 2018 +0200
-
-    FindLibUV: Also check uv/version.h for version detection
-
-    Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
-    Make FindLibUV aware of the file's new location for configuration to work.
-
-    Upstream change: https://github.com/libuv/libuv/pull/1429
-
---- Source/Modules/FindLibUV.cmake
-+++ 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()
diff --git devel/cmake/Makefile devel/cmake/Makefile
index 33a3d15a2de8..d4a12786e5b0 100644
--- devel/cmake/Makefile
+++ devel/cmake/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION=	3.11.4
-PORTREVISION=	1
+DISTVERSION=	3.12.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
-USES=		compiler:c++11-lang ncurses
+USES=		compiler:c++11-lang libarchive ncurses
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=make
@@ -29,9 +28,9 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--docdir="/${DOCSDIR_REL}" \
 		--system-libs \
 		--parallel=${MAKE_JOBS_NUMBER} \
-		--init="${WRKSRC}/InitialCache.cmake"
+		--init="${PATCHDIR}/InitialCache.cmake"
 
-OPTIONS_DEFINE=	DOCS MANPAGES CPACK
+OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
@@ -39,11 +38,6 @@ MANPAGES_USES=		python:env
 MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 MANPAGES_CONFIGURE_ON=	--sphinx-man
 
-CPACK_DESC=		Enable FreeBSD generator in CPack (experimental)
-CPACK_LIB_DEPENDS=	libpkg.so:ports-mgmt/pkg
-CPACK_USES_OFF=		libarchive
-# When CPACK is on, uses base libarchive and won't pass stage-qa
-
 CONFLICTS_INSTALL=	cmake-modules-*
 
 .include <bsd.port.pre.mk>
@@ -52,25 +46,6 @@ CONFLICTS_INSTALL=	cmake-modules-*
 INSTALL_TARGET=	install/strip
 .endif
 
-# Before running configure, substitute in the values of options
-# for the build. CMake's configure doesn't accept --with-foo
-# or similar options: it expects them to be set in CMake-style
-# syntax in the initial cache.
-pre-configure:
-	@${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake"
-
-pre-configure-CPACK-on:
-	@${REINPLACE_CMD} \
-		-e 's/@@CPACK_OPTION_VALUE@@/ON/' \
-		-e 's/@@CPACK_OPTION_COMMENT@@//' \
-		"${WRKSRC}/InitialCache.cmake"
-
-pre-configure-CPACK-off:
-	@${REINPLACE_CMD} \
-		-e 's/@@CPACK_OPTION_VALUE@@/OFF/' \
-		-e 's/@@CPACK_OPTION_COMMENT@@/# /' \
-		"${WRKSRC}/InitialCache.cmake"
-
 post-patch:
 	@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 		${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \
diff --git devel/cmake/distinfo devel/cmake/distinfo
index 81052f2a27e1..4b14ef224fe5 100644
--- devel/cmake/distinfo
+++ devel/cmake/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529041092
-SHA256 (cmake-3.11.4.tar.gz) = 8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5
-SIZE (cmake-3.11.4.tar.gz) = 7955301
+TIMESTAMP = 1531849848
+SHA256 (cmake-3.12.0.tar.gz) = d0781a90f6cdb9049d104ac16a150f9350b693498b9dea8a0331e799db6b9d69
+SIZE (cmake-3.12.0.tar.gz) = 8089372
diff --git devel/cmake/files/InitialCache.cmake devel/cmake/files/InitialCache.cmake
index ee769818debd..7d4a742232cc 100644
--- devel/cmake/files/InitialCache.cmake
+++ devel/cmake/files/InitialCache.cmake
@@ -15,15 +15,5 @@ set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH
 set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH
     "LibLZMA library to link against.")
 
-# Set (or not) by the CPACK option by replacing @@CPACK_OPTION_VALUE@@
-# with the value of the option itself.
-#
-set(CPACK_ENABLE_FREEBSD_PKG @@CPACK_OPTION_VALUE@@ CACHE BOOL "Enable pkg(8) generator in CPack")
-# Use base libarchive instead of ports, because libpkg uses base
-@@CPACK_OPTION_COMMENT@@set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH
-@@CPACK_OPTION_COMMENT@@    "Directory where LibArchive headers are located.")
-# Hack to (a) prevent using either ports libarchive or the bundled version 
-#     and (b) libpkg links to base libarchive.
-@@CPACK_OPTION_COMMENT@@set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH
-@@CPACK_OPTION_COMMENT@@    "LibArchive library to link against.")
-
+# Don't even try
+set(CPACK_ENABLE_FREEBSD_PKG OFF CACHE BOOL "Enable pkg(8) generator in CPack")
diff --git devel/cmake/files/patch-Modules_FindLua.cmake devel/cmake/files/patch-Modules_FindLua.cmake
new file mode 100644
index 000000000000..2bbed06198aa
--- /dev/null
+++ devel/cmake/files/patch-Modules_FindLua.cmake
@@ -0,0 +1,18 @@
+diff --git a/Modules/FindLua.cmake b/Modules/FindLua.cmake
+index 8f35fc7f1..cdce60866 100644
+--- Modules/FindLua.cmake
++++ Modules/FindLua.cmake
+@@ -35,6 +35,8 @@
+ #
+ # This is because, the lua location is not standardized and may exist in
+ # locations other than lua/
++cmake_policy(PUSH)
++cmake_policy(SET CMP0012 NEW)
+ 
+ unset(_lua_include_subdirs)
+ unset(_lua_library_names)
+@@ -236,3 +238,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
+                                   VERSION_VAR LUA_VERSION_STRING)
+ 
+ mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)
++cmake_policy(POP)
diff --git devel/cmake/files/patch-Modules_FindQt4.cmake devel/cmake/files/patch-Modules_FindQt4.cmake
deleted file mode 100644
index f3cd418a8a96..000000000000
--- devel/cmake/files/patch-Modules_FindQt4.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
---- Modules/FindQt4.cmake.orig	2018-03-28 11:16:49 UTC
-+++ Modules/FindQt4.cmake
-@@ -713,10 +713,15 @@ if (QT_QMAKE_EXECUTABLE AND
-     foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
-       set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
-     endforeach()
--    find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
-+    find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs
-       HINTS ${qt_cross_paths} ${qt_plugins_dir}
-       DOC "The location of the Qt plugins"
--      NO_CMAKE_FIND_ROOT_PATH)
-+      NO_CMAKE_FIND_ROOT_PATH
-+      NO_SYSTEM_ENVIRONMENT_PATH
-+      NO_CMAKE_SYSTEM_PATH)
-+    if(NOT QT_PLUGINS_DIR AND qt_plugins_dir)
-+      set(QT_PLUGINS_DIR ${qt_plugins_dir})
-+    endif()
-   endif ()
- 
-   # ask qmake for the translations directory
-@@ -740,6 +745,9 @@ if (QT_QMAKE_EXECUTABLE AND
-         NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
-         NO_CMAKE_SYSTEM_PATH)
-       mark_as_advanced(QT_IMPORTS_DIR)
-+      if(NOT QT_IMPORTS_DIR AND qt_imports_dir)
-+        set(QT_IMPORTS_DIR ${qt_imports_dir})
-+      endif()
-     endif()
-   endif ()
- 
diff --git devel/cmake/files/patch-Source_Modules_FindLibUV.cmake devel/cmake/files/patch-Source_Modules_FindLibUV.cmake
deleted file mode 100644
index f2c13733eca2..000000000000
--- devel/cmake/files/patch-Source_Modules_FindLibUV.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-Sent upstream: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169
-
-commit 6ad09a5d14ef497cca653d303c3849f83aa0aca3
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Sat Jun 23 20:30:07 2018 +0200
-
-    FindLibUV: Also check uv/version.h for version detection
-
-    Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
-    Make FindLibUV aware of the file's new location for configuration to work.
-
-    Upstream change: https://github.com/libuv/libuv/pull/1429
-
---- Source/Modules/FindLibUV.cmake
-+++ 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()
diff --git devel/cmake/pkg-plist devel/cmake/pkg-plist
index 387cf9a762ad..94e7754a13e7 100644
--- devel/cmake/pkg-plist
+++ devel/cmake/pkg-plist
@@ -23,9 +23,11 @@ bin/ctest
 %%MANPAGES%%man/man7/cmake-toolchains.7.gz
 %%MANPAGES%%man/man7/cmake-variables.7.gz
 share/aclocal/cmake.m4
+%%DATADIR%%/Help/command/COMPILE_OPTIONS_SHELL.txt
 %%DATADIR%%/Help/command/FIND_XXX.txt
 %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt
 %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt
+%%DATADIR%%/Help/command/add_compile_definitions.rst
 %%DATADIR%%/Help/command/add_compile_options.rst
 %%DATADIR%%/Help/command/add_custom_command.rst
 %%DATADIR%%/Help/command/add_custom_target.rst
@@ -148,6 +150,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/envvar/ASM_DIALECTFLAGS.rst
 %%DATADIR%%/Help/envvar/CC.rst
 %%DATADIR%%/Help/envvar/CFLAGS.rst
+%%DATADIR%%/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
 %%DATADIR%%/Help/envvar/CMAKE_CONFIG_TYPE.rst
 %%DATADIR%%/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
 %%DATADIR%%/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
@@ -162,6 +165,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/envvar/CXX.rst
 %%DATADIR%%/Help/envvar/CXXFLAGS.rst
 %%DATADIR%%/Help/envvar/DASHBOARD_TEST_FROM_CTEST.rst
+%%DATADIR%%/Help/envvar/DESTDIR.rst
 %%DATADIR%%/Help/envvar/FC.rst
 %%DATADIR%%/Help/envvar/FFLAGS.rst
 %%DATADIR%%/Help/envvar/LDFLAGS.rst
@@ -251,6 +255,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CPackIFW.rst
 %%DATADIR%%/Help/module/CPackIFWConfigureFile.rst
 %%DATADIR%%/Help/module/CPackNSIS.rst
+%%DATADIR%%/Help/module/CPackNuGet.rst
 %%DATADIR%%/Help/module/CPackPackageMaker.rst
 %%DATADIR%%/Help/module/CPackProductBuild.rst
 %%DATADIR%%/Help/module/CPackRPM.rst
@@ -363,6 +368,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindMPI.rst
 %%DATADIR%%/Help/module/FindMatlab.rst
 %%DATADIR%%/Help/module/FindMotif.rst
+%%DATADIR%%/Help/module/FindODBC.rst
 %%DATADIR%%/Help/module/FindOpenACC.rst
 %%DATADIR%%/Help/module/FindOpenAL.rst
 %%DATADIR%%/Help/module/FindOpenCL.rst
@@ -384,6 +390,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindPostgreSQL.rst
 %%DATADIR%%/Help/module/FindProducer.rst
 %%DATADIR%%/Help/module/FindProtobuf.rst
+%%DATADIR%%/Help/module/FindPython.rst
+%%DATADIR%%/Help/module/FindPython2.rst
+%%DATADIR%%/Help/module/FindPython3.rst
 %%DATADIR%%/Help/module/FindPythonInterp.rst
 %%DATADIR%%/Help/module/FindPythonLibs.rst
 %%DATADIR%%/Help/module/FindQt.rst
@@ -539,6 +548,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/policy/CMP0070.rst
 %%DATADIR%%/Help/policy/CMP0071.rst
 %%DATADIR%%/Help/policy/CMP0072.rst
+%%DATADIR%%/Help/policy/CMP0073.rst
+%%DATADIR%%/Help/policy/CMP0074.rst
+%%DATADIR%%/Help/policy/CMP0075.rst
 %%DATADIR%%/Help/policy/DEPRECATED.txt
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
@@ -573,6 +585,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_dir/RULE_LAUNCH_LINK.rst
 %%DATADIR%%/Help/prop_dir/SOURCE_DIR.rst
 %%DATADIR%%/Help/prop_dir/SUBDIRECTORIES.rst
+%%DATADIR%%/Help/prop_dir/TESTS.rst
 %%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILE.rst
 %%DATADIR%%/Help/prop_dir/TEST_INCLUDE_FILES.rst
 %%DATADIR%%/Help/prop_dir/VARIABLES.rst
@@ -589,6 +602,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/DEBUG_CONFIGURATIONS.rst
 %%DATADIR%%/Help/prop_gbl/DISABLED_FEATURES.rst
+%%DATADIR%%/Help/prop_gbl/ECLIPSE_EXTRA_CPROJECT_CONTENTS.rst
 %%DATADIR%%/Help/prop_gbl/ECLIPSE_EXTRA_NATURES.rst
 %%DATADIR%%/Help/prop_gbl/ENABLED_FEATURES.rst
 %%DATADIR%%/Help/prop_gbl/ENABLED_LANGUAGES.rst
@@ -655,6 +669,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_FLAGS.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_OBJECT_FILE_NAME.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_OUTPUT_HEADER_FILE.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_TYPE.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_VARIABLE_NAME.rst
@@ -678,6 +693,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_test/MEASUREMENT.rst
 %%DATADIR%%/Help/prop_test/PASS_REGULAR_EXPRESSION.rst
 %%DATADIR%%/Help/prop_test/PROCESSORS.rst
+%%DATADIR%%/Help/prop_test/PROCESSOR_AFFINITY.rst
 %%DATADIR%%/Help/prop_test/REQUIRED_FILES.rst
 %%DATADIR%%/Help/prop_test/RESOURCE_LOCK.rst
 %%DATADIR%%/Help/prop_test/RUN_SERIAL.rst
@@ -727,6 +743,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
 %%DATADIR%%/Help/prop_tgt/BUNDLE.rst
 %%DATADIR%%/Help/prop_tgt/BUNDLE_EXTENSION.rst
+%%DATADIR%%/Help/prop_tgt/COMMON_LANGUAGE_RUNTIME.rst
 %%DATADIR%%/Help/prop_tgt/COMPATIBLE_INTERFACE_BOOL.rst
 %%DATADIR%%/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MAX.rst
 %%DATADIR%%/Help/prop_tgt/COMPATIBLE_INTERFACE_NUMBER_MIN.rst
@@ -759,11 +776,13 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/DEBUG_POSTFIX.rst
 %%DATADIR%%/Help/prop_tgt/DEFINE_SYMBOL.rst
 %%DATADIR%%/Help/prop_tgt/DEPLOYMENT_REMOTE_DIRECTORY.rst
+%%DATADIR%%/Help/prop_tgt/DOTNET_TARGET_FRAMEWORK_VERSION.rst
 %%DATADIR%%/Help/prop_tgt/ENABLE_EXPORTS.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_ALL.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD.rst
 %%DATADIR%%/Help/prop_tgt/EXCLUDE_FROM_DEFAULT_BUILD_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/EXPORT_NAME.rst
+%%DATADIR%%/Help/prop_tgt/EXPORT_PROPERTIES.rst
 %%DATADIR%%/Help/prop_tgt/EchoString.rst
 %%DATADIR%%/Help/prop_tgt/FOLDER.rst
 %%DATADIR%%/Help/prop_tgt/FRAMEWORK.rst
@@ -775,6 +794,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/HAS_CXX.rst
 %%DATADIR%%/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED.rst
+%%DATADIR%%/Help/prop_tgt/IMPORTED_COMMON_LANGUAGE_RUNTIME.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_GLOBAL.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_IMPLIB.rst
@@ -888,6 +908,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 %%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
+%%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_COMMAND.rst
 %%DATADIR%%/Help/prop_tgt/VS_DEBUGGER_WORKING_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCEPROP_refname_TAG_tagname.rst
@@ -925,6 +946,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/release/3.1.rst
 %%DATADIR%%/Help/release/3.10.rst
 %%DATADIR%%/Help/release/3.11.rst
+%%DATADIR%%/Help/release/3.12.rst
 %%DATADIR%%/Help/release/3.2.rst
 %%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/3.4.rst
@@ -1037,6 +1059,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_DIRECTORY_LABELS.rst
 %%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 %%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst
+%%DATADIR%%/Help/variable/CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES.rst
 %%DATADIR%%/Help/variable/CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT.rst
 %%DATADIR%%/Help/variable/CMAKE_ECLIPSE_MAKE_ARGUMENTS.rst
@@ -1072,6 +1095,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.rst
 %%DATADIR%%/Help/variable/CMAKE_FIND_ROOT_PATH_MODE_XXX.txt
+%%DATADIR%%/Help/variable/CMAKE_FOLDER.rst
 %%DATADIR%%/Help/variable/CMAKE_FRAMEWORK_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_Fortran_FORMAT.rst
 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst
@@ -1229,8 +1253,14 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_PREFIX_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_PROGRAM_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_PROJECT_DESCRIPTION.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_HOMEPAGE_URL.rst
 %%DATADIR%%/Help/variable/CMAKE_PROJECT_NAME.rst
 %%DATADIR%%/Help/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_MAJOR.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_MINOR.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_PATCH.rst
+%%DATADIR%%/Help/variable/CMAKE_PROJECT_VERSION_TWEAK.rst
 %%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
 %%DATADIR%%/Help/variable/CMAKE_ROOT.rst
 %%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
@@ -1260,6 +1290,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS_INIT.rst
 %%DATADIR%%/Help/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.rst
 %%DATADIR%%/Help/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.rst
+%%DATADIR%%/Help/variable/CMAKE_SUPPRESS_REGENERATION.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSROOT.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSROOT_COMPILE.rst
 %%DATADIR%%/Help/variable/CMAKE_SYSROOT_LINK.rst
@@ -1296,6 +1327,14 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET_VERSION.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_EXCLUDE_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_EXECUTABLE_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_INCLUDE_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_LIBRARY_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_LIBRARY_WINRT_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_REFERENCE_DIRECTORIES.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_SDK_SOURCE_DIRECTORIES.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst
 %%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
@@ -1402,8 +1441,11 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/MSVC80.rst
 %%DATADIR%%/Help/variable/MSVC90.rst
 %%DATADIR%%/Help/variable/MSVC_IDE.rst
+%%DATADIR%%/Help/variable/MSVC_TOOLSET_VERSION.rst
 %%DATADIR%%/Help/variable/MSVC_VERSION.rst
 %%DATADIR%%/Help/variable/PROJECT-NAME_BINARY_DIR.rst
+%%DATADIR%%/Help/variable/PROJECT-NAME_DESCRIPTION.rst
+%%DATADIR%%/Help/variable/PROJECT-NAME_HOMEPAGE_URL.rst
 %%DATADIR%%/Help/variable/PROJECT-NAME_SOURCE_DIR.rst
 %%DATADIR%%/Help/variable/PROJECT-NAME_VERSION.rst
 %%DATADIR%%/Help/variable/PROJECT-NAME_VERSION_MAJOR.rst
@@ -1412,6 +1454,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/PROJECT-NAME_VERSION_TWEAK.rst
 %%DATADIR%%/Help/variable/PROJECT_BINARY_DIR.rst
 %%DATADIR%%/Help/variable/PROJECT_DESCRIPTION.rst
+%%DATADIR%%/Help/variable/PROJECT_HOMEPAGE_URL.rst
 %%DATADIR%%/Help/variable/PROJECT_NAME.rst
 %%DATADIR%%/Help/variable/PROJECT_SOURCE_DIR.rst
 %%DATADIR%%/Help/variable/PROJECT_VERSION.rst
@@ -1552,6 +1595,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/CPack.DS_Store.in
 %%DATADIR%%/Modules/CPack.Description.plist.in
 %%DATADIR%%/Modules/CPack.Info.plist.in
+%%DATADIR%%/Modules/CPack.NuGet.nuspec.in
 %%DATADIR%%/Modules/CPack.OSXScriptLauncher.in
 %%DATADIR%%/Modules/CPack.OSXScriptLauncher.rsrc.in
 %%DATADIR%%/Modules/CPack.OSXX11.Info.plist.in
@@ -1572,6 +1616,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/CPackIFW.cmake
 %%DATADIR%%/Modules/CPackIFWConfigureFile.cmake
 %%DATADIR%%/Modules/CPackNSIS.cmake
+%%DATADIR%%/Modules/CPackNuGet.cmake
 %%DATADIR%%/Modules/CPackPackageMaker.cmake
 %%DATADIR%%/Modules/CPackProductBuild.cmake
 %%DATADIR%%/Modules/CPackRPM.cmake
@@ -1722,6 +1767,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-ASM.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-C-FeatureTests.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-C.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
@@ -1882,6 +1929,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/FindMPI/test_mpi.f90.in
 %%DATADIR%%/Modules/FindMatlab.cmake
 %%DATADIR%%/Modules/FindMotif.cmake
+%%DATADIR%%/Modules/FindODBC.cmake
 %%DATADIR%%/Modules/FindOpenACC.cmake
 %%DATADIR%%/Modules/FindOpenAL.cmake
 %%DATADIR%%/Modules/FindOpenCL.cmake
@@ -1903,6 +1951,10 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/FindPostgreSQL.cmake
 %%DATADIR%%/Modules/FindProducer.cmake
 %%DATADIR%%/Modules/FindProtobuf.cmake
+%%DATADIR%%/Modules/FindPython.cmake
+%%DATADIR%%/Modules/FindPython/Support.cmake
+%%DATADIR%%/Modules/FindPython2.cmake
+%%DATADIR%%/Modules/FindPython3.cmake
 %%DATADIR%%/Modules/FindPythonInterp.cmake
 %%DATADIR%%/Modules/FindPythonLibs.cmake
 %%DATADIR%%/Modules/FindQt.cmake
@@ -2066,6 +2118,30 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_shared.cmake
 %%DATADIR%%/Modules/Platform/Android/ndk-stl-stlport_static.cmake
 %%DATADIR%%/Modules/Platform/Android/ndk-stl-system.cmake
+%%DATADIR%%/Modules/Platform/Apple-Absoft-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-AppleClang-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-AppleClang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-Clang-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-Clang-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-Clang.cmake
+%%DATADIR%%/Modules/Platform/Apple-GNU-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-GNU-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-GNU.cmake
+%%DATADIR%%/Modules/Platform/Apple-Intel-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-Intel-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-Intel.cmake
+%%DATADIR%%/Modules/Platform/Apple-NAG-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-NVIDIA-CUDA.cmake
+%%DATADIR%%/Modules/Platform/Apple-PGI-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-PGI-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Platform/Apple-PGI.cmake
+%%DATADIR%%/Modules/Platform/Apple-VisualAge-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-VisualAge-CXX.cmake
+%%DATADIR%%/Modules/Platform/Apple-XL-C.cmake
+%%DATADIR%%/Modules/Platform/Apple-XL-CXX.cmake
 %%DATADIR%%/Modules/Platform/BSDOS.cmake
 %%DATADIR%%/Modules/Platform/BeOS.cmake
 %%DATADIR%%/Modules/Platform/BlueGeneL.cmake
@@ -2110,32 +2186,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/Platform/CYGWIN.cmake
 %%DATADIR%%/Modules/Platform/Catamount.cmake
 %%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Clang.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Determine-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-GNU.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Initialize.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-Intel.cmake
-%%DATADIR%%/Modules/Platform/Darwin-NAG-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-NVIDIA-CUDA.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI-Fortran.cmake
-%%DATADIR%%/Modules/Platform/Darwin-PGI.cmake
-%%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake
-%%DATADIR%%/Modules/Platform/Darwin-XL-C.cmake
-%%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake
 %%DATADIR%%/Modules/Platform/Darwin.cmake
 %%DATADIR%%/Modules/Platform/DragonFly.cmake
 %%DATADIR%%/Modules/Platform/Euros.cmake