cmake: updated to 3.11.0

Some of the more significant changes in CMake 3.11 are:

The Makefile Generators and the “Ninja” generator learned to add
compiler launcher tools along with the compiler for the “Fortran”
language (“C”, “CXX”, and “CUDA” were supported previously). See the
“CMAKE_<LANG>_COMPILER_LAUNCHER” variable and
“<LANG>_COMPILER_LAUNCHER” target property for details.

Visual Studio Generators learned to support the “COMPILE_LANGUAGE”
“generator expression” in target-wide “COMPILE_DEFINITIONS”,
“INCLUDE_DIRECTORIES”, “COMPILE_OPTIONS”, and “file(GENERATE)”. See
generator expression documentation for caveats.

The “Xcode” Generator learned to support the “COMPILE_LANGUAGE”
“generator expression” in target-wide “COMPILE_DEFINITIONS” and
“INCLUDE_DIRECTORIES”. It previously supported only
“COMPILE_OPTIONS” and “file(GENERATE)”. See generator expression
documentation for caveats.

“add_library()” and “add_executable()” commands can now be called
without any sources and will not complain as long as sources are
added later via the “target_sources()” command.

The “target_compile_definitions()” command learned to set the
“INTERFACE_COMPILE_DEFINITIONS” property on Imported Targets.

The “target_compile_features()” command learned to set the
“INTERFACE_COMPILE_FEATURES” property on Imported Targets.

The “target_compile_options()” command learned to set the
“INTERFACE_COMPILE_OPTIONS” property on Imported Targets.

The “target_include_directories()” command learned to set the
“INTERFACE_INCLUDE_DIRECTORIES” property on Imported Targets.

The “target_sources()” command learned to set the
“INTERFACE_SOURCES” property on Imported Targets.

The “target_link_libraries()” command learned to set the
“INTERFACE_LINK_LIBRARIES” property on Imported Targets.

The “COMPILE_DEFINITIONS” source file property learned to support
“generator expressions”.

A “COMPILE_OPTIONS” source file property was added to manage list
of options to pass to the compiler.

When using “AUTOMOC” or “AUTOUIC”, CMake now starts multiple
parallel “moc” or “uic” processes to reduce the build time. A new
“CMAKE_AUTOGEN_PARALLEL” variable and “AUTOGEN_PARALLEL” target
property may be set to specify the number of parallel “moc” or “uic”
processes to start. The default is derived from the number of CPUs
on the host.

5 files changed, 42 insertions, 179 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 2239a2c62ed..45f4977a03c 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2018/03/17 08:03:09 adam Exp $
+# $NetBSD: Makefile,v 1.141 2018/04/02 19:36:44 adam Exp $
 
 .include "Makefile.version"
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--system-libs
 CONFIGURE_ARGS+=	--no-system-jsoncpp
 
 LDFLAGS+=		-lcrypto # for rhash
+LDFLAGS.Darwin+=	-framework CoreServices # for LSOpenCFURLRef()
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/cmake/Makefile.version b/devel/cmake/Makefile.version
index 51591138ae8..9cad26cd52a 100644
--- a/devel/cmake/Makefile.version
+++ b/devel/cmake/Makefile.version
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.22 2018/03/17 08:03:09 adam Exp $
+# $NetBSD: Makefile.version,v 1.23 2018/04/02 19:36:44 adam Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION=	3.10.3
+CMAKE_VERSION=	3.11.0
 CMAKE_API=	${CMAKE_VERSION:R}
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 1a2f7f326c7..2ffbff0ce99 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2017/12/14 22:13:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.49 2018/04/02 19:36:44 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -154,7 +154,6 @@ share/cmake-${CMAKE_API}/Help/generator/CodeBlocks.rst
 share/cmake-${CMAKE_API}/Help/generator/CodeLite.rst
 share/cmake-${CMAKE_API}/Help/generator/Eclipse CDT4.rst
 share/cmake-${CMAKE_API}/Help/generator/Green Hills MULTI.rst
-share/cmake-${CMAKE_API}/Help/generator/KDevelop3.rst
 share/cmake-${CMAKE_API}/Help/generator/Kate.rst
 share/cmake-${CMAKE_API}/Help/generator/MSYS Makefiles.rst
 share/cmake-${CMAKE_API}/Help/generator/MinGW Makefiles.rst
@@ -271,6 +270,7 @@ share/cmake-${CMAKE_API}/Help/module/Documentation.rst
 share/cmake-${CMAKE_API}/Help/module/ExternalData.rst
 share/cmake-${CMAKE_API}/Help/module/ExternalProject.rst
 share/cmake-${CMAKE_API}/Help/module/FeatureSummary.rst
+share/cmake-${CMAKE_API}/Help/module/FetchContent.rst
 share/cmake-${CMAKE_API}/Help/module/FindALSA.rst
 share/cmake-${CMAKE_API}/Help/module/FindASPELL.rst
 share/cmake-${CMAKE_API}/Help/module/FindAVIFile.rst
@@ -319,6 +319,7 @@ share/cmake-${CMAKE_API}/Help/module/FindHg.rst
 share/cmake-${CMAKE_API}/Help/module/FindICU.rst
 share/cmake-${CMAKE_API}/Help/module/FindITK.rst
 share/cmake-${CMAKE_API}/Help/module/FindIce.rst
+share/cmake-${CMAKE_API}/Help/module/FindIconv.rst
 share/cmake-${CMAKE_API}/Help/module/FindIcotool.rst
 share/cmake-${CMAKE_API}/Help/module/FindImageMagick.rst
 share/cmake-${CMAKE_API}/Help/module/FindIntl.rst
@@ -519,6 +520,7 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0068.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0069.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0070.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0071.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0072.rst
 share/cmake-${CMAKE_API}/Help/policy/DEPRECATED.txt
 share/cmake-${CMAKE_API}/Help/policy/DISALLOWED_COMMAND.txt
 share/cmake-${CMAKE_API}/Help/prop_cache/ADVANCED.rst
@@ -606,10 +608,12 @@ share/cmake-${CMAKE_API}/Help/prop_sf/AUTOUIC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/COMPILE_DEFINITIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/COMPILE_FLAGS.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/COMPILE_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/EXTERNAL_OBJECT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/Fortran_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/GENERATED.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/HEADER_FILE_ONLY.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/KEEP_EXTENSION.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/LABELS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/LANGUAGE.rst
@@ -628,6 +632,8 @@ share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENABLE_DEBUG.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_SHADER_MODEL.rst
@@ -685,6 +691,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOGEN_PARALLEL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst
@@ -751,6 +758,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/HAS_CXX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_GLOBAL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_IMPLIB.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/IMPORTED_LIBNAME.rst
@@ -898,6 +906,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_NAME.txt
 share/cmake-${CMAKE_API}/Help/release/${CMAKE_API}.rst
 share/cmake-${CMAKE_API}/Help/release/3.0.rst
 share/cmake-${CMAKE_API}/Help/release/3.1.rst
+share/cmake-${CMAKE_API}/Help/release/3.10.rst
 share/cmake-${CMAKE_API}/Help/release/3.2.rst
 share/cmake-${CMAKE_API}/Help/release/3.3.rst
 share/cmake-${CMAKE_API}/Help/release/3.4.rst
@@ -944,6 +953,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARGC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARGV0.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOGEN_PARALLEL.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
@@ -968,6 +978,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_MINOR_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CFG_INTDIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CL_64.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_COLOR_MAKEFILE.rst
@@ -985,6 +996,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CTEST_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_STANDARD.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst
@@ -1049,6 +1061,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODDIR_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR_INSTANCE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_GNUtoMS.rst
@@ -1070,6 +1083,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INCLUDE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_MESSAGE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -1080,6 +1094,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_LINK.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
@@ -1109,6 +1124,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CREATE_SHARED_LIBRARY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_INIT.rst
@@ -1118,6 +1135,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
@@ -1172,6 +1190,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_CONFIG_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MODULE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_NETRC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_NETRC_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
@@ -1265,11 +1285,13 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_WIN32_EXECUTABLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_INSTALL_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_SET_DESTDIR.rst
@@ -1331,6 +1353,7 @@ share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_CLIENT.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SCP_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SITE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SOURCE_DIRECTORY.rst
@@ -1389,10 +1412,10 @@ share/cmake-${CMAKE_API}/Modules/.NoDartCoverage
 share/cmake-${CMAKE_API}/Modules/AddFileDependencies.cmake
 share/cmake-${CMAKE_API}/Modules/AndroidTestUtilities.cmake
 share/cmake-${CMAKE_API}/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
-share/cmake-${CMAKE_API}/Modules/AutogenInfo.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-ExactVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+share/cmake-${CMAKE_API}/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
 share/cmake-${CMAKE_API}/Modules/BundleUtilities.cmake
 share/cmake-${CMAKE_API}/Modules/CMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeASM-ATTInformation.cmake
@@ -1456,9 +1479,9 @@ share/cmake-${CMAKE_API}/Modules/CMakeFindDependencyMacro.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindEclipseCDT4.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindFrameworks.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindJavaCommon.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeFindKDevelop3.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindKate.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindPackageMode.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeFindSublimeText2.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindWMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeFindXCode.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeForceCompiler.cmake
@@ -1470,6 +1493,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeGraphVizOptions.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeIOSInstallCombined.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeImportBuildSettings.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeInitializeConfigs.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeJOMFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeJavaCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake
@@ -1680,6 +1704,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MIPSpro-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/MSVC-DetermineCompiler.cmake
@@ -1754,6 +1779,8 @@ share/cmake-${CMAKE_API}/Modules/ExternalProject-verify.cmake.in
 share/cmake-${CMAKE_API}/Modules/ExternalProject.cmake
 share/cmake-${CMAKE_API}/Modules/FLTKCompatibility.cmake
 share/cmake-${CMAKE_API}/Modules/FeatureSummary.cmake
+share/cmake-${CMAKE_API}/Modules/FetchContent.cmake
+share/cmake-${CMAKE_API}/Modules/FetchContent/CMakeLists.cmake.in
 share/cmake-${CMAKE_API}/Modules/FindALSA.cmake
 share/cmake-${CMAKE_API}/Modules/FindASPELL.cmake
 share/cmake-${CMAKE_API}/Modules/FindAVIFile.cmake
@@ -1806,6 +1833,7 @@ share/cmake-${CMAKE_API}/Modules/FindHTMLHelp.cmake
 share/cmake-${CMAKE_API}/Modules/FindHg.cmake
 share/cmake-${CMAKE_API}/Modules/FindICU.cmake
 share/cmake-${CMAKE_API}/Modules/FindIce.cmake
+share/cmake-${CMAKE_API}/Modules/FindIconv.cmake
 share/cmake-${CMAKE_API}/Modules/FindIcotool.cmake
 share/cmake-${CMAKE_API}/Modules/FindImageMagick.cmake
 share/cmake-${CMAKE_API}/Modules/FindIntl.cmake
@@ -2191,6 +2219,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Windows-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-Embarcadero.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Windows-Flang-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-G95-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C-ABI.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Windows-GNU-C.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index b5673eafbec..806ceea6dae 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.114 2018/03/17 08:03:09 adam Exp $
+$NetBSD: distinfo,v 1.115 2018/04/02 19:36:44 adam Exp $
 
-SHA1 (cmake-3.10.3.tar.gz) = 5cfbcccbbf8034d98d72b3e3dd5f3f4eb898de92
-RMD160 (cmake-3.10.3.tar.gz) = 3fba4057c079fe3ce3830ac1399eb5cbce95afa5
-SHA512 (cmake-3.10.3.tar.gz) = 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
-Size (cmake-3.10.3.tar.gz) = 7825559 bytes
+SHA1 (cmake-3.11.0.tar.gz) = 7851f87185f80e260ea634d5985ec9215fe408c8
+RMD160 (cmake-3.11.0.tar.gz) = 66ae49e6e10679dd56aa05269a6321b9269a5cd5
+SHA512 (cmake-3.11.0.tar.gz) = 03b058483d236d4f4427c93cc41af77068c243fc4b6f24aeaf2daf97af215bc664bc1b733195463af4cfc94ec70076710f425661859d752ddf3b9610adca9834
+Size (cmake-3.11.0.tar.gz) = 7948287 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
-SHA1 (patch-Modules_FindBoost.cmake) = 1c021f17ba2a5720409aa6ab356c35efe8f32042
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff --git a/devel/cmake/patches/patch-Modules_FindBoost.cmake b/devel/cmake/patches/patch-Modules_FindBoost.cmake
deleted file mode 100644
index 43dfa67fec3..00000000000
--- a/devel/cmake/patches/patch-Modules_FindBoost.cmake
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-Modules_FindBoost.cmake,v 1.3 2018/01/15 18:12:41 minskim Exp $
-
-Add Boost 1.66.0 support.
-(https://gitlab.kitware.com/cmake/cmake/merge_requests/1625
-
---- Modules/FindBoost.cmake.orig	2017-12-13 13:25:23.000000000 +0000
-+++ Modules/FindBoost.cmake
-@@ -797,9 +797,8 @@ function(_Boost_COMPONENT_DEPENDENCIES c
-       set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
-       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-     endif()
--    if(NOT Boost_VERSION VERSION_LESS 106600)
-+    if(NOT Boost_VERSION VERSION_LESS 106700)
-       message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
--      set(_Boost_IMPORTED_TARGETS FALSE)
-     endif()
-   endif()
- 
-@@ -831,8 +830,8 @@ function(_Boost_COMPONENT_HEADERS compon
-   set(_Boost_CONTAINER_HEADERS           "boost/container/container_fwd.hpp")
-   set(_Boost_CONTEXT_HEADERS             "boost/context/all.hpp")
-   set(_Boost_COROUTINE_HEADERS           "boost/coroutine/all.hpp")
--  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")
-   set(_Boost_DATE_TIME_HEADERS           "boost/date_time/date.hpp")
-+  set(_Boost_EXCEPTION_HEADERS           "boost/exception/exception.hpp")
-   set(_Boost_FIBER_HEADERS               "boost/fiber/all.hpp")
-   set(_Boost_FILESYSTEM_HEADERS          "boost/filesystem/path.hpp")
-   set(_Boost_GRAPH_HEADERS               "boost/graph/adjacency_list.hpp")
-@@ -931,8 +930,8 @@ endfunction()
- # `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`.
- #
- function(_Boost_COMPILER_FEATURES component _ret)
--  # Boost >= 1.62 and < 1.65
--  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106500)
-+  # Boost >= 1.62 and < 1.67
-+  if(NOT Boost_VERSION VERSION_LESS 106200 AND Boost_VERSION VERSION_LESS 106700)
-     set(_Boost_FIBER_COMPILER_FEATURES
-         cxx_alias_templates
-         cxx_auto_type
-@@ -1038,7 +1037,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.65.1" "1.65.0" "1.65"
-+    "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
-     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
-@@ -1385,8 +1384,11 @@ if(Boost_DEBUG)
- endif()
- 
- #======================
--# Systematically build up the Boost ABI tag
--# http://boost.org/doc/libs/1_41_0/more/getting_started/windows.html#library-naming
-+# Systematically build up the Boost ABI tag for the 'tagged' and 'versioned' layouts
-+# http://boost.org/doc/libs/1_66_0/more/getting_started/windows.html#library-naming
-+# http://boost.org/doc/libs/1_66_0/boost/config/auto_link.hpp
-+# http://boost.org/doc/libs/1_66_0/tools/build/src/tools/common.jam
-+# http://boost.org/doc/libs/1_66_0/boostcpp.jam
- set( _boost_RELEASE_ABI_TAG "-")
- set( _boost_DEBUG_ABI_TAG   "-")
- # Key       Use this library when:
-@@ -1418,11 +1420,40 @@ if(Boost_USE_STLPORT)
-   string(APPEND _boost_DEBUG_ABI_TAG "p")
- endif()
- #  n        using the STLport deprecated "native iostreams" feature
-+#           removed from the documentation in 1.43.0 but still present in
-+#           boost/config/auto_link.hpp
- if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
-   string(APPEND _boost_RELEASE_ABI_TAG "n")
-   string(APPEND _boost_DEBUG_ABI_TAG "n")
- endif()
- 
-+#  -x86     Architecture and address model tag
-+#           First character is the architecture, then word-size, either 32 or 64
-+#           Only used in 'versioned' layout, added in Boost 1.66.0
-+set(_boost_ARCHITECTURE_TAG "")
-+# {CMAKE_CXX_COMPILER_ARCHITECTURE_ID} is not currently set for all compilers
-+if(NOT "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x" AND NOT Boost_VERSION VERSION_LESS 106600)
-+  string(APPEND _boost_ARCHITECTURE_TAG "-")
-+  # This needs to be kept in-sync with the section of CMakePlatformId.h.in
-+  # inside 'defined(_WIN32) && defined(_MSC_VER)'
-+  if(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "IA64")
-+    string(APPEND _boost_ARCHITECTURE_TAG "i")
-+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "X86"
-+            OR ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "x64")
-+    string(APPEND _boost_ARCHITECTURE_TAG "x")
-+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} MATCHES "^ARM")
-+    string(APPEND _boost_ARCHITECTURE_TAG "a")
-+  elseif(${CMAKE_CXX_COMPILER_ARCHITECTURE_ID} STREQUAL "MIPS")
-+    string(APPEND _boost_ARCHITECTURE_TAG "m")
-+  endif()
-+
-+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+    string(APPEND _boost_ARCHITECTURE_TAG "64")
-+  else()
-+    string(APPEND _boost_ARCHITECTURE_TAG "32")
-+  endif()
-+endif()
-+
- if(Boost_DEBUG)
-   message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
-     "_boost_RELEASE_ABI_TAG = ${_boost_RELEASE_ABI_TAG}")
-@@ -1470,6 +1501,7 @@ foreach(c DEBUG RELEASE)
-       ${Boost_INCLUDE_DIR}/stage/lib
-       )
-     _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
-+    _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}")
-     if( Boost_NO_SYSTEM_PATHS )
-       list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
-     else()
-@@ -1616,22 +1648,22 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
-   unset(_boost_RELEASE_NAMES)
-   foreach(compiler IN LISTS _boost_COMPILER)
-     list(APPEND _boost_RELEASE_NAMES
--      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
-   endforeach()
-   list(APPEND _boost_RELEASE_NAMES
--    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-   if(_boost_STATIC_RUNTIME_WORKAROUND)
-     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
-     foreach(compiler IN LISTS _boost_COMPILER)
-       list(APPEND _boost_RELEASE_NAMES
--        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-     endforeach()
-     list(APPEND _boost_RELEASE_NAMES
--      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
-@@ -1666,11 +1698,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
-   unset(_boost_DEBUG_NAMES)
-   foreach(compiler IN LISTS _boost_COMPILER)
-     list(APPEND _boost_DEBUG_NAMES
--      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
-   endforeach()
-   list(APPEND _boost_DEBUG_NAMES
--    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+    ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
-     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
-@@ -1678,11 +1710,11 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
-     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
-     foreach(compiler IN LISTS _boost_COMPILER)
-       list(APPEND _boost_DEBUG_NAMES
--        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+        ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-         ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-     endforeach()
-     list(APPEND _boost_DEBUG_NAMES
--      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+      ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
-       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-   endif()
-   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")