<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/64f7eeff4b10a3e7d3bb82f1e798608099dd0523">https://github.com/macports/macports-ports/commit/64f7eeff4b10a3e7d3bb82f1e798608099dd0523</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 64f7eef cmake-devel: update to 1c3bbda2 (20180320).
</span>64f7eef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 64f7eeff4b10a3e7d3bb82f1e798608099dd0523
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Mar 20 16:40:00 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 1c3bbda2 (20180320).
</span>---
devel/cmake/Portfile | 10 +++++-----
devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff | 8 ++++----
devel/cmake/files/patch-qt4gui.devel.diff | 8 ++------
devel/cmake/files/patch-qt5gui.devel.diff | 8 ++------
4 files changed, 13 insertions(+), 21 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 45cceed..581159d 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;'>@@ -64,11 +64,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180316
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit b3e668ea25d35a04adc41e17cfb4c8ab7a97a7d9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e40a4d69c1a055b8f03cc5b7c48bdec65a36afcf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 adbbd56754644df1cdb037e1d99f6e694c541662cbf2c5340eb5d0bb84bab676 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6246932
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 1c3bbda2f2920f416304086ece139ba1b50015ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c42a1e559586c1b34cb404c5337678007afadf5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f7bd447d144cb5b45b6cf52bf294580efb1b8787a681d16cbbc8a4c829a12129 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6253085
</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;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff b/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 59904dc..5862cd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/FindQt4.cmake.orig
+++ Modules/FindQt4.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -743,9 +743,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -736,9 +736,7 @@
</span> find_path(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC "The location of the Qt imports"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,6 @@
</span> - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
- NO_CMAKE_SYSTEM_PATH)
+ NO_DEFAULT_PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If the imports folder is empty, set QT_IMPORTS_DIR to ${qt_imports_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT QT_IMPORTS_DIR AND qt_imports_dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(QT_IMPORTS_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</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 fdbe79b..c7be85f 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;'>@@ -126,7 +126,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;'>-@@ -235,18 +150,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +150,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,11 +135,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +161,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
<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 574b990..ee3c1ee 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;'>@@ -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;'>-@@ -235,18 +224,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +224,7 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,11 +67,7 @@
</span> install(CODE "
execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +235,7 @@
</span> # install rules for including 3rd party libs such as Qt
# if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</pre><pre style='margin:0'>
</pre>