Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Apr 2018 21:43:57 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467437 - in head/devel: cmake cmake-doc cmake-gui cmake/files
Message-ID:  <201804152143.w3FLhvam034649@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Sun Apr 15 21:43:57 2018
New Revision: 467437
URL: https://svnweb.freebsd.org/changeset/ports/467437

Log:
  Update CMake to 3.11.0. Thanks to antoine@ for the exp-run.
  
  In the run-up to this commit, many other ports were pre-emptively fixed.
  The only issue still known is math/kig, which had a build failure in
  the exp-run, but which isn't reproducible across multiple 11.1 {i386,amd64}
  machines and poudriere builds. We've decided to forge ahead.
  
  The new CMake version:
   - drops FreeBSD patches that have been incorporated upstream,
   - re-shuffles patches to FindQt4, since upstream has made some changes
     which break FindQt4 in new ways on FreeBSD (while fixing the old ones),
   - has new patches to make OpenMP and BLAS findable on FreeBSD,
   - drops ports libarchive in favor of the version in base, to avoid
     overlinking for the pkg(8) support in CPack (this makes portlint
     complain, and we have decided to ignore it).
  
  PR:		227372 226959 223678
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D14506

Added:
  head/devel/cmake/files/patch-Modules_FindBLAS.cmake   (contents, props changed)
  head/devel/cmake/files/patch-Modules_FindOpenMP.cmake   (contents, props changed)
Deleted:
  head/devel/cmake/files/patch-Modules_FindImageMagick.cmake
  head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake
  head/devel/cmake/files/patch-Modules_FindwxWindows.cmake
  head/devel/cmake/files/patch-git_3f4924-boost_1.66
Modified:
  head/devel/cmake-doc/Makefile
  head/devel/cmake-doc/pkg-plist
  head/devel/cmake-gui/Makefile
  head/devel/cmake/Makefile
  head/devel/cmake/distinfo
  head/devel/cmake/files/InitialCache.cmake
  head/devel/cmake/files/patch-Modules_FindQt4.cmake
  head/devel/cmake/pkg-plist

Modified: head/devel/cmake-doc/Makefile
==============================================================================
--- head/devel/cmake-doc/Makefile	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake-doc/Makefile	Sun Apr 15 21:43:57 2018	(r467437)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.10.2
-PORTREVISION=	1
+DISTVERSION=	3.11.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-doc

Modified: head/devel/cmake-doc/pkg-plist
==============================================================================
--- head/devel/cmake-doc/pkg-plist	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake-doc/pkg-plist	Sun Apr 15 21:43:57 2018	(r467437)
@@ -1,28 +1,4 @@
 %%DOCSDIR%%/CMake-%%CMAKEVERSION%%.qch
-%%DOCSDIR%%/html/release/3.0.html
-%%DOCSDIR%%/html/release/3.1.html
-%%DOCSDIR%%/html/release/3.10.html
-%%DOCSDIR%%/html/release/3.2.html
-%%DOCSDIR%%/html/release/3.3.html
-%%DOCSDIR%%/html/release/3.4.html
-%%DOCSDIR%%/html/release/3.5.html
-%%DOCSDIR%%/html/release/3.6.html
-%%DOCSDIR%%/html/release/3.7.html
-%%DOCSDIR%%/html/release/3.8.html
-%%DOCSDIR%%/html/release/3.9.html
-%%DOCSDIR%%/html/release/index.html
-%%DOCSDIR%%/html/_sources/release/3.0.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.1.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.10.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.2.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.3.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.4.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.5.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.6.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.7.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.8.rst.txt
-%%DOCSDIR%%/html/_sources/release/3.9.rst.txt
-%%DOCSDIR%%/html/_sources/release/index.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_compile_options.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_command.rst.txt
 %%DOCSDIR%%/html/_sources/command/add_custom_target.rst.txt
@@ -170,7 +146,6 @@
 %%DOCSDIR%%/html/_sources/generator/CodeLite.rst.txt
 %%DOCSDIR%%/html/_sources/generator/Eclipse CDT4.rst.txt
 %%DOCSDIR%%/html/_sources/generator/Green Hills MULTI.rst.txt
-%%DOCSDIR%%/html/_sources/generator/KDevelop3.rst.txt
 %%DOCSDIR%%/html/_sources/generator/Kate.rst.txt
 %%DOCSDIR%%/html/_sources/generator/MSYS Makefiles.rst.txt
 %%DOCSDIR%%/html/_sources/generator/MinGW Makefiles.rst.txt
@@ -280,6 +255,7 @@
 %%DOCSDIR%%/html/_sources/module/ExternalData.rst.txt
 %%DOCSDIR%%/html/_sources/module/ExternalProject.rst.txt
 %%DOCSDIR%%/html/_sources/module/FeatureSummary.rst.txt
+%%DOCSDIR%%/html/_sources/module/FetchContent.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindALSA.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindASPELL.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindAVIFile.rst.txt
@@ -328,6 +304,7 @@
 %%DOCSDIR%%/html/_sources/module/FindICU.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindITK.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindIce.rst.txt
+%%DOCSDIR%%/html/_sources/module/FindIconv.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindIcotool.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindImageMagick.rst.txt
 %%DOCSDIR%%/html/_sources/module/FindIntl.rst.txt
@@ -528,6 +505,7 @@
 %%DOCSDIR%%/html/_sources/policy/CMP0069.rst.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0070.rst.txt
 %%DOCSDIR%%/html/_sources/policy/CMP0071.rst.txt
+%%DOCSDIR%%/html/_sources/policy/CMP0072.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/ADVANCED.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/HELPSTRING.rst.txt
 %%DOCSDIR%%/html/_sources/prop_cache/MODIFIED.rst.txt
@@ -613,10 +591,12 @@
 %%DOCSDIR%%/html/_sources/prop_sf/COMPILE_DEFINITIONS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/COMPILE_FLAGS.rst.txt
+%%DOCSDIR%%/html/_sources/prop_sf/COMPILE_OPTIONS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/EXTERNAL_OBJECT.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/Fortran_FORMAT.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/GENERATED.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/HEADER_FILE_ONLY.rst.txt
+%%DOCSDIR%%/html/_sources/prop_sf/INCLUDE_DIRECTORIES.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/KEEP_EXTENSION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/LABELS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/LANGUAGE.rst.txt
@@ -635,6 +615,8 @@
 %%DOCSDIR%%/html/_sources/prop_sf/VS_DEPLOYMENT_LOCATION.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_INCLUDE_IN_VSIX.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_RESOURCE_GENERATOR.rst.txt
+%%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst.txt
+%%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_ENABLE_DEBUG.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_ENTRYPOINT.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_FLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_sf/VS_SHADER_MODEL.rst.txt
@@ -692,6 +674,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_BUILD_DIR.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_PARALLEL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst.txt
@@ -757,6 +740,7 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_CONFIGURATIONS.rst.txt
+%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_GLOBAL.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_IMPLIB.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_LIBNAME.rst.txt
@@ -897,6 +881,19 @@
 %%DOCSDIR%%/html/_sources/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/XCODE_PRODUCT_TYPE.rst.txt
 %%DOCSDIR%%/html/_sources/prop_tgt/XCTEST.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.0.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.1.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.10.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.11.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.2.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.3.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.4.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.5.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.6.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.7.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.8.rst.txt
+%%DOCSDIR%%/html/_sources/release/3.9.rst.txt
+%%DOCSDIR%%/html/_sources/release/index.rst.txt
 %%DOCSDIR%%/html/_sources/variable/ANDROID.rst.txt
 %%DOCSDIR%%/html/_sources/variable/APPLE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/BORLAND.rst.txt
@@ -933,6 +930,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGC.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGV0.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOGEN_PARALLEL.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst.txt
@@ -957,6 +955,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CACHE_PATCH_VERSION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CFG_INTDIR.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CL_64.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CODELITE_USE_TARGETS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_COLOR_MAKEFILE.rst.txt
@@ -974,6 +973,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CTEST_COMMAND.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_EXTENSIONS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_HOST_COMPILER.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_STANDARD.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst.txt
@@ -1037,6 +1037,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_Fortran_MODOUT_FLAG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_GENERATOR.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_GENERATOR_INSTANCE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_GENERATOR_PLATFORM.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_GENERATOR_TOOLSET.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_GNUtoMS.rst.txt
@@ -1058,6 +1059,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INCLUDE_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_MESSAGE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_NAME_DIR.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_PREFIX.rst.txt
@@ -1068,6 +1070,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOLS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_LINK.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst.txt
@@ -1097,6 +1100,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_INIT.rst.txt
@@ -1106,6 +1111,7 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.rst.txt
@@ -1160,6 +1166,8 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MODULE_PATH.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_MSVCIDE_RUN_PATH.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_NETRC.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_NETRC_FILE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_NO_BUILTIN_CHRPATH.rst.txt
@@ -1252,11 +1260,13 @@
 %%DOCSDIR%%/html/_sources/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_GENERATE_SCHEME.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_INSTALL_SCRIPT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CPACK_SET_DESTDIR.rst.txt
@@ -1317,6 +1327,7 @@
 %%DOCSDIR%%/html/_sources/variable/CTEST_P4_COMMAND.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_P4_OPTIONS.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_P4_UPDATE_OPTIONS.rst.txt
+%%DOCSDIR%%/html/_sources/variable/CTEST_RUN_CURRENT_SCRIPT.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_SCP_COMMAND.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_SITE.rst.txt
 %%DOCSDIR%%/html/_sources/variable/CTEST_SOURCE_DIRECTORY.rst.txt
@@ -1544,7 +1555,6 @@
 %%DOCSDIR%%/html/generator/CodeLite.html
 %%DOCSDIR%%/html/generator/Eclipse CDT4.html
 %%DOCSDIR%%/html/generator/Green Hills MULTI.html
-%%DOCSDIR%%/html/generator/KDevelop3.html
 %%DOCSDIR%%/html/generator/Kate.html
 %%DOCSDIR%%/html/generator/MSYS Makefiles.html
 %%DOCSDIR%%/html/generator/MinGW Makefiles.html
@@ -1655,6 +1665,7 @@
 %%DOCSDIR%%/html/module/ExternalData.html
 %%DOCSDIR%%/html/module/ExternalProject.html
 %%DOCSDIR%%/html/module/FeatureSummary.html
+%%DOCSDIR%%/html/module/FetchContent.html
 %%DOCSDIR%%/html/module/FindALSA.html
 %%DOCSDIR%%/html/module/FindASPELL.html
 %%DOCSDIR%%/html/module/FindAVIFile.html
@@ -1703,6 +1714,7 @@
 %%DOCSDIR%%/html/module/FindICU.html
 %%DOCSDIR%%/html/module/FindITK.html
 %%DOCSDIR%%/html/module/FindIce.html
+%%DOCSDIR%%/html/module/FindIconv.html
 %%DOCSDIR%%/html/module/FindIcotool.html
 %%DOCSDIR%%/html/module/FindImageMagick.html
 %%DOCSDIR%%/html/module/FindIntl.html
@@ -1904,6 +1916,7 @@
 %%DOCSDIR%%/html/policy/CMP0069.html
 %%DOCSDIR%%/html/policy/CMP0070.html
 %%DOCSDIR%%/html/policy/CMP0071.html
+%%DOCSDIR%%/html/policy/CMP0072.html
 %%DOCSDIR%%/html/prop_cache/ADVANCED.html
 %%DOCSDIR%%/html/prop_cache/HELPSTRING.html
 %%DOCSDIR%%/html/prop_cache/MODIFIED.html
@@ -1989,10 +2002,12 @@
 %%DOCSDIR%%/html/prop_sf/COMPILE_DEFINITIONS.html
 %%DOCSDIR%%/html/prop_sf/COMPILE_DEFINITIONS_CONFIG.html
 %%DOCSDIR%%/html/prop_sf/COMPILE_FLAGS.html
+%%DOCSDIR%%/html/prop_sf/COMPILE_OPTIONS.html
 %%DOCSDIR%%/html/prop_sf/EXTERNAL_OBJECT.html
 %%DOCSDIR%%/html/prop_sf/Fortran_FORMAT.html
 %%DOCSDIR%%/html/prop_sf/GENERATED.html
 %%DOCSDIR%%/html/prop_sf/HEADER_FILE_ONLY.html
+%%DOCSDIR%%/html/prop_sf/INCLUDE_DIRECTORIES.html
 %%DOCSDIR%%/html/prop_sf/KEEP_EXTENSION.html
 %%DOCSDIR%%/html/prop_sf/LABELS.html
 %%DOCSDIR%%/html/prop_sf/LANGUAGE.html
@@ -2011,6 +2026,8 @@
 %%DOCSDIR%%/html/prop_sf/VS_DEPLOYMENT_LOCATION.html
 %%DOCSDIR%%/html/prop_sf/VS_INCLUDE_IN_VSIX.html
 %%DOCSDIR%%/html/prop_sf/VS_RESOURCE_GENERATOR.html
+%%DOCSDIR%%/html/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.html
+%%DOCSDIR%%/html/prop_sf/VS_SHADER_ENABLE_DEBUG.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_ENTRYPOINT.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_FLAGS.html
 %%DOCSDIR%%/html/prop_sf/VS_SHADER_MODEL.html
@@ -2068,6 +2085,7 @@
 %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME.html
 %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/AUTOGEN_BUILD_DIR.html
+%%DOCSDIR%%/html/prop_tgt/AUTOGEN_PARALLEL.html
 %%DOCSDIR%%/html/prop_tgt/AUTOGEN_TARGET_DEPENDS.html
 %%DOCSDIR%%/html/prop_tgt/AUTOMOC.html
 %%DOCSDIR%%/html/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.html
@@ -2133,6 +2151,7 @@
 %%DOCSDIR%%/html/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_CONFIGURATIONS.html
+%%DOCSDIR%%/html/prop_tgt/IMPORTED_GLOBAL.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_IMPLIB.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_IMPLIB_CONFIG.html
 %%DOCSDIR%%/html/prop_tgt/IMPORTED_LIBNAME.html
@@ -2273,6 +2292,19 @@
 %%DOCSDIR%%/html/prop_tgt/XCODE_EXPLICIT_FILE_TYPE.html
 %%DOCSDIR%%/html/prop_tgt/XCODE_PRODUCT_TYPE.html
 %%DOCSDIR%%/html/prop_tgt/XCTEST.html
+%%DOCSDIR%%/html/release/3.0.html
+%%DOCSDIR%%/html/release/3.1.html
+%%DOCSDIR%%/html/release/3.10.html
+%%DOCSDIR%%/html/release/3.11.html
+%%DOCSDIR%%/html/release/3.2.html
+%%DOCSDIR%%/html/release/3.3.html
+%%DOCSDIR%%/html/release/3.4.html
+%%DOCSDIR%%/html/release/3.5.html
+%%DOCSDIR%%/html/release/3.6.html
+%%DOCSDIR%%/html/release/3.7.html
+%%DOCSDIR%%/html/release/3.8.html
+%%DOCSDIR%%/html/release/3.9.html
+%%DOCSDIR%%/html/release/index.html
 %%DOCSDIR%%/html/search.html
 %%DOCSDIR%%/html/searchindex.js
 %%DOCSDIR%%/html/variable/ANDROID.html
@@ -2311,6 +2343,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_ARGC.html
 %%DOCSDIR%%/html/variable/CMAKE_ARGV0.html
+%%DOCSDIR%%/html/variable/CMAKE_AUTOGEN_PARALLEL.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.html
 %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.html
@@ -2335,6 +2368,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_CACHE_PATCH_VERSION.html
 %%DOCSDIR%%/html/variable/CMAKE_CFG_INTDIR.html
 %%DOCSDIR%%/html/variable/CMAKE_CL_64.html
+%%DOCSDIR%%/html/variable/CMAKE_CODEBLOCKS_COMPILER_ID.html
 %%DOCSDIR%%/html/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.html
 %%DOCSDIR%%/html/variable/CMAKE_CODELITE_USE_TARGETS.html
 %%DOCSDIR%%/html/variable/CMAKE_COLOR_MAKEFILE.html
@@ -2352,6 +2386,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_CTEST_COMMAND.html
 %%DOCSDIR%%/html/variable/CMAKE_CUDA_EXTENSIONS.html
 %%DOCSDIR%%/html/variable/CMAKE_CUDA_HOST_COMPILER.html
+%%DOCSDIR%%/html/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.html
 %%DOCSDIR%%/html/variable/CMAKE_CUDA_STANDARD.html
 %%DOCSDIR%%/html/variable/CMAKE_CUDA_STANDARD_REQUIRED.html
 %%DOCSDIR%%/html/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.html
@@ -2415,6 +2450,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_Fortran_MODOUT_FLAG.html
 %%DOCSDIR%%/html/variable/CMAKE_Fortran_MODULE_DIRECTORY.html
 %%DOCSDIR%%/html/variable/CMAKE_GENERATOR.html
+%%DOCSDIR%%/html/variable/CMAKE_GENERATOR_INSTANCE.html
 %%DOCSDIR%%/html/variable/CMAKE_GENERATOR_PLATFORM.html
 %%DOCSDIR%%/html/variable/CMAKE_GENERATOR_TOOLSET.html
 %%DOCSDIR%%/html/variable/CMAKE_GNUtoMS.html
@@ -2436,6 +2472,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.html
 %%DOCSDIR%%/html/variable/CMAKE_INCLUDE_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.html
+%%DOCSDIR%%/html/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_MESSAGE.html
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_NAME_DIR.html
 %%DOCSDIR%%/html/variable/CMAKE_INSTALL_PREFIX.html
@@ -2446,6 +2483,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.html
 %%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_IOS_INSTALL_COMBINED.html
+%%DOCSDIR%%/html/variable/CMAKE_JOB_POOLS.html
 %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_COMPILE.html
 %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_LINK.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.html
@@ -2475,6 +2513,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_LANG_CREATE_SHARED_MODULE.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_CONFIG.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_DEBUG.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_INIT.html
@@ -2484,6 +2524,7 @@
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.html
+%%DOCSDIR%%/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_DEBUG.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_MINSIZEREL.html
 %%DOCSDIR%%/html/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_RELEASE.html
@@ -2538,6 +2579,8 @@
 %%DOCSDIR%%/html/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.html
 %%DOCSDIR%%/html/variable/CMAKE_MODULE_PATH.html
 %%DOCSDIR%%/html/variable/CMAKE_MSVCIDE_RUN_PATH.html
+%%DOCSDIR%%/html/variable/CMAKE_NETRC.html
+%%DOCSDIR%%/html/variable/CMAKE_NETRC_FILE.html
 %%DOCSDIR%%/html/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.html
 %%DOCSDIR%%/html/variable/CMAKE_NOT_USING_CONFIG_FLAGS.html
 %%DOCSDIR%%/html/variable/CMAKE_NO_BUILTIN_CHRPATH.html
@@ -2630,11 +2673,13 @@
 %%DOCSDIR%%/html/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html
 %%DOCSDIR%%/html/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.html
 %%DOCSDIR%%/html/variable/CMAKE_XCODE_GENERATE_SCHEME.html
+%%DOCSDIR%%/html/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.html
 %%DOCSDIR%%/html/variable/CMAKE_XCODE_PLATFORM_TOOLSET.html
 %%DOCSDIR%%/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html
 %%DOCSDIR%%/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html
 %%DOCSDIR%%/html/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.html
 %%DOCSDIR%%/html/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.html
+%%DOCSDIR%%/html/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.html
 %%DOCSDIR%%/html/variable/CPACK_INSTALL_SCRIPT.html
 %%DOCSDIR%%/html/variable/CPACK_PACKAGING_INSTALL_PREFIX.html
 %%DOCSDIR%%/html/variable/CPACK_SET_DESTDIR.html
@@ -2695,6 +2740,7 @@
 %%DOCSDIR%%/html/variable/CTEST_P4_COMMAND.html
 %%DOCSDIR%%/html/variable/CTEST_P4_OPTIONS.html
 %%DOCSDIR%%/html/variable/CTEST_P4_UPDATE_OPTIONS.html
+%%DOCSDIR%%/html/variable/CTEST_RUN_CURRENT_SCRIPT.html
 %%DOCSDIR%%/html/variable/CTEST_SCP_COMMAND.html
 %%DOCSDIR%%/html/variable/CTEST_SITE.html
 %%DOCSDIR%%/html/variable/CTEST_SOURCE_DIRECTORY.html

Modified: head/devel/cmake-gui/Makefile
==============================================================================
--- head/devel/cmake-gui/Makefile	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake-gui/Makefile	Sun Apr 15 21:43:57 2018	(r467437)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-DISTVERSION=	3.10.2
+DISTVERSION=	3.11.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	-gui

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake/Makefile	Sun Apr 15 21:43:57 2018	(r467437)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmake
 # Remember to update devel/cmake-doc and devel/cmake-gui as well.
-DISTVERSION=	3.10.2
+DISTVERSION=	3.11.0
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libuv.so:devel/libuv \
 		librhash.so:security/rhash
 
-USES=		compiler:c++11-lang libarchive ncurses
+USES=		compiler:c++11-lang ncurses
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=make

Modified: head/devel/cmake/distinfo
==============================================================================
--- head/devel/cmake/distinfo	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake/distinfo	Sun Apr 15 21:43:57 2018	(r467437)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516374700
-SHA256 (cmake-3.10.2.tar.gz) = 80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+TIMESTAMP = 1522528039
+SHA256 (cmake-3.11.0.tar.gz) = c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b
+SIZE (cmake-3.11.0.tar.gz) = 7948287

Modified: head/devel/cmake/files/InitialCache.cmake
==============================================================================
--- head/devel/cmake/files/InitialCache.cmake	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake/files/InitialCache.cmake	Sun Apr 15 21:43:57 2018	(r467437)
@@ -13,7 +13,13 @@ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tr
 set(LIBLZMA_INCLUDE_DIR "/usr/include" CACHE PATH
     "Directory where LibLZMA headers are located.")
 set(LIBLZMA_LIBRARY "/usr/lib/liblzma.so" CACHE PATH
-    "LibLZMA library to link against..")
+    "LibLZMA library to link against.")
+
+# Similarly for libarchive
+set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH
+    "Directory where LibArchive headers are located.")
+set(LibArchive_LIBRARY "/usr/lib/libthr.so;/usr/lib/libarchive.so" CACHE PATH
+    "LibArchive library to link against.")
 
 # Modern FreeBSD systems are assumed to have libpkg installed,
 # so enable its use in CPack for the direct generation of FreeBSD

Added: head/devel/cmake/files/patch-Modules_FindBLAS.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cmake/files/patch-Modules_FindBLAS.cmake	Sun Apr 15 21:43:57 2018	(r467437)
@@ -0,0 +1,34 @@
+When finding BLAS, we may need to explicitly add gcc_s from the correct
+gcc directory to the libraries linked in while testing for BLAS functions.
+Check for the necessity via some ldd trickery. PR 226959.
+
+--- Modules/FindBLAS.cmake.orig	2018-04-06 14:25:24.441628000 +0200
++++ Modules/FindBLAS.cmake	2018-04-06 15:24:27.515872000 +0200
+@@ -162,6 +162,27 @@
+   else()
+     check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS)
+   endif()
++  if (NOT ${_prefix}${_combined_name}_WORKS)
++    # On FreeBSD, we may need to link to gcc_s in a special way
++    execute_process(
++        COMMAND /usr/bin/ldd ${${LIBRARIES}}
++        COMMAND /usr/bin/grep gcc_s
++        COMMAND /usr/bin/cut -w -f 4
++        RESULT_VARIABLE _found_needed
++        OUTPUT_VARIABLE _output_needed
++        )
++#    message("DEBUG: found=${_found_needed} output=${_output_needed}")
++    if (_found_needed EQUAL "0" AND _output_needed MATCHES "libgcc_s")
++        set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_output_needed} ${_thread})
++        message(STATUS "Re-trying ${LIBRARIES} search with gcc_s")
++        if (CMAKE_Fortran_COMPILER_LOADED)
++            check_fortran_function_exists("${_name}" ${_prefix}${_combined_name}_WORKS2)
++        else()
++            check_function_exists("${_name}_" ${_prefix}${_combined_name}_WORKS2)
++        endif()
++        set(${_prefix}${_combined_name}_WORKS ${${_prefix}${_combined_name}_WORKS2})
++    endif()
++  endif()  
+   set(CMAKE_REQUIRED_LIBRARIES)
+   mark_as_advanced(${_prefix}${_combined_name}_WORKS)
+   set(_libraries_work ${${_prefix}${_combined_name}_WORKS})

Added: head/devel/cmake/files/patch-Modules_FindOpenMP.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cmake/files/patch-Modules_FindOpenMP.cmake	Sun Apr 15 21:43:57 2018	(r467437)
@@ -0,0 +1,16 @@
+Avoid looking for pthread by simply asserting that it is there.
+Otherwise openmp can't be found because the pthread library
+lives in /usr/lib and CMake 3.11 doesn't look there anymore
+while looking for openmp. PR 223678.
+
+--- Modules/FindOpenMP.cmake 2018-04-07 20:56:40.059488000 +0000
++++ Modules/FindOpenMP.cmake 2018-04-07 21:48:55.681077000 +0000
+@@ -79,6 +79,8 @@
+ cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
+ cmake_policy(SET CMP0057 NEW) # if IN_LIST
+ 
++set(OpenMP_pthread_LIBRARY -lpthread)
++
+ function(_OPENMP_FLAG_CANDIDATES LANG)
+   message(STATUS "FindOpenMP: flag-candidates ${LANG}")
+   if(NOT OpenMP_${LANG}_FLAG)

Modified: head/devel/cmake/files/patch-Modules_FindQt4.cmake
==============================================================================
--- head/devel/cmake/files/patch-Modules_FindQt4.cmake	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake/files/patch-Modules_FindQt4.cmake	Sun Apr 15 21:43:57 2018	(r467437)
@@ -1,36 +1,30 @@
---- Modules/FindQt4.cmake.orig	2017-05-31 14:00:09 UTC
+--- Modules/FindQt4.cmake.orig	2018-03-28 11:16:49 UTC
 +++ Modules/FindQt4.cmake
-@@ -706,14 +706,7 @@ if (QT_QMAKE_EXECUTABLE AND
-   # ask qmake for the plugins directory
-   if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
-     _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir)
--    set(QT_PLUGINS_DIR NOTFOUND)
--    foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
--      set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
--    endforeach()
+@@ -713,10 +713,15 @@ if (QT_QMAKE_EXECUTABLE AND
+     foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
+       set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins")
+     endforeach()
 -    find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
--      HINTS ${qt_cross_paths} ${qt_plugins_dir}
--      DOC "The location of the Qt plugins"
++    find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs
+       HINTS ${qt_cross_paths} ${qt_plugins_dir}
+       DOC "The location of the Qt plugins"
 -      NO_CMAKE_FIND_ROOT_PATH)
-+    set(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
++      NO_CMAKE_FIND_ROOT_PATH
++      NO_SYSTEM_ENVIRONMENT_PATH
++      NO_CMAKE_SYSTEM_PATH)
++    if(NOT QT_PLUGINS_DIR AND qt_plugins_dir)
++      set(QT_PLUGINS_DIR ${qt_plugins_dir})
++    endif()
    endif ()
  
    # ask qmake for the translations directory
-@@ -726,16 +719,7 @@ if (QT_QMAKE_EXECUTABLE AND
-   if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
-     _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir)
-     if(qt_imports_dir)
--      set(QT_IMPORTS_DIR NOTFOUND)
--      foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH})
--        set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/imports")
--      endforeach()
--      find_path(QT_IMPORTS_DIR NAMES Qt
--        HINTS ${qt_cross_paths} ${qt_imports_dir}
--        DOC "The location of the Qt imports"
--        NO_CMAKE_FIND_ROOT_PATH
--        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
--        NO_CMAKE_SYSTEM_PATH)
-+      set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports" FORCE)
+@@ -740,6 +745,9 @@ if (QT_QMAKE_EXECUTABLE AND
+         NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
+         NO_CMAKE_SYSTEM_PATH)
        mark_as_advanced(QT_IMPORTS_DIR)
++      if(NOT QT_IMPORTS_DIR AND qt_imports_dir)
++        set(QT_IMPORTS_DIR ${qt_imports_dir})
++      endif()
      endif()
    endif ()
+ 

Modified: head/devel/cmake/pkg-plist
==============================================================================
--- head/devel/cmake/pkg-plist	Sun Apr 15 21:26:26 2018	(r467436)
+++ head/devel/cmake/pkg-plist	Sun Apr 15 21:43:57 2018	(r467437)
@@ -173,7 +173,6 @@ share/aclocal/cmake.m4
 %%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
 %%DATADIR%%/Help/generator/MinGW Makefiles.rst
@@ -289,6 +288,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/ExternalData.rst
 %%DATADIR%%/Help/module/ExternalProject.rst
 %%DATADIR%%/Help/module/FeatureSummary.rst
+%%DATADIR%%/Help/module/FetchContent.rst
 %%DATADIR%%/Help/module/FindALSA.rst
 %%DATADIR%%/Help/module/FindASPELL.rst
 %%DATADIR%%/Help/module/FindAVIFile.rst
@@ -337,6 +337,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindICU.rst
 %%DATADIR%%/Help/module/FindITK.rst
 %%DATADIR%%/Help/module/FindIce.rst
+%%DATADIR%%/Help/module/FindIconv.rst
 %%DATADIR%%/Help/module/FindIcotool.rst
 %%DATADIR%%/Help/module/FindImageMagick.rst
 %%DATADIR%%/Help/module/FindIntl.rst
@@ -537,6 +538,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/policy/CMP0069.rst
 %%DATADIR%%/Help/policy/CMP0070.rst
 %%DATADIR%%/Help/policy/CMP0071.rst
+%%DATADIR%%/Help/policy/CMP0072.rst
 %%DATADIR%%/Help/policy/DEPRECATED.txt
 %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
 %%DATADIR%%/Help/prop_cache/ADVANCED.rst
@@ -624,10 +626,12 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS.rst
 %%DATADIR%%/Help/prop_sf/COMPILE_DEFINITIONS_CONFIG.rst
 %%DATADIR%%/Help/prop_sf/COMPILE_FLAGS.rst
+%%DATADIR%%/Help/prop_sf/COMPILE_OPTIONS.rst
 %%DATADIR%%/Help/prop_sf/EXTERNAL_OBJECT.rst
 %%DATADIR%%/Help/prop_sf/Fortran_FORMAT.rst
 %%DATADIR%%/Help/prop_sf/GENERATED.rst
 %%DATADIR%%/Help/prop_sf/HEADER_FILE_ONLY.rst
+%%DATADIR%%/Help/prop_sf/INCLUDE_DIRECTORIES.rst
 %%DATADIR%%/Help/prop_sf/KEEP_EXTENSION.rst
 %%DATADIR%%/Help/prop_sf/LABELS.rst
 %%DATADIR%%/Help/prop_sf/LANGUAGE.rst
@@ -646,6 +650,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_LOCATION.rst
 %%DATADIR%%/Help/prop_sf/VS_INCLUDE_IN_VSIX.rst
 %%DATADIR%%/Help/prop_sf/VS_RESOURCE_GENERATOR.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_DISABLE_OPTIMIZATIONS.rst
+%%DATADIR%%/Help/prop_sf/VS_SHADER_ENABLE_DEBUG.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_FLAGS.rst
 %%DATADIR%%/Help/prop_sf/VS_SHADER_MODEL.rst
@@ -703,6 +709,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst
 %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/AUTOGEN_BUILD_DIR.rst
+%%DATADIR%%/Help/prop_tgt/AUTOGEN_PARALLEL.rst
 %%DATADIR%%/Help/prop_tgt/AUTOGEN_TARGET_DEPENDS.rst
 %%DATADIR%%/Help/prop_tgt/AUTOMOC.rst
 %%DATADIR%%/Help/prop_tgt/AUTOMOC_COMPILER_PREDEFINES.rst
@@ -769,6 +776,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/IMPLICIT_DEPENDS_INCLUDE_TRANSFORM.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_CONFIGURATIONS.rst
+%%DATADIR%%/Help/prop_tgt/IMPORTED_GLOBAL.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_IMPLIB.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_IMPLIB_CONFIG.rst
 %%DATADIR%%/Help/prop_tgt/IMPORTED_LIBNAME.rst
@@ -916,6 +924,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/release/3.0.rst
 %%DATADIR%%/Help/release/3.1.rst
 %%DATADIR%%/Help/release/3.10.rst
+%%DATADIR%%/Help/release/3.11.rst
 %%DATADIR%%/Help/release/3.2.rst
 %%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/3.4.rst
@@ -962,6 +971,7 @@ share/aclocal/cmake.m4
 %%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_AUTOGEN_PARALLEL.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_COMPILER_PREDEFINES.rst
 %%DATADIR%%/Help/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.rst
@@ -986,6 +996,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_CACHE_PATCH_VERSION.rst
 %%DATADIR%%/Help/variable/CMAKE_CFG_INTDIR.rst
 %%DATADIR%%/Help/variable/CMAKE_CL_64.rst
+%%DATADIR%%/Help/variable/CMAKE_CODEBLOCKS_COMPILER_ID.rst
 %%DATADIR%%/Help/variable/CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES.rst
 %%DATADIR%%/Help/variable/CMAKE_CODELITE_USE_TARGETS.rst
 %%DATADIR%%/Help/variable/CMAKE_COLOR_MAKEFILE.rst
@@ -1003,6 +1014,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst
 %%DATADIR%%/Help/variable/CMAKE_CUDA_EXTENSIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst
+%%DATADIR%%/Help/variable/CMAKE_CUDA_SEPARABLE_COMPILATION.rst
 %%DATADIR%%/Help/variable/CMAKE_CUDA_STANDARD.rst
 %%DATADIR%%/Help/variable/CMAKE_CUDA_STANDARD_REQUIRED.rst
 %%DATADIR%%/Help/variable/CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.rst
@@ -1067,6 +1079,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst
 %%DATADIR%%/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst
 %%DATADIR%%/Help/variable/CMAKE_GENERATOR.rst
+%%DATADIR%%/Help/variable/CMAKE_GENERATOR_INSTANCE.rst
 %%DATADIR%%/Help/variable/CMAKE_GENERATOR_PLATFORM.rst
 %%DATADIR%%/Help/variable/CMAKE_GENERATOR_TOOLSET.rst
 %%DATADIR%%/Help/variable/CMAKE_GNUtoMS.rst
@@ -1088,6 +1101,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
 %%DATADIR%%/Help/variable/CMAKE_INCLUDE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME.rst
+%%DATADIR%%/Help/variable/CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_MESSAGE.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_NAME_DIR.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -1098,6 +1112,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.rst
 %%DATADIR%%/Help/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
 %%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
+%%DATADIR%%/Help/variable/CMAKE_JOB_POOLS.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst
@@ -1127,6 +1142,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_CREATE_SHARED_MODULE.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_CREATE_STATIC_LIBRARY.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_CONFIG.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_CONFIG_INIT.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_DEBUG.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_DEBUG_INIT.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_INIT.rst
@@ -1136,6 +1153,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELEASE_INIT.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_FLAGS_RELWITHDEBINFO_INIT.rst
+%%DATADIR%%/Help/variable/CMAKE_LANG_GHS_KERNEL_FLAGS_CONFIG.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
@@ -1190,6 +1208,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_MODULE_LINKER_FLAGS_INIT.rst
 %%DATADIR%%/Help/variable/CMAKE_MODULE_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_MSVCIDE_RUN_PATH.rst
+%%DATADIR%%/Help/variable/CMAKE_NETRC.rst
+%%DATADIR%%/Help/variable/CMAKE_NETRC_FILE.rst
 %%DATADIR%%/Help/variable/CMAKE_NINJA_OUTPUT_PATH_PREFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_NOT_USING_CONFIG_FLAGS.rst
 %%DATADIR%%/Help/variable/CMAKE_NO_BUILTIN_CHRPATH.rst
@@ -1283,11 +1303,13 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_SCHEME.rst
+%%DATADIR%%/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst
 %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst
 %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst
 %%DATADIR%%/Help/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.rst
 %%DATADIR%%/Help/variable/CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst
 %%DATADIR%%/Help/variable/CPACK_INCLUDE_TOPLEVEL_DIRECTORY.rst
+%%DATADIR%%/Help/variable/CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS.rst
 %%DATADIR%%/Help/variable/CPACK_INSTALL_SCRIPT.rst
 %%DATADIR%%/Help/variable/CPACK_PACKAGING_INSTALL_PREFIX.rst
 %%DATADIR%%/Help/variable/CPACK_SET_DESTDIR.rst
@@ -1349,6 +1371,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CTEST_P4_COMMAND.rst
 %%DATADIR%%/Help/variable/CTEST_P4_OPTIONS.rst
 %%DATADIR%%/Help/variable/CTEST_P4_UPDATE_OPTIONS.rst
+%%DATADIR%%/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst
 %%DATADIR%%/Help/variable/CTEST_SCP_COMMAND.rst
 %%DATADIR%%/Help/variable/CTEST_SITE.rst
 %%DATADIR%%/Help/variable/CTEST_SOURCE_DIRECTORY.rst
@@ -1406,10 +1429,10 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/AddFileDependencies.cmake
 %%DATADIR%%/Modules/AndroidTestUtilities.cmake
 %%DATADIR%%/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake
-%%DATADIR%%/Modules/AutogenInfo.cmake.in
 %%DATADIR%%/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
 %%DATADIR%%/Modules/BasicConfigVersion-ExactVersion.cmake.in
 %%DATADIR%%/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+%%DATADIR%%/Modules/BasicConfigVersion-SameMinorVersion.cmake.in
 %%DATADIR%%/Modules/BundleUtilities.cmake
 %%DATADIR%%/Modules/CMake.cmake
 %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake
@@ -1473,9 +1496,9 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/CMakeFindEclipseCDT4.cmake
 %%DATADIR%%/Modules/CMakeFindFrameworks.cmake
 %%DATADIR%%/Modules/CMakeFindJavaCommon.cmake
-%%DATADIR%%/Modules/CMakeFindKDevelop3.cmake
 %%DATADIR%%/Modules/CMakeFindKate.cmake
 %%DATADIR%%/Modules/CMakeFindPackageMode.cmake
+%%DATADIR%%/Modules/CMakeFindSublimeText2.cmake
 %%DATADIR%%/Modules/CMakeFindWMake.cmake
 %%DATADIR%%/Modules/CMakeFindXCode.cmake
 %%DATADIR%%/Modules/CMakeForceCompiler.cmake
@@ -1487,6 +1510,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
 %%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
 %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
+%%DATADIR%%/Modules/CMakeInitializeConfigs.cmake
 %%DATADIR%%/Modules/CMakeJOMFindMake.cmake
 %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
 %%DATADIR%%/Modules/CMakeJavaInformation.cmake
@@ -1697,6 +1721,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/MSVC-ASM.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake
 %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake
@@ -1771,6 +1796,8 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/ExternalProject.cmake
 %%DATADIR%%/Modules/FLTKCompatibility.cmake
 %%DATADIR%%/Modules/FeatureSummary.cmake
+%%DATADIR%%/Modules/FetchContent.cmake
+%%DATADIR%%/Modules/FetchContent/CMakeLists.cmake.in
 %%DATADIR%%/Modules/FindALSA.cmake
 %%DATADIR%%/Modules/FindASPELL.cmake
 %%DATADIR%%/Modules/FindAVIFile.cmake
@@ -1823,6 +1850,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/FindHg.cmake
 %%DATADIR%%/Modules/FindICU.cmake
 %%DATADIR%%/Modules/FindIce.cmake
+%%DATADIR%%/Modules/FindIconv.cmake
 %%DATADIR%%/Modules/FindIcotool.cmake
 %%DATADIR%%/Modules/FindImageMagick.cmake
 %%DATADIR%%/Modules/FindIntl.cmake
@@ -2206,6 +2234,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Modules/Platform/Windows-Embarcadero-C.cmake
 %%DATADIR%%/Modules/Platform/Windows-Embarcadero-CXX.cmake
 %%DATADIR%%/Modules/Platform/Windows-Embarcadero.cmake
+%%DATADIR%%/Modules/Platform/Windows-Flang-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Windows-G95-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Windows-GNU-C-ABI.cmake
 %%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804152143.w3FLhvam034649>