<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/a71af11294cbe9d0cc60c6926f8c6ecf4c876ae6">https://github.com/macports/macports-ports/commit/a71af11294cbe9d0cc60c6926f8c6ecf4c876ae6</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 a71af11 cmake: update release to 3.11.0 and devel to 98f23da8 (20180328).
</span>a71af11 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a71af11294cbe9d0cc60c6926f8c6ecf4c876ae6
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Mar 29 08:53:51 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.11.0 and devel to 98f23da8 (20180328).
</span>---
devel/cmake/Portfile | 24 +++++++++++-----------
.../patch-Modules-FindFreetype.cmake.release.diff | 13 ------------
.../files/patch-Modules-FindQt4.cmake.release.diff | 2 +-
devel/cmake/files/patch-Source_CMakeLists.txt.diff | 2 +-
devel/cmake/files/patch-qt4gui.release.diff | 16 ++++++---------
devel/cmake/files/patch-qt5gui.release.diff | 14 +++++--------
6 files changed, 25 insertions(+), 46 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 61c9cc2..1c0e335 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.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.11
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3fba4057c079fe3ce3830ac1399eb5cbce95afa5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c3a1dcf0be03e40cf4f341dda79c96ffb6c35ae35f2f911845b72dab3559cf8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7825559
</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 66ae49e6e10679dd56aa05269a6321b9269a5cd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c313bee371d4d255be2b4e96fd59b11d58bc550a7c78c021444ae565709a656b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7948287
</span>
master_sites ${homepage}/files/v${branch}/
conflicts cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,10 +51,10 @@ if {${subport} eq ${name}} {
</span> # release-only patches
patchfiles-append \
patch-Modules-FindQt4.cmake.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Modules-FindFreetype.cmake.release.diff \
</span> patch-Modules-noArchCheck.release.diff \
patch-CMakeFindFrameworks.cmake.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Source_CMakeVersionCompute.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Source_CMakeVersionCompute.cmake.release.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Source_CMakeLists.txt.diff
</span>
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<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 20180327
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit d5f0b2df8eaa7d4d266ac43384e7aa91e19107e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c3077a8ffa1b2e7f0fff754efcb65f45e1f305c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9c85d6ebcdac03703c5d2b09f133131cd162195efe40ba0808e7e1a3167a3e98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6258851
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit 98f23da8dfe4d6bb90225de83476b6a958c3e284
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 cfb11ccae21b9d6c688eec22d285522618681517 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf1957cd5f94962a7ad13affef675cafb1d80ac5722aa2e08fe85183d9ca3172 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6258250
</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-FindFreetype.cmake.release.diff b/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab2c239..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-FindFreetype.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/FindFreetype.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/FindFreetype.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,10 +63,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENV FREETYPE_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/X11R6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11R6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/freeware
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENV GTKMM_BASEPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</span><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 1add353..5862cd4 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;'>-@@ -735,9 +735,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;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 74b19c7..3f001d8 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;'>-@@ -774,9 +774,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,9 +777,9 @@
</span> endif()
endif()
<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 1ba7fa8..c7be85f 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;'>@@ -38,7 +38,7 @@
</span> - endif()
-
- # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # FIXME: This should be part of Qt5 CMake scripts, but unfortunately
</span> - # Qt5 support is missing there.
- if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
- macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,8 +116,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;'>- # cmake-gui has not been updated for `include-what-you-use`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,7 +104,7 @@
</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;'>-@@ -231,18 +146,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;background:#e0e0e0;'>@@ -150,7 +146,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;'>+@@ -699,12 +699,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 c237f74..ee3c1ee 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;'>@@ -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;'>- # cmake-gui has not been updated for `include-what-you-use`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +174,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,7 +178,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;'>-@@ -231,18 +220,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}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +78,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;'>+@@ -699,12 +699,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>