<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/451fc5a8bd32018bef78ea77c6690d5b4f1d737f">https://github.com/macports/macports-ports/commit/451fc5a8bd32018bef78ea77c6690d5b4f1d737f</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 451fc5a cmake: update release to 3.12.0.
</span>451fc5a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 451fc5a8bd32018bef78ea77c6690d5b4f1d737f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jul 20 21:12:48 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.12.0.
</span>---
devel/cmake/Portfile | 11 +++++------
devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff | 13 -------------
devel/cmake/files/patch-Source_CMakeLists.txt.release.diff | 2 +-
.../files/patch-Source_Modules_FindLibUV.cmake.release.diff | 4 ++--
devel/cmake/files/patch-qt4gui.release.diff | 2 +-
devel/cmake/files/patch-qt5gui.release.diff | 2 +-
6 files changed, 10 insertions(+), 24 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 d2e02c5..296dc6b 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;'>@@ -31,16 +31,16 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.12
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6182b0a029c127db27bd88208bbb7f94923ecb2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7955301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version ${branch}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e4165d2e2ff4ce76e9d5c023a9731f826da5be40 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d0781a90f6cdb9049d104ac16a150f9350b693498b9dea8a0331e799db6b9d69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8089372
</span>
master_sites ${homepage}/files/v${branch}/
conflicts cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,6 @@ if {${subport} eq ${name}} {
</span>
# release-only patches
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Modules-FindQt4.cmake.release.diff \
</span> patch-Modules-noArchCheck.release.diff \
patch-CMakeFindFrameworks.cmake.release.diff \
patch-Source_CMakeVersionCompute.cmake.release.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff b/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5862cd4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/FindQt4.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/FindQt4.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -736,9 +736,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_path(QT_IMPORTS_DIR NAMES Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HINTS ${qt_cross_paths} ${qt_imports_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOC "The location of the Qt imports"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_CMAKE_FIND_ROOT_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NO_CMAKE_SYSTEM_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mark_as_advanced(QT_IMPORTS_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif ()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.release.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f001d8..3df8a35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeLists.txt.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeLists.txt.release.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;'>-@@ -777,9 +777,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,9 +784,9 @@
</span> endif()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.release.diff b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f535b7..1b5b3db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,5 +9,5 @@
</span> + 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}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${LibUV_INCLUDE_DIR}/uv.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;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.release.diff b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c7be85f..1f51653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -699,12 +699,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,12 +701,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt5gui.release.diff b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ee3c1ee..bf623ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -699,12 +699,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -701,12 +701,6 @@
</span> set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</pre><pre style='margin:0'>
</pre>