From a7a7b7a19ea25b243f6c41ef209eac2001eda131 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 19 Sep 2017 21:24:06 +0000
Subject: [PATCH] devel/cmake: backport boost 1.65 support

PR:		222207
Approved by:	kde (???) !!! NOT YET !!!
---
 devel/cmake/Makefile                            |  1 +
 devel/cmake/files/patch-Modules_FindBoost.cmake | 63 +++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 devel/cmake/files/patch-Modules_FindBoost.cmake

diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index e7568fc4265a..694440a0022c 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cmake
 DISTVERSION=	3.9.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
 
diff --git a/devel/cmake/files/patch-Modules_FindBoost.cmake b/devel/cmake/files/patch-Modules_FindBoost.cmake
new file mode 100644
index 000000000000..2a7a2ef689bf
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindBoost.cmake
@@ -0,0 +1,63 @@
+https://github.com/Kitware/CMake/commit/fa114e7d708b
+https://github.com/Kitware/CMake/commit/dbba53a5aae0
+
+--- Modules/FindBoost.cmake.orig	2017-05-31 14:00:09 UTC
++++ Modules/FindBoost.cmake
+@@ -548,7 +548,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)
+@@ -762,8 +765,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)
+@@ -813,6 +835,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")
+@@ -969,6 +992,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"