Patch cmake to find boost version 1.65 (i.e., the one in pkgsrc)

3 files changed, 69 insertions, 2 deletions

diff --git a/devel/cmake/Makefile.version b/devel/cmake/Makefile.version
index 3aaa1af59cd..52331511448 100644
--- a/devel/cmake/Makefile.version
+++ b/devel/cmake/Makefile.version
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.version,v 1.13 2017/09/08 07:56:08 adam Exp $
+# $NetBSD: Makefile.version,v 1.14 2017/09/19 15:58:21 prlw1 Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
 CMAKE_VERSION=	3.9.2
 CMAKE_API=	${CMAKE_VERSION:R}
+PKGREVISION=	1
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index d77cf8a1627..5523b99ac72 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.104 2017/09/08 07:56:08 adam Exp $
+$NetBSD: distinfo,v 1.105 2017/09/19 15:58:21 prlw1 Exp $
 
 SHA1 (cmake-3.9.2.tar.gz) = 99ef24c8286d87a13fc2d27bef35566cf0cc4888
 RMD160 (cmake-3.9.2.tar.gz) = 133cfee5d133675b94851a4583d9e8186eb9654d
 SHA512 (cmake-3.9.2.tar.gz) = 9528d9f39d00bb282cf36b4126c09f6884751ac68ab924893884eecbb77ea99b0e560b30e30d46faaa89417e7386f4b376e6c7c61ccf2f23948765f8607f943c
 Size (cmake-3.9.2.tar.gz) = 7703777 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
+SHA1 (patch-Modules_FindBoost.cmake) = 4f79011e4921bcf8cb5fb185865fd15d05620d14
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
diff --git a/devel/cmake/patches/patch-Modules_FindBoost.cmake b/devel/cmake/patches/patch-Modules_FindBoost.cmake
new file mode 100644
index 00000000000..79ee92cce05
--- /dev/null
+++ b/devel/cmake/patches/patch-Modules_FindBoost.cmake
@@ -0,0 +1,65 @@
+$NetBSD: patch-Modules_FindBoost.cmake,v 1.1 2017/09/19 15:58:21 prlw1 Exp $
+
+- dbba53a5 FindBoost: Add version 1.65.1
+- fa114e7d FindBoost: Add Boost 1.65 dependencies
+
+--- Modules/FindBoost.cmake.orig	2017-09-07 16:10:58.000000000 +0000
++++ Modules/FindBoost.cmake
+@@ -550,7 +550,10 @@ function(_Boost_COMPONENT_DEPENDENCIES c
+   # 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 c
+     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 compon
+   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"