Date: Sun, 16 Aug 2020 09:27:19 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545091 - in head: cad/opensta cad/opensta/files devel devel/cmake devel/cmake-doc devel/cmake-gui devel/cmakedoc devel/folly/files devel/kms-cmake-utils graphics/qgis-ltr/files graphic... Message-ID: <202008160927.07G9RJSO038658@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Aug 16 09:27:18 2020 New Revision: 545091 URL: https://svnweb.freebsd.org/changeset/ports/545091 Log: devel/cmake: update to 3.18.1 - update to 3.18.1 - new port devel/cmakedoc Thanks to adridg@ for tackling most of the fallout. PR: 248003 Exp-run by: antoine Added: head/devel/cmakedoc/ head/devel/cmakedoc/Makefile (contents, props changed) head/devel/cmakedoc/distinfo (contents, props changed) head/devel/cmakedoc/pkg-descr (contents, props changed) head/devel/folly/files/patch-CMakeLists.txt (contents, props changed) head/graphics/qgis/files/patch-src_core_CMakeLists.txt (contents, props changed) head/net-p2p/libtorrent-rasterbar/files/ head/net-p2p/libtorrent-rasterbar/files/patch-cmake_Modules_GeneratePkgConfig.cmake (contents, props changed) Modified: head/cad/opensta/Makefile head/cad/opensta/files/patch-CMakeLists.txt head/devel/Makefile head/devel/cmake-doc/Makefile head/devel/cmake-gui/Makefile head/devel/cmake/Makefile head/devel/cmake/distinfo head/devel/cmake/pkg-plist head/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp head/devel/folly/files/patch-folly_memory_detail_MallocImpl.h head/devel/kms-cmake-utils/Makefile head/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt head/net-p2p/libtorrent-rasterbar/Makefile Modified: head/cad/opensta/Makefile ============================================================================== --- head/cad/opensta/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/cad/opensta/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -2,6 +2,7 @@ PORTNAME= opensta DISTVERSION= g20200315 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org Modified: head/cad/opensta/files/patch-CMakeLists.txt ============================================================================== --- head/cad/opensta/files/patch-CMakeLists.txt Sun Aug 16 09:11:47 2020 (r545090) +++ head/cad/opensta/files/patch-CMakeLists.txt Sun Aug 16 09:27:18 2020 (r545091) @@ -1,11 +1,19 @@ ---- CMakeLists.txt.orig 2020-03-16 14:40:15 UTC +--- CMakeLists.txt.orig 2020-08-02 12:25:56 UTC +++ CMakeLists.txt -@@ -627,7 +627,7 @@ set(STA_INCLUDE_DIRS - # compatibility with configure +@@ -474,7 +474,7 @@ add_flex_bison_dependency(SdfLex SdfParser) + + ################################################################ + +-find_package(SWIG REQUIRED 3.0) ++find_package(SWIG 4.0 COMPONENTS python REQUIRED) + include(UseSWIG) + + set(STA_SWIG_FILE app/StaApp.i) +@@ -628,6 +628,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${STA_HOME}/app) --add_library(OpenSTA -+add_library(OpenSTA SHARED + add_library(OpenSTA ++ SHARED ${STA_SOURCE} ${STA_TCL_INIT} Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -349,6 +349,7 @@ SUBDIR += cmake-fedora SUBDIR += cmake-gui SUBDIR += cmake-modules-webos + SUBDIR += cmakedoc SUBDIR += cmph SUBDIR += cmunge SUBDIR += coccinelle Modified: head/devel/cmake-doc/Makefile ============================================================================== --- head/devel/cmake-doc/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/cmake-doc/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -DISTVERSION= 3.17.3 +DISTVERSION= 3.18.1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -doc Modified: head/devel/cmake-gui/Makefile ============================================================================== --- head/devel/cmake-gui/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/cmake-gui/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -DISTVERSION= 3.17.3 -PORTREVISION= 1 +DISTVERSION= 3.18.1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/cmake/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -3,8 +3,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. -DISTVERSION= 3.17.3 -PORTREVISION= 1 +DISTVERSION= 3.18.1 CATEGORIES= devel MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ https://www.cmake.org/files/v${PORTVERSION}/ Modified: head/devel/cmake/distinfo ============================================================================== --- head/devel/cmake/distinfo Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/cmake/distinfo Sun Aug 16 09:27:18 2020 (r545091) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590771652 -SHA256 (cmake-3.17.3.tar.gz) = 0bd60d512275dc9f6ef2a2865426a184642ceb3761794e6b65bff233b91d8c40 -SIZE (cmake-3.17.3.tar.gz) = 9470753 +TIMESTAMP = 1596138044 +SHA256 (cmake-3.18.1.tar.gz) = c0e3338bd37e67155b9d1e9526fec326b5c541f74857771b7ffed0c46ad62508 +SIZE (cmake-3.18.1.tar.gz) = 8969366 Modified: head/devel/cmake/pkg-plist ============================================================================== --- head/devel/cmake/pkg-plist Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/cmake/pkg-plist Sun Aug 16 09:27:18 2020 (r545091) @@ -25,6 +25,10 @@ bin/ctest %%MANPAGES%%man/man7/cmake-variables.7.gz %%MANPAGES%%man/man7/cpack-generators.7.gz share/aclocal/cmake.m4 +share/bash-completion/completions/cmake +share/bash-completion/completions/cpack +share/bash-completion/completions/ctest +%%DATADIR%%/Help/command/DEVICE_LINK_OPTIONS.txt %%DATADIR%%/Help/command/FIND_XXX.txt %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt @@ -46,6 +50,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/command/build_command.rst %%DATADIR%%/Help/command/build_name.rst %%DATADIR%%/Help/command/cmake_host_system_information.rst +%%DATADIR%%/Help/command/cmake_language.rst %%DATADIR%%/Help/command/cmake_minimum_required.rst %%DATADIR%%/Help/command/cmake_parse_arguments.rst %%DATADIR%%/Help/command/cmake_policy.rst @@ -170,6 +175,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/envvar/ASM_DIALECT.rst %%DATADIR%%/Help/envvar/ASM_DIALECTFLAGS.rst %%DATADIR%%/Help/envvar/CC.rst +%%DATADIR%%/Help/envvar/CCMAKE_COLORS.rst %%DATADIR%%/Help/envvar/CFLAGS.rst %%DATADIR%%/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst %%DATADIR%%/Help/envvar/CMAKE_CONFIG_TYPE.rst @@ -182,6 +188,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/envvar/CMAKE_MSVCIDE_RUN_PATH.rst %%DATADIR%%/Help/envvar/CMAKE_NO_VERBOSE.rst %%DATADIR%%/Help/envvar/CMAKE_OSX_ARCHITECTURES.rst +%%DATADIR%%/Help/envvar/CMAKE_PREFIX_PATH.rst %%DATADIR%%/Help/envvar/CSFLAGS.rst %%DATADIR%%/Help/envvar/CTEST_INTERACTIVE_DEBUG_MODE.rst %%DATADIR%%/Help/envvar/CTEST_OUTPUT_ON_FAILURE.rst @@ -324,6 +331,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/module/CheckIncludeFiles.rst %%DATADIR%%/Help/module/CheckLanguage.rst %%DATADIR%%/Help/module/CheckLibraryExists.rst +%%DATADIR%%/Help/module/CheckLinkerFlag.rst %%DATADIR%%/Help/module/CheckOBJCCompilerFlag.rst %%DATADIR%%/Help/module/CheckOBJCSourceCompiles.rst %%DATADIR%%/Help/module/CheckOBJCSourceRuns.rst @@ -632,6 +640,12 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/policy/CMP0100.rst %%DATADIR%%/Help/policy/CMP0101.rst %%DATADIR%%/Help/policy/CMP0102.rst +%%DATADIR%%/Help/policy/CMP0103.rst +%%DATADIR%%/Help/policy/CMP0104.rst +%%DATADIR%%/Help/policy/CMP0105.rst +%%DATADIR%%/Help/policy/CMP0106.rst +%%DATADIR%%/Help/policy/CMP0107.rst +%%DATADIR%%/Help/policy/CMP0108.rst %%DATADIR%%/Help/policy/DEPRECATED.txt %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt %%DATADIR%%/Help/prop_cache/ADVANCED.rst @@ -728,6 +742,7 @@ share/aclocal/cmake.m4 %%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/Fortran_PREPROCESS.rst %%DATADIR%%/Help/prop_sf/GENERATED.rst %%DATADIR%%/Help/prop_sf/HEADER_FILE_ONLY.rst %%DATADIR%%/Help/prop_sf/INCLUDE_DIRECTORIES.rst @@ -747,12 +762,14 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_sf/SYMBOLIC.rst %%DATADIR%%/Help/prop_sf/Swift_DEPENDENCIES_FILE.rst %%DATADIR%%/Help/prop_sf/Swift_DIAGNOSTICS_FILE.rst +%%DATADIR%%/Help/prop_sf/UNITY_GROUP.rst %%DATADIR%%/Help/prop_sf/VS_COPY_TO_OUT_DIR.rst %%DATADIR%%/Help/prop_sf/VS_CSHARP_tagname.rst %%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst %%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_SETTINGS.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 @@ -796,6 +813,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/ADDITIONAL_CLEAN_FILES.rst %%DATADIR%%/Help/prop_tgt/AIX_EXPORT_ALL_SYMBOLS.rst %%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.rst +%%DATADIR%%/Help/prop_tgt/ALIAS_GLOBAL.rst %%DATADIR%%/Help/prop_tgt/ANDROID_ANT_ADDITIONAL_OPTIONS.rst %%DATADIR%%/Help/prop_tgt/ANDROID_API.rst %%DATADIR%%/Help/prop_tgt/ANDROID_API_MIN.rst @@ -860,6 +878,7 @@ share/aclocal/cmake.m4 %%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/CUDA_ARCHITECTURES.rst %%DATADIR%%/Help/prop_tgt/CUDA_EXTENSIONS.rst %%DATADIR%%/Help/prop_tgt/CUDA_PTX_COMPILATION.rst %%DATADIR%%/Help/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.rst @@ -891,9 +910,11 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/EchoString.rst %%DATADIR%%/Help/prop_tgt/FOLDER.rst %%DATADIR%%/Help/prop_tgt/FRAMEWORK.rst +%%DATADIR%%/Help/prop_tgt/FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst %%DATADIR%%/Help/prop_tgt/FRAMEWORK_VERSION.rst %%DATADIR%%/Help/prop_tgt/Fortran_FORMAT.rst %%DATADIR%%/Help/prop_tgt/Fortran_MODULE_DIRECTORY.rst +%%DATADIR%%/Help/prop_tgt/Fortran_PREPROCESS.rst %%DATADIR%%/Help/prop_tgt/GENERATOR_FILE_NAME.rst %%DATADIR%%/Help/prop_tgt/GHS_INTEGRITY_APP.rst %%DATADIR%%/Help/prop_tgt/GHS_NO_SOURCE_GROUP_FILE.rst @@ -1003,6 +1024,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst %%DATADIR%%/Help/prop_tgt/OUTPUT_NAME.rst %%DATADIR%%/Help/prop_tgt/OUTPUT_NAME_CONFIG.rst +%%DATADIR%%/Help/prop_tgt/PCH_WARN_INVALID.rst %%DATADIR%%/Help/prop_tgt/PDB_NAME.rst %%DATADIR%%/Help/prop_tgt/PDB_NAME_CONFIG.rst %%DATADIR%%/Help/prop_tgt/PDB_NOTE.txt @@ -1042,6 +1064,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_BATCH_SIZE.rst %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_CODE_AFTER_INCLUDE.rst %%DATADIR%%/Help/prop_tgt/UNITY_BUILD_CODE_BEFORE_INCLUDE.rst +%%DATADIR%%/Help/prop_tgt/UNITY_BUILD_MODE.rst %%DATADIR%%/Help/prop_tgt/VERSION.rst %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst %%DATADIR%%/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst @@ -1068,12 +1091,15 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.rst %%DATADIR%%/Help/prop_tgt/VS_NO_SOLUTION_DEPLOY.rst %%DATADIR%%/Help/prop_tgt/VS_PACKAGE_REFERENCES.rst +%%DATADIR%%/Help/prop_tgt/VS_PLATFORM_TOOLSET.rst %%DATADIR%%/Help/prop_tgt/VS_PROJECT_IMPORT.rst %%DATADIR%%/Help/prop_tgt/VS_SCC_AUXPATH.rst %%DATADIR%%/Help/prop_tgt/VS_SCC_LOCALPATH.rst %%DATADIR%%/Help/prop_tgt/VS_SCC_PROJECTNAME.rst %%DATADIR%%/Help/prop_tgt/VS_SCC_PROVIDER.rst %%DATADIR%%/Help/prop_tgt/VS_SDK_REFERENCES.rst +%%DATADIR%%/Help/prop_tgt/VS_SOLUTION_DEPLOY.rst +%%DATADIR%%/Help/prop_tgt/VS_SOURCE_SETTINGS_tool.rst %%DATADIR%%/Help/prop_tgt/VS_USER_PROPS.rst %%DATADIR%%/Help/prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst %%DATADIR%%/Help/prop_tgt/VS_WINRT_COMPONENT.rst @@ -1119,6 +1145,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/release/3.15.rst %%DATADIR%%/Help/release/3.16.rst %%DATADIR%%/Help/release/3.17.rst +%%DATADIR%%/Help/release/3.18.rst %%DATADIR%%/Help/release/3.2.rst %%DATADIR%%/Help/release/3.3.rst %%DATADIR%%/Help/release/3.4.rst @@ -1215,6 +1242,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_CROSS_CONFIGS.rst %%DATADIR%%/Help/variable/CMAKE_CTEST_ARGUMENTS.rst %%DATADIR%%/Help/variable/CMAKE_CTEST_COMMAND.rst +%%DATADIR%%/Help/variable/CMAKE_CUDA_ARCHITECTURES.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_COMPILE_FEATURES.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_EXTENSIONS.rst %%DATADIR%%/Help/variable/CMAKE_CUDA_HOST_COMPILER.rst @@ -1302,12 +1330,14 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY.rst %%DATADIR%%/Help/variable/CMAKE_FOLDER.rst %%DATADIR%%/Help/variable/CMAKE_FRAMEWORK.rst +%%DATADIR%%/Help/variable/CMAKE_FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_FRAMEWORK_PATH.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_FORMAT.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_MODDIR_DEFAULT.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_MODDIR_FLAG.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_MODOUT_FLAG.rst %%DATADIR%%/Help/variable/CMAKE_Fortran_MODULE_DIRECTORY.rst +%%DATADIR%%/Help/variable/CMAKE_Fortran_PREPROCESS.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR_INSTANCE.rst %%DATADIR%%/Help/variable/CMAKE_GENERATOR_PLATFORM.rst @@ -1471,6 +1501,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_OSX_VARIABLE.txt %%DATADIR%%/Help/variable/CMAKE_PARENT_LIST_FILE.rst %%DATADIR%%/Help/variable/CMAKE_PATCH_VERSION.rst +%%DATADIR%%/Help/variable/CMAKE_PCH_WARN_INVALID.rst %%DATADIR%%/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY.rst %%DATADIR%%/Help/variable/CMAKE_PDB_OUTPUT_DIRECTORY_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_POLICY_DEFAULT_CMPNNNN.rst @@ -1666,6 +1697,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_RESOURCE_SPEC_FILE.rst %%DATADIR%%/Help/variable/CTEST_RUN_CURRENT_SCRIPT.rst %%DATADIR%%/Help/variable/CTEST_SCP_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_SITE.rst @@ -1908,6 +1940,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/CheckLanguage.cmake %%DATADIR%%/Modules/CheckLibraryExists.cmake %%DATADIR%%/Modules/CheckLibraryExists.lists.in +%%DATADIR%%/Modules/CheckLinkerFlag.cmake %%DATADIR%%/Modules/CheckOBJCCompilerFlag.cmake %%DATADIR%%/Modules/CheckOBJCSourceCompiles.cmake %%DATADIR%%/Modules/CheckOBJCSourceRuns.cmake @@ -1955,6 +1988,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake %%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake %%DATADIR%%/Modules/Compiler/Clang-C.cmake +%%DATADIR%%/Modules/Compiler/Clang-CUDA.cmake %%DATADIR%%/Modules/Compiler/Clang-CXX-FeatureTests.cmake %%DATADIR%%/Modules/Compiler/Clang-CXX-TestableFeatures.cmake %%DATADIR%%/Modules/Compiler/Clang-CXX.cmake @@ -2028,7 +2062,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake %%DATADIR%%/Modules/Compiler/NVIDIA-CUDA.cmake %%DATADIR%%/Modules/Compiler/NVIDIA-DetermineCompiler.cmake +%%DATADIR%%/Modules/Compiler/OpenWatcom-C.cmake +%%DATADIR%%/Modules/Compiler/OpenWatcom-CXX.cmake %%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake +%%DATADIR%%/Modules/Compiler/OpenWatcom.cmake %%DATADIR%%/Modules/Compiler/PGI-C.cmake %%DATADIR%%/Modules/Compiler/PGI-CXX.cmake %%DATADIR%%/Modules/Compiler/PGI-DetermineCompiler.cmake @@ -2103,6 +2140,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/ExternalData.cmake %%DATADIR%%/Modules/ExternalData_config.cmake.in %%DATADIR%%/Modules/ExternalProject-download.cmake.in +%%DATADIR%%/Modules/ExternalProject-gitupdate.cmake.in %%DATADIR%%/Modules/ExternalProject-verify.cmake.in %%DATADIR%%/Modules/ExternalProject.cmake %%DATADIR%%/Modules/FLTKCompatibility.cmake @@ -2489,6 +2527,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Platform/CYGWIN.cmake %%DATADIR%%/Modules/Platform/Catamount.cmake %%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake +%%DATADIR%%/Modules/Platform/DOS-OpenWatcom-C.cmake +%%DATADIR%%/Modules/Platform/DOS-OpenWatcom-CXX.cmake +%%DATADIR%%/Modules/Platform/DOS-OpenWatcom.cmake +%%DATADIR%%/Modules/Platform/DOS.cmake %%DATADIR%%/Modules/Platform/Darwin-Determine-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin-Initialize.cmake %%DATADIR%%/Modules/Platform/Darwin.cmake @@ -2535,6 +2577,9 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake %%DATADIR%%/Modules/Platform/Linux-Intel.cmake %%DATADIR%%/Modules/Platform/Linux-NAG-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-OpenWatcom-C.cmake +%%DATADIR%%/Modules/Platform/Linux-OpenWatcom-CXX.cmake +%%DATADIR%%/Modules/Platform/Linux-OpenWatcom.cmake %%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake %%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-PGI-Fortran.cmake @@ -2557,6 +2602,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/Platform/Midipix.cmake %%DATADIR%%/Modules/Platform/MirBSD.cmake %%DATADIR%%/Modules/Platform/NetBSD.cmake +%%DATADIR%%/Modules/Platform/OS2-OpenWatcom-C.cmake +%%DATADIR%%/Modules/Platform/OS2-OpenWatcom-CXX.cmake +%%DATADIR%%/Modules/Platform/OS2-OpenWatcom.cmake +%%DATADIR%%/Modules/Platform/OS2.cmake %%DATADIR%%/Modules/Platform/OSF1.cmake %%DATADIR%%/Modules/Platform/OpenBSD.cmake %%DATADIR%%/Modules/Platform/OpenVMS.cmake @@ -2682,6 +2731,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Modules/TestForSTDNamespace.cxx %%DATADIR%%/Modules/UseEcos.cmake %%DATADIR%%/Modules/UseJava.cmake +%%DATADIR%%/Modules/UseJava/ClearClassFiles.cmake %%DATADIR%%/Modules/UseJavaClassFilelist.cmake %%DATADIR%%/Modules/UseJavaSymlinks.cmake %%DATADIR%%/Modules/UsePkgConfig.cmake @@ -2751,13 +2801,9 @@ share/aclocal/cmake.m4 %%DATADIR%%/Templates/Windows/SplashScreen.png %%DATADIR%%/Templates/Windows/StoreLogo.png %%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx -%%DATADIR%%/completions/cmake -%%DATADIR%%/completions/cpack -%%DATADIR%%/completions/ctest -%%DATADIR%%/editors/emacs/cmake-mode.el -%%DATADIR%%/editors/vim/indent/cmake.vim -%%DATADIR%%/editors/vim/syntax/cmake.vim %%DATADIR%%/include/cmCPluginAPI.h %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt %%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt share/emacs/site-lisp/cmake-mode.el +share/vim/vimfiles/indent/cmake.vim +share/vim/vimfiles/syntax/cmake.vim Added: head/devel/cmakedoc/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmakedoc/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= cmakedoc +DISTVERSION= 1.0.1 +CATEGORIES= devel +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= kde@FreeBSD.org +COMMENT= Command-line tool to read CMake documentation + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +RUN_DEPENDS= cmake-doc>=0:devel/cmake-doc + +USES= python:3.5+ +USE_GITHUB= yes +GH_ACCOUNT= agateau +USE_PYTHON= autoplist distutils noflavors + +.include <bsd.port.mk> Added: head/devel/cmakedoc/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmakedoc/distinfo Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,3 @@ +TIMESTAMP = 1594411880 +SHA256 (agateau-cmakedoc-1.0.1_GH0.tar.gz) = 8ac2ccd2dad2426bc7d94b65f7b3927b1afee28b2c884a89b6855eaa6385f2bf +SIZE (agateau-cmakedoc-1.0.1_GH0.tar.gz) = 6368 Added: head/devel/cmakedoc/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmakedoc/pkg-descr Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,5 @@ +CMakeDoc is a command-line tool to read CMake documentation. It lets you search +through CMake commands, modules, variables and properties before displaying the +selected topic with less or the pager defined in $PAGER. + +WWW: https://github.com/agateau/cmakedoc Added: head/devel/folly/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/folly/files/patch-CMakeLists.txt Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,15 @@ +--- CMakeLists.txt.orig 2020-08-09 10:25:45 UTC ++++ CMakeLists.txt +@@ -437,6 +437,12 @@ install( + + # Generate a pkg-config file so that downstream projects that don't use + # CMake can depend on folly using pkg-config. ++ ++# Avoid things in the CFLAGS -- which can come from INTERFACE_OPTIONS ++# of dependencies -- that don't work with file(GENERATE). CMake bug 21074 ++string(REPLACE "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>" _s "${FOLLY_PKGCONFIG_CFLAGS}") ++set(FOLLY_PKGCONFIG_CFLAGS "${_s}") ++ + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/libfolly.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libfolly.pc.gen Modified: head/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp ============================================================================== --- head/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp Sun Aug 16 09:27:18 2020 (r545091) @@ -1,6 +1,6 @@ ---- folly/experimental/symbolizer/Dwarf.cpp.orig 2020-05-27 18:46:20 UTC +--- folly/experimental/symbolizer/Dwarf.cpp.orig 2020-08-03 02:16:39 UTC +++ folly/experimental/symbolizer/Dwarf.cpp -@@ -1264,9 +1264,11 @@ Dwarf::LineNumberVM::StepResult Dwarf::LineNumberVM::s +@@ -1286,9 +1286,11 @@ Dwarf::LineNumberVM::StepResult Dwarf::LineNumberVM::s // use unbounded amounts of state (ie. use the heap). We'll do a second // pass (using nextDefineFile()) if necessary. break; Modified: head/devel/folly/files/patch-folly_memory_detail_MallocImpl.h ============================================================================== --- head/devel/folly/files/patch-folly_memory_detail_MallocImpl.h Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/folly/files/patch-folly_memory_detail_MallocImpl.h Sun Aug 16 09:27:18 2020 (r545091) @@ -1,4 +1,4 @@ ---- folly/memory/detail/MallocImpl.h.orig 2020-05-27 18:42:57 UTC +--- folly/memory/detail/MallocImpl.h.orig 2020-08-03 02:16:39 UTC +++ folly/memory/detail/MallocImpl.h @@ -38,9 +38,9 @@ int mallctlnametomib(const char*, size_t*, size_t*) __attribute__((__nothrow__, __weak__)); @@ -9,5 +9,5 @@ __attribute__((__weak__)); -#endif #else - extern void* (*mallocx)(size_t, int); - extern void* (*rallocx)(void*, size_t, int); + #if (!defined(USE_JEMALLOC) && !defined(FOLLY_USE_JEMALLOC)) || FOLLY_SANITIZE + // we do not want to declare these if we have jemalloc support Modified: head/devel/kms-cmake-utils/Makefile ============================================================================== --- head/devel/kms-cmake-utils/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/devel/kms-cmake-utils/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -2,6 +2,7 @@ PORTNAME= kms-cmake-utils DISTVERSION= 6.13.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -16,6 +17,6 @@ GH_ACCOUNT= Kurento NO_ARCH= yes -PLIST_SUB= CMAKE_VERSION=3.17 +PLIST_SUB= CMAKE_VERSION=3.18 .include <bsd.port.mk> Modified: head/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt ============================================================================== --- head/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt Sun Aug 16 09:11:47 2020 (r545090) +++ head/graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt Sun Aug 16 09:27:18 2020 (r545091) @@ -1,5 +1,18 @@ --- src/core/CMakeLists.txt.orig 2019-10-28 04:34:30 UTC +--- src/core/CMakeLists.txt.orig 2020-06-19 12:15:52 UTC +++ src/core/CMakeLists.txt +@@ -693,9 +693,9 @@ SET(QGIS_CORE_SRCS + ) + + FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*") +-IF(NOT USING_NINJA) ++IF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) + STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}") +-ENDIF(NOT USING_NINJA) ++ENDIF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) + STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}") + STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}") + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp @@ -889,6 +889,7 @@ ELSE(MSVC) SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) Added: head/graphics/qgis/files/patch-src_core_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/qgis/files/patch-src_core_CMakeLists.txt Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,14 @@ +--- src/core/CMakeLists.txt.orig 2020-06-19 12:15:52 UTC ++++ src/core/CMakeLists.txt +@@ -693,9 +693,9 @@ SET(QGIS_CORE_SRCS + ) + + FILE(GLOB JSON_HELP_FILES "${CMAKE_SOURCE_DIR}/resources/function_help/json/*") +-IF(NOT USING_NINJA) ++IF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) + STRING(REPLACE "$" "$$" JSON_HELP_FILES "${JSON_HELP_FILES}") +-ENDIF(NOT USING_NINJA) ++ENDIF(CMAKE_VERSION VERSION_LESS "3.18" AND NOT USING_NINJA) + STRING(REPLACE "\(" "\\(" JSON_HELP_FILES "${JSON_HELP_FILES}") + STRING(REPLACE "\)" "\\)" JSON_HELP_FILES "${JSON_HELP_FILES}") + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp Modified: head/net-p2p/libtorrent-rasterbar/Makefile ============================================================================== --- head/net-p2p/libtorrent-rasterbar/Makefile Sun Aug 16 09:11:47 2020 (r545090) +++ head/net-p2p/libtorrent-rasterbar/Makefile Sun Aug 16 09:27:18 2020 (r545091) @@ -4,6 +4,7 @@ PORTNAME= libtorrent-rasterbar DISTVERSIONPREFIX= libtorrent- DISTVERSION= 1.2.8 +PORTREVISION= 1 CATEGORIES= net-p2p MAINTAINER= yuri@FreeBSD.org Added: head/net-p2p/libtorrent-rasterbar/files/patch-cmake_Modules_GeneratePkgConfig.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/libtorrent-rasterbar/files/patch-cmake_Modules_GeneratePkgConfig.cmake Sun Aug 16 09:27:18 2020 (r545091) @@ -0,0 +1,14 @@ +--- cmake/Modules/GeneratePkgConfig.cmake.orig 2020-08-09 10:43:19 UTC ++++ cmake/Modules/GeneratePkgConfig.cmake +@@ -171,6 +171,11 @@ function(generate_and_install_pkg_config_file _target + set(_pkg_config_file_template_filename "${_GeneratePkGConfigDir}/pkg-config.cmake.in") + + # put target and project properties into a file ++ # Avoid things in the CFLAGS -- which can come from INTERFACE_OPTIONS ++ # of dependencies -- that don't work with file(GENERATE). CMake bug 21074 ++ string(REPLACE "<COMPILE_LANG_AND_ID:CUDA,NVIDIA>" "<COMPILE_LANGUAGE:CUDA>" _s "${_interface_compile_options}") ++ set(_interface_compile_options "${_s}") ++ + configure_file("${_GeneratePkGConfigDir}/target-compile-settings.cmake.in" + "${_generate_target_dir}/compile-settings.cmake" @ONLY) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008160927.07G9RJSO038658>