Attachment 157418 Details for Bug 200647 – patch

[patch] patch

cmake.diff (text/plain), 8.54 KB, created by Brad Davis on 2015-06-04 21:07:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2015-06-04 21:07:55 UTC

Size: 8.54 KB

patch

obsolete

>Index: devel/cmake/Makefile
>===================================================================
>--- devel/cmake/Makefile	(revision 388424)
>+++ devel/cmake/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-PORTVERSION=	3.1.3
>+PORTVERSION=	3.2.3
> PORTREVISION?=	0
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.cmake.org/files/v3.1/
>+MASTER_SITES=	http://www.cmake.org/files/v3.2/
> 
> MAINTAINER=	kde@FreeBSD.org
> COMMENT?=	Cross-platform Makefile generator
>@@ -28,7 +28,8 @@
> HAS_CONFIGURE=	yes
> 
> LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
>-		libexpat.so:${PORTSDIR}/textproc/expat2
>+		libexpat.so:${PORTSDIR}/textproc/expat2 \
>+		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp
> RUN_DEPENDS=	${LOCALBASE}/share/cmake/Modules/CMake.cmake:${PORTSDIR}/devel/cmake-modules
> 
> MANPAGES_BUILD_DEPENDS=	sphinx-build:${PORTSDIR}/textproc/py-sphinx
>Index: devel/cmake/distinfo
>===================================================================
>--- devel/cmake/distinfo	(revision 388424)
>+++ devel/cmake/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (cmake-3.1.3.tar.gz) = 45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0
>-SIZE (cmake-3.1.3.tar.gz) = 5959549
>+SHA256 (cmake-3.2.3.tar.gz) = a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297
>+SIZE (cmake-3.2.3.tar.gz) = 6438938
>Index: devel/cmake/pkg-plist
>===================================================================
>--- devel/cmake/pkg-plist	(revision 388424)
>+++ devel/cmake/pkg-plist	(working copy)
>@@ -42,6 +42,7 @@
> %%DATADIR%%/Help/command/cmake_minimum_required.rst
> %%DATADIR%%/Help/command/cmake_policy.rst
> %%DATADIR%%/Help/command/configure_file.rst
>+%%DATADIR%%/Help/command/continue.rst
> %%DATADIR%%/Help/command/create_test_sourcelist.rst
> %%DATADIR%%/Help/command/ctest_build.rst
> %%DATADIR%%/Help/command/ctest_configure.rst
>@@ -165,6 +166,8 @@
> %%DATADIR%%/Help/generator/Watcom WMake.rst
> %%DATADIR%%/Help/generator/Xcode.rst
> %%DATADIR%%/Help/include/COMPILE_DEFINITIONS_DISCLAIMER.txt
>+%%DATADIR%%/Help/include/INTERFACE_INCLUDE_DIRECTORIES_WARNING.txt  
>+%%DATADIR%%/Help/include/INTERFACE_LINK_LIBRARIES_WARNING.txt
> %%DATADIR%%/Help/index.rst
> %%DATADIR%%/Help/manual/LINKS.txt
> %%DATADIR%%/Help/manual/OPTIONS_BUILD.txt
>@@ -217,6 +220,7 @@
> %%DATADIR%%/Help/module/CPackRPM.rst
> %%DATADIR%%/Help/module/CPackWIX.rst
> %%DATADIR%%/Help/module/CTest.rst
>+%%DATADIR%%/Help/module/CTestCoverageCollectGCOV.rst
> %%DATADIR%%/Help/module/CTestScriptMode.rst
> %%DATADIR%%/Help/module/CTestUseLaunchers.rst
> %%DATADIR%%/Help/module/CheckCCompilerFlag.rst
>@@ -278,6 +282,7 @@
> %%DATADIR%%/Help/module/FindGIF.rst
> %%DATADIR%%/Help/module/FindGLEW.rst
> %%DATADIR%%/Help/module/FindGLUT.rst
>+%%DATADIR%%/Help/module/FindGSL.rst
> %%DATADIR%%/Help/module/FindGTK.rst
> %%DATADIR%%/Help/module/FindGTK2.rst
> %%DATADIR%%/Help/module/FindGTest.rst
>@@ -290,6 +295,7 @@
> %%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
>@@ -466,6 +472,8 @@
> %%DATADIR%%/Help/policy/CMP0052.rst
> %%DATADIR%%/Help/policy/CMP0053.rst
> %%DATADIR%%/Help/policy/CMP0054.rst
>+%%DATADIR%%/Help/policy/CMP0055.rst  
>+%%DATADIR%%/Help/policy/CMP0056.rst
> %%DATADIR%%/Help/policy/DISALLOWED_COMMAND.txt
> %%DATADIR%%/Help/prop_cache/ADVANCED.rst
> %%DATADIR%%/Help/prop_cache/HELPSTRING.rst
>@@ -549,6 +557,7 @@
> %%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_CONTENT.rst
> %%DATADIR%%/Help/prop_sf/VS_DEPLOYMENT_LOCATION.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
> %%DATADIR%%/Help/prop_sf/VS_SHADER_TYPE.rst
> %%DATADIR%%/Help/prop_sf/WRAP_EXCLUDE.rst
>@@ -650,7 +659,9 @@
> %%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
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_FEATURES.rst
> %%DATADIR%%/Help/prop_tgt/INTERFACE_COMPILE_OPTIONS.rst
>@@ -743,8 +754,9 @@
> %%DATADIR%%/Help/prop_tgt/XCODE_ATTRIBUTE_an-attribute.rst
> %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_DIRECTORY.txt
> %%DATADIR%%/Help/prop_tgt/XXX_OUTPUT_NAME.txt
>-%%DATADIR%%/Help/release/3.0.0.rst
>-%%DATADIR%%/Help/release/3.1.0.rst
>+%%DATADIR%%/Help/release/3.0.rst  
>+%%DATADIR%%/Help/release/3.1.rst  
>+%%DATADIR%%/Help/release/3.2.rst
> %%DATADIR%%/Help/release/dev.txt
> %%DATADIR%%/Help/release/index.rst
> %%DATADIR%%/Help/variable/APPLE.rst
>@@ -751,6 +763,7 @@
> %%DATADIR%%/Help/variable/BORLAND.rst
> %%DATADIR%%/Help/variable/BUILD_SHARED_LIBS.rst
> %%DATADIR%%/Help/variable/CMAKE_ABSOLUTE_DESTINATION_FILES.rst
>+%%DATADIR%%/Help/variable/CMAKE_ANDROID_API_MIN.rst
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_API.rst
> %%DATADIR%%/Help/variable/CMAKE_ANDROID_GUI.rst
> %%DATADIR%%/Help/variable/CMAKE_APPBUNDLE_PATH.rst
>@@ -910,6 +923,7 @@
> %%DATADIR%%/Help/variable/CMAKE_MACOSX_RPATH.rst
> %%DATADIR%%/Help/variable/CMAKE_MAJOR_VERSION.rst
> %%DATADIR%%/Help/variable/CMAKE_MAKE_PROGRAM.rst
>+%%DATADIR%%/Help/variable/CMAKE_MATCH_COUNT.rst
> %%DATADIR%%/Help/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.rst
> %%DATADIR%%/Help/variable/CMAKE_MFC_FLAG.rst
> %%DATADIR%%/Help/variable/CMAKE_MINIMUM_REQUIRED_VERSION.rst
>@@ -1049,6 +1063,7 @@
> %%DATADIR%%/Help/variable/ENV.rst
> %%DATADIR%%/Help/variable/EXECUTABLE_OUTPUT_PATH.rst
> %%DATADIR%%/Help/variable/LIBRARY_OUTPUT_PATH.rst
>+%%DATADIR%%/Help/variable/MINGW.rst
> %%DATADIR%%/Help/variable/MSVC.rst
> %%DATADIR%%/Help/variable/MSVC10.rst
> %%DATADIR%%/Help/variable/MSVC11.rst
>Index: devel/cmake-modules/pkg-plist
>===================================================================
>--- devel/cmake-modules/pkg-plist	(revision 388424)
>+++ devel/cmake-modules/pkg-plist	(working copy)
>@@ -130,6 +130,7 @@
> %%DATADIR%%/Modules/CPackWIX.cmake
> %%DATADIR%%/Modules/CPackZIP.cmake
> %%DATADIR%%/Modules/CTest.cmake
>+%%DATADIR%%/Modules/CTestCoverageCollectGCOV.cmake
> %%DATADIR%%/Modules/CTestScriptMode.cmake
> %%DATADIR%%/Modules/CTestTargets.cmake
> %%DATADIR%%/Modules/CTestUseLaunchers.cmake
>@@ -167,7 +168,9 @@
> %%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-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/AppleClang-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Borland-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Clang-ASM.cmake
>@@ -174,6 +177,7 @@
> %%DATADIR%%/Modules/Compiler/Clang-C-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/Clang-C.cmake
> %%DATADIR%%/Modules/Compiler/Clang-CXX-FeatureTests.cmake
>+%%DATADIR%%/Modules/Compiler/Clang-CXX-TestableFeatures.cmake
> %%DATADIR%%/Modules/Compiler/Clang-CXX.cmake
> %%DATADIR%%/Modules/Compiler/Clang-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/Clang-DetermineCompilerInternal.cmake
>@@ -218,6 +222,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-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/NAG-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake
>@@ -243,6 +249,7 @@
> %%DATADIR%%/Modules/Compiler/SunPro-C-DetermineCompiler.cmake
> %%DATADIR%%/Modules/Compiler/SunPro-C.cmake
> %%DATADIR%%/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake
>+%%DATADIR%%/Modules/Compiler/SunPro-CXX-FeatureTests.cmake
> %%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake
> %%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake
> %%DATADIR%%/Modules/Compiler/TI-ASM.cmake
>@@ -321,6 +328,7 @@
> %%DATADIR%%/Modules/FindGLEW.cmake
> %%DATADIR%%/Modules/FindGLU.cmake
> %%DATADIR%%/Modules/FindGLUT.cmake
>+%%DATADIR%%/Modules/FindGSL.cmake
> %%DATADIR%%/Modules/FindGTK.cmake
> %%DATADIR%%/Modules/FindGTK2.cmake
> %%DATADIR%%/Modules/FindGTest.cmake
>@@ -335,6 +343,7 @@
> %%DATADIR%%/Modules/FindIce.cmake
> %%DATADIR%%/Modules/FindIcotool.cmake
> %%DATADIR%%/Modules/FindImageMagick.cmake
>+%%DATADIR%%/Modules/FindIntl.cmake
> %%DATADIR%%/Modules/FindJNI.cmake
> %%DATADIR%%/Modules/FindJPEG.cmake
> %%DATADIR%%/Modules/FindJasper.cmake

Actions: View | Diff

Attachments on bug 200647: 157418 | 157435