diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index a3b0c88..a040496 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.4.2 +PORTVERSION= 3.5.0 CATEGORIES= devel -MASTER_SITES= https://www.cmake.org/files/v3.4/ +MASTER_SITES= https://www.cmake.org/files/v3.5/ PKGNAMESUFFIX= -gui MAINTAINER= kde@FreeBSD.org diff --git a/devel/cmake-modules/pkg-plist b/devel/cmake-modules/pkg-plist index fb09a0f..52c3b6b 100644 --- a/devel/cmake-modules/pkg-plist +++ b/devel/cmake-modules/pkg-plist @@ -69,10 +69,12 @@ %%DATADIR%%/Modules/CMakeFortranInformation.cmake %%DATADIR%%/Modules/CMakeGenericSystem.cmake %%DATADIR%%/Modules/CMakeGraphVizOptions.cmake +%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake %%DATADIR%%/Modules/CMakeJOMFindMake.cmake %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in %%DATADIR%%/Modules/CMakeJavaInformation.cmake +%%DATADIR%%/Modules/CMakeLanguageInformation.cmake %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake @@ -169,6 +171,11 @@ %%DATADIR%%/Modules/CheckVariableExists.c %%DATADIR%%/Modules/CheckVariableExists.cmake %%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake +%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake +%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake +%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake +%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake +%%DATADIR%%/Modules/Compiler/ARMCC.cmake %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake %%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake @@ -194,6 +201,22 @@ %%DATADIR%%/Modules/Compiler/Cray-CXX.cmake %%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake +%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake %%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake @@ -422,6 +445,7 @@ %%DATADIR%%/Modules/FindX11.cmake %%DATADIR%%/Modules/FindXCTest.cmake %%DATADIR%%/Modules/FindXMLRPC.cmake +%%DATADIR%%/Modules/FindXalanC.cmake %%DATADIR%%/Modules/FindXercesC.cmake %%DATADIR%%/Modules/FindZLIB.cmake %%DATADIR%%/Modules/Findosg.cmake @@ -541,6 +565,7 @@ %%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake %%DATADIR%%/Modules/Platform/CYGWIN.cmake %%DATADIR%%/Modules/Platform/Catamount.cmake +%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake %%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake %%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index e5c0ce5..66ab147 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.4.2 +PORTVERSION= 3.5.0 PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= https://www.cmake.org/files/v3.4/ +MASTER_SITES= https://www.cmake.org/files/v3.5/ MAINTAINER= kde@FreeBSD.org COMMENT?= Cross-platform Makefile generator diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index bcc0875..c92200a 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,2 +1,2 @@ -SHA256 (cmake-3.4.2.tar.gz) = da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392 -SIZE (cmake-3.4.2.tar.gz) = 6722152 +SHA256 (cmake-3.5.0.tar.gz) = 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa +SIZE (cmake-3.5.0.tar.gz) = 6861686 diff --git a/devel/cmake/files/patch-Modules_FindDCMTK.cmake b/devel/cmake/files/patch-Modules_FindDCMTK.cmake deleted file mode 100644 index f99754d..0000000 --- a/devel/cmake/files/patch-Modules_FindDCMTK.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- Modules/FindDCMTK.cmake.orig 2012-07-11 12:01:05.000000000 +0200 -+++ Modules/FindDCMTK.cmake 2012-07-11 12:01:51.000000000 +0200 -@@ -56,6 +56,7 @@ - ijg12 - ijg16 - ijg8 -+ oflog - ofstd) - - find_library(DCMTK_${lib}_LIBRARY diff --git a/devel/cmake/files/patch-git_9d653f9c b/devel/cmake/files/patch-git_9d653f9c deleted file mode 100644 index 9d893b8..0000000 --- a/devel/cmake/files/patch-git_9d653f9c +++ /dev/null @@ -1,59 +0,0 @@ -Fixes a crash in CMake itself when configuring x11-toolkits/fltk-devel with -CMake 3.4.0. - -commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e -Author: Stephen Kelly -Date: Sat Aug 29 18:05:46 2015 +0200 - - cmFLTKWrapUI: Remove CMake 2.2 compat code. - - CMake 3.0 dropped CMake <= 2.4 compatibility. - ---- Source/cmFLTKWrapUICommand.cxx -+++ Source/cmFLTKWrapUICommand.cxx -@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass() - cmSystemTools::Message(msg.c_str(),"Warning"); - return; - } -- std::vector srcs; -- target->GetSourceFiles(srcs, ""); -- bool found = false; -- for (unsigned int i = 0; i < srcs.size(); ++i) -- { -- if (srcs[i]->GetFullPath() == -- this->GeneratedSourcesClasses[0]->GetFullPath()) -- { -- found = true; -- break; -- } -- } -- if (!found) -- { -- std::string msg = -- "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of " -- "source files that should be added to your executable or library. It " -- "appears that you have not added these source files to your target. " -- "You should change your CMakeLists.txt file to " -- "directly add the generated files to the target. " -- "For example FTLK_WRAP_UI(foo src1 src2 src3) " -- "will create a variable named foo_FLTK_UI_SRCS that contains the list " -- "of sources to add to your target when you call ADD_LIBRARY or " -- "ADD_EXECUTABLE. For now CMake will add the sources to your target " -- "for you as was done in CMake 2.0 and earlier. In the future this may " -- "become an error."; -- msg +="The problem was found while processing the source directory: "; -- msg += this->Makefile->GetCurrentSourceDirectory(); -- cmSystemTools::Message(msg.c_str(),"Warning"); -- // first we add the rules for all the .fl to .h and .cxx files -- size_t lastHeadersClass = this->GeneratedSourcesClasses.size(); -- -- // Generate code for all the .fl files -- for(size_t classNum = 0; classNum < lastHeadersClass; classNum++) -- { -- this->Makefile->GetTargets()[this->Target] -- .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath()); -- } -- } - } - - diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index a0c52e9..ea63776 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -39,6 +39,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/command/build_name.rst %%DATADIR%%/Help/command/cmake_host_system_information.rst %%DATADIR%%/Help/command/cmake_minimum_required.rst +%%DATADIR%%/Help/command/cmake_parse_arguments.rst %%DATADIR%%/Help/command/cmake_policy.rst %%DATADIR%%/Help/command/configure_file.rst %%DATADIR%%/Help/command/continue.rst @@ -296,10 +297,10 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/module/FindHTMLHelp.rst %%DATADIR%%/Help/module/FindHg.rst %%DATADIR%%/Help/module/FindITK.rst -%%DATADIR%%/Help/module/FindIntl.rst %%DATADIR%%/Help/module/FindIce.rst %%DATADIR%%/Help/module/FindIcotool.rst %%DATADIR%%/Help/module/FindImageMagick.rst +%%DATADIR%%/Help/module/FindIntl.rst %%DATADIR%%/Help/module/FindJNI.rst %%DATADIR%%/Help/module/FindJPEG.rst %%DATADIR%%/Help/module/FindJasper.rst @@ -370,6 +371,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/module/FindX11.rst %%DATADIR%%/Help/module/FindXCTest.rst %%DATADIR%%/Help/module/FindXMLRPC.rst +%%DATADIR%%/Help/module/FindXalanC.rst %%DATADIR%%/Help/module/FindXercesC.rst %%DATADIR%%/Help/module/FindZLIB.rst %%DATADIR%%/Help/module/Findosg.rst @@ -706,6 +708,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst +%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst %%DATADIR%%/Help/prop_tgt/LABELS.rst @@ -802,6 +805,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/release/3.2.rst %%DATADIR%%/Help/release/3.3.rst %%DATADIR%%/Help/release/3.4.rst +%%DATADIR%%/Help/release/3.5.rst %%DATADIR%%/Help/release/dev.txt %%DATADIR%%/Help/release/index.rst %%DATADIR%%/Help/variable/APPLE.rst @@ -884,6 +888,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst +%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst %%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst %%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst @@ -935,6 +940,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst %%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst +%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst