<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/0fd74f1edc97047288fc9fcbce213bfb6c05dc38">https://github.com/macports/macports-ports/commit/0fd74f1edc97047288fc9fcbce213bfb6c05dc38</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 0fd74f1 cmake-devel: update to 20170516 (3f25f873).
</span>0fd74f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0fd74f1edc97047288fc9fcbce213bfb6c05dc38
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 17 16:25:21 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 20170516 (3f25f873).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patches to apply cleanly.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix fetch to use cmake's GIT, because they moved all source snapshots to using just ZIP.
</span><span style='display:block; white-space:pre;color:#404040;'> Fix livecheck to match fetch style.
</span><span style='display:block; white-space:pre;color:#404040;'> Allows selection by GIT commit, which is more robust than daily snapshots.
</span>---
devel/cmake/Portfile | 30 ++++++++++++++++--------------
devel/cmake/files/patch-qt4gui.devel.diff | 8 ++++----
devel/cmake/files/patch-qt5gui.devel.diff | 12 ++++++------
3 files changed, 26 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 2cae824..d305fbf 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;'>@@ -54,20 +54,22 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170511
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dist_branch 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dist_date 20170506
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dist_hash gcbee4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 caeeb20bde2f5fd810cb2bdb76156436c33534ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1c66097b405f4131c19217c29bc30e46541dff3046c2e3f74716a5ddf491cf48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://www.cmake.org/files/dev/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170516
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 3f25f873f8f0cd4c9c8d5dce29535c6b2757eaea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 e6144adeee31232d7f0d08678c97dd0532a12dfc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dd1525b3e9a4e651485de69aeab57d65c7e62892b203f8494dd8919ed9adca84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive.tar.bz2?ref=${commit}&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname ${name}-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${name}-${commit}-${commit} ${workpath}/${name}-${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts cmake
</span> long_description ${base_long_description} \
The ${subport} port is updated roughly every week.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # devel-only patches
patchfiles-append \
patch-Modules-FindQt4.cmake.devel.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,9 +79,9 @@ if {${subport} eq ${name}} {
</span> patch-Source_CMakeVersionCompute.cmake.devel.diff
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://www.cmake.org/files/dev/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex /cmake/cmake/commit/(\[0-9a-g\]+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.version ${commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://gitlab.kitware.com/cmake/cmake/tree/master
</span>
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-qt4gui.devel.diff b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5418332..446f4ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,8 +110,8 @@
</span> +add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Files generated by MOC, RCC, and UIC may produce clang-tidy warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake-gui has not been updated for `include-what-you-use`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +100,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +120,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,18 +140,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,18 +146,18 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,7 +144,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -687,12 +687,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -706,12 +706,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.devel.diff b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ea2f6d5..8dd7850 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@
</span>
set(SRCS
AddCacheEntry.cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +129,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@
</span> set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +146,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,8 +48,8 @@
</span> +add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Files generated by MOC, RCC, and UIC may produce clang-tidy warnings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake-gui has not been updated for `include-what-you-use`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,7 +168,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@
</span> file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,18 +140,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,18 +214,18 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -687,12 +687,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -706,12 +706,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>