CVS commit: pkgsrc/devel/cmake

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jun 24 09:13:22 UTC 2018

Modified Files:
        pkgsrc/devel/cmake: Makefile.version distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_Modules_FindLibUV.cmake

Log Message:
cmake: updated to 3.11.4

3.11.4:
Windows: Restore support for running CMake through a symlink
ExternalProject: Fix cache generation when args end with "-NOTFOUND"
ExternalProject: Improve URL_HASH argument description


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/cmake/Makefile.version
cvs rdiff -u -r1.122 -r1.123 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Source_Modules_FindLibUV.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile.version
diff -u pkgsrc/devel/cmake/Makefile.version:1.26 pkgsrc/devel/cmake/Makefile.version:1.27
--- pkgsrc/devel/cmake/Makefile.version:1.26    Fri Jun  1 07:16:03 2018
+++ pkgsrc/devel/cmake/Makefile.version Sun Jun 24 09:13:22 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.version,v 1.26 2018/06/01 07:16:03 adam Exp $
+# $NetBSD: Makefile.version,v 1.27 2018/06/24 09:13:22 adam Exp $
 #
 # used by devel/cmake/Makefile
 # used by devel/cmake-fedora/Makefile
-CMAKE_VERSION= 3.11.3
+CMAKE_VERSION= 3.11.4
 CMAKE_API=     ${CMAKE_VERSION:R}

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.122 pkgsrc/devel/cmake/distinfo:1.123
--- pkgsrc/devel/cmake/distinfo:1.122   Mon Jun 11 17:33:51 2018
+++ pkgsrc/devel/cmake/distinfo Sun Jun 24 09:13:22 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.122 2018/06/11 17:33:51 tron Exp $
+$NetBSD: distinfo,v 1.123 2018/06/24 09:13:22 adam Exp $
 
-SHA1 (cmake-3.11.3.tar.gz) = 73261a5b7f71abf7277c1d2a418ca3c4cf170c89
-RMD160 (cmake-3.11.3.tar.gz) = 90e5ae01c3a68b31095967b5d1c8e245065bb294
-SHA512 (cmake-3.11.3.tar.gz) = a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
-Size (cmake-3.11.3.tar.gz) = 7954155 bytes
+SHA1 (cmake-3.11.4.tar.gz) = 6bcf931844964fefc4ccfd7d025ba4ec2c7c2abb
+RMD160 (cmake-3.11.4.tar.gz) = 6182b0a029c127db27bd88208bbb7f94923ecb2d
+SHA512 (cmake-3.11.4.tar.gz) = c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
+Size (cmake-3.11.4.tar.gz) = 7955301 bytes
 SHA1 (patch-CMakeLists.txt) = a0b03f2fad5ea174095c4fe52cea67d94cf46e2d
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9
 SHA1 (patch-Modules_FindCurses.cmake) = 09fcd7adfbc2dfc2cd8af4e047d870a5243d77dc
@@ -15,5 +15,6 @@ SHA1 (patch-Source_CMakeLists.txt) = 533
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = 37772f3e7edc2413cb2e294462312aff18e5c989
 SHA1 (patch-Source_Checks_cm_cxx_features.cmake) = 83eb2bedb84972637d02d12f72fec0ccf74563eb
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
+SHA1 (patch-Source_Modules_FindLibUV.cmake) = 54773f03e8122904985c192c14d56c01f8f98e6c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = 9d99cfe9f9ae826250f94bc297f5a22b8de09e84

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_Modules_FindLibUV.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_Modules_FindLibUV.cmake:1.1
--- /dev/null   Sun Jun 24 09:13:22 2018
+++ pkgsrc/devel/cmake/patches/patch-Source_Modules_FindLibUV.cmake     Sun Jun 24 09:13:22 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_Modules_FindLibUV.cmake,v 1.1 2018/06/24 09:13:22 adam Exp $
+
+Find libuv 1.21.0 and newer.
+
+--- Source/Modules/FindLibUV.cmake.orig        2018-06-24 07:50:12.000000000 +0000
++++ Source/Modules/FindLibUV.cmake
+@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
+ if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
++  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ else()