From owner-svn-ports-head@freebsd.org Mon Nov 30 14:20:15 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97BF7A3C211; Mon, 30 Nov 2015 14:20:15 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 582E9105B; Mon, 30 Nov 2015 14:20:15 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAUEKEea035009; Mon, 30 Nov 2015 14:20:14 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAUEKD7N034997; Mon, 30 Nov 2015 14:20:13 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201511301420.tAUEKD7N034997@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 30 Nov 2015 14:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402670 - in head: databases/kbibtex devel/cmake devel/cmake-gui devel/cmake-modules devel/cmake/files devel/qross X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2015 14:20:15 -0000 Author: rakuco Date: Mon Nov 30 14:20:13 2015 New Revision: 402670 URL: https://svnweb.freebsd.org/changeset/ports/402670 Log: Update CMake to 3.4.0. Release notes: https://cmake.org/cmake/help/v3.4/release/3.4.html - Bump PORTREVISION in a few ports that do not ship SOVERSIONed libraries anymore (see https://cmake.org/gitweb?p=cmake.git;a=commit;h=f799ffb5). - Switch MASTER_SITES to https. PR: 204629 Added: head/devel/cmake/files/patch-git_9682de56 (contents, props changed) head/devel/cmake/files/patch-git_9d653f9c (contents, props changed) Deleted: head/devel/cmake/files/patch-git_ffa6f057 Modified: head/databases/kbibtex/Makefile head/databases/kbibtex/pkg-plist head/devel/cmake-gui/Makefile head/devel/cmake-modules/pkg-plist head/devel/cmake/Makefile head/devel/cmake/distinfo head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake head/devel/cmake/pkg-plist head/devel/qross/Makefile head/devel/qross/pkg-plist Modified: head/databases/kbibtex/Makefile ============================================================================== --- head/databases/kbibtex/Makefile Mon Nov 30 14:05:47 2015 (r402669) +++ head/databases/kbibtex/Makefile Mon Nov 30 14:20:13 2015 (r402670) @@ -3,6 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= databases kde MASTER_SITES= http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/ Modified: head/databases/kbibtex/pkg-plist ============================================================================== --- head/databases/kbibtex/pkg-plist Mon Nov 30 14:05:47 2015 (r402669) +++ head/databases/kbibtex/pkg-plist Mon Nov 30 14:20:13 2015 (r402670) @@ -107,8 +107,6 @@ include/kbibtex/value.h include/kbibtex/valuelistmodel.h include/kbibtex/xsltransform.h lib/kde4/kbibtexpart.so -lib/kde4/kbibtexpart.so.0.6 -lib/kde4/kbibtexpart.so.0.6.0 lib/libkbibtexconfig.so lib/libkbibtexconfig.so.0.6 lib/libkbibtexconfig.so.0.6.0 Modified: head/devel/cmake-gui/Makefile ============================================================================== --- head/devel/cmake-gui/Makefile Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake-gui/Makefile Mon Nov 30 14:20:13 2015 (r402670) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.3.1 +PORTVERSION= 3.4.0 CATEGORIES= devel -MASTER_SITES= http://www.cmake.org/files/v3.3/ +MASTER_SITES= https://www.cmake.org/files/v3.4/ PKGNAMESUFFIX= -gui MAINTAINER= kde@FreeBSD.org Modified: head/devel/cmake-modules/pkg-plist ============================================================================== --- head/devel/cmake-modules/pkg-plist Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake-modules/pkg-plist Mon Nov 30 14:20:13 2015 (r402670) @@ -26,7 +26,6 @@ %%DATADIR%%/Modules/CMakeCXXCompilerABI.cpp %%DATADIR%%/Modules/CMakeCXXCompilerId.cpp.in %%DATADIR%%/Modules/CMakeCXXInformation.cmake -%%DATADIR%%/Modules/CMakeClDeps.cmake %%DATADIR%%/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake %%DATADIR%%/Modules/CMakeCommonLanguageInclude.cmake %%DATADIR%%/Modules/CMakeCompilerABI.h @@ -39,13 +38,14 @@ %%DATADIR%%/Modules/CMakeDetermineASM_NASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake %%DATADIR%%/Modules/CMakeDetermineCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake -%%DATADIR%%/Modules/CMakeDetermineCompileFeatures.cmake %%DATADIR%%/Modules/CMakeDetermineCompilerId.cmake %%DATADIR%%/Modules/CMakeDetermineFortranCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineJavaCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineRCCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineSwiftCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineSystem.cmake %%DATADIR%%/Modules/CMakeDetermineVSServicePack.cmake %%DATADIR%%/Modules/CMakeExpandImportedTargets.cmake @@ -86,6 +86,8 @@ %%DATADIR%%/Modules/CMakePushCheckState.cmake %%DATADIR%%/Modules/CMakeRCCompiler.cmake.in %%DATADIR%%/Modules/CMakeRCInformation.cmake +%%DATADIR%%/Modules/CMakeSwiftCompiler.cmake.in +%%DATADIR%%/Modules/CMakeSwiftInformation.cmake %%DATADIR%%/Modules/CMakeSystem.cmake.in %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake %%DATADIR%%/Modules/CMakeSystemSpecificInitialize.cmake @@ -100,6 +102,7 @@ %%DATADIR%%/Modules/CMakeTestGNU.c %%DATADIR%%/Modules/CMakeTestJavaCompiler.cmake %%DATADIR%%/Modules/CMakeTestRCCompiler.cmake +%%DATADIR%%/Modules/CMakeTestSwiftCompiler.cmake %%DATADIR%%/Modules/CMakeTestWatcomVersion.c %%DATADIR%%/Modules/CMakeUnixFindMake.cmake %%DATADIR%%/Modules/CMakeVS6BackwardCompatibility.cmake @@ -168,12 +171,13 @@ %%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake -%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake %%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake -%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake +%%DATADIR%%/Modules/Compiler/AppleClang-C.cmake %%DATADIR%%/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake +%%DATADIR%%/Modules/Compiler/AppleClang-CXX.cmake %%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake +%%DATADIR%%/Modules/Compiler/CCur-Fortran.cmake %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake %%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake %%DATADIR%%/Modules/Compiler/Clang-C.cmake @@ -226,8 +230,8 @@ %%DATADIR%%/Modules/Compiler/MIPSpro-CXX.cmake %%DATADIR%%/Modules/Compiler/MIPSpro-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/MIPSpro-Fortran.cmake -%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake %%DATADIR%%/Modules/Compiler/MSVC-CXX-FeatureTests.cmake +%%DATADIR%%/Modules/Compiler/MSVC-CXX.cmake %%DATADIR%%/Modules/Compiler/MSVC-DetermineCompiler.cmake %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake %%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake @@ -285,6 +289,7 @@ %%DATADIR%%/Modules/CompilerId/Xcode-1.pbxproj.in %%DATADIR%%/Modules/CompilerId/Xcode-2.pbxproj.in %%DATADIR%%/Modules/CompilerId/Xcode-3.pbxproj.in +%%DATADIR%%/Modules/CompilerId/main.swift.in %%DATADIR%%/Modules/Dart.cmake %%DATADIR%%/Modules/DartConfiguration.tcl.in %%DATADIR%%/Modules/DeployQt4.cmake @@ -492,6 +497,8 @@ %%DATADIR%%/Modules/Platform/AIX-XL-Fortran.cmake %%DATADIR%%/Modules/Platform/AIX-XL.cmake %%DATADIR%%/Modules/Platform/AIX.cmake +%%DATADIR%%/Modules/Platform/ARTOS-GNU-C.cmake +%%DATADIR%%/Modules/Platform/ARTOS.cmake %%DATADIR%%/Modules/Platform/Android.cmake %%DATADIR%%/Modules/Platform/BSDOS.cmake %%DATADIR%%/Modules/Platform/BeOS.cmake @@ -557,6 +564,7 @@ %%DATADIR%%/Modules/Platform/Darwin-XL-CXX.cmake %%DATADIR%%/Modules/Platform/Darwin.cmake %%DATADIR%%/Modules/Platform/DragonFly.cmake +%%DATADIR%%/Modules/Platform/Euros.cmake %%DATADIR%%/Modules/Platform/FreeBSD.cmake %%DATADIR%%/Modules/Platform/GHS-MULTI-Initialize.cmake %%DATADIR%%/Modules/Platform/GHS-MULTI.cmake @@ -569,6 +577,7 @@ %%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake %%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake %%DATADIR%%/Modules/Platform/Generic.cmake +%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake %%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake %%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake %%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake @@ -577,13 +586,13 @@ %%DATADIR%%/Modules/Platform/HP-UX-HP-C.cmake %%DATADIR%%/Modules/Platform/HP-UX-HP-CXX.cmake %%DATADIR%%/Modules/Platform/HP-UX-HP-Fortran.cmake -%%DATADIR%%/Modules/Platform/HP-UX-GNU-ASM.cmake %%DATADIR%%/Modules/Platform/HP-UX-HP.cmake %%DATADIR%%/Modules/Platform/HP-UX.cmake %%DATADIR%%/Modules/Platform/Haiku.cmake %%DATADIR%%/Modules/Platform/IRIX.cmake %%DATADIR%%/Modules/Platform/IRIX64.cmake %%DATADIR%%/Modules/Platform/Linux-Absoft-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-CCur-Fortran.cmake %%DATADIR%%/Modules/Platform/Linux-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-Clang-C.cmake %%DATADIR%%/Modules/Platform/Linux-Clang-CXX.cmake @@ -709,9 +718,6 @@ %%DATADIR%%/Modules/UsePkgConfig.cmake %%DATADIR%%/Modules/UseQt4.cmake %%DATADIR%%/Modules/UseSWIG.cmake -%%DATADIR%%/Modules/UseVTK40.cmake -%%DATADIR%%/Modules/UseVTKBuildSettings40.cmake -%%DATADIR%%/Modules/UseVTKConfig40.cmake %%DATADIR%%/Modules/Use_wxWindows.cmake %%DATADIR%%/Modules/UsewxWidgets.cmake %%DATADIR%%/Modules/VTKCompatibility.cmake @@ -743,6 +749,7 @@ %%DATADIR%%/Templates/Windows/ApplicationIcon.png %%DATADIR%%/Templates/Windows/Logo.png %%DATADIR%%/Templates/Windows/SmallLogo.png +%%DATADIR%%/Templates/Windows/SmallLogo44x44.png %%DATADIR%%/Templates/Windows/SplashScreen.png %%DATADIR%%/Templates/Windows/StoreLogo.png %%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake/Makefile Mon Nov 30 14:20:13 2015 (r402670) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.3.1 +PORTVERSION= 3.4.0 PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= http://www.cmake.org/files/v3.3/ +MASTER_SITES= https://www.cmake.org/files/v3.4/ MAINTAINER= kde@FreeBSD.org COMMENT?= Cross-platform Makefile generator Modified: head/devel/cmake/distinfo ============================================================================== --- head/devel/cmake/distinfo Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake/distinfo Mon Nov 30 14:20:13 2015 (r402670) @@ -1,2 +1,2 @@ -SHA256 (cmake-3.3.1.tar.gz) = cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 -SIZE (cmake-3.3.1.tar.gz) = 6577869 +SHA256 (cmake-3.4.0.tar.gz) = a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea +SIZE (cmake-3.4.0.tar.gz) = 6719859 Modified: head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake ============================================================================== --- head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake Mon Nov 30 14:20:13 2015 (r402670) @@ -4,8 +4,8 @@ #----------------------------------------------------------------- # Support cross-compiling, only search in the target platform. 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 +- NAMES wx-config wx-config-3.1 wx-config-3.0 wx-config-2.9 wx-config-2.8 ++ NAMES $ENV{WX_CONFIG} wx-config-3.1 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 ) Added: head/devel/cmake/files/patch-git_9682de56 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-git_9682de56 Mon Nov 30 14:20:13 2015 (r402670) @@ -0,0 +1,107 @@ +Required for building devel/libcxxrt. + +commit 9682de566e264c53018cccd05465f2c5d91ccf73 +Author: Brad King +Date: Mon Nov 23 10:13:38 2015 -0500 + + Revert "Disable shared library support when compiler links statically" (#15855) + + In commit v3.4.0-rc1~18^2 (Disable shared library support when compiler + links statically, 2015-09-30) we tried to detect when the compiler is + not capable of linking shared libraries (possibly due to flags in use). + However, the approach is not robust against flags like `-nostdlib`. + Revert it for now pending another solution to the original problem. + +--- Modules/CMakeCCompiler.cmake.in ++++ Modules/CMakeCCompiler.cmake.in +@@ -2,7 +2,6 @@ set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@") + set(CMAKE_C_COMPILER_ARG1 "@CMAKE_C_COMPILER_ARG1@") + set(CMAKE_C_COMPILER_ID "@CMAKE_C_COMPILER_ID@") + set(CMAKE_C_COMPILER_VERSION "@CMAKE_C_COMPILER_VERSION@") +-set(CMAKE_C_COMPILER_LINKS_STATICALLY "@CMAKE_C_COMPILER_LINKS_STATICALLY@") + set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "@CMAKE_C_STANDARD_COMPUTED_DEFAULT@") + set(CMAKE_C_COMPILE_FEATURES "@CMAKE_C_COMPILE_FEATURES@") + set(CMAKE_C90_COMPILE_FEATURES "@CMAKE_C90_COMPILE_FEATURES@") +--- Modules/CMakeCInformation.cmake ++++ Modules/CMakeCInformation.cmake +@@ -75,10 +75,6 @@ if(CMAKE_C_SIZEOF_DATA_PTR) + unset(CMAKE_C_ABI_FILES) + endif() + +-if(CMAKE_C_COMPILER_LINKS_STATICALLY) +- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) +-endif() +- + # This should be included before the _INIT variables are + # used to initialize the cache. Since the rule variables + # have if blocks on them, users can still define them here. +--- Modules/CMakeCXXCompiler.cmake.in ++++ Modules/CMakeCXXCompiler.cmake.in +@@ -2,7 +2,6 @@ set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@") + set(CMAKE_CXX_COMPILER_ARG1 "@CMAKE_CXX_COMPILER_ARG1@") + set(CMAKE_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@") + set(CMAKE_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@") +-set(CMAKE_CXX_COMPILER_LINKS_STATICALLY "@CMAKE_CXX_COMPILER_LINKS_STATICALLY@") + set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "@CMAKE_CXX_STANDARD_COMPUTED_DEFAULT@") + set(CMAKE_CXX_COMPILE_FEATURES "@CMAKE_CXX_COMPILE_FEATURES@") + set(CMAKE_CXX98_COMPILE_FEATURES "@CMAKE_CXX98_COMPILE_FEATURES@") +--- Modules/CMakeCXXInformation.cmake ++++ Modules/CMakeCXXInformation.cmake +@@ -74,10 +74,6 @@ if(CMAKE_CXX_SIZEOF_DATA_PTR) + unset(CMAKE_CXX_ABI_FILES) + endif() + +-if(CMAKE_CXX_COMPILER_LINKS_STATICALLY) +- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) +-endif() +- + # This should be included before the _INIT variables are + # used to initialize the cache. Since the rule variables + # have if blocks on them, users can still define them here. +--- Modules/CMakeDetermineCompilerId.cmake ++++ Modules/CMakeDetermineCompilerId.cmake +@@ -106,7 +106,6 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) + set(MSVC_${lang}_ARCHITECTURE_ID "${MSVC_${lang}_ARCHITECTURE_ID}" + PARENT_SCOPE) + set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX}" PARENT_SCOPE) +- set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY "${CMAKE_${lang}_COMPILER_LINKS_STATICALLY}" PARENT_SCOPE) + set(CMAKE_${lang}_COMPILER_VERSION "${CMAKE_${lang}_COMPILER_VERSION}" PARENT_SCOPE) + set(CMAKE_${lang}_SIMULATE_ID "${CMAKE_${lang}_SIMULATE_ID}" PARENT_SCOPE) + set(CMAKE_${lang}_SIMULATE_VERSION "${CMAKE_${lang}_SIMULATE_VERSION}" PARENT_SCOPE) +@@ -530,13 +529,6 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) + endif() + endif() + +- if(UNIX) +- execute_process(COMMAND file "${file}" OUTPUT_VARIABLE out ERROR_VARIABLE out) +- if(out MATCHES "statically linked") +- set(CMAKE_${lang}_COMPILER_LINKS_STATICALLY 1 PARENT_SCOPE) +- endif() +- endif() +- + # Check if a valid compiler and platform were found. + if(COMPILER_ID AND NOT COMPILER_ID_TWICE) + set(CMAKE_${lang}_COMPILER_ID "${COMPILER_ID}") +--- Modules/CMakeFortranCompiler.cmake.in ++++ Modules/CMakeFortranCompiler.cmake.in +@@ -2,7 +2,6 @@ set(CMAKE_Fortran_COMPILER "@CMAKE_Fortran_COMPILER@") + set(CMAKE_Fortran_COMPILER_ARG1 "@CMAKE_Fortran_COMPILER_ARG1@") + set(CMAKE_Fortran_COMPILER_ID "@CMAKE_Fortran_COMPILER_ID@") + set(CMAKE_Fortran_COMPILER_VERSION "@CMAKE_Fortran_COMPILER_VERSION@") +-set(CMAKE_Fortran_COMPILER_LINKS_STATICALLY "@CMAKE_Fortran_COMPILER_LINKS_STATICALLY@") + set(CMAKE_Fortran_PLATFORM_ID "@CMAKE_Fortran_PLATFORM_ID@") + set(CMAKE_Fortran_SIMULATE_ID "@CMAKE_Fortran_SIMULATE_ID@") + set(CMAKE_Fortran_SIMULATE_VERSION "@CMAKE_Fortran_SIMULATE_VERSION@") +--- Modules/CMakeFortranInformation.cmake ++++ Modules/CMakeFortranInformation.cmake +@@ -51,10 +51,6 @@ if(CMAKE_Fortran_SIZEOF_DATA_PTR) + unset(CMAKE_Fortran_ABI_FILES) + endif() + +-if(CMAKE_Fortran_COMPILER_LINKS_STATICALLY) +- set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) +-endif() +- + # This should be included before the _INIT variables are + # used to initialize the cache. Since the rule variables + # have if blocks on them, users can still define them here. Added: head/devel/cmake/files/patch-git_9d653f9c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-git_9d653f9c Mon Nov 30 14:20:13 2015 (r402670) @@ -0,0 +1,59 @@ +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()); +- } +- } + } + + Modified: head/devel/cmake/pkg-plist ============================================================================== --- head/devel/cmake/pkg-plist Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/cmake/pkg-plist Mon Nov 30 14:20:13 2015 (r402670) @@ -22,7 +22,6 @@ bin/ctest %%MANPAGES%%man/man7/cmake-variables.7.gz share/aclocal/cmake.m4 %%DATADIR%%/Help/command/FIND_XXX.txt -%%DATADIR%%/Help/command/FIND_XXX_MAC.txt %%DATADIR%%/Help/command/FIND_XXX_ORDER.txt %%DATADIR%%/Help/command/FIND_XXX_ROOT.txt %%DATADIR%%/Help/command/add_compile_options.rst @@ -484,6 +483,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/policy/CMP0061.rst %%DATADIR%%/Help/policy/CMP0062.rst %%DATADIR%%/Help/policy/CMP0063.rst +%%DATADIR%%/Help/policy/CMP0064.rst +%%DATADIR%%/Help/policy/CMP0065.rst %%DATADIR%%/Help/policy/DEPRECATED.txt %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt %%DATADIR%%/Help/prop_cache/ADVANCED.rst @@ -542,6 +543,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_gbl/RULE_LAUNCH_LINK.rst %%DATADIR%%/Help/prop_gbl/RULE_MESSAGES.rst %%DATADIR%%/Help/prop_gbl/TARGET_ARCHIVES_MAY_BE_SHARED_LIBS.rst +%%DATADIR%%/Help/prop_gbl/TARGET_MESSAGES.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 @@ -596,8 +598,23 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_test/WILL_FAIL.rst %%DATADIR%%/Help/prop_test/WORKING_DIRECTORY.rst %%DATADIR%%/Help/prop_tgt/ALIASED_TARGET.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 +%%DATADIR%%/Help/prop_tgt/ANDROID_ARCH.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_ASSETS_DIRECTORIES.rst %%DATADIR%%/Help/prop_tgt/ANDROID_GUI.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DEPENDENCIES.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_JAR_DIRECTORIES.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_JAVA_SOURCE_DIR.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_NATIVE_LIB_DEPENDENCIES.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_NATIVE_LIB_DIRECTORIES.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_PROCESS_MAX.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_PROGUARD.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_PROGUARD_CONFIG_PATH.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_SECURE_PROPS_PATH.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_SKIP_ANT_STEP.rst +%%DATADIR%%/Help/prop_tgt/ANDROID_STL_TYPE.rst %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst %%DATADIR%%/Help/prop_tgt/ARCHIVE_OUTPUT_NAME.rst @@ -609,6 +626,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/AUTORCC_OPTIONS.rst %%DATADIR%%/Help/prop_tgt/AUTOUIC.rst %%DATADIR%%/Help/prop_tgt/AUTOUIC_OPTIONS.rst +%%DATADIR%%/Help/prop_tgt/BINARY_DIR.rst %%DATADIR%%/Help/prop_tgt/BUILD_WITH_INSTALL_RPATH.rst %%DATADIR%%/Help/prop_tgt/BUNDLE.rst %%DATADIR%%/Help/prop_tgt/BUNDLE_EXTENSION.rst @@ -645,6 +663,7 @@ 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_VERSION.rst %%DATADIR%%/Help/prop_tgt/Fortran_FORMAT.rst %%DATADIR%%/Help/prop_tgt/Fortran_MODULE_DIRECTORY.rst %%DATADIR%%/Help/prop_tgt/GENERATOR_FILE_NAME.rst @@ -675,7 +694,6 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/INSTALL_NAME_DIR.rst %%DATADIR%%/Help/prop_tgt/INSTALL_RPATH.rst %%DATADIR%%/Help/prop_tgt/INSTALL_RPATH_USE_LINK_PATH.rst -%%DATADIR%%/Help/prop_tgt/ANDROID_API_MIN.rst %%DATADIR%%/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst %%DATADIR%%/Help/prop_tgt/INTERFACE_BUILD_PROPERTY.txt %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_DEFINITIONS.rst @@ -691,6 +709,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_COMPILER_LAUNCHER.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 @@ -745,6 +764,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/RUNTIME_OUTPUT_NAME_CONFIG.rst %%DATADIR%%/Help/prop_tgt/SKIP_BUILD_RPATH.rst %%DATADIR%%/Help/prop_tgt/SOURCES.rst +%%DATADIR%%/Help/prop_tgt/SOURCE_DIR.rst %%DATADIR%%/Help/prop_tgt/SOVERSION.rst %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS.rst %%DATADIR%%/Help/prop_tgt/STATIC_LIBRARY_FLAGS_CONFIG.rst @@ -752,21 +772,27 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/prop_tgt/TYPE.rst %%DATADIR%%/Help/prop_tgt/VERSION.rst %%DATADIR%%/Help/prop_tgt/VISIBILITY_INLINES_HIDDEN.rst +%%DATADIR%%/Help/prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION.rst %%DATADIR%%/Help/prop_tgt/VS_DOTNET_REFERENCES.rst %%DATADIR%%/Help/prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION.rst %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_PROJECT_TYPES.rst %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_ROOTNAMESPACE.rst %%DATADIR%%/Help/prop_tgt/VS_GLOBAL_variable.rst +%%DATADIR%%/Help/prop_tgt/VS_IOT_EXTENSIONS_VERSION.rst +%%DATADIR%%/Help/prop_tgt/VS_IOT_STARTUP_TASK.rst %%DATADIR%%/Help/prop_tgt/VS_KEYWORD.rst +%%DATADIR%%/Help/prop_tgt/VS_MOBILE_EXTENSIONS_VERSION.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_WINDOWS_TARGET_PLATFORM_MIN_VERSION.rst %%DATADIR%%/Help/prop_tgt/VS_WINRT_COMPONENT.rst %%DATADIR%%/Help/prop_tgt/VS_WINRT_EXTENSIONS.rst %%DATADIR%%/Help/prop_tgt/VS_WINRT_REFERENCES.rst %%DATADIR%%/Help/prop_tgt/WIN32_EXECUTABLE.rst +%%DATADIR%%/Help/prop_tgt/WINDOWS_EXPORT_ALL_SYMBOLS.rst %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst %%DATADIR%%/Help/prop_tgt/XCTEST.rst %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt @@ -775,15 +801,30 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/release/3.1.rst %%DATADIR%%/Help/release/3.2.rst %%DATADIR%%/Help/release/3.3.rst +%%DATADIR%%/Help/release/3.4.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_ANT_ADDITIONAL_OPTIONS.rst %%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst %%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_ARCH.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_ASSETS_DIRECTORIES.rst %%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DEPENDENCIES.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAR_DIRECTORIES.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_JAVA_SOURCE_DIR.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROCESS_MAX.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_PROGUARD_CONFIG_PATH.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_SECURE_PROPS_PATH.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_SKIP_ANT_STEP.rst +%%DATADIR%%/Help/variable/CMAKE_ANDROID_STL_TYPE.rst %%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst %%DATADIR%%/Help/variable/CMAKE_AR.rst %%DATADIR%%/Help/variable/CMAKE_ARCHIVE_OUTPUT_DIRECTORY.rst @@ -837,6 +878,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.rst %%DATADIR%%/Help/variable/CMAKE_DL_LIBS.rst %%DATADIR%%/Help/variable/CMAKE_EDIT_COMMAND.rst +%%DATADIR%%/Help/variable/CMAKE_ENABLE_EXPORTS.rst %%DATADIR%%/Help/variable/CMAKE_ERROR_DEPRECATED.rst %%DATADIR%%/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION.rst %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst @@ -845,6 +887,8 @@ share/aclocal/cmake.m4 %%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 +%%DATADIR%%/Help/variable/CMAKE_FIND_APPBUNDLE.rst +%%DATADIR%%/Help/variable/CMAKE_FIND_FRAMEWORK.rst %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_PREFIXES.rst %%DATADIR%%/Help/variable/CMAKE_FIND_LIBRARY_SUFFIXES.rst %%DATADIR%%/Help/variable/CMAKE_FIND_NO_INSTALL_PREFIX.rst @@ -900,6 +944,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ABI.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_ID.rst +%%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LAUNCHER.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_LOADED.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_TARGET.rst %%DATADIR%%/Help/variable/CMAKE_LANG_COMPILER_VERSION.rst @@ -945,6 +990,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FILE_FLAG.rst %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_FLAG.rst %%DATADIR%%/Help/variable/CMAKE_LINK_LIBRARY_SUFFIX.rst +%%DATADIR%%/Help/variable/CMAKE_LINK_SEARCH_END_STATIC.rst +%%DATADIR%%/Help/variable/CMAKE_LINK_SEARCH_START_STATIC.rst %%DATADIR%%/Help/variable/CMAKE_MACOSX_BUNDLE.rst %%DATADIR%%/Help/variable/CMAKE_MACOSX_RPATH.rst %%DATADIR%%/Help/variable/CMAKE_MAJOR_VERSION.rst @@ -1002,6 +1049,8 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG.rst %%DATADIR%%/Help/variable/CMAKE_SYSROOT.rst %%DATADIR%%/Help/variable/CMAKE_SYSTEM.rst +%%DATADIR%%/Help/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.rst +%%DATADIR%%/Help/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.rst %%DATADIR%%/Help/variable/CMAKE_SYSTEM_IGNORE_PATH.rst %%DATADIR%%/Help/variable/CMAKE_SYSTEM_INCLUDE_PATH.rst %%DATADIR%%/Help/variable/CMAKE_SYSTEM_LIBRARY_PATH.rst @@ -1027,9 +1076,11 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CMAKE_VS_NsightTegra_VERSION.rst %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_NAME.rst %%DATADIR%%/Help/variable/CMAKE_VS_PLATFORM_TOOLSET.rst +%%DATADIR%%/Help/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.rst %%DATADIR%%/Help/variable/CMAKE_WARN_DEPRECATED.rst %%DATADIR%%/Help/variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION.rst %%DATADIR%%/Help/variable/CMAKE_WIN32_EXECUTABLE.rst +%%DATADIR%%/Help/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.rst %%DATADIR%%/Help/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.rst %%DATADIR%%/Help/variable/CMAKE_XCODE_PLATFORM_TOOLSET.rst %%DATADIR%%/Help/variable/CPACK_ABSOLUTE_DESTINATION_FILES.rst @@ -1045,12 +1096,31 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CTEST_BUILD_NAME.rst %%DATADIR%%/Help/variable/CTEST_BZR_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_BZR_UPDATE_OPTIONS.rst +%%DATADIR%%/Help/variable/CTEST_CHANGE_ID.rst %%DATADIR%%/Help/variable/CTEST_CHECKOUT_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_CONFIGURATION_TYPE.rst %%DATADIR%%/Help/variable/CTEST_CONFIGURE_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_COVERAGE_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_COVERAGE_EXTRA_FLAGS.rst %%DATADIR%%/Help/variable/CTEST_CURL_OPTIONS.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_COVERAGE_EXCLUDE.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_EXCEPTION.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_MATCH.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_POST_CONTEXT.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_ERROR_PRE_CONTEXT.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_MEMCHECK_IGNORE.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_POST_MEMCHECK.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_POST_TEST.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_PRE_MEMCHECK.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_PRE_TEST.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_TEST_IGNORE.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_WARNING_EXCEPTION.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_WARNING_MATCH.rst +%%DATADIR%%/Help/variable/CTEST_CUSTOM_XXX.txt %%DATADIR%%/Help/variable/CTEST_CVS_CHECKOUT.rst %%DATADIR%%/Help/variable/CTEST_CVS_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_CVS_UPDATE_OPTIONS.rst @@ -1060,6 +1130,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CTEST_DROP_SITE_CDASH.rst %%DATADIR%%/Help/variable/CTEST_DROP_SITE_PASSWORD.rst %%DATADIR%%/Help/variable/CTEST_DROP_SITE_USER.rst +%%DATADIR%%/Help/variable/CTEST_EXTRA_COVERAGE_GLOB.rst %%DATADIR%%/Help/variable/CTEST_GIT_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_CUSTOM.rst %%DATADIR%%/Help/variable/CTEST_GIT_UPDATE_OPTIONS.rst @@ -1081,6 +1152,7 @@ share/aclocal/cmake.m4 %%DATADIR%%/Help/variable/CTEST_SVN_COMMAND.rst %%DATADIR%%/Help/variable/CTEST_SVN_OPTIONS.rst %%DATADIR%%/Help/variable/CTEST_SVN_UPDATE_OPTIONS.rst +%%DATADIR%%/Help/variable/CTEST_TEST_LOAD.rst %%DATADIR%%/Help/variable/CTEST_TEST_TIMEOUT.rst %%DATADIR%%/Help/variable/CTEST_TRIGGER_SITE.rst %%DATADIR%%/Help/variable/CTEST_UPDATE_COMMAND.rst Modified: head/devel/qross/Makefile ============================================================================== --- head/devel/qross/Makefile Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/qross/Makefile Mon Nov 30 14:20:13 2015 (r402670) @@ -3,7 +3,7 @@ PORTNAME= qross PORTVERSION= 0.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= vg@FreeBSD.org Modified: head/devel/qross/pkg-plist ============================================================================== --- head/devel/qross/pkg-plist Mon Nov 30 14:05:47 2015 (r402669) +++ head/devel/qross/pkg-plist Mon Nov 30 14:20:13 2015 (r402670) @@ -14,7 +14,6 @@ include/qross/core/script.h include/qross/core/wrapperinterface.h include/qross/ui/model.h %%PYTHON%%lib/qrosspython.so -%%PYTHON%%lib/qrosspython.so.0.1 lib/libqrosscore.so lib/libqrosscore.so.0.1 lib/libqrosscore.so.1 @@ -22,7 +21,6 @@ lib/libqrossui.so lib/libqrossui.so.0.1 lib/libqrossui.so.1 lib/qrossqts.so -lib/qrossqts.so.0.1 lib/qrossqts.so.1 lib/qt4/plugins/script/libqrossqtsplugin.so lib/qt4/plugins/script/libqrossqtsplugin.so.0.1