Attachment 186614 Details for Bug 222513 – Patch against ports svn

[patch] Patch against ports svn

cmake-3.9.3.patch (text/plain), 6.78 KB, created by Adriaan de Groot on 2017-09-22 10:36:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adriaan de Groot

Created: 2017-09-22 10:36:53 UTC

Size: 6.78 KB

patch

obsolete

>Index: devel/cmake/Makefile
>===================================================================
>--- devel/cmake/Makefile	(revision 450349)
>+++ devel/cmake/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-DISTVERSION=	3.9.2
>-PORTREVISION=	1
>+# Remember to update devel/cmake-doc and devel/cmake-gui as well.
>+DISTVERSION=	3.9.3
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> 
>Index: devel/cmake/distinfo
>===================================================================
>--- devel/cmake/distinfo	(revision 450349)
>+++ devel/cmake/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1504850116
>-SHA256 (cmake-3.9.2.tar.gz) = 954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1
>-SIZE (cmake-3.9.2.tar.gz) = 7703777
>+TIMESTAMP = 1505937220
>+SHA256 (cmake-3.9.3.tar.gz) = 8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a
>+SIZE (cmake-3.9.3.tar.gz) = 7705238
>Index: devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake
>===================================================================
>--- devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake	(revision 450349)
>+++ devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake	(working copy)
>@@ -1,5 +1,8 @@
> This prefers c++ over CC as the C++ compiler command. See PR 203793.
> 
>+Upstreamed as 6f666f4335c7f6b44fc4ccdc886590094fdfa16d
>+Will be included in CMake 3.10
>+
> --- Modules/Platform/FreeBSD-CXX.cmake.orig	2017-06-14 21:54:30 UTC
> +++ Modules/Platform/FreeBSD-CXX.cmake
> @@ -0,0 +1,3 @@
>Index: devel/cmake/files/patch-git_ee1f8903
>===================================================================
>--- devel/cmake/files/patch-git_ee1f8903	(revision 450349)
>+++ devel/cmake/files/patch-git_ee1f8903	(nonexistent)
>@@ -1,72 +0,0 @@
>-From ee1f8903322b443b263ec9638ab4851e7e5edf21 Mon Sep 17 00:00:00 2001
>-From: Roger Leigh <rleigh@dundee.ac.uk>
>-Date: Wed, 6 Sep 2017 21:11:47 +0100
>-Subject: [PATCH] FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake
>- 3.9
>-
>-Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65
>-dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version
>-1.65.1, 2017-09-06) to CMake 3.9.
>-
>-Fixes: #17289
>-
>---- Modules/FindBoost.cmake.orig	2017-09-07 16:10:58 UTC
>-+++ Modules/FindBoost.cmake
>-@@ -550,7 +550,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
>-   # The addition of a new release should only require it to be run
>-   # against the new release.
>-   set(_Boost_IMPORTED_TARGETS TRUE)
>--  if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
>-+  if(Boost_VERSION VERSION_LESS 103300)
>-+    message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
>-+    set(_Boost_IMPORTED_TARGETS FALSE)
>-+  elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500)
>-     set(_Boost_IOSTREAMS_DEPENDENCIES regex thread)
>-     set(_Boost_REGEX_DEPENDENCIES thread)
>-     set(_Boost_WAVE_DEPENDENCIES filesystem thread)
>-@@ -764,8 +767,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
>-     set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
>-     set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
>-   else()
>--    message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}")
>--    set(_Boost_IMPORTED_TARGETS FALSE)
>-+    if(NOT Boost_VERSION VERSION_LESS 106500)
>-+      set(_Boost_CHRONO_DEPENDENCIES system)
>-+      set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
>-+      set(_Boost_COROUTINE_DEPENDENCIES context system)
>-+      set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
>-+      set(_Boost_FILESYSTEM_DEPENDENCIES system)
>-+      set(_Boost_IOSTREAMS_DEPENDENCIES regex)
>-+      set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
>-+      set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
>-+      set(_Boost_MPI_DEPENDENCIES serialization)
>-+      set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
>-+      set(_Boost_NUMPY_DEPENDENCIES python)
>-+      set(_Boost_RANDOM_DEPENDENCIES system)
>-+      set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
>-+      set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
>-+      set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
>-+    endif()
>-+    if(NOT Boost_VERSION VERSION_LESS 106600)
>-+      message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
>-+      set(_Boost_IMPORTED_TARGETS FALSE)
>-+    endif()
>-   endif()
>- 
>-   string(TOUPPER ${component} uppercomponent)
>-@@ -815,6 +837,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
>-   set(_Boost_MATH_TR1L_HEADERS           "boost/math/tr1.hpp")
>-   set(_Boost_MPI_HEADERS                 "boost/mpi.hpp")
>-   set(_Boost_MPI_PYTHON_HEADERS          "boost/mpi/python/config.hpp")
>-+  set(_Boost_NUMPY_HEADERS               "boost/python/numpy.hpp")
>-   set(_Boost_PRG_EXEC_MONITOR_HEADERS    "boost/test/prg_exec_monitor.hpp")
>-   set(_Boost_PROGRAM_OPTIONS_HEADERS     "boost/program_options.hpp")
>-   set(_Boost_PYTHON_HEADERS              "boost/python.hpp")
>-@@ -998,6 +1021,7 @@ else()
>-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
>-   # _Boost_COMPONENT_DEPENDENCIES.
>-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
>-+    "1.65.1" "1.65.0" "1.65"
>-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
>-     "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
>-     "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
>
>Property changes on: devel/cmake/files/patch-git_ee1f8903
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: devel/cmake-doc/Makefile
>===================================================================
>--- devel/cmake-doc/Makefile	(revision 450349)
>+++ devel/cmake-doc/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-DISTVERSION=	3.9.2
>+DISTVERSION=	3.9.3
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> PKGNAMESUFFIX=	-doc
>Index: devel/cmake-gui/Makefile
>===================================================================
>--- devel/cmake-gui/Makefile	(revision 450349)
>+++ devel/cmake-gui/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cmake
>-DISTVERSION=	3.9.2
>+DISTVERSION=	3.9.3
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> PKGNAMESUFFIX=	-gui

Actions: View | Diff

Attachments on bug 222513: 186614