Changes 3.5.0:

The cmake-gui(1) gained options to control warnings about deprecated functionality.
The cmake-gui(1) learned an option to set the toolset to be used with VS IDE and Xcode generators, much like the existing -T option to cmake(1).
The cmake-gui(1) gained a Regular Expression Explorer which may be used to create and evaluate regular expressions in real-time. The explorer window is available via the Tools menu.
The -Wdev and -Wno-dev cmake(1) options now also enable and suppress the deprecated warnings output by default.
The suppression of developer warnings as errors can now be controlled with the new -Werror=dev and -Wno-error=dev cmake(1) options.
The cmake(1) -E command-line tools copy, copy_if_different, copy_directory, and make_directory learned to support multiple input files or directories.
The cmake_parse_arguments() command is now implemented natively. The CMakeParseArguments module remains as an empty placeholder for compatibility.
The install(DIRECTORY) command learned to support generator expressions in the list of directories.
The CMAKE_ERROR_DEPRECATED variable can now be set using the -Werror=deprecated and -Wno-error=deprecated cmake(1) options.
The CMAKE_WARN_DEPRECATED variable can now be set using the -Wdeprecated and -Wno-deprecated cmake(1) options.
The VS_GLOBAL_<variable> target property is now implemented for VS 2010 and above. Previously it worked only in VS 2008 and below.
The ExternalProject module learned a new GIT_REMOTE_NAME option to control the git clone --origin value.
The FindBoost module now provides imported targets such as Boost::boost and Boost::filesystem.
The FindFLEX module FLEX_TARGET macro learned a new DEFINES_FILE option to specify a custom output header to be generated.
The FindGTest module now provides imported targets.
The FindGTK2 module, when GTK2_USE_IMPORTED_TARGETS is enabled, now sets GTK2_LIBRARIES to contain the list of imported targets instead of the paths to the libraries. Moreover it now sets a new GTK2_TARGETS variable containing all the targets imported.
The FindOpenMP module learned to support Clang.
The FindOpenSSL module gained a new OPENSSL_MSVC_STATIC_RT option to search for libraries using the MSVC static runtime.
The FindPNG module now provides imported targets.
The FindTIFF module now provides imported targets.
A FindXalanC module was introduced to find the Apache Xalan-C++ XSL transform processing library.
The FindXercesC module now provides imported targets.

5 files changed, 56 insertions, 24 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index 019b7c98f21..e56ab113131 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.113 2016/03/05 11:28:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.114 2016/03/14 10:49:55 adam Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.3
-PKGREVISION=	1
+DISTNAME=	cmake-${CMAKE_API}.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
-CMAKE_API=	3.4
+CMAKE_API=	3.5
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cmake.org/
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 540564f00fe..47240197371 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.40 2015/11/17 12:12:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.41 2016/03/14 10:49:55 adam Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -22,6 +22,7 @@ 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_minimum_required.rst
+share/cmake-${CMAKE_API}/Help/command/cmake_parse_arguments.rst
 share/cmake-${CMAKE_API}/Help/command/cmake_policy.rst
 share/cmake-${CMAKE_API}/Help/command/configure_file.rst
 share/cmake-${CMAKE_API}/Help/command/continue.rst
@@ -354,6 +355,7 @@ share/cmake-${CMAKE_API}/Help/module/FindWish.rst
 share/cmake-${CMAKE_API}/Help/module/FindX11.rst
 share/cmake-${CMAKE_API}/Help/module/FindXCTest.rst
 share/cmake-${CMAKE_API}/Help/module/FindXMLRPC.rst
+share/cmake-${CMAKE_API}/Help/module/FindXalanC.rst
 share/cmake-${CMAKE_API}/Help/module/FindXercesC.rst
 share/cmake-${CMAKE_API}/Help/module/FindZLIB.rst
 share/cmake-${CMAKE_API}/Help/module/Findosg.rst
@@ -690,6 +692,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SOURCES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
 share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/prop_tgt/IOS_INSTALL_COMBINED.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
@@ -786,6 +789,7 @@ 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/3.5.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
@@ -868,6 +872,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATI
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.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
@@ -919,6 +924,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
 share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
+share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.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_ARCHIVE_APPEND.rst
@@ -1254,10 +1260,12 @@ share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerId.F.in
 share/cmake-${CMAKE_API}/Modules/CMakeFortranInformation.cmake
 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/CMakeJOMFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeJavaCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeLanguageInformation.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeMSYSFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake
@@ -1354,6 +1362,11 @@ share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c
 share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/ADSP-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-ASM.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-DetermineCompiler.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -1379,6 +1392,22 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Cray-C.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Cray-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
+share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
 share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake
@@ -1607,6 +1636,7 @@ share/cmake-${CMAKE_API}/Modules/FindWish.cmake
 share/cmake-${CMAKE_API}/Modules/FindX11.cmake
 share/cmake-${CMAKE_API}/Modules/FindXCTest.cmake
 share/cmake-${CMAKE_API}/Modules/FindXMLRPC.cmake
+share/cmake-${CMAKE_API}/Modules/FindXalanC.cmake
 share/cmake-${CMAKE_API}/Modules/FindXercesC.cmake
 share/cmake-${CMAKE_API}/Modules/FindZLIB.cmake
 share/cmake-${CMAKE_API}/Modules/Findosg.cmake
@@ -1726,6 +1756,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-windres.cmake
 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/Darwin-Absoft-Fortran.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-CXX.cmake
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index c09bfe77cbb..25fcd4789b9 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.85 2016/01/26 16:33:38 adam Exp $
+$NetBSD: distinfo,v 1.86 2016/03/14 10:49:55 adam Exp $
 
-SHA1 (cmake-3.4.3.tar.gz) = 49e4f05d46d4752e514b19ba36bf97d20a7da66a
-RMD160 (cmake-3.4.3.tar.gz) = 4328fe65c290f641ee37c21ddd117bde33533ed8
-SHA512 (cmake-3.4.3.tar.gz) = a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11
-Size (cmake-3.4.3.tar.gz) = 6722311 bytes
+SHA1 (cmake-3.5.0.tar.gz) = 4a10116e061bbe806ffdd5164aca7780b0e98f4e
+RMD160 (cmake-3.5.0.tar.gz) = 201368d60ee8375f91f584ba109fc7e3e3e48b9e
+SHA512 (cmake-3.5.0.tar.gz) = 4fef712560f1975f8d19e897c7b1903811f7bad9314602961b5b32ac58f367bf1308f96cc5edaceb99ac9084b1e0517e4ecb4b5996d2ad53b6aec305ae879b09
+Size (cmake-3.5.0.tar.gz) = 6861686 bytes
 SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = c77cf55df2b047908178e7ed1db6e5454834ea49
-SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92
+SHA1 (patch-Source_cmELF.cxx) = ad6fa581da8ad36223aa53285a1a8dbec0c02a9d
 SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 5e8c8ff7875c329e48c54ee03570ea4a6d52953a
 SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961
-SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
+SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9
 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx
index 8d624d5047e..a1ac398cdfe 100644
--- a/devel/cmake/patches/patch-Source_cmELF.cxx
+++ b/devel/cmake/patches/patch-Source_cmELF.cxx
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $
+$NetBSD: patch-Source_cmELF.cxx,v 1.3 2016/03/14 10:49:55 adam Exp $
 
 * SCO OpenServer 5.0.7/3.2 has not 64bit ELF support.
 
---- Source/cmELF.cxx.orig	2014-12-15 20:07:43.000000000 +0000
+--- Source/cmELF.cxx.orig	2016-03-08 14:36:22.000000000 +0000
 +++ Source/cmELF.cxx
-@@ -49,6 +49,9 @@
+@@ -45,6 +45,9 @@
  #if defined(__sun)
  # include <sys/link.h> // For dynamic section information
  #endif
@@ -14,7 +14,7 @@ $NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $
  
  //----------------------------------------------------------------------------
  // Low-level byte swapping implementation.
-@@ -203,6 +206,8 @@ struct cmELFTypes32
+@@ -199,6 +202,8 @@ struct cmELFTypes32
  };
  
  // Configure the implementation template for 64-bit ELF files.
@@ -23,15 +23,15 @@ $NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $
  struct cmELFTypes64
  {
    typedef Elf64_Ehdr ELF_Ehdr;
-@@ -212,6 +217,7 @@ struct cmELFTypes64
-   typedef cmIML_INT_uint64_t tagtype;
+@@ -208,6 +213,7 @@ struct cmELFTypes64
+   typedef KWIML_INT_uint64_t tagtype;
    static const char* GetName() { return "64-bit"; }
  };
 +#endif
  
  //----------------------------------------------------------------------------
  // Parser implementation template.
-@@ -788,11 +794,14 @@ cmELF::cmELF(const char* fname): Interna
+@@ -790,11 +796,14 @@ cmELF::cmELF(const char* fname): Interna
      // 32-bit ELF
      this->Internal = new cmELFInternalImpl<cmELFTypes32>(this, fin, order);
      }
diff --git a/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt b/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt
index 1840b4a6439..ad44a40cae0 100644
--- a/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt
+++ b/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt
@@ -1,12 +1,14 @@
-$NetBSD: patch-Utilities_KWIML_CMakeLists.txt,v 1.1 2012/01/08 17:44:23 adam Exp $
+$NetBSD: patch-Utilities_KWIML_CMakeLists.txt,v 1.2 2016/03/14 10:49:55 adam Exp $
 
 Disable tests. Solves some preprocessor problems.
 
---- Utilities/KWIML/CMakeLists.txt.orig	2012-01-08 16:31:36.000000000 +0000
+--- Utilities/KWIML/CMakeLists.txt.orig	2016-03-08 14:36:25.000000000 +0000
 +++ Utilities/KWIML/CMakeLists.txt
-@@ -75,5 +75,4 @@ endforeach()
+@@ -42,7 +42,6 @@ if(KWIML_INSTALL_INCLUDE_DIR)
+ endif()
  
- #-----------------------------------------------------------------------------
- if(BUILD_TESTING)
+ if(KWIML_TEST_ENABLE)
 -  add_subdirectory(test)
  endif()
+ 
+ if(NOT kwiml_standalone)