--- a/dev/cmake/cmake.sh	Thu Aug 29 22:15:00 2019 +0200
+++ b/dev/cmake/cmake.sh	Wed Aug 28 12:55:52 2019 +0200
@@ -16,19 +16,21 @@
 #
 
 PKGNAME=cmake
-PKGVERSION=3.13.4
+PKGVERSION=3.15.2
 PKGREVISION=1
 PKGLICENSE="CUSTOM"
 PKGSUMMARY="cross platform make"
 PKGDOWNLOAD="https://github.com/Kitware/CMake/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="curl
+            bzip2
             expat
             jsoncpp
+            libarchive
             libuv
             rhash
-            bzip2
             xz
-            libarchive"
+            zlib
+            zstd"
 PKGOPTIONS="QT5"
 
 : ${CC:=clang}

--- a/dev/cmake/cmake.sha1	Thu Aug 29 22:15:00 2019 +0200
+++ b/dev/cmake/cmake.sha1	Wed Aug 28 12:55:52 2019 +0200
@@ -1,1 +1,1 @@
-242ac4986ab38ddb06c7bfb7eb950e4c1b1ca770  cmake-3.13.4.tar.gz
+7561a018f41d6adc0efbdd399904172abb4968ec  cmake-3.15.2.tar.gz

--- a/dev/cmake/patch-fhs.patch	Thu Aug 29 22:15:00 2019 +0200
+++ b/dev/cmake/patch-fhs.patch	Wed Aug 28 12:55:52 2019 +0200
@@ -1,5 +1,5 @@
---- Modules/Platform/UnixPaths.cmake.orig	2019-08-09 10:02:27.447007587 +0200
-+++ Modules/Platform/UnixPaths.cmake	2019-08-09 10:04:02.843010517 +0200
+--- Modules/Platform/UnixPaths.cmake.orig	2019-08-28 08:48:53.229519581 +0000
++++ Modules/Platform/UnixPaths.cmake	2019-08-28 08:51:03.813523592 +0000
 @@ -23,7 +23,7 @@
  # search types.
  list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@@ -9,7 +9,7 @@
  
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
-@@ -41,39 +41,32 @@
+@@ -41,52 +41,34 @@
    endif()
  endif()
  
@@ -38,19 +38,32 @@
 +  /lib
    )
  
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
+-if(CMAKE_SYSROOT_COMPILE)
+-  set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
+-else()
+-  set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
+-endif()
+-
+ # Default per-language values.  These may be later replaced after
+ # parsing the implicit directory information from compiler output.
+ set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+-  ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
 +  /include
    )
- list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
+ set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+-  ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
 +  /include
    )
- list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
+ set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
+-  ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
+-  "${_cmake_sysroot_compile}/usr/include"
 +  /include
    )
  
+-unset(_cmake_sysroot_compile)
+-
  # Enable use of lib32 and lib64 search path variants by default.
 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
@@ -58,18 +71,33 @@
 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE)
---- Modules/GNUInstallDirs.cmake.orig	2019-08-09 15:27:50.247607285 +0200
-+++ Modules/GNUInstallDirs.cmake	2019-08-09 15:29:28.923610316 +0200
+--- Modules/GNUInstallDirs.cmake.orig	2019-08-28 08:52:16.169525815 +0000
++++ Modules/GNUInstallDirs.cmake	2019-08-28 08:56:58.197534478 +0000
 @@ -36,7 +36,7 @@
- # ``BINDIR``
- #   user executables (``bin``)
- # ``SBINDIR``
--#   system admin executables (``sbin``)
-+#   system admin executables (``bin``)
- # ``LIBEXECDIR``
- #   program executables (``libexec``)
- # ``SYSCONFDIR``
-@@ -164,8 +164,8 @@
+ ``BINDIR``
+   user executables (``bin``)
+ ``SBINDIR``
+-  system admin executables (``sbin``)
++  system admin executables (``bin``)
+ ``LIBEXECDIR``
+   program executables (``libexec``)
+ ``SYSCONFDIR``
+@@ -48,12 +48,11 @@
+ ``RUNSTATEDIR``
+   run-time variable data (``LOCALSTATEDIR/run``)
+ ``LIBDIR``
+-  object code libraries (``lib`` or ``lib64``
+-  or ``lib/<multiarch-tuple>`` on Debian)
++  object code libraries (``lib``)
+ ``INCLUDEDIR``
+   C header files (``include``)
+ ``OLDINCLUDEDIR``
+-  C header files for non-gcc (``/usr/include``)
++  C header files for non-gcc (``include``)
+ ``DATAROOTDIR``
+   read-only architecture-independent data root (``share``)
+ ``DATADIR``
+@@ -165,8 +164,8 @@
  
  _GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin"
    "User executables (bin)")
@@ -80,10 +108,37 @@
  _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec"
    "Program executables (libexec)")
  _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc"
-@@ -201,52 +201,6 @@
-   #    second time.
- 
-   set(_LIBDIR_DEFAULT "lib")
+@@ -175,97 +174,16 @@
+   "Modifiable architecture-independent data (com)")
+ _GNUInstallDirs_cache_path(CMAKE_INSTALL_LOCALSTATEDIR "var"
+   "Modifiable single-machine data (var)")
+-
+-# We check if the variable was manually set and not cached, in order to
+-# allow projects to set the values as normal variables before including
+-# GNUInstallDirs to avoid having the entries cached or user-editable. It
+-# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the
+-# other cases.
+-# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the
+-# variable is a normal one, otherwise it is a cache one.
+-get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET)
+-if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
+-    AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
+-    AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}"))
+-  # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed.
+-  # Otherwise:
+-  #  * if _libdir_set is false it is not executed (meaning that it is
+-  #    not a cache variable)
+-  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is
+-  #    not executed
+-  #  * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and
+-  #    CMAKE_INSTALL_PREFIX are the same string it is not executed.
+-  #    _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the
+-  #    execution, of this part of code, therefore at the next inclusion
+-  #    of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings
+-  #    are equal, meaning that the if is not executed the code the
+-  #    second time.
+-
+-  set(_LIBDIR_DEFAULT "lib")
 -  # Override this default 'lib' with 'lib64' iff:
 -  #  - we are on Linux system but NOT cross-compiling
 -  #  - we are NOT on debian
@@ -130,17 +185,28 @@
 -      endif()
 -    endif()
 -  endif()
-   if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-     set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
-   elseif(DEFINED __LAST_LIBDIR_DEFAULT
-@@ -263,8 +217,8 @@
+-  if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+-    set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
+-  elseif(DEFINED __LAST_LIBDIR_DEFAULT
+-      AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}")
+-    set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}")
+-  endif()
+-endif()
+-_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBDIR "lib"
++  "Object code libraries (lib)")
+ 
+ # Save for next run
+ set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run")
+-unset(_libdir_set)
+-unset(__LAST_LIBDIR_DEFAULT)
  
  _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include"
    "C header files (include)")
 -_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include"
 -  "C header files for non-gcc (/usr/include)")
-+_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/include"
-+  "C header files for non-gcc (/include)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "include"
++  "C header files for non-gcc (include)")
  _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
    "Read-only architecture-independent data root (share)")