5 files changed, 47 insertions, 38 deletions

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index e3753aa2c1b5..26bf6948ac5f 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.2.3
-PORTREVISION?=	2
+PORTVERSION=	3.3.1
+PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.cmake.org/files/v3.2/
+MASTER_SITES=	http://www.cmake.org/files/v3.3/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT?=	Cross-platform Makefile generator
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index b638fed72995..3838e85904d3 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.2.3.tar.gz) = a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
-SIZE (cmake-3.2.3.tar.gz) = 6438938
+SHA256 (cmake-3.3.1.tar.gz) = cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6
+SIZE (cmake-3.3.1.tar.gz) = 6577869
diff --git a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
index 01c7b5f07c17..8c9eb6c1aeee 100644
--- a/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
+++ b/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
@@ -1,11 +1,11 @@
---- Modules/FindwxWidgets.cmake.orig	2013-10-14 16:39:11.995705456 +0300
-+++ Modules/FindwxWidgets.cmake	2013-10-14 16:39:31.315704621 +0300
-@@ -702,7 +702,7 @@
-     # UNIX: Start actual work.
+--- Modules/FindwxWidgets.cmake.orig	2015-07-23 15:59:33.000000000 +0200
++++ Modules/FindwxWidgets.cmake	2015-08-10 20:04:36.068295000 +0200
+@@ -741,7 +741,7 @@
      #-----------------------------------------------------------------
      # Support cross-compiling, only search in the target platform.
--    find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
-+    find_program(wxWidgets_CONFIG_EXECUTABLE NAMES $ENV{WX_CONFIG} wx-config
+     find_program(wxWidgets_CONFIG_EXECUTABLE
+-      NAMES wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
++      NAMES $ENV{WX_CONFIG} wx-config wx-config-3.0 wx-config-2.9 wx-config-2.8
        DOC "Location of wxWidgets library configuration provider binary (wx-config)."
        ONLY_CMAKE_FIND_ROOT_PATH
        )
diff --git a/devel/cmake/files/patch-git_c775072a b/devel/cmake/files/patch-git_c775072a
deleted file mode 100644
index b867712d24a6..000000000000
--- a/devel/cmake/files/patch-git_c775072a
+++ /dev/null
@@ -1,20 +0,0 @@
-commit c775072ad5a93306183f83f4396268b1690bb392
-Author: Brad King <brad.king@kitware.com>
-Date:   Wed Apr 22 09:58:46 2015 -0400
-
-    cmGeneratorExpressionEvaluationFile: Add missing sys/types.h include
-    
-    This is needed for 'mode_t', and on mingw-w64 in particular.  We added
-    use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use
-    permissions of input file if present, 2014-07-22).
-
---- Source/cmGeneratorExpressionEvaluationFile.h
-+++ Source/cmGeneratorExpressionEvaluationFile.h
-@@ -13,6 +13,7 @@
- #define cmGeneratorExpressionEvaluationFile_h
- 
- #include "cmStandardIncludes.h"
-+#include <sys/types.h>
- #include <cmsys/auto_ptr.hxx>
- 
- #include "cmGeneratorExpression.h"
diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist
index 7e5834ab57ce..c7455933501a 100644
--- a/devel/cmake/pkg-plist
+++ b/devel/cmake/pkg-plist
@@ -145,6 +145,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/generator/CodeBlocks.rst
 %%DATADIR%%/Help/generator/CodeLite.rst
 %%DATADIR%%/Help/generator/Eclipse CDT4.rst
+%%DATADIR%%/Help/generator/Green Hills MULTI.rst
 %%DATADIR%%/Help/generator/KDevelop3.rst
 %%DATADIR%%/Help/generator/Kate.rst
 %%DATADIR%%/Help/generator/MSYS Makefiles.rst
@@ -166,7 +167,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/generator/Watcom WMake.rst
 %%DATADIR%%/Help/generator/Xcode.rst
 %%DATADIR%%/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
-%%DATADIR%%/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt  
+%%DATADIR%%/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt
 %%DATADIR%%/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
 %%DATADIR%%/Help/index.rst
 %%DATADIR%%/Help/manual/LINKS.txt
@@ -230,6 +231,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/CheckCXXSourceCompiles.rst
 %%DATADIR%%/Help/module/CheckCXXSourceRuns.rst
 %%DATADIR%%/Help/module/CheckCXXSymbolExists.rst
+%%DATADIR%%/Help/module/CheckFortranCompilerFlag.rst
 %%DATADIR%%/Help/module/CheckFortranFunctionExists.rst
 %%DATADIR%%/Help/module/CheckFortranSourceCompiles.rst
 %%DATADIR%%/Help/module/CheckFunctionExists.rst
@@ -367,6 +369,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindWget.rst
 %%DATADIR%%/Help/module/FindWish.rst
 %%DATADIR%%/Help/module/FindX11.rst
+%%DATADIR%%/Help/module/FindXCTest.rst
 %%DATADIR%%/Help/module/FindXMLRPC.rst
 %%DATADIR%%/Help/module/FindXercesC.rst
 %%DATADIR%%/Help/module/FindZLIB.rst
@@ -472,8 +475,16 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/policy/CMP0052.rst
 %%DATADIR%%/Help/policy/CMP0053.rst
 %%DATADIR%%/Help/policy/CMP0054.rst
-%%DATADIR%%/Help/policy/CMP0055.rst  
+%%DATADIR%%/Help/policy/CMP0055.rst
 %%DATADIR%%/Help/policy/CMP0056.rst
+%%DATADIR%%/Help/policy/CMP0057.rst
+%%DATADIR%%/Help/policy/CMP0058.rst
+%%DATADIR%%/Help/policy/CMP0059.rst
+%%DATADIR%%/Help/policy/CMP0060.rst
+%%DATADIR%%/Help/policy/CMP0061.rst
+%%DATADIR%%/Help/policy/CMP0062.rst
+%%DATADIR%%/Help/policy/CMP0063.rst
+%%DATADIR%%/Help/policy/DEPRECATED.txt
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
 %%DATADIR%%/Help/prop_cache/HELPSTRING.rst
@@ -533,8 +544,11 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst
 %%DATADIR%%/Help/prop_gbl/TARGET_SUPPORTS_SHARED_LIBS.rst
 %%DATADIR%%/Help/prop_gbl/USE_FOLDERS.rst
+%%DATADIR%%/Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
 %%DATADIR%%/Help/prop_inst/CPACK_NEVER_OVERWRITE.rst
 %%DATADIR%%/Help/prop_inst/CPACK_PERMANENT.rst
+%%DATADIR%%/Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
+%%DATADIR%%/Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
 %%DATADIR%%/Help/prop_inst/CPACK_WIX_ACL.rst
 %%DATADIR%%/Help/prop_sf/ABSTRACT.rst
 %%DATADIR%%/Help/prop_sf/AUTORCC_OPTIONS.rst
@@ -560,6 +574,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_sf/VS_SHADER_FLAGS.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_TYPE.rst
+%%DATADIR%%/Help/prop_sf/VS_XAML_TYPE.rst
 %%DATADIR%%/Help/prop_sf/WRAP_EXCLUDE.rst
 %%DATADIR%%/Help/prop_sf/XCODE_EXPLICIT_FILE_TYPE.rst
 %%DATADIR%%/Help/prop_sf/XCODE_LAST_KNOWN_FILE_TYPE.rst
@@ -613,6 +628,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/COMPILE_PDB_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/CONFIG_OUTPUT_NAME.rst
 %%DATADIR%%/Help/prop_tgt/CONFIG_POSTFIX.rst
+%%DATADIR%%/Help/prop_tgt/CROSSCOMPILING_EMULATOR.rst
 %%DATADIR%%/Help/prop_tgt/CXX_EXTENSIONS.rst
 %%DATADIR%%/Help/prop_tgt/CXX_STANDARD.rst
 %%DATADIR%%/Help/prop_tgt/CXX_STANDARD_REQUIRED.rst
@@ -675,6 +691,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
 %%DATADIR%%/Help/prop_tgt/LABELS.rst
+%%DATADIR%%/Help/prop_tgt/LANG_INCLUDE_WHAT_YOU_USE.rst
 %%DATADIR%%/Help/prop_tgt/LANG_VISIBILITY_PRESET.rst
 %%DATADIR%%/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
 %%DATADIR%%/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
@@ -732,7 +749,6 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst
 %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/SUFFIX.rst
-%%DATADIR%%/Help/prop_tgt/TARGET_FILE_TYPES.txt
 %%DATADIR%%/Help/prop_tgt/TYPE.rst
 %%DATADIR%%/Help/prop_tgt/VERSION.rst
 %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst
@@ -752,23 +768,26 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/VS_WINRT_REFERENCES.rst
 %%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst
 %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
+%%DATADIR%%/Help/prop_tgt/XCTEST.rst
 %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
 %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
-%%DATADIR%%/Help/release/3.0.rst  
-%%DATADIR%%/Help/release/3.1.rst  
+%%DATADIR%%/Help/release/3.0.rst
+%%DATADIR%%/Help/release/3.1.rst
 %%DATADIR%%/Help/release/3.2.rst
+%%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/dev.txt
 %%DATADIR%%/Help/release/index.rst
 %%DATADIR%%/Help/variable/APPLE.rst
 %%DATADIR%%/Help/variable/BORLAND.rst
 %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
 %%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
-%%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
+%%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
 %%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
 %%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_AR.rst
 %%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_ARGC.rst
 %%DATADIR%%/Help/variable/CMAKE_ARGV0.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
@@ -798,6 +817,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_CONFIGURATION_TYPES.rst
 %%DATADIR%%/Help/variable/CMAKE_CONFIG_POSTFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING.rst
+%%DATADIR%%/Help/variable/CMAKE_CROSSCOMPILING_EMULATOR.rst
 %%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_CURRENT_BINARY_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_CURRENT_LIST_DIR.rst
@@ -892,11 +912,16 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_MINSIZEREL.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELEASE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELWITHDEBINFO.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_IGNORE_EXTENSIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_INCLUDE_DIRECTORIES.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_DIRECTORIES.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_IMPLICIT_LINK_LIBRARIES.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_INCLUDE_WHAT_YOU_USE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_LIBRARY_ARCHITECTURE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_LINKER_PREFERENCE_PROPAGATES.rst
@@ -911,6 +936,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_ARCHITECTURE_REGEX.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_LIBRARY_PATH_FLAG.rst
 %%DATADIR%%/Help/variable/CMAKE_LINK_DEF_FILE_FLAG.rst
@@ -923,8 +949,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_MACOSX_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_MAJOR_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_MAKE_PROGRAM.rst
-%%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
 %%DATADIR%%/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
+%%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
 %%DATADIR%%/Help/variable/CMAKE_MFC_FLAG.rst
 %%DATADIR%%/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_MINOR_VERSION.rst
@@ -953,6 +979,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_RANLIB.rst
 %%DATADIR%%/Help/variable/CMAKE_ROOT.rst
 %%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CMAKE_RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_SCRIPT_MODE_FILE.rst
 %%DATADIR%%/Help/variable/CMAKE_SHARED_LIBRARY_PREFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_SHARED_LIBRARY_SUFFIX.rst
@@ -993,6 +1020,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_VISIBILITY_INLINES_HIDDEN.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_DEVENV_COMMAND.rst
+%%DATADIR%%/Help/variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_MSBUILD_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_VS_MSDEV_COMMAND.rst
@@ -1062,6 +1090,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CYGWIN.rst
 %%DATADIR%%/Help/variable/ENV.rst
 %%DATADIR%%/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
+%%DATADIR%%/Help/variable/GHS-MULTI.rst
 %%DATADIR%%/Help/variable/LIBRARY_OUTPUT_PATH.rst
 %%DATADIR%%/Help/variable/MINGW.rst
 %%DATADIR%%/Help/variable/MSVC.rst