Update cmake to 3.4.0:

CMake 3.4 Release Notes
***********************

Changes made since CMake 3.3 include the following.

New Features
============

Generators
----------

* The :generator:`Visual Studio 14 2015` generator learned to select
  a Windows 10 SDK based on the value of the :variable:`CMAKE_SYSTEM_VERSION`
  variable and the SDKs available on the host.

* CMake learned rudimentary support for the Apple Swift language.  When using
  the :generator:`Xcode` generator with Xcode 6.1 or higher, one may enable
  the ``Swift`` language with the :command:`enable_language` command or the
  :command:`project` command (this is an error with other generators or when
  Xcode is too old).  Then one may list ``.swift`` source files in targets
  for compilation.

Commands
--------

* The :command:`find_program` command learned a ``NAMES_PER_DIR``
  option to consider all given ``NAMES`` in each directory before
  moving on to the next directory.

* The :command:`get_filename_component` command learned a new ``BASE_DIR``
  subcommand.  This is used to specify a base directory when calculating an
  absolute path from a relative path.

* The :command:`if` command learned a new ``TEST`` operator that evaluates
  to true if a given test name has been defined by the :command:`add_test`
  command.  See policy :policy:`CMP0064`.

* The :command:`install(DIRECTORY)` command ``DESTINATION`` option learned to
  support :manual:`generator expressions <cmake-generator-expressions(7)>`.

* The :command:`install(FILES)` command ``DESTINATION`` option learned to
  support :manual:`generator expressions <cmake-generator-expressions(7)>`.

* The :command:`string` command learned a new ``APPEND`` subcommand.

Variables
---------

* The :ref:`Makefile Generators` and the :generator:`Ninja` generator
  learned to add compiler launcher tools like distcc and ccache along
  with the compiler for ``C`` and ``CXX`` languages.  See the
  :variable:`CMAKE_<LANG>_COMPILER_LAUNCHER` variable and
  :prop_tgt:`<LANG>_COMPILER_LAUNCHER` target property for details.

* New :variable:`CMAKE_LINK_SEARCH_START_STATIC` and
  :variable:`CMAKE_LINK_SEARCH_END_STATIC` variables were
  introduced to initialize the
  :prop_tgt:`LINK_SEARCH_START_STATIC` and
  :prop_tgt:`LINK_SEARCH_END_STATIC` target properties,
  respectively.

Properties
----------

* :ref:`Visual Studio Generators` learned to support additonal
  target properties to customize projects for NVIDIA Nsight
  Tegra Visual Studio Edition:

  * :prop_tgt:`ANDROID_ANT_ADDITIONAL_OPTIONS`
  * :prop_tgt:`ANDROID_ARCH`
  * :prop_tgt:`ANDROID_ASSETS_DIRECTORIES`
  * :prop_tgt:`ANDROID_JAR_DEPENDENCIES`
  * :prop_tgt:`ANDROID_JAR_DIRECTORIES`
  * :prop_tgt:`ANDROID_JAVA_SOURCE_DIR`
  * :prop_tgt:`ANDROID_NATIVE_LIB_DEPENDENCIES`
  * :prop_tgt:`ANDROID_NATIVE_LIB_DIRECTORIES`
  * :prop_tgt:`ANDROID_PROCESS_MAX`
  * :prop_tgt:`ANDROID_PROGUARD`
  * :prop_tgt:`ANDROID_PROGUARD_CONFIG_PATH`
  * :prop_tgt:`ANDROID_SECURE_PROPS_PATH`
  * :prop_tgt:`ANDROID_SKIP_ANT_STEP`
  * :prop_tgt:`ANDROID_STL_TYPE`

* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
  :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
  :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
  support :manual:`generator expressions <cmake-generator-expressions(7)>`.

* The :prop_tgt:`SOURCE_DIR` and :prop_tgt:`BINARY_DIR` target properties
  were introduced to allow project code to query where a target is defined.

* The :prop_tgt:`OUTPUT_NAME` target property and its variants learned to
  support :manual:`generator expressions <cmake-generator-expressions(7)>`.

* A :prop_gbl:`TARGET_MESSAGES` global property was added to tell the
  :ref:`Makefile Generators` whether to generate commands to print output
  after each target is completed.

* On Windows with MS-compatible tools, CMake learned to optionally
  generate a module definition (``.def``) file for ``SHARED`` libraries.
  See the :prop_tgt:`WINDOWS_EXPORT_ALL_SYMBOLS` target property.

Modules
-------

* The :module:`ExternalProject` module :command:`ExternalProject_Add`
  function ``GIT_SUBMODULES`` option now also limits the set of
  submodules that are initialized in addition to the prior behavior
  of limiting the set of submodules that are updated.

* The :module:`ExternalProject` module learned new ``USES_TERMINAL``
  arguments for giving steps exclusive terminal access.  This is
  useful with the :generator:`Ninja` generator to monitor CMake
  superbuild progress and prevent CPU oversubscription.

* The :module:`FindBISON` module ``BISON_TARGET`` macro learned a
  new ``DEFINES_FILE`` option to specify a custom output header
  to be generated.

* The :module:`FindHDF5` module learend a new ``HDF5_PREFER_PARALLEL``
  option allowing users to specify that a parallel HDF5 tool is
  preferred if both are available.

* The :module:`FindIce` module now provides imported targets.

* The :module:`FindJava` module learned to optionally find
  the ``idlj`` and ``jarsigner`` tools.

* The :module:`FindOpenSSL` module now provides imported targets.

* The :module:`FindOpenSSL` module learned a new ``OPENSSL_USE_STATIC_LIBS``
  option to search only for static libraries.

* The :module:`FindPkgConfig` learned a new :command:`pkg_get_variable`
  command which may be used to query for arbitrary variables from a package
  (such as for related tools or data and plugin install paths).

* The :module:`FindProtobuf` module gained a new
  :command:`protobuf_generate_python` function to generate python
  sources from ``.proto`` files.

* The :module:`FindTIFF` module learned to search separately for
  debug and release variants.

* The :module:`FindwxWidgets` module learned to support version requests.

* The :module:`FindXercesC` module learned to search separately for
  debug and release variants.

* The :module:`FindZLIB` module learned to search separately for
  debug and release variants.

* The :module:`GNUInstallDirs` module learned special default values
  for certain installation prefixes according to the `GNU Coding
  Standards`_ and the `Filesystem Hierarchy Standard`_.

* The :module:`UseJava` module ``add_jar`` function learned
  to support response files (e.g. ``@srcs.txt``) for source
  specification.

* The :module:`UseJava` module ``install_jar`` function learned
  new ``DESTINATION`` and ``COMPONENT`` options to specify
  the corresponding :command:`install` command options.

* The :module:`UseJava` module gained a new ``create_javah``
  function to create C headers from Java classes.

.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html

Generator Expressions
---------------------

* A new ``$<SHELL_PATH:...>``
  :manual:`generator expression <cmake-generator-expressions(7)>`
  has been added.

CTest
-----

* CTest learned to optionally measure the CPU load during parallel
  testing and avoid starting tests that may cause the load to exceed
  a given threshold.  See the :manual:`ctest(1)` command ``--test-load``
  option, the ``TestLoad`` setting of the :ref:`CTest Test Step`,
  the :variable:`CTEST_TEST_LOAD` variable, and the ``TEST_LOAD``
  option of the :command:`ctest_test` command.

* :manual:`ctest(1)` learned options
  ``--test-output-size-passed`` and ``--test-output-size-failed``
  to customize the limit on test output size submitted when
  running as a :ref:`Dashboard Client`.

CPack
-----

* The :module:`CPackDeb` module learned to set package dependencies
  per component.  See variables:

  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_BREAKS`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_CONFLICTS`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_ENHANCES`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PREDEPENDS`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_PROVIDES`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_RECOMMENDS`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_REPLACES`
  * :variable:`CPACK_DEBIAN_<COMPONENT>_PACKAGE_SUGGESTS`

* The :module:`CPack` module learned to package empty directories.

* The :module:`CPack` module gained a new setting, ``CPACK_VERBATIM_VARIABLES``,
  which can be used to ensure the cpack program receives the settings' values
  exactly as they were set, even if they contain CMake-special characters.
  For compatibility, it's off by default.

Other
-----

* The :manual:`Compile Features <cmake-compile-features(7)>` functionality
  is now aware of features supported by GNU C compilers on Windows.

* CMake learned to honor ``*.manifest`` source files with MSVC tools.
  Manifest files named as sources of ``.exe`` and ``.dll`` targets
  will be merged with linker-generated manifests and embedded in the
  binary.

* The `Concurrent Fortran 77 <https://ccur.com>`__ compiler is now supported.
  Its :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` is ``CCur``.

* :manual:`cmake(1)` gained a new ``--trace-expand`` command line option
  that is like ``--trace`` but expands variable references in the output.

Deprecated and Removed Features
===============================

* The :module:`CMakeExpandImportedTargets` module is now documented
  as deprecated.  See module documentation for an explanation.

* The :variable:`CMAKE_USE_RELATIVE_PATHS` variable no longer has any
  effect.  Previously it was partially implemented and unreliable.

Other Changes
=============

* The :module:`CheckFunctionExists`, :module:`CheckLibraryExists`,
  :module:`CheckSymbolExists`, and :module:`FindThreads` modules learned to
  work in environments where only CXX is enabled.

* The :module:`CPackDeb` module now correctly excludes symlinks during package
  checksum calculation.

* The :module:`CPackDeb` no longer uses fakeroot and system tar program for
  packaging.

* The :module:`CPack` module no longer mangles settings with CMake-special
  characters when they're used as defaults for other settings. The macro
  ``cpack_set_if_not_set``, which was responsible for this, is now deprecated.

* CMake no longer links executables with flags to export symbols
  unless the :prop_tgt:`ENABLE_EXPORTS` target property is set.
  See policy :policy:`CMP0065`.

* The ``SONAME`` field is no longer set for ``MODULE`` libraries
  created with the :command:`add_library` command.  ``MODULE``
  libraries are meant for explicit dynamic loading at runtime.
  They cannot be linked so ``SONAME`` is not useful.

* The internal :variable:`CMAKE_<LANG>_COMPILE_OBJECT` rule variable now
  substitutes compiler include flags in a separate ``<INCLUDES>`` placeholder
  instead of the main ``<FLAGS>`` placeholder.

10 files changed, 102 insertions, 231 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 8dc2ad8b8b9..206dd210900 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.107 2015/10/27 09:04:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.108 2015/11/17 12:12:11 wiz Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.2
-PKGREVISION=	1
+DISTNAME=	cmake-${CMAKE_API}.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
-CMAKE_API=	3.3
+CMAKE_API=	3.4
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cmake.org/
@@ -64,7 +63,7 @@ pre-configure:
 	    ${WRKSRC}/Modules/Platform/SunOS-Clang-${lang}.cmake
 .endfor
 
-INCOMPAT_CURSES=	NetBSD-[0-5].*
+INCOMPAT_CURSES=	NetBSD-[0-5].*-*
 
 BUILDLINK_API_DEPENDS.libarchive+=	libarchive>=3.0.0
 .include "../../archivers/libarchive/buildlink3.mk"
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 9a4fa973a94..540564f00fe 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.39 2015/10/27 09:04:38 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.40 2015/11/17 12:12:11 wiz Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
 bin/ctest
 share/aclocal/cmake.m4
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX.txt
-share/cmake-${CMAKE_API}/Help/command/FIND_XXX_MAC.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ORDER.txt
 share/cmake-${CMAKE_API}/Help/command/FIND_XXX_ROOT.txt
 share/cmake-${CMAKE_API}/Help/command/add_compile_options.rst
@@ -468,6 +467,8 @@ share/cmake-${CMAKE_API}/Help/policy/CMP0060.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0061.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0062.rst
 share/cmake-${CMAKE_API}/Help/policy/CMP0063.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0064.rst
+share/cmake-${CMAKE_API}/Help/policy/CMP0065.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
@@ -526,6 +527,7 @@ share/cmake-${CMAKE_API}/Help/prop_gbl/RULE_LAUNCH_CUSTOM.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/RULE_LAUNCH_LINK.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/RULE_MESSAGES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
+share/cmake-${CMAKE_API}/Help/prop_gbl/TARGET_MESSAGES.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
 share/cmake-${CMAKE_API}/Help/prop_gbl/USE_FOLDERS.rst
 share/cmake-${CMAKE_API}/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
@@ -580,9 +582,23 @@ share/cmake-${CMAKE_API}/Help/prop_test/TIMEOUT.rst
 share/cmake-${CMAKE_API}/Help/prop_test/WILL_FAIL.rst
 share/cmake-${CMAKE_API}/Help/prop_test/WORKING_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ALIASED_TARGET.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
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_ARCH.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_GUI.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_PROCESS_MAX.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_PROGUARD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/ANDROID_STL_TYPE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
@@ -594,6 +610,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTORCC_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOUIC.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/AUTOUIC_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/BINARY_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -630,6 +647,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/EXPORT_NAME.rst
 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_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/GENERATOR_FILE_NAME.rst
@@ -675,6 +693,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_COMPILE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_LINK.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LABELS.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_COMPILER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
@@ -729,6 +748,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/RUNTIME_OUTPUT_NAME.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/RUNTIME_OUTPUT_NAME_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/SKIP_BUILD_RPATH.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/SOURCES.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/SOURCE_DIR.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/SOVERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
@@ -736,21 +756,27 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/TYPE.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_DESKTOP_EXTENSIONS_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_REFERENCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_PROJECT_TYPES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_ROOTNAMESPACE.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_GLOBAL_variable.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_KEYWORD.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.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_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_COMPONENT.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/VS_WINRT_REFERENCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/WIN32_EXECUTABLE.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XCTEST.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
@@ -759,15 +785,30 @@ 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.2.rst
 share/cmake-${CMAKE_API}/Help/release/3.3.rst
+share/cmake-${CMAKE_API}/Help/release/3.4.rst
 share/cmake-${CMAKE_API}/Help/release/dev.txt
 share/cmake-${CMAKE_API}/Help/release/index.rst
 share/cmake-${CMAKE_API}/Help/variable/APPLE.rst
 share/cmake-${CMAKE_API}/Help/variable/BORLAND.rst
 share/cmake-${CMAKE_API}/Help/variable/BUILD_SHARED_LIBS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_API_MIN.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ARCH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_GUI.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ANDROID_STL_TYPE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_APPBUNDLE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_AR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
@@ -821,6 +862,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_DL_LIBS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EDIT_COMMAND.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_ENABLE_EXPORTS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
@@ -829,6 +871,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_GENERATOR.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_APPBUNDLE.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_FRAMEWORK.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst
@@ -884,6 +928,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ABI.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_ID.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_LOADED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst
@@ -929,6 +974,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_INTERFACE_LIBRARIES.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MACOSX_BUNDLE.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MACOSX_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_MAJOR_VERSION.rst
@@ -986,6 +1033,8 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSROOT.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_IGNORE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_INCLUDE_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_SYSTEM_LIBRARY_PATH.rst
@@ -1011,9 +1060,11 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_DEPRECATED.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 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_PLATFORM_TOOLSET.rst
 share/cmake-${CMAKE_API}/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
@@ -1029,12 +1080,31 @@ share/cmake-${CMAKE_API}/Help/variable/CTEST_BUILD_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_BUILD_NAME.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_BZR_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_BZR_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CHANGE_ID.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CHECKOUT_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CONFIGURATION_TYPE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CONFIGURE_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_COVERAGE_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_COVERAGE_EXTRA_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CURL_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_POST_TEST.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_PRE_TEST.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_CUSTOM_XXX.txt
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_CHECKOUT.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst
@@ -1044,6 +1114,7 @@ share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_CDASH.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_PASSWORD.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_DROP_SITE_USER.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst
@@ -1065,6 +1136,7 @@ share/cmake-${CMAKE_API}/Help/variable/CTEST_SOURCE_DIRECTORY.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_COMMAND.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_OPTIONS.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_SVN_UPDATE_OPTIONS.rst
+share/cmake-${CMAKE_API}/Help/variable/CTEST_TEST_LOAD.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_TEST_TIMEOUT.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_TRIGGER_SITE.rst
 share/cmake-${CMAKE_API}/Help/variable/CTEST_UPDATE_COMMAND.rst
@@ -1140,7 +1212,6 @@ share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerABI.cpp
 share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerId.cpp.in
 share/cmake-${CMAKE_API}/Modules/CMakeCXXInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
-share/cmake-${CMAKE_API}/Modules/CMakeClDeps.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCommonLanguageInclude.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCompilerABI.h
 share/cmake-${CMAKE_API}/Modules/CMakeCompilerIdDetection.cmake
@@ -1159,6 +1230,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeDetermineCompilerId.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineRCCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeDetermineSwiftCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineSystem.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeDetermineVSServicePack.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeExpandImportedTargets.cmake
@@ -1199,6 +1271,8 @@ share/cmake-${CMAKE_API}/Modules/CMakePrintSystemInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakePushCheckState.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeRCCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeRCInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeSwiftCompiler.cmake.in
+share/cmake-${CMAKE_API}/Modules/CMakeSwiftInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeSystem.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeSystemSpecificInitialize.cmake
@@ -1213,6 +1287,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeTestFortranCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestGNU.c
 share/cmake-${CMAKE_API}/Modules/CMakeTestJavaCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestRCCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeTestSwiftCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeTestWatcomVersion.c
 share/cmake-${CMAKE_API}/Modules/CMakeUnixFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeVS6BackwardCompatibility.cmake
@@ -1287,6 +1362,7 @@ share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Borland-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CCur-Fortran.cmake
 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
@@ -1398,6 +1474,7 @@ share/cmake-${CMAKE_API}/Modules/CompilerId/VS-NsightTegra.vcxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-1.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-2.pbxproj.in
 share/cmake-${CMAKE_API}/Modules/CompilerId/Xcode-3.pbxproj.in
+share/cmake-${CMAKE_API}/Modules/CompilerId/main.swift.in
 share/cmake-${CMAKE_API}/Modules/Dart.cmake
 share/cmake-${CMAKE_API}/Modules/DartConfiguration.tcl.in
 share/cmake-${CMAKE_API}/Modules/DeployQt4.cmake
@@ -1605,6 +1682,8 @@ share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-XL.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/ARTOS-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/ARTOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Android.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BSDOS.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/BeOS.cmake
@@ -1670,6 +1749,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-XL-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/DragonFly.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Euros.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/FreeBSD.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/GHS-MULTI-Initialize.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/GHS-MULTI.cmake
@@ -1697,6 +1777,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/Haiku.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/IRIX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/IRIX64.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Absoft-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Platform/Linux-CCur-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Linux-Clang-CXX.cmake
@@ -1825,9 +1906,6 @@ share/cmake-${CMAKE_API}/Modules/UseJavaSymlinks.cmake
 share/cmake-${CMAKE_API}/Modules/UsePkgConfig.cmake
 share/cmake-${CMAKE_API}/Modules/UseQt4.cmake
 share/cmake-${CMAKE_API}/Modules/UseSWIG.cmake
-share/cmake-${CMAKE_API}/Modules/UseVTK40.cmake
-share/cmake-${CMAKE_API}/Modules/UseVTKBuildSettings40.cmake
-share/cmake-${CMAKE_API}/Modules/UseVTKConfig40.cmake
 share/cmake-${CMAKE_API}/Modules/Use_wxWindows.cmake
 share/cmake-${CMAKE_API}/Modules/UsewxWidgets.cmake
 share/cmake-${CMAKE_API}/Modules/VTKCompatibility.cmake
@@ -1859,6 +1937,7 @@ share/cmake-${CMAKE_API}/Templates/UtilityHeader.dsptemplate
 share/cmake-${CMAKE_API}/Templates/Windows/ApplicationIcon.png
 share/cmake-${CMAKE_API}/Templates/Windows/Logo.png
 share/cmake-${CMAKE_API}/Templates/Windows/SmallLogo.png
+share/cmake-${CMAKE_API}/Templates/Windows/SmallLogo44x44.png
 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
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 79c0fd24f7b..f7440bb8da1 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,22 +1,16 @@
-$NetBSD: distinfo,v 1.80 2015/11/03 03:27:19 agc Exp $
+$NetBSD: distinfo,v 1.81 2015/11/17 12:12:11 wiz Exp $
 
-SHA1 (cmake-3.3.2.tar.gz) = 85f4debf7406bb2a436a302bfd51ada2b4e43719
-RMD160 (cmake-3.3.2.tar.gz) = c7d3b8895e2e143b7e1019477764370535917dca
-SHA512 (cmake-3.3.2.tar.gz) = 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180
-Size (cmake-3.3.2.tar.gz) = 6578184 bytes
+SHA1 (cmake-3.4.0.tar.gz) = 986ac16b09dfa8a667c3b5da58f1ab5fe03206e8
+RMD160 (cmake-3.4.0.tar.gz) = 95d3d0cd86e17c249459975eb9b293a5075ae87a
+SHA512 (cmake-3.4.0.tar.gz) = 3600faa8475840e350954c8273829c1fb6dc63984860455b792b520e20a8fd9864c96d7afd6b42a6937624edf49b73c8807aa230a3ee9c24aa7aec136022bc90
+Size (cmake-3.4.0.tar.gz) = 6719859 bytes
 SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
-SHA1 (patch-Modules_Platform_SunOS.cmake) = 7a53ae3c902dd69ee22ef9fe0ae2a022d5284f16
-SHA1 (patch-Source_CursesDialog_cmCursesLongMessageForm.cxx) = 9b31c475571bb9a32cae8e165fa50ee6b7efd00b
-SHA1 (patch-Source_CursesDialog_cmCursesMainForm.cxx) = 2dff7b23d95cf54fb47dc8e8c61382ad7f9b2864
-SHA1 (patch-Source_CursesDialog_cmCursesStringWidget.cxx) = 04f7dedd281300bda9eb18a24f356c842f21b0ef
-SHA1 (patch-Source_CursesDialog_cmCursesWidget.cxx) = ffc07666acd449f2e822672f7540ce4bfa85ed5f
 SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92
-SHA1 (patch-Source_kwsys_SystemInformation.cxx) = e259da70601cf1b4641f253de3d4f3aaec5e68f6
+SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 5e8c8ff7875c329e48c54ee03570ea4a6d52953a
 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
-SHA1 (patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp) = 52c4cb0e8f097ada5185d1172bced3fbfc159104
 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff --git a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake b/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
deleted file mode 100644
index 82dfe17528c..00000000000
--- a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-Modules_Platform_SunOS.cmake,v 1.3 2012/11/15 19:31:55 adam Exp $
-
-Don't use gcc to link c++ libraries on SunOS,
-unless we are really using a gcc lacking libstdc++.
-
-See http://public.kitware.com/pipermail/cmake/2011-July/045300.html
-
---- Modules/Platform/SunOS.cmake.orig	2012-11-14 19:47:33.000000000 +0000
-+++ Modules/Platform/SunOS.cmake
-@@ -7,12 +7,20 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4.*")
-    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
- endif()
- 
-+# Take the default c++ shared library creation rule from the
-+# CMakeDefaultMakeRuleVariables.cmake file unless using GCC and libstdc++.so
-+# does not exist, in which case fall back to the old implementation;
-+# using gcc to invoke the linker.
- if(CMAKE_COMPILER_IS_GNUCXX)
-   if(CMAKE_COMPILER_IS_GNUCC)
--    set(CMAKE_CXX_CREATE_SHARED_LIBRARY
--        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
--  else()
--    # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
-+    execute_process(
-+      COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libstdc++.so
-+      OUTPUT_VARIABLE SHARED_LIBSTDCXX_FILENAME
-+      OUTPUT_STRIP_TRAILING_WHITESPACE)
-+    if(NOT EXISTS "${SHARED_LIBSTDCXX_FILENAME}")
-+      set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-+          "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-+    endif()
-   endif()
- endif()
- include(Platform/UnixPaths)
diff --git a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesLongMessageForm.cxx b/devel/cmake/patches/patch-Source_CursesDialog_cmCursesLongMessageForm.cxx
deleted file mode 100644
index e2a76e64d17..00000000000
--- a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesLongMessageForm.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-Source_CursesDialog_cmCursesLongMessageForm.cxx,v 1.2 2015/09/12 16:46:11 wiz Exp $
-
-printw takes a format string.
-http://public.kitware.com/Bug/view.php?id=15738
-
---- Source/CursesDialog/cmCursesLongMessageForm.cxx.orig	2015-09-07 09:50:13.000000000 +0000
-+++ Source/CursesDialog/cmCursesLongMessageForm.cxx
-@@ -82,10 +82,10 @@ void cmCursesLongMessageForm::UpdateStat
- 
-   curses_move(y-4,0);
-   attron(A_STANDOUT);
--  printw(bar);
-+  printw("%s", bar);
-   attroff(A_STANDOUT);
-   curses_move(y-3,0);
--  printw(version);
-+  printw("%s", version);
-   pos_form_cursor(this->Form);
- }
- 
-@@ -102,7 +102,7 @@ void cmCursesLongMessageForm::PrintKeys(
-   sprintf(firstLine,  "Press [e] to exit help");
- 
-   curses_move(y-2,0);
--  printw(firstLine);
-+  printw("%s", firstLine);
-   pos_form_cursor(this->Form);
- 
- }
diff --git a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesMainForm.cxx b/devel/cmake/patches/patch-Source_CursesDialog_cmCursesMainForm.cxx
deleted file mode 100644
index 9aac46a560a..00000000000
--- a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesMainForm.cxx
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-Source_CursesDialog_cmCursesMainForm.cxx,v 1.2 2015/09/12 16:46:11 wiz Exp $
-
-printw takes a format string.
-http://public.kitware.com/Bug/view.php?id=15738
-
---- Source/CursesDialog/cmCursesMainForm.cxx.orig	2015-09-07 09:50:58.000000000 +0000
-+++ Source/CursesDialog/cmCursesMainForm.cxx
-@@ -456,19 +456,19 @@ void cmCursesMainForm::PrintKeys(int pro
-     {
-     strcpy(fmt, "                           ");
-     }
--  printw(fmt);
-+  printw("%s", fmt);
-   curses_move(y-3,0);
--  printw(firstLine);
-+  printw("%s", firstLine);
-   curses_move(y-2,0);
--  printw(secondLine);
-+  printw("%s", secondLine);
-   curses_move(y-1,0);
--  printw(thirdLine);
-+  printw("%s", thirdLine);
- 
-   if (cw)
-     {
-     sprintf(firstLine, "Page %d of %d", cw->GetPage(), this->NumberOfPages);
-     curses_move(0,65-static_cast<unsigned int>(strlen(firstLine))-1);
--    printw(firstLine);
-+    printw("%s", firstLine);
-     }
- //    }
- 
-@@ -614,11 +614,10 @@ void cmCursesMainForm::UpdateStatusBar(c
-   // Now print both lines
-   curses_move(y-5,0);
-   attron(A_STANDOUT);
--  char format[] = "%s";
--  printw(format, bar);
-+  printw("%s", bar);
-   attroff(A_STANDOUT);
-   curses_move(y-4,0);
--  printw(version);
-+  printw("%s", version);
-   pos_form_cursor(this->Form);
- }
- 
diff --git a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesStringWidget.cxx b/devel/cmake/patches/patch-Source_CursesDialog_cmCursesStringWidget.cxx
deleted file mode 100644
index 40b08b32dbb..00000000000
--- a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesStringWidget.cxx
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-Source_CursesDialog_cmCursesStringWidget.cxx,v 1.2 2015/09/12 16:46:11 wiz Exp $
-
-printw takes a format string.
-http://public.kitware.com/Bug/view.php?id=15738
-
-Don't use implemention-details of ncurses to see
-if the overloading behavior of REQ_DEL_PREV is active, just undo any
-damage it may have done.
-http://public.kitware.com/Bug/view.php?id=15739
-
---- Source/CursesDialog/cmCursesStringWidget.cxx.orig	2015-08-13 14:57:00.000000000 +0000
-+++ Source/CursesDialog/cmCursesStringWidget.cxx
-@@ -168,17 +168,16 @@ bool cmCursesStringWidget::HandleInput(i
-     else if ( key == 127 ||
-               key == KEY_BACKSPACE )
-       {
--      if ( form->curcol > 0 )
--        {
-+        FIELD *cur = current_field(form);
-         form_driver(form, REQ_DEL_PREV);
--        }
-+        if (current_field(form) != cur)
-+          {
-+          set_current_field(form, cur);
-+          }
-       }
-     else if ( key == ctrl('d') ||key == KEY_DC )
-       {
--      if ( form->curcol >= 0 )
--        {
--        form_driver(form, REQ_DEL_CHAR);
--        }
-+      form_driver(form, REQ_DEL_CHAR);
-       }
-     else
-       {
-@@ -229,17 +228,16 @@ bool cmCursesStringWidget::PrintKeys()
-       }
-     firstLine[511] = '\0';
-     curses_move(y-4,0);
--    printw(firstLine);
-+    printw("%s", firstLine);
-     curses_move(y-3,0);
--    printw(firstLine);
-+    printw("%s", firstLine);
-     curses_move(y-2,0);
--    printw(firstLine);
-+    printw("%s", firstLine);
-     curses_move(y-1,0);
--    printw(firstLine);
-+    printw("%s", firstLine);
- 
--    sprintf(firstLine,  "Editing option, press [enter] to leave edit.");
-     curses_move(y-3,0);
--    printw(firstLine);
-+    printw("Editing option, press [enter] to leave edit.");
-     return true;
-     }
-   else
diff --git a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesWidget.cxx b/devel/cmake/patches/patch-Source_CursesDialog_cmCursesWidget.cxx
deleted file mode 100644
index 7a1dac1e52c..00000000000
--- a/devel/cmake/patches/patch-Source_CursesDialog_cmCursesWidget.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_CursesDialog_cmCursesWidget.cxx,v 1.2 2015/09/12 16:46:11 wiz Exp $
-
-Compensate for missing const attribute in NetBSD.
-http://public.kitware.com/Bug/view.php?id=15740
-
---- Source/CursesDialog/cmCursesWidget.cxx.orig	2015-09-07 09:53:22.000000000 +0000
-+++ Source/CursesDialog/cmCursesWidget.cxx
-@@ -49,7 +49,7 @@ void cmCursesWidget::Move(int x, int y, 
- void cmCursesWidget::SetValue(const std::string& value)
- {
-   this->Value = value;
--  set_field_buffer(this->Field, 0, value.c_str());
-+  set_field_buffer(this->Field, 0, const_cast<char *>(value.c_str()));
- }
- 
- const char* cmCursesWidget::GetValue()
diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx b/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
index 541131aea9c..bc61bd5d6d5 100644
--- a/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
+++ b/devel/cmake/patches/patch-Source_kwsys_SystemInformation.cxx
@@ -1,14 +1,14 @@
-$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.8 2014/07/18 10:00:18 ryoon Exp $
+$NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.9 2015/11/17 12:12:11 wiz Exp $
 
 * Add more conditional handling for NetBSD, same as others.
 * Treat FreeBSD and DragonFly the same way as NetBSD and OpenBSD.
 * Treat Solaris same as Linux.
 * Use correct cmake define.
 
---- Source/kwsys/SystemInformation.cxx.orig	2014-01-16 17:15:08.000000000 +0000
+--- Source/kwsys/SystemInformation.cxx.orig	2015-11-12 15:39:51.000000000 +0000
 +++ Source/kwsys/SystemInformation.cxx
-@@ -78,9 +78,9 @@ typedef int siginfo_t;
- # include <errno.h> // extern int errno;
+@@ -80,9 +80,9 @@ typedef int siginfo_t;
+ # undef _WIN32
  #endif
  
 -#ifdef __FreeBSD__
@@ -19,7 +19,7 @@ $NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.8 2014/07/18 10:00:18 ryoo
  # include <sys/socket.h>
  # include <netdb.h>
  # include <netinet/in.h>
-@@ -88,11 +88,15 @@ typedef int siginfo_t;
+@@ -90,11 +90,15 @@ typedef int siginfo_t;
  #  include <ifaddrs.h>
  #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
  # endif
@@ -40,7 +40,7 @@ $NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.8 2014/07/18 10:00:18 ryoo
  #endif
  
  #if defined(KWSYS_SYS_HAS_MACHINE_CPU_H)
-@@ -130,7 +134,7 @@ typedef int siginfo_t;
+@@ -124,7 +128,7 @@ typedef int siginfo_t;
  # endif
  #endif
  
@@ -49,7 +49,7 @@ $NetBSD: patch-Source_kwsys_SystemInformation.cxx,v 1.8 2014/07/18 10:00:18 ryoo
  # include <fenv.h>
  # include <sys/socket.h>
  # include <netdb.h>
-@@ -4616,7 +4620,7 @@ bool SystemInformationImplementation::Qu
+@@ -4741,7 +4745,7 @@ bool SystemInformationImplementation::Qu
    // a 32 bit process on a 64 bit host the returned memory will be
    // limited to 4GiB. So if this is a 32 bit process or if the sysconf
    // method fails use the kstat interface.
diff --git a/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp b/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp
deleted file mode 100644
index 39aff8cc10b..00000000000
--- a/devel/cmake/patches/patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Utilities_cmjsoncpp_src_lib__json_json__writer.cpp,v 1.2 2015/07/26 23:10:47 wiz Exp $
-
-iso/math_c99.h defines isfinite already on SunOS.
-
---- Utilities/cmjsoncpp/src/lib_json/json_writer.cpp.orig	2015-07-23 13:59:36.000000000 +0000
-+++ Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
-@@ -24,7 +24,9 @@
- // Solaris
- #if defined(__sun)
- # include <ieeefp.h>
--# define isfinite finite
-+# if !defined(isfinite)
-+#  define isfinite finite
-+# endif
- #endif
- 
- // AIX