CVS commit: pkgsrc/devel/cmake

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jul 31 09:02:31 UTC 2020

Modified Files:
        pkgsrc/devel/cmake: Makefile.common PLIST distinfo
        pkgsrc/devel/cmake/patches: patch-Modules_Platform_UnixPaths.cmake
Added Files:
        pkgsrc/devel/cmake: version.mk
Removed Files:
        pkgsrc/devel/cmake: Makefile.version PLIST.Cygwin
        pkgsrc/devel/cmake/patches: patch-Source_cmWorkerPool.cxx

Log Message:
cmake: update to 3.18.1.

Some of the more significant changes in CMake 3.18 are:

* The “CUDA” language can now be compiled using Clang on non-Windows platforms.
  Separable compilation is not yet supported on any platform.
* “cmake(1)” gained support for profiling of CMake scripts through the
  parameters “–profiling-output” and “–profiling-format”.
* The “add_library()” and “add_executable()” commands learned to
  create Alias Targets referencing non-“GLOBAL” Imported Targets.
* The “cmake_language()” command was added for meta-operations on
  scripted or built-in commands, starting with a mode to “CALL” other
  commands, and “EVAL CODE” to inplace evaluate a CMake script.
* The “file(CONFIGURE)” subcommand was created in order to replicate
  the “configure_file()” functionality without resorting to a pre-
  existing file on disk as input. The content is instead passed as a
  string.
* The “find_program()”, “find_library()”, “find_path()” and
  “find_file()” commands gained a new “REQUIRED” option that will stop
  processing with an error message if nothing is found.
* A “CMAKE_CUDA_ARCHITECTURES” variable was added to specify CUDA
  output architectures. Users are encouraged to use this instead of
  specifying options manually, as this approach is compiler-agnostic.
  The variable is initialized automatically when
  “CMAKE_CUDA_COMPILER_ID” is “NVIDIA”. The variable is used to
  initialize the new “CUDA_ARCHITECTURES” target property. See policy
  “CMP0104”.
* The “UNITY_BUILD_MODE” target property was added to tell generators
  which algorithm (“BATCH”, “GROUP”) to use for grouping included source
  files.
* The “CheckLinkerFlag” module has been added to provide a facility to
  check validity of link flags.
* The “$<DEVICE_LINK:…>” and “$<HOST_LINK:…>” “generator
  expressions” were added to manage device and host link steps.
* The “$<LINK_LANGUAGE:…>” and “$<LINK_LANG_AND_ID:…>” “generator expressions” were added.
* “ctest(1)” gained a new “CTEST_RESOURCE_SPEC_FILE” variable, which
  can be used to specify a resource specification file.
* “ccmake(1)” learned to read a “CCMAKE_COLORS” environment variable
  to customize colors.
* On Windows, the “Ninja” and “Ninja Multi-Config” generators, when a
  compiler is not explicitly specified, now select the first compiler
  (of any name) found in directories listed by the “PATH” environment
  variable.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/cmake/Makefile.common
cvs rdiff -u -r1.58 -r0 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.61 -r1.62 pkgsrc/devel/cmake/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/cmake/PLIST.Cygwin
cvs rdiff -u -r1.160 -r1.161 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake/version.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_cmWorkerPool.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile.common
diff -u pkgsrc/devel/cmake/Makefile.common:1.1 pkgsrc/devel/cmake/Makefile.common:1.2
--- pkgsrc/devel/cmake/Makefile.common:1.1      Wed Nov 27 22:33:03 2019
+++ pkgsrc/devel/cmake/Makefile.common  Fri Jul 31 09:02:31 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2019/11/27 22:33:03 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2020/07/31 09:02:31 wiz Exp $
 # used by devel/cmake-gui/Makefile
 
-.include "Makefile.version"
+.include "version.mk"
 
 DISTNAME=      cmake-${CMAKE_VERSION}
 CATEGORIES=    devel

Index: pkgsrc/devel/cmake/PLIST
diff -u pkgsrc/devel/cmake/PLIST:1.61 pkgsrc/devel/cmake/PLIST:1.62
--- pkgsrc/devel/cmake/PLIST:1.61       Mon Jun  1 06:21:27 2020
+++ pkgsrc/devel/cmake/PLIST    Fri Jul 31 09:02:31 2020
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.61 2020/06/01 06:21:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.62 2020/07/31 09:02:31 wiz Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
 bin/ctest
 share/aclocal/cmake.m4
+share/bash-completion/completions/cmake
+share/bash-completion/completions/cpack
+share/bash-completion/completions/ctest
+share/cmake-${CMAKE_API}/Help/command/DEVICE_LINK_OPTIONS.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ORDER.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ROOT.txt
@@ -25,6 +29,7 @@ share/cmake-${CMAKE_API}/Help/command/br
 share/cmake-${CMAKE_API}/Help/command/build_command.rst
 share/cmake-${CMAKE_API}/Help/command/build_name.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_host_system_information.rst
+share/cmake-${CMAKE_API}/Help/command/cmake_language.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_minimum_required.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_parse_arguments.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_policy.rst
@@ -149,6 +154,7 @@ share/cmake-${CMAKE_API}/Help/cpack_gen/
 share/cmake-${CMAKE_API}/Help/envvar/ASM_DIALECT.rst
 share/cmake-${CMAKE_API}/Help/envvar/ASM_DIALECTFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CC.rst
+share/cmake-${CMAKE_API}/Help/envvar/CCMAKE_COLORS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_CONFIG_TYPE.rst
@@ -161,6 +167,7 @@ share/cmake-${CMAKE_API}/Help/envvar/CMA
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_NO_VERBOSE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst
+share/cmake-${CMAKE_API}/Help/envvar/CMAKE_PREFIX_PATH.rst
 share/cmake-${CMAKE_API}/Help/envvar/CSFLAGS.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst
 share/cmake-${CMAKE_API}/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst
@@ -304,6 +311,7 @@ share/cmake-${CMAKE_API}/Help/module/Che
 share/cmake-${CMAKE_API}/Help/module/CheckIncludeFiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckLanguage.rst
 share/cmake-${CMAKE_API}/Help/module/CheckLibraryExists.rst
+share/cmake-${CMAKE_API}/Help/module/CheckLinkerFlag.rst
 share/cmake-${CMAKE_API}/Help/module/CheckOBJCCompilerFlag.rst
 share/cmake-${CMAKE_API}/Help/module/CheckOBJCSourceCompiles.rst
 share/cmake-${CMAKE_API}/Help/module/CheckOBJCSourceRuns.rst
@@ -612,6 +620,12 @@ share/cmake-${CMAKE_API}/Help/policy/CMP
 share/cmake-${CMAKE_API}/Help/policy/CMP0100.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0101.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0102.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0103.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0104.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0105.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0106.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0107.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0108.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
@@ -708,6 +722,7 @@ share/cmake-${CMAKE_API}/Help/prop_sf/CO
 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/Fortran_PREPROCESS.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
@@ -727,12 +742,14 @@ share/cmake-${CMAKE_API}/Help/prop_sf/SK
 share/cmake-${CMAKE_API}/Help/prop_sf/SYMBOLIC.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/Swift_DIAGNOSTICS_FILE.rst
+share/cmake-${CMAKE_API}/Help/prop_sf/UNITY_GROUP.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_sf/VS_CSHARP_tagname.rst
 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_SETTINGS.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
@@ -776,6 +793,7 @@ share/cmake-${CMAKE_API}/Help/prop_test/
 share/cmake-${CMAKE_API}/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AIX_EXPORT_ALL_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ALIASED_TARGET.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ALIAS_GLOBAL.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_API.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_API_MIN.rst
@@ -840,6 +858,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/C
 share/cmake-${CMAKE_API}/Help/prop_tgt/CONFIG_OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CONFIG_POSTFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_PTX_COMPILATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst
@@ -871,9 +890,11 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/E
 share/cmake-${CMAKE_API}/Help/prop_tgt/EchoString.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FOLDER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FRAMEWORK.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/Fortran_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/Fortran_MODULE_DIRECTORY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/Fortran_PREPROCESS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/GENERATOR_FILE_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/GHS_INTEGRITY_APP.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/GHS_NO_SOURCE_GROUP_FILE.rst
@@ -983,6 +1004,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/O
 share/cmake-${CMAKE_API}/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/OUTPUT_NAME_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/PCH_WARN_INVALID.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_NAME_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/PDB_NOTE.txt
@@ -1022,6 +1044,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/U
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/UNITY_BUILD_MODE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst
@@ -1048,12 +1071,15 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/V
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_NO_SOLUTION_DEPLOY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_PROJECT_IMPORT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_AUXPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_LOCALPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_PROJECTNAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SCC_PROVIDER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SDK_REFERENCES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_USER_PROPS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_COMPONENT.rst
@@ -1089,7 +1115,6 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/X
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCTEST.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
 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
@@ -1099,6 +1124,8 @@ share/cmake-${CMAKE_API}/Help/release/3.
 share/cmake-${CMAKE_API}/Help/release/3.14.rst
 share/cmake-${CMAKE_API}/Help/release/3.15.rst
 share/cmake-${CMAKE_API}/Help/release/3.16.rst
+share/cmake-${CMAKE_API}/Help/release/3.17.rst
+share/cmake-${CMAKE_API}/Help/release/3.18.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
@@ -1195,6 +1222,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CROSS_CONFIGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CTEST_ARGUMENTS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CTEST_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_ARCHITECTURES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_COMPILE_FEATURES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
@@ -1282,12 +1310,14 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FOLDER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FRAMEWORK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_FORMAT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst
 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_Fortran_PREPROCESS.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
@@ -1451,6 +1481,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_OSX_VARIABLE.txt
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PARENT_LIST_FILE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PATCH_VERSION.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_PCH_WARN_INVALID.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_POLICY_DEFAULT_CMPNNNN.rst
@@ -1646,6 +1677,7 @@ share/cmake-${CMAKE_API}/Help/variable/C
 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_RESOURCE_SPEC_FILE.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
@@ -1889,6 +1921,7 @@ share/cmake-${CMAKE_API}/Modules/CheckIn
 share/cmake-${CMAKE_API}/Modules/CheckLanguage.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.cmake
 share/cmake-${CMAKE_API}/Modules/CheckLibraryExists.lists.in
+share/cmake-${CMAKE_API}/Modules/CheckLinkerFlag.cmake
 share/cmake-${CMAKE_API}/Modules/CheckOBJCCompilerFlag.cmake
 share/cmake-${CMAKE_API}/Modules/CheckOBJCSourceCompiles.cmake
 share/cmake-${CMAKE_API}/Modules/CheckOBJCSourceRuns.cmake
@@ -1936,6 +1969,7 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CUDA.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Clang-CXX.cmake
@@ -2009,7 +2043,10 @@ share/cmake-${CMAKE_API}/Modules/Compile
 share/cmake-${CMAKE_API}/Modules/Compiler/NAG-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NVIDIA-CUDA.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/NVIDIA-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/OpenWatcom.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/PGI-DetermineCompiler.cmake
@@ -2084,6 +2121,7 @@ share/cmake-${CMAKE_API}/Modules/DummyCX
 share/cmake-${CMAKE_API}/Modules/ExternalData.cmake
 share/cmake-${CMAKE_API}/Modules/ExternalData_config.cmake.in
 share/cmake-${CMAKE_API}/Modules/ExternalProject-download.cmake.in
+share/cmake-${CMAKE_API}/Modules/ExternalProject-gitupdate.cmake.in
 share/cmake-${CMAKE_API}/Modules/ExternalProject-verify.cmake.in
 share/cmake-${CMAKE_API}/Modules/ExternalProject.cmake
 share/cmake-${CMAKE_API}/Modules/FLTKCompatibility.cmake
@@ -2470,6 +2508,10 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CrayLinuxEnvironment.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/DOS-OpenWatcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/DOS-OpenWatcom-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/DOS-OpenWatcom.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/DOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Determine-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Initialize.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin.cmake
@@ -2515,6 +2557,9 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Intel.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-NAG-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-OpenWatcom.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-PGI-Fortran.cmake
@@ -2537,6 +2582,10 @@ share/cmake-${CMAKE_API}/Modules/Platfor
 share/cmake-${CMAKE_API}/Modules/Platform/Midipix.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/MirBSD.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/NetBSD.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/OS2-OpenWatcom-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/OS2-OpenWatcom-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/OS2-OpenWatcom.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/OS2.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/OSF1.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/OpenBSD.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/OpenVMS.cmake
@@ -2663,6 +2712,7 @@ share/cmake-${CMAKE_API}/Modules/TestFor
 share/cmake-${CMAKE_API}/Modules/TestForSTDNamespace.cxx
 share/cmake-${CMAKE_API}/Modules/UseEcos.cmake
 share/cmake-${CMAKE_API}/Modules/UseJava.cmake
+share/cmake-${CMAKE_API}/Modules/UseJava/ClearClassFiles.cmake
 share/cmake-${CMAKE_API}/Modules/UseJavaClassFilelist.cmake
 share/cmake-${CMAKE_API}/Modules/UseJavaSymlinks.cmake
 share/cmake-${CMAKE_API}/Modules/UsePkgConfig.cmake
@@ -2732,12 +2782,9 @@ share/cmake-${CMAKE_API}/Templates/Windo
 share/cmake-${CMAKE_API}/Templates/Windows/SplashScreen.png
 share/cmake-${CMAKE_API}/Templates/Windows/StoreLogo.png
 share/cmake-${CMAKE_API}/Templates/Windows/Windows_TemporaryKey.pfx
-share/cmake-${CMAKE_API}/completions/cmake
-share/cmake-${CMAKE_API}/completions/cpack
-share/cmake-${CMAKE_API}/completions/ctest
-share/cmake-${CMAKE_API}/editors/emacs/cmake-mode.el
-share/cmake-${CMAKE_API}/editors/vim/indent/cmake.vim
-share/cmake-${CMAKE_API}/editors/vim/syntax/cmake.vim
 share/cmake-${CMAKE_API}/include/cmCPluginAPI.h
 share/doc/cmake-${CMAKE_API}/Copyright.txt
 share/doc/cmake-${CMAKE_API}/cmsys/Copyright.txt
+share/emacs/site-lisp/cmake-mode.el
+share/vim/vimfiles/indent/cmake.vim
+share/vim/vimfiles/syntax/cmake.vim

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.160 pkgsrc/devel/cmake/distinfo:1.161
--- pkgsrc/devel/cmake/distinfo:1.160   Mon Jun  8 12:00:59 2020
+++ pkgsrc/devel/cmake/distinfo Fri Jul 31 09:02:31 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.160 2020/06/08 12:00:59 kamil Exp $
+$NetBSD: distinfo,v 1.161 2020/07/31 09:02:31 wiz Exp $
 
-SHA1 (cmake-3.17.3.tar.gz) = faef76cfc9f07cae7eecee72eba0d28abbbac5b4
-RMD160 (cmake-3.17.3.tar.gz) = 3dbfa61d6a51c1190bba6b0423dd3d227906a24c
-SHA512 (cmake-3.17.3.tar.gz) = 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
-Size (cmake-3.17.3.tar.gz) = 9470753 bytes
+SHA1 (cmake-3.18.1.tar.gz) = 60c36386d0df016adc96c8bb3215d02de3777869
+RMD160 (cmake-3.18.1.tar.gz) = 3ed2d64fe8640f05522570cb9000e31f20477d7e
+SHA512 (cmake-3.18.1.tar.gz) = e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
+Size (cmake-3.18.1.tar.gz) = 8969366 bytes
 SHA1 (patch-CMakeLists.txt) = fabdb0590f4b97c34c2242749ae3b6af18aefc0a
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 98cac805a6abafcfb8b61e441b50a1d6aec27ad0
@@ -11,14 +11,13 @@ SHA1 (patch-Modules_FindGTK2.cmake) = 51
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
-SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
+SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
 SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
 SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = c86cae48f7b39fb735eba4788d4e9d595b2ccf3b
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
-SHA1 (patch-Source_cmWorkerPool.cxx) = 8eb3faf10767fe9228ed6822c17c96c04f017777
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
 SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd

Index: pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake
diff -u pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake:1.1 pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake:1.2
--- pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake:1.1       Wed Jul 19 17:44:34 2017
+++ pkgsrc/devel/cmake/patches/patch-Modules_Platform_UnixPaths.cmake   Fri Jul 31 09:02:31 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-Modules_Platform_UnixPaths.cmake,v 1.1 2017/07/19 17:44:34 adam Exp $
+$NetBSD: patch-Modules_Platform_UnixPaths.cmake,v 1.2 2020/07/31 09:02:31 wiz Exp $
 
 Patch in pkgsrc paths for finding stuff.
 
---- Modules/Platform/UnixPaths.cmake.orig      2017-07-18 15:22:54.000000000 +0000
+--- Modules/Platform/UnixPaths.cmake.orig      2020-07-15 11:19:20.000000000 +0000
 +++ Modules/Platform/UnixPaths.cmake
-@@ -23,7 +23,7 @@ get_filename_component(_CMAKE_INSTALL_DI
- # search types.
+@@ -27,7 +27,7 @@ get_filename_component(_CMAKE_INSTALL_DI
+ # synchronized
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
 -  /usr/local /usr /
@@ -13,7 +13,7 @@ Patch in pkgsrc paths for finding stuff.
  
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
-@@ -43,20 +43,20 @@ endif()
+@@ -47,20 +47,20 @@ endif()
  
  # Non "standard" but common install prefixes
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH

Added files:

Index: pkgsrc/devel/cmake/version.mk
diff -u /dev/null pkgsrc/devel/cmake/version.mk:1.1
--- /dev/null   Fri Jul 31 09:02:31 2020
+++ pkgsrc/devel/cmake/version.mk       Fri Jul 31 09:02:31 2020
@@ -0,0 +1,6 @@
+# $NetBSD: version.mk,v 1.1 2020/07/31 09:02:31 wiz Exp $
+# used by devel/cmake/Makefile.common
+# used by devel/cmake-fedora/Makefile
+
+CMAKE_VERSION= 3.18.1
+CMAKE_API=     ${CMAKE_VERSION:R}