<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/b98b2e9503bac86b8f23a49f0d1f3d82959f0f45">https://github.com/macports/macports-ports/commit/b98b2e9503bac86b8f23a49f0d1f3d82959f0f45</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 b98b2e9 cmake-devel: update to 9fbad8b4 (20190325)
</span>b98b2e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b98b2e9503bac86b8f23a49f0d1f3d82959f0f45
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Mar 25 21:14:19 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 9fbad8b4 (20190325)
</span>---
devel/cmake/Portfile | 10 +++++-----
devel/cmake/files/patch-qt4gui.devel.diff | 18 +++++++++---------
devel/cmake/files/patch-qt5gui.devel.diff | 16 ++++++++--------
3 files changed, 22 insertions(+), 22 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 91f95bd..5669980 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;'>@@ -75,11 +75,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190314
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 2efecea485a76df149ecc5d644cc2a1ec6c33cf3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 1fa0a04427c14830387d0af026e565d4f3ca972f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8c23d5cd7cd72f5b89c5a9291292747ca022fe0ccfd46a16e37ca05bce56588a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6827156
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190325
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 9fbad8b40be8e915f84f51842d88e97b0c949b2b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b7a5f97c5a22efc19b27d6d443d017b47bd196de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 42d3bd30d58caaafd072ea07ec560921442be443295eae4750184b2c2f6e617e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6855393
</span> revision 0
use_bzip2 yes
<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 6d78821..7b5b8bd 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;'>@@ -1,8 +1,8 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,100 +6,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,100 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(QtDialog)
</span> CMake_OPTIONAL_COMPONENT(cmake-gui)
-find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +101,7 @@
</span> set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,8 +14,6 @@ else()
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +58,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,7 +119,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;'>-@@ -174,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +75,7 @@ endif()
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +101,7 @@ Checks: '-*,llvm-twine-local'
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,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;'>-@@ -246,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,7 +147,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,7 +146,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;'>-@@ -257,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,7 +158,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</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 93139e6..1b4b793 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;'>@@ -1,7 +1,7 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ project(QtDialog)
</span> CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,19 +101,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)
</span> get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
<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;'>-@@ -157,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</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;'>-@@ -174,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -171,7 +160,7 @@ endif()
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +189,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +186,7 @@ Checks: '-*,llvm-twine-local'
</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;'>-@@ -246,7 +235,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,7 +232,7 @@ if(UNIX AND NOT APPLE)
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +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;'>-@@ -257,7 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -254,7 +243,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</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>