<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/5f3bd128704014627f2605502d687e3fe7fd581f">https://github.com/macports/macports-ports/commit/5f3bd128704014627f2605502d687e3fe7fd581f</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 5f3bd12 cmake: update release to 3.10.0 and devel to 4d52b46c (20171120).
</span>5f3bd12 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f3bd128704014627f2605502d687e3fe7fd581f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Nov 21 08:37:27 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.10.0 and devel to 4d52b46c (20171120).
</span>---
devel/cmake/Portfile | 20 ++++++++------------
.../files/patch-Modules-FindQt4.cmake.release.diff | 2 +-
...tch-Source-kwsys-kwsysPlatformTestsCXX.cxx.diff | 15 ---------------
devel/cmake/files/patch-Source_CMakeLists.txt.diff | 2 +-
devel/cmake/files/patch-qt4gui.devel.diff | 2 +-
devel/cmake/files/patch-qt4gui.release.diff | 22 ++++++++++++++--------
devel/cmake/files/patch-qt5gui.devel.diff | 2 +-
devel/cmake/files/patch-qt5gui.release.diff | 12 ++++++------
8 files changed, 32 insertions(+), 45 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 414193d..1875056 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;'>@@ -23,15 +23,15 @@ dist_subdir cmake
</span>
subport cmake-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.10
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 858257d95fde810195e4cf7254072dd8db608cc4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218
</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 03a457f0e7b9752eda04d88b4d956c9df9cb31c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b3345c17609ea0f039960ef470aa099de9942135990930a57c14575aae884987
</span>
master_sites http://www.cmake.org/files/v${branch}/
conflicts cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +47,6 @@ if {${subport} eq ${name}} {
</span> patch-CMakeFindFrameworks.cmake.release.diff \
patch-Source_CMakeVersionCompute.cmake.release.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch for allow for building using Xcode 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see also: https://trac.macports.org/ticket/54875
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Source-kwsys-kwsysPlatformTestsCXX.cxx.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
livecheck.url [lindex $master_sites 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +55,10 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20171116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit c1930caffe827b937d05dca9ffb82ba0b0b20eb2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 95b9979a5ac3f4f863949e3f735c1ebc33281e22 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ddf939731c412aeee13e5a09bcc8caa2d0cb465c022860b689b5b11e1a6936e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20171120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 4d52b46c7046a23948221d4142d768b9ff834e33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 aa3314bf972efe2e274fa8d46b13b6e4efbe36f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1dba5347960a8c9451588828e205483117f46520ebe4bddb0e2d82cb2f27bb9b
</span>
master_sites https://gitlab.kitware.com/cmake/cmake/repository/archive.tar.bz2?ref=${commit}&
distname ${name}-${commit}
<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><span style='display:block; white-space:pre;color:#808080;'>index e9d3c2d..1add353 100644
</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;'>+++ b/devel/cmake/files/patch-Modules-FindQt4.cmake.release.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;'>-@@ -733,9 +733,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -735,9 +735,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;color:#808080;'>diff --git a/devel/cmake/files/patch-Source-kwsys-kwsysPlatformTestsCXX.cxx.diff b/devel/cmake/files/patch-Source-kwsys-kwsysPlatformTestsCXX.cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d748b65..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source-kwsys-kwsysPlatformTestsCXX.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/kwsys/kwsysPlatformTestsCXX.cxx.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/kwsys/kwsysPlatformTestsCXX.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,6 +265,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef TEST_KWSYS_CXX_HAS_UTIMENSAT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#error "utimensat not available on macOS < 10.13"
</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;background:#ffe0e0;'>- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timespec times[2] = { { 0, UTIME_OMIT }, { 0, UTIME_NOW } };
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d91f94..74b19c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeLists.txt.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;'>-@@ -771,9 +771,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -774,9 +774,9 @@
</span> endif()
endif()
<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 1ba7fa8..f94b869 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;'>@@ -150,7 +150,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,12 +679,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -684,12 +684,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-qt4gui.release.diff b/devel/cmake/files/patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dd4659c..1ba7fa8 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;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,83 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,89 +6,6 @@
</span> cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,12 @@
</span> - PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
- endif()
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
- # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
- # Qt5 support is missing there.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +69,7 @@
</span> - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
- ${COMPONENT})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span> - install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +90,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;'>-@@ -94,8 +17,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,8 +17,6 @@
</span>
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +99,7 @@
</span> set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +61,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +61,7 @@
</span> if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +108,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;'>+@@ -163,7 +78,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +117,7 @@
</span> target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
# cmake-gui has not been updated for `include-what-you-use`.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +100,7 @@
</span> ...
")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,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;'>-@@ -225,18 +146,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,18 +146,18 @@
</span> ${COMPONENT})
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,7 +150,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -703,12 +703,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,12 +679,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 c237f74..3cf72cc 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;'>@@ -82,7 +82,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,12 +679,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -684,12 +684,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 acaa568..c237f74 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;'>@@ -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;'>-@@ -82,19 +84,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,19 +90,6 @@
</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;'>-@@ -140,7 +129,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +135,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 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +152,7 @@
</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})
# cmake-gui has not been updated for `include-what-you-use`.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +168,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +174,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;'>-@@ -225,18 +214,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,18 +220,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;'>-@@ -703,12 +703,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,12 +679,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>