<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/0cde58d2ee3a60c7213eeac2aad626025bdfd977">https://github.com/macports/macports-ports/commit/0cde58d2ee3a60c7213eeac2aad626025bdfd977</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 0cde58d cmake: update release to 3.9.0 and devel to b5a28eb9 (20170718).
</span>0cde58d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cde58d2ee3a60c7213eeac2aad626025bdfd977
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jul 18 16:09:22 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update release to 3.9.0 and devel to b5a28eb9 (20170718).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update patches for release.
</span><span style='display:block; white-space:pre;color:#404040;'> Make changes for darwin 8 more complete.
</span><span style='display:block; white-space:pre;color:#404040;'> Move comment to where it really should be.
</span>---
devel/cmake/Portfile | 40 +++++++++++++---------
.../files/patch-Modules-noArchCheck.release.diff | 6 ++--
...h-Source_CMakeVersionCompute.cmake.release.diff | 12 +++++++
devel/cmake/files/patch-qt4gui.release.diff | 11 ++++--
devel/cmake/files/patch-qt5gui.release.diff | 11 ++++--
5 files changed, 55 insertions(+), 25 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 924c089..95d88c4 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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch 3.9
</span>
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version ${branch}.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 369ed02b2a69a47d0792b7ee964907afedbd669d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d
</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 5ac047b24806642d999fd1a460935274a3238f95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 167701525183dbb722b9ffe69fb525aa2b81798cf12f5ce1c020c93394dfae0f
</span>
master_sites http://www.cmake.org/files/v${branch}/
conflicts cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,8 @@ if {${subport} eq ${name}} {
</span> patch-Modules-FindQt4.cmake.release.diff \
patch-Modules-FindFreetype.cmake.release.diff \
patch-Modules-noArchCheck.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeFindFrameworks.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeFindFrameworks.cmake.release.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Source_CMakeVersionCompute.cmake.release.diff
</span>
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,10 +55,10 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170711
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 107a92ea9a784d283b8d6d35a8c9bd93db8cd06d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fa6ddd4c5f9d1a6734147ee43788911e95068099 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1e3fa5eae5a6a2721ac799196d12e405a52827f76cc01f169e9f1f7e0a1e6653
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170718
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit b5a28eb9e7b997bf15c9b6fbaf7b61e053873c34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4ae4c494c1e34ef4af9bfb2620d8a3bca698450b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f3e0f667a284cdc1d484fda8472a2ab9b0863300fe3f8812c3f1303471e716ee
</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;background:#e0e0e0;'>@@ -96,10 +97,6 @@ depends_lib-append port:curl \
</span> # system libuv is the default as of 20160830 (g320f5)
depends_lib-append path:lib/pkgconfig/libuv.pc:libuv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# CMake 3.2 changed dependency requirements to include jsoncpp.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use its internal jsoncpp until a better solution comes about.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,6 +121,10 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake 3.2 changed dependency requirements to include jsoncpp.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use its internal jsoncpp until a better solution comes about.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --docdir=share/doc/cmake \
--parallel=${build.jobs} \
--init=${worksrcpath}/macports.cmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,9 +141,16 @@ array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
</span> # Tiger has issues with system libraries;
# just use the ones internal to cmake instead.
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --system-libs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --no-system-jsoncpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/pkgconfig/libuv.pc:libuv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --system-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --no-system-libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/libuv.pc:libuv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses
</span> }
# Leopard's Rosetta has some difficulties configuring the ppc slice
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.release.diff b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d5e577..373f0b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Modules-noArchCheck.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,15 +17,3 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,15 +17,3 @@
</span> set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,16 +32,3 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,16 +32,3 @@
</span> if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
set(PACKAGE_VERSION_EXACT TRUE)
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> -endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,16 +31,3 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,16 +31,3 @@
</span> set(PACKAGE_VERSION_EXACT TRUE)
endif()
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff b/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..eec9810
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/CMakeVersionCompute.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/CMakeVersionCompute.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMake_VERSION_IS_DIRTY 0) # may be set to 1 by CMakeVersionSource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMake_VERSION_IS_RELEASE 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT CMake_VERSION_IS_DIRTY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMake_VERSION_IS_DIRTY 0)
</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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Compute the full version string.
</span><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 1a2d81d..dd4659c 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;'>@@ -102,7 +102,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,10 +78,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +78,7 @@
</span>
set(CMAKE_INCLUDE_CURRENT_DIR ON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,12 +110,17 @@
</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:#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:#e0ffe0;'>+ ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -if(APPLE)
+if(APPLEBUNDLE)
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;'>-@@ -206,18 +127,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;'>@@ -139,7 +144,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -680,12 +680,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,12 +703,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 7c97288..acaa568 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;'>@@ -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,10 +146,10 @@
</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,12 +48,17 @@
</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:#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:#e0ffe0;'>+ ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -if(APPLE)
+if(APPLEBUNDLE)
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;'>-@@ -206,18 +195,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;'>@@ -77,7 +82,7 @@
</span> install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -680,12 +680,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -703,12 +703,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>