<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/a2b35ff01110fe89e56a898876b65863f26b0073">https://github.com/macports/macports-ports/commit/a2b35ff01110fe89e56a898876b65863f26b0073</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 a2b35ff cmake: update to 3.17.1
</span>a2b35ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a2b35ff01110fe89e56a898876b65863f26b0073
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Apr 14 10:37:01 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake: update to 3.17.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Deprecate cmake-devel: cmake is updated regularly enough to not warrant needing this port.
</span>---
devel/cmake/Portfile | 505 ++++++++++-----------
.../patch-CMakeFindFrameworks.cmake.devel.diff | 11 -
.../files/patch-Modules-noArchCheck.devel.diff | 72 ---
...patch-Source_Modules_FindLibUV.cmake.devel.diff | 13 -
.../files/patch-cmake-leopard-tiger.devel.diff | 119 -----
.../files/patch-fix-clock_gettime-test.devel.diff | 15 -
.../files/patch-fix-system-prefix-path.devel.diff | 75 ---
.../files/patch-fix_cxx14_17_checks.devel.diff | 63 ---
devel/cmake/files/patch-qt4gui.devel.diff | 172 -------
devel/cmake/files/patch-qt5gui.devel.diff | 93 ----
10 files changed, 243 insertions(+), 895 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 115e89b..50eb99a 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;'>@@ -6,7 +6,7 @@ PortGroup xcodeversion 1.0
</span> PortGroup gitlab 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Cmake is a depedency of clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake is a depedency of clang
</span> PortGroup clang_dependency 1.0
name cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,40 +25,40 @@ homepage https://cmake.org
</span> platforms darwin freebsd
gitlab.instance https://gitlab.kitware.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# require C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {!((${os.major} < 9) || ${build_arch} eq "ppc" || ${build_arch} eq "ppc64")} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport cmake-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200323-8638c49f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# OSX <= 10.11 does not provide "clock_gettime"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/59832
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.redirect_bins cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport cmake-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch 3.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.setup cmake cmake 3.17.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gitlab.livecheck.regex {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9afa348d301a329500a54687c179b4b9496ca01c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0169920aff738ebfc7b008d2eddb0db5dd9c6ef36cf26283b02cdcacb4188be6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7413964
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.setup cmake cmake ${branch}.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.livecheck.regex {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # require C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bc8af0a1638c1d21333f162e133c22203e44dd35 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c8ee2d53f4aad3987d8a3cb138d12c772c1ad6b65b2b69c74421b21ea8d6fb79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7411593
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!((${os.major} < 9) || ${build_arch} eq "ppc" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build_arch} eq "ppc64")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libc++
</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:#ffe0e0;'>- conflicts cmake-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OSX <= 10.11 does not provide "clock_gettime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59832
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ legacysupport.redirect_bins cmake
</span>
long_description ${base_long_description} \
The ${subport} release port is updated roughly every few months.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,282 +72,263 @@ if {${subport} eq ${name}} {
</span> patch-fix-system-prefix-path.release.diff \
patch-cmake-leopard-tiger.release.diff \
patch-fix-clock_gettime-test.release.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gitlab.setup cmake cmake 8638c49f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200323-${gitlab.version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e2b2fb0728376283ef35dd15a6f01de8540272e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 849ed895f1a8d2efd2ff5bd66ba414e28ab9aa43942a701e5a95eae7fdc32b23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6692910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow use of libuv or libuv-devel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system libuv is the default as of 20160830 (g320f5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/pkgconfig/libuv.pc:libuv
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${base_long_description} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The ${subport} port is updated roughly every week.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel-only patches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Modules-noArchCheck.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeFindFrameworks.cmake.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Source_Modules_FindLibUV.cmake.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_cxx14_17_checks.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-system-prefix-path.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-leopard-tiger.devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-clock_gettime-test.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # configure is just a shell script that passes directly to bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd ./bootstrap
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libarchive \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow use of libuv or libuv-devel;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# system libuv is the default as of 20160830 (g320f5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/libuv.pc:libuv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure is just a shell script that passes directly to bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# bootstrap takes cmake-style args for the build of the cmake to be installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the args are passed as usual for cmake, after "--", so we pass them as post_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_PREFIX_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check if the default compiler has yet to be installed. Used to prevent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# circular deps involving variants. Has to be tested here before our
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# blacklisting and whitelisting is applied.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 10 && ${cxx_stdlib} eq "libc++" && ![file exists ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmake_bootstrapping yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On Lion, Clang 3.3 produces bad stream reading code when using libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/44129
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clang 3.4 works. But Clang 3.7 doesn't work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} == 11 && ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bootstrap takes cmake-style args for the build of the cmake to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # be installed. the args are passed as usual for cmake, after
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # "--", so we pass them as post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args --
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang 3.4 can't build certain parts of the cmake self-testing infrastructure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59782
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.compiler} eq "macports-clang-3.4"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.post_args-append -DBUILD_TESTING=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span> configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_PREFIX_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check if the default compiler has yet to be installed. Used to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent circular deps involving variants. Has to be tested here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # before our blacklisting and whitelisting is applied.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 10 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cxx_stdlib} eq "libc++" && ![file exists ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cmake_bootstrapping yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append SDKROOT=/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On Lion, Clang 3.3 produces bad stream reading code when using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libc++. See https://trac.macports.org/ticket/44129 . Clang 3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # works. But Clang 3.7 doesn't work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} == 11 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-3.4
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.arch} eq "i386" && ${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The old system headers do some bit shifting on Intel about which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # newer compilers throw errors:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SecKeychain.h:102:46: error: shift expression '(1853123693 << 8)' overflows [-fpermissive]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cflags-append -fpermissive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang 3.4 can't build certain parts of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cmake self-testing infrastructure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/59782
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.compiler} eq "macports-clang-3.4"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -DBUILD_TESTING=OFF
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# jsoncpp 1.0+ requires CMake for building; circular dependencies are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not possible in MacPorts. In addition, jsoncpp uses C++, so it would
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not be possible for CMake, which uses libc++ on 10.6-10.8, to link
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with a MacPorts copy of jsoncpp, which would usually use libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# on those systems. Fortunately CMake comes bundled with its own
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# internal copy of jsoncpp, so we use that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append SDKROOT=/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --docdir=share/doc/cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --parallel=${build.jobs} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --init=${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --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;'>- --no-system-librhash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "i386" && ${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The old system headers do some bit shifting on Intel about which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # newer compilers throw errors:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SecKeychain.h:102:46: error: shift expression '(1853123693 << 8)' overflows [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -fpermissive
</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:#ffe0e0;'>-configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # jsoncpp 1.0+ requires CMake for building; circular dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are not possible in MacPorts. In addition, jsoncpp uses C++, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it would not be possible for CMake, which uses libc++ on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 10.6-10.8, to link with a MacPorts copy of jsoncpp, which would
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # usually use libstdc++ on those systems. Fortunately CMake comes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bundled with its own internal copy of jsoncpp, so we use that.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# CMake's configure script doesn't recognize `--host`.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --docdir=share/doc/cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --parallel=${build.jobs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --init=${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --system-libs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-system-jsoncpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-system-librhash
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -Wl,-framework -Wl,ApplicationServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_args
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Leopard's Rosetta has some difficulties configuring the ppc slice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global universal_archs_supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_archs_supported ${supported_archs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake's configure script doesn't recognize `--host`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.post_args VERBOSE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -Wl,-framework -Wl,ApplicationServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy cmake init file, ready to be patched below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/macports.cmake ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Leopard's Rosetta has some difficulties configuring the ppc slice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global universal_archs_supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_archs_supported ${supported_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Modules/CMakeFindFrameworks.cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args VERBOSE=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach type {syntax indent} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([variant_isset gui]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set app CMake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${applications_dir}/${app}.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/cmake-gui ${destroot}${applications_dir}/${app}.app/Contents/MacOS/cmake-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/Source/QtDialog/CMakeSetup.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/CMakeSetup.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy cmake init file, ready to be patched below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/macports.cmake ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Modules/CMakeFindFrameworks.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Modules/Platform/Darwin.cmake
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# All the variants create circular dependencies on 10.6 with libc++,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# due to the default compiler needing cmake to build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[info exists cmake_bootstrapping]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set some_variant_disabled 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset $vname]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset ::variations($vname)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set some_variant_disabled 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach type {syntax indent} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ([variant_isset gui]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/${app}.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/cmake-gui ${destroot}${applications_dir}/${app}.app/Contents/MacOS/cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/Source/QtDialog/CMakeSetup.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/CMakeSetup.icns
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$some_variant_disabled} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "Installing $name with variants would create\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- circular dependencies, so all variants have been\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- deselected. You can install again with your desired\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variants after the default compiler has been installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gui description {Build Qt-based cmake-gui} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 conflicts qt5 requires gui description {Build Qt GUI using Qt4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # All the variants create circular dependencies on 10.6 with libc++,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # due to the default compiler needing cmake to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists cmake_bootstrapping]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set some_variant_disabled 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset $vname]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset ::variations($vname)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set some_variant_disabled 1
</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;'>+ if {$some_variant_disabled} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Installing $name with variants would create\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ circular dependencies, so all variants have been\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ deselected. You can install again with your desired\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variants after the default compiler has been installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gui description {Build Qt-based cmake-gui} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --qt-gui
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --qt-qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset gui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt4 conflicts qt5 requires gui description {Build Qt GUI using Qt4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt4gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt4gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --qt-qmake=${qt_qmake_cmd}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +qt4 or +qt5 variant when using variant +gui.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt5gui.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qt5gui.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --qt-qmake=${qt_qmake_cmd}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --no-qt-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant docs description {Build documentation: HTML and manpages} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sphinx-man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sphinx-html \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +qt4 or +qt5 variant when using variant +gui.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --no-qt-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python36 python37 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 3.5} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant docs description {Build documentation: HTML and manpages} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python35 python37 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 3.6} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python35 conflicts python36 python37 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.5} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python35 python36 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 3.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python36 conflicts python35 python37 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.6} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python35 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description {Build documentation using Sphinx from Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python37 conflicts python35 python36 python38 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.7} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python38 conflicts python35 python36 python37 requires docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description {Build documentation using Sphinx from Python 3.8} {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # default Python is 3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset docs]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure -python36 is not specified alone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +python35, +python36, +python37, or +python38 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default Python is 3.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # determine Python-related variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "3.5"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "3.6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "3.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_WITH_DOT "3.8"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure -python36 is not specified alone
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python35] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python36] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select either the +python35, +python36, +python37, or +python38 variant when using variant +docs.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch Python Version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # determine Python-related variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python35]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python36]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT "3.8"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch Python Version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
</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;color:#808080;'>diff --git a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff b/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d26bd8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/CMakeFindFrameworks.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${_cmff_CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __PREFIX__/Library/Frameworks/${fwk}.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /System/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /Network/Library/Frameworks
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-noArchCheck.devel.diff b/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0338cf7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,15 +23,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return()
</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 the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</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;'>--# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,15 +38,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return()
</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 the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</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;'>--# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,15 +37,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return()
</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 the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</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;'>--# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,15 +41,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return()
</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 the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</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;'>--# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.devel.diff b/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b5b3db..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.devel.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;'>---- Source/Modules/FindLibUV.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/Modules/FindLibUV.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -61,7 +61,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract version number if possible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff b/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ce70486..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,119 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The <memory> header seems to be needed if building with gcc/libstdc++ on MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-adding it does no harm to clang/libc++ builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it must be somehow automatically included with the libc++ headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Source/cmMachO.h Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c44b55..06c39db 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iosfwd>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(CMAKE_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The patches below match the tiger patches in the libuv port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Although cmake is configured to use the system libuv, it appears that the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bootstrap version of cmake uses a more current version, and that is a moving
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-target as libuv advances.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-At some point we may have to switch to an older bootstrap version of cmake,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if libuv becomes too difficult to keep up-to-date.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cf7dea0..b48ca73 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -525,10 +525,24 @@ skip:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * will unwind the thread when it's in the cancel state. Work around that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * by making the system call directly. Musl libc is unaffected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* gcc diagnostic pragmas available */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define GCC_DIAGNOSTIC_AVAILABLE
</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;'>- int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</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 defined(__LP64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int close$NOCANCEL(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return close$NOCANCEL(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +550,11 @@ int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return close$NOCANCEL$UNIX2003(fd);
</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 defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #pragma GCC diagnostic pop
</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;'>- #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1306,8 +1324,12 @@ int uv_os_unsetenv(const char* name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (name == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unsetenv(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (unsetenv(name) != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return UV__ERR(errno);
</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;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5fb34f1..7453980 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -743,7 +743,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1055,7 +1055,7 @@ static void uv__to_stat(struct stat* src, uv_stat_t* dst) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_blksize = src->st_blksize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_blocks = src->st_blocks;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Utilities/cmlibuv/src/unix/tty.c Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index db479d6..5a7a86b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,7 +44,7 @@ static int uv__tty_is_slave(const int fd) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int dummy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result = ioctl(fd, TIOCGPTN, &dummy) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char dummy[256];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix-clock_gettime-test.devel.diff b/devel/cmake/files/patch-fix-clock_gettime-test.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2f78ccd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix-clock_gettime-test.devel.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/kwsysPlatformTestsC.c.orig 2020-03-04 06:50:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/kwsys/kwsysPlatformTestsC.c 2020-03-17 03:35:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,12 +56,6 @@
</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;'>- #ifdef TEST_KWSYS_C_HAS_CLOCK_GETTIME_MONOTONIC
</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 < 101200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# error "clock_gettime not available on macOS < 10.12"
</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;'>- # include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int KWSYS_PLATFORM_TEST_C_MAIN()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix-system-prefix-path.devel.diff b/devel/cmake/files/patch-fix-system-prefix-path.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0b2221e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix-system-prefix-path.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,75 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/Platform/Darwin.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,6 +207,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${_apps_paths})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(_apps_paths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# add to CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# might already exist before this if the user has specified it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ __PREFIX__ # MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(Platform/UnixPaths)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(_CMAKE_OSX_SYSROOT_PATH AND EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,7 +220,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /sw # Fink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/local # MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/Platform/UnixPaths.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/Platform/UnixPaths.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,22 +23,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # search types.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Standard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local /usr /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /usr /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # CMake install location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${_CMAKE_INSTALL_DIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# CMake install location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# append the _CMAKE_INSTALL_DIR if not already in the list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+list(FIND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Project install destination.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${_CMAKE_INSTALL_DIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMAKE_STAGING_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+unset(HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT CMAKE_FIND_NO_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # append the CMAKE_INSTALL_PREFIX if not already in the list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # User-supplied staging prefix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_STAGING_PREFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Project install destination.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${CMAKE_INSTALL_PREFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unset(HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(CMAKE_STAGING_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # append the CMAKE_STAGING_PREFIX if not already in the list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_STAGING_PREFIX}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # User-supplied staging prefix.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${CMAKE_STAGING_PREFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</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;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Non "standard" but common install prefixes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 931fedd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/Checks/cm_cxx14_check.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/Checks/cm_cxx14_check.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,9 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// actually use c++14 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// doesn't understand it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iterator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-+ std::unique_ptr < int > foo = std::make_unique < int > (4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "std::make_unique < int >(4) is '"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << *foo << "'" << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/Checks/cm_cxx17_check.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/Checks/cm_cxx17_check.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// actually use c++17 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// doesn't understand it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iterator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +21,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return item.get();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+std::optional < std::string >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+create
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(bool b) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (b) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "foo!";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</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;'>- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +53,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IDispatchPtr disp(ptr);
</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;'>-+ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::optional<int> oi = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci)) + oi.value();
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 058a917..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,172 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/QtDialog/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/QtDialog/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,100 +3,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(QtDialog)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_package(Qt5Widgets QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(${Qt5Widgets_DEFINITONS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_wrap_ui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_wrap_ui(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_wrap_cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_wrap_cpp(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macro(qt4_add_resources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- qt5_add_resources(${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Try to find the package WinExtras for the task bar progress
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5WinExtras QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (Qt5WinExtras_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${Qt5WinExtras_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(-DQT_WINEXTRAS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
</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;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Remove this when the minimum version of Qt is 4.6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
</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_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_property(SOURCE CMakeSetup.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)
</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;'>-- # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # FIXME: This should be part of Qt5 CMake scripts, but unfortunately
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Qt5 support is missing there.
</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;'>-- macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(EXISTS "${_qt_plugin_path}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dir "PlugIns")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dir "plugins")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${_qt_plugin_path}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "${_qt_plugin_dest}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(${_qt_plugins_var}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endmacro()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION bin
</span><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;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(TARGET Qt5::Core)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
</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;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QT_MIN_VERSION "4.4.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT QT4_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,8 +14,6 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>- set(SRCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +58,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.rc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +75,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +105,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +151,7 @@ if(UNIX AND NOT APPLE)
</span><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(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +162,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install rules for including 3rd party libs such as Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -718,12 +718,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</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;'>-
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c0b69d9b..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/QtDialog/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/QtDialog/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- project(QtDialog)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMake_OPTIONAL_COMPONENT(cmake-gui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5Widgets QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(FATAL_ERROR "Qt5 required but not found")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories(${Qt5Widgets_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(${Qt5Widgets_DEFINITONS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macro(qt4_wrap_ui)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
</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;'>--else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(QT_MIN_VERSION "4.4.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt4 REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT QT4_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(SEND_ERROR "Failed to find Qt 4.4 or greater.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return()
</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;'>-- include(${QT_USE_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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;'>- set(SRCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AddCacheEntry.cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.rc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(SRCS ${SRCS} CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,7 +160,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +190,7 @@ Checks: '-*,llvm-twine-local'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,7 +236,7 @@ if(UNIX AND NOT APPLE)
</span><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(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -258,7 +247,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install rules for including 3rd party libs such as Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLEBUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(CODE "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -718,12 +718,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</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;'>-
</span></pre><pre style='margin:0'>
</pre>