<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1303ec6edf1dc384be152e5c796d8ee6de60b7a6">https://github.com/macports/macports-ports/commit/1303ec6edf1dc384be152e5c796d8ee6de60b7a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1303ec6 cmake: update release to 3.11.4 and devel to 63fbff54 (20180616).
</span>1303ec6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1303ec6edf1dc384be152e5c796d8ee6de60b7a6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 19 10:55:43 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.11.4 and devel to 63fbff54 (20180616).
</span>---
devel/cmake/Portfile | 21 ++++++++++++---------
.../files/patch-Source_CMakeLists.txt.devel.diff | 2 +-
.../files/patch-Source_Modules_FindLibUV.cmake.diff | 13 +++++++++++++
3 files changed, 26 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce9ac26..3425f39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,10 +37,10 @@ if {${subport} eq ${name}} {
</span>
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 90e5ae01c3a68b31095967b5d1c8e245065bb294 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 287135b6beb7ffc1ccd02707271080bbf14c21d80c067ae2c0040e5f3508c39a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7954155
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${branch}.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6182b0a029c127db27bd88208bbb7f94923ecb2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7955301
</span>
master_sites ${homepage}/files/v${branch}/
conflicts cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180605
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit acaaca968c512fa420f3564649be1f49acfa6a6a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 49c44b3c8157cf7f3d41006fcbb197107f1b32ed\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b1ad7795e735b4be2d805f4a4292dfcab8746e19bb498a3d69e858b54c9ba4db\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6281249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180616
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 63fbff548e9bb3227943b2e94e700257d343d2c3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f5f467926c21ab4631e523ee947f1e5c2925ae54\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 524642a2c3ceddbd5a0f724cdef7ef57f306cfa84c44fcbd6e02535f7248b00a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6283769
</span>
use_bzip2 yes
master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,6 +107,9 @@ depends_lib-append port:curl \
</span> # system libuv is the default as of 20160830 (g320f5)
depends_lib-append path:lib/pkgconfig/libuv.pc:libuv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# common patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Source_Modules_FindLibUV.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3df8a35..10e82c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/CMakeLists.txt.orig
+++ Source/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -784,9 +784,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -788,9 +788,9 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.diff b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4f535b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/Modules/FindLibUV.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/Modules/FindLibUV.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract version number if possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span></pre><pre style='margin:0'>
</pre>