<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Hi Michael,<div class=""><br class=""></div><div class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Apr 14, 2020, at 8:37 AM, Michael Dickens <<a href="mailto:michaelld@macports.org" class="">michaelld@macports.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><pre style="margin:0" class="">Michael Dickens (michaelld) pushed a commit to branch master

in repository macports-ports.

</pre><p class=""><a href="https://github.com/macports/macports-ports/commit/a2b35ff01110fe89e56a898876b65863f26b0073" class="">https://github.com/macports/macports-ports/commit/a2b35ff01110fe89e56a898876b65863f26b0073</a></p>

<pre style="white-space: pre; background: #F8F8F8" class="">The following commit(s) were added to refs/heads/master by this push:

<span style="display:block; white-space:pre;color:#404040;" class="">     new a2b35ff  cmake: update to 3.17.1

</span>a2b35ff is described below

<span style="display:block; white-space:pre;color:#808000;" class="">commit a2b35ff01110fe89e56a898876b65863f26b0073

</span>Author: Michael Dickens <<a href="mailto:michaelld@macports.org" class="">michaelld@macports.org</a>>

AuthorDate: Tue Apr 14 10:37:01 2020 -0400

<span style="display:block; white-space:pre;color:#404040;" class="">    cmake: update to 3.17.1

</span><span style="display:block; white-space:pre;color:#404040;" class="">    

<span style="display:block; white-space:pre;color:#404040;" class="">    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;" class="">diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile

</span><span style="display:block; white-space:pre;color:#808080;" class="">index 115e89b..50eb99a 100644

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/Portfile

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ b/devel/cmake/Portfile

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -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;" class="">-# Cmake is a depedency of clang

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+# CMake is a depedency of clang

</span></pre></div></blockquote><div><br class=""></div><div>“dependency” is still spelled incorrectly here. :)</div><br class=""><blockquote type="cite" class=""><div class=""><pre style="white-space: pre; background: #F8F8F8" class=""> PortGroup           clang_dependency 1.0

 name                cmake

<span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -25,40 +25,40 @@ homepage            <a href="https://cmake.org" class="">https://cmake.org</a>

</span> platforms           darwin freebsd

 gitlab.instance     <a href="https://gitlab.kitware.com" class="">https://gitlab.kitware.com</a>

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# require C++11

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-compiler.cxx_standard 2011

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-platform darwin {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {!((${os.major} < 9) || ${build_arch} eq "ppc" || ${build_arch} eq "ppc64")} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        depends_lib-append port:libcxx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        configure.cxx_stdlib libc++

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+subport cmake-devel {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    PortGroup       obsolete 1.0

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    replaced_by     cmake

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    version         20200323-8638c49f

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    revision        2

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    depends_build

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    depends_lib

</span> }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-dist_subdir         cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# OSX <= 10.11 does not provide "clock_gettime"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-legacysupport.newest_darwin_requires_legacy 15

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# see <a href="https://trac.macports.org/ticket/59832" class="">https://trac.macports.org/ticket/59832</a>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-legacysupport.redirect_bins cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-subport cmake-devel {}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-set branch          3.17

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span> if {${subport} eq ${name}} {

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # release

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    gitlab.setup cmake cmake 3.17.1 v

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    gitlab.livecheck.regex {([0-9.]+)}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    checksums rmd160 9afa348d301a329500a54687c179b4b9496ca01c \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+              sha256 0169920aff738ebfc7b008d2eddb0db5dd9c6ef36cf26283b02cdcacb4188be6 \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+              size   7413964

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    revision  0

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    gitlab.setup    cmake cmake ${branch}.0 v

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    gitlab.livecheck.regex  {([0-9.]+)}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # require C++11

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    compiler.cxx_standard 2011

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    checksums rmd160 bc8af0a1638c1d21333f162e133c22203e44dd35 \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-              sha256 c8ee2d53f4aad3987d8a3cb138d12c772c1ad6b65b2b69c74421b21ea8d6fb79 \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-              size   7411593

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    revision  1

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    platform darwin {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {!((${os.major} < 9) || ${build_arch} eq "ppc" ||

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+              ${build_arch} eq "ppc64")} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            depends_lib-append port:libcxx

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            configure.cxx_stdlib libc++

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    conflicts       cmake-devel

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # OSX <= 10.11 does not provide "clock_gettime"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    legacysupport.newest_darwin_requires_legacy 15

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # see <a href="https://trac.macports.org/ticket/59832" class="">https://trac.macports.org/ticket/59832</a>

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    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;" class="">@@ -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;" class="">-} else {

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # devel

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    depends_lib-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:curl \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:expat \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:zlib \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:bzip2 \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:libarchive \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        port:ncurses

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    gitlab.setup     cmake cmake 8638c49f

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    version   20200323-${gitlab.version}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    checksums rmd160 e2b2fb0728376283ef35dd15a6f01de8540272e1 \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-              sha256 849ed895f1a8d2efd2ff5bd66ba414e28ab9aa43942a701e5a95eae7fdc32b23 \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-              size   6692910

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    revision  1

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # allow use of libuv or libuv-devel;

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # system libuv is the default as of 20160830 (g320f5)

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    depends_lib-append path:lib/pkgconfig/libuv.pc:libuv

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    conflicts       cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    long_description ${base_long_description} \

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        The ${subport} port is updated roughly every week.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # devel-only patches

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    patchfiles-append \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-Modules-noArchCheck.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-CMakeFindFrameworks.cmake.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-Source_Modules_FindLibUV.cmake.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-fix_cxx14_17_checks.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-fix-system-prefix-path.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-cmake-leopard-tiger.devel.diff \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patch-fix-clock_gettime-test.devel.diff

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # configure is just a shell script that passes directly to bootstrap

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    configure.cmd ./bootstrap

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-depends_lib-append  port:curl \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    port:expat \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    port:zlib \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    port:bzip2 \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    port:libarchive \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    port:ncurses

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# allow use of libuv or libuv-devel;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# system libuv is the default as of 20160830 (g320f5)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-depends_lib-append  path:lib/pkgconfig/libuv.pc:libuv

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# configure is just a shell script that passes directly to bootstrap

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-configure.cmd       ./bootstrap

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# bootstrap takes cmake-style args for the build of the cmake to be installed.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# 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;" class="">-configure.post_args --

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-configure.env-append \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    CMAKE_PREFIX_PATH=${prefix} \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    CMAKE_LIBRARY_PATH=${prefix}/lib

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# Check if the default compiler has yet to be installed. Used to prevent

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# circular deps involving variants. Has to be tested here before our

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# blacklisting and whitelisting is applied.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-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;" class="">-    set cmake_bootstrapping yes

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# On Lion, Clang 3.3 produces bad stream reading code when using libc++.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# See <a href="https://trac.macports.org/ticket/44129" class="">https://trac.macports.org/ticket/44129</a>

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# Clang 3.4 works. But Clang 3.7 doesn't work.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if {${os.platform} eq "darwin" && ${os.major} == 11 && ${configure.cxx_stdlib} eq "libc++"} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    compiler.whitelist macports-clang-3.4

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # bootstrap takes cmake-style args for the build of the cmake to

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # be installed.  the args are passed as usual for cmake, after

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # "--", so we pass them as post_args

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    configure.post_args --

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# clang 3.4 can't build certain parts of the cmake self-testing infrastructure

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# <a href="https://trac.macports.org/ticket/59782" class="">https://trac.macports.org/ticket/59782</a>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if {${configure.compiler} eq "macports-clang-3.4"} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.post_args-append -DBUILD_TESTING=OFF

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-platform darwin {

</span>     configure.env-append \

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        CMAKE_PREFIX_PATH=${prefix} \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        CMAKE_LIBRARY_PATH=${prefix}/lib

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # Check if the default compiler has yet to be installed. Used to

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # prevent circular deps involving variants. Has to be tested here

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # before our blacklisting and whitelisting is applied.

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {${os.platform} eq "darwin" && ${os.major} <= 10 &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        ${cxx_stdlib} eq "libc++" && ![file exists ${configure.cxx}]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        set cmake_bootstrapping yes

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {${configure.sdkroot} eq ""} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        configure.env-append SDKROOT=/

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # On Lion, Clang 3.3 produces bad stream reading code when using

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # libc++.  See <a href="https://trac.macports.org/ticket/44129" class="">https://trac.macports.org/ticket/44129</a> . Clang 3.4

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # works. But Clang 3.7 doesn't work.

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {${os.platform} eq "darwin" && ${os.major} == 11 &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        ${configure.cxx_stdlib} eq "libc++"} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        compiler.whitelist macports-clang-3.4

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {${os.arch} eq "i386" && ${os.major} <= 9} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        # The old system headers do some bit shifting on Intel about which

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        # newer compilers throw errors:

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        # SecKeychain.h:102:46: error: shift expression '(1853123693 << 8)' overflows [-fpermissive]

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        configure.cflags-append -fpermissive

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        configure.cxxflags-append -fpermissive

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # clang 3.4 can't build certain parts of the

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # cmake self-testing infrastructure

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # <a href="https://trac.macports.org/ticket/59782" class="">https://trac.macports.org/ticket/59782</a>

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {${configure.compiler} eq "macports-clang-3.4"} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.post_args-append -DBUILD_TESTING=OFF

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# jsoncpp 1.0+ requires CMake for building; circular dependencies are

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# not possible in MacPorts. In addition, jsoncpp uses C++, so it would

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# 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;" class="">-# with a MacPorts copy of jsoncpp, which would usually use libstdc++

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# on those systems. Fortunately CMake comes bundled with its own

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# internal copy of jsoncpp, so we use that.

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    platform darwin {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.env-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {${configure.sdkroot} eq ""} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            configure.env-append SDKROOT=/

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-configure.args-append --docdir=share/doc/cmake \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    --parallel=${build.jobs} \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    --init=${worksrcpath}/macports.cmake \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    --system-libs \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    --no-system-jsoncpp \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-                    --no-system-librhash

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {${os.arch} eq "i386" && ${os.major} <= 9} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            # The old system headers do some bit shifting on Intel about which

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            # newer compilers throw errors:

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            # SecKeychain.h:102:46: error: shift expression '(1853123693 << 8)' overflows [-fpermissive]

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            configure.cflags-append -fpermissive

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            configure.cxxflags-append -fpermissive

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-configure.universal_args

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # jsoncpp 1.0+ requires CMake for building; circular dependencies

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # are not possible in MacPorts. In addition, jsoncpp uses C++, so

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # it would not be possible for CMake, which uses libc++ on

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # 10.6-10.8, to link with a MacPorts copy of jsoncpp, which would

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # usually use libstdc++ on those systems. Fortunately CMake comes

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # bundled with its own internal copy of jsoncpp, so we use that.

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# CMake's configure script doesn't recognize `--host`.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    configure.args-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --docdir=share/doc/cmake \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --parallel=${build.jobs} \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --init=${worksrcpath}/macports.cmake \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --system-libs \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --no-system-jsoncpp \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        --no-system-librhash

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-platform darwin 8 {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.ldflags-append -Wl,-framework -Wl,ApplicationServices

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    configure.universal_args

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# Leopard's Rosetta has some difficulties configuring the ppc slice

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-platform darwin 9 {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    global universal_archs_supported

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        supported_archs i386 x86_64

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        supported_archs ppc ppc64

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    set universal_archs_supported ${supported_archs}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # CMake's configure script doesn't recognize `--host`.

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {}}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-build.post_args VERBOSE=ON

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    platform darwin 8 {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.ldflags-append -Wl,-framework -Wl,ApplicationServices

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-post-patch {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # copy cmake init file, ready to be patched below

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    copy ${filespath}/macports.cmake ${worksrcpath}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # Leopard's Rosetta has some difficulties configuring the ppc slice

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    platform darwin 9 {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        global universal_archs_supported

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            supported_archs i386 x86_64

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            supported_archs ppc ppc64

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        set universal_archs_supported ${supported_archs}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # patch PREFIX

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    reinplace "s|__PREFIX__|${prefix}|g" \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ${worksrcpath}/macports.cmake \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ${worksrcpath}/Modules/CMakeFindFrameworks.cmake \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ${worksrcpath}/Modules/Platform/Darwin.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    build.post_args VERBOSE=ON

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-post-destroot {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ${destroot}${prefix}/share/emacs/site-lisp

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    foreach type {syntax indent} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            ${destroot}${prefix}/share/vim/vimfiles/${type}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if ([variant_isset gui]) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        set app CMake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            ${destroot}${applications_dir}/${app}.app/Contents/Resources

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        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;" class="">-        reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        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;" class="">-        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;" class="">+    post-patch {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        # copy cmake init file, ready to be patched below

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        copy ${filespath}/macports.cmake ${worksrcpath}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        # patch PREFIX

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        reinplace "s|__PREFIX__|${prefix}|g" \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ${worksrcpath}/macports.cmake \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ${worksrcpath}/Modules/CMakeFindFrameworks.cmake \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ${worksrcpath}/Modules/Platform/Darwin.cmake

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# All the variants create circular dependencies on 10.6 with libc++,

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-# due to the default compiler needing cmake to build.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if {[info exists cmake_bootstrapping]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    set some_variant_disabled 0

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        if {[variant_isset $vname]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            unset ::variations($vname)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            set some_variant_disabled 1

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    post-destroot {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ${destroot}${prefix}/share/emacs/site-lisp

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        foreach type {syntax indent} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                ${destroot}${prefix}/share/vim/vimfiles/${type}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if ([variant_isset gui]) {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            set app CMake

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                ${destroot}${applications_dir}/${app}.app/Contents/Resources

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            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;" class="">+            reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            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;" class="">+            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;" class="">-    if {$some_variant_disabled} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        notes-append "Installing $name with variants would create\

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            circular dependencies, so all variants have been\

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            deselected. You can install again with your desired\

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-            variants after the default compiler has been installed."

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant gui description {Build Qt-based cmake-gui} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.args-append --qt-gui

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant qt4 conflicts qt5 requires gui description {Build Qt GUI using Qt4} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    PortGroup qt4 1.0

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {${subport} eq ${name}} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patchfiles-append patch-qt4gui.release.diff

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } else {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patchfiles-append patch-qt4gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # All the variants create circular dependencies on 10.6 with libc++,

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    # due to the default compiler needing cmake to build.

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {[info exists cmake_bootstrapping]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        set some_variant_disabled 0

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        foreach vname {gui qt4 qt5 docs python35 python36 python37 python38} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            if {[variant_isset $vname]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                unset ::variations($vname)

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                set some_variant_disabled 1

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {$some_variant_disabled} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            notes-append "Installing $name with variants would create\

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                circular dependencies, so all variants have been\

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                deselected. You can install again with your desired\

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+                variants after the default compiler has been installed."

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.args-append --qt-qmake=${qt_qmake_cmd}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    PortGroup qt5 1.0

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {${subport} eq ${name}} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patchfiles-append patch-qt5gui.release.diff

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } else {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        patchfiles-append patch-qt5gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant gui description {Build Qt-based cmake-gui} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.args-append --qt-gui

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.args-append --qt-qmake=${qt_qmake_cmd}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if {[variant_isset gui]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {![variant_isset qt4] && ![variant_isset qt5]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        default_variants +qt4

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant qt4 conflicts qt5 requires gui description {Build Qt GUI using Qt4} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        PortGroup qt4 1.0

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {${subport} eq ${name}} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            patchfiles-append patch-qt4gui.release.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } else {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            patchfiles-append patch-qt4gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.args-append --qt-qmake=${qt_qmake_cmd}

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {![variant_isset qt4] && ![variant_isset qt5]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        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;" class="">-        return -code error "Invalid variant selection"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant qt5 conflicts qt4 requires gui description {Build Qt GUI using Qt5} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        PortGroup qt5 1.0

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {${subport} eq ${name}} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            patchfiles-append patch-qt5gui.release.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } else {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            patchfiles-append patch-qt5gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.args-append --qt-qmake=${qt_qmake_cmd}

</span>     }

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-} else {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.args-append --no-qt-gui

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant docs description {Build documentation: HTML and manpages} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {[variant_isset gui]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {![variant_isset qt4] && ![variant_isset qt5]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            default_variants +qt4

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    configure.args-append \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        --mandir=share/man \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        --sphinx-man \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        --sphinx-html \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    depends_build-append \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    depends_build-append \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {![variant_isset qt4] && ![variant_isset qt5]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            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;" class="">+            return -code error "Invalid variant selection"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    } else {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.args-append --no-qt-gui

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant python35 conflicts python36 python37 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    description {Build documentation using Sphinx from Python 3.5} {}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant docs description {Build documentation: HTML and manpages} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        configure.args-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            --mandir=share/man \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            --sphinx-man \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            --sphinx-html \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        depends_build-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinx

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        depends_build-append \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant python36 conflicts python35 python37 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    description {Build documentation using Sphinx from Python 3.6} {}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant python35 conflicts python36 python37 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        description {Build documentation using Sphinx from Python 3.5} {}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant python37 conflicts python35 python36 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    description {Build documentation using Sphinx from Python 3.7} {}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant python36 conflicts python35 python37 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        description {Build documentation using Sphinx from Python 3.6} {}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-variant python38 conflicts python35 python36 python37 requires docs \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    description {Build documentation using Sphinx from Python 3.8} {}

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant python37 conflicts python35 python36 python38 requires docs \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        description {Build documentation using Sphinx from Python 3.7} {}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if {[variant_isset docs]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    variant python38 conflicts python35 python36 python37 requires docs \

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        description {Build documentation using Sphinx from Python 3.8} {}

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # default Python is 3.6

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {![variant_isset python35] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python36] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python37] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python38]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        default_variants +python37

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    if {[variant_isset docs]} {

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # make sure -python36 is not specified alone

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {![variant_isset python35] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python36] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python37] &&

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        ![variant_isset python38]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        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;" class="">-        return -code error "Invalid variant selection"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        # default Python is 3.6

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {![variant_isset python35] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python36] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python37] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python38]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            default_variants +python37

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    # determine Python-related variables

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    if {[variant_isset python35]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        set PYTHON_VERSION_WITH_DOT "3.5"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } elseif {[variant_isset python36]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        set PYTHON_VERSION_WITH_DOT "3.6"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } elseif {[variant_isset python37]} {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        set PYTHON_VERSION_WITH_DOT "3.7"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    } else {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        set PYTHON_VERSION_WITH_DOT "3.8"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        # make sure -python36 is not specified alone

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {![variant_isset python35] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python36] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python37] &&

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            ![variant_isset python38]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            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;" class="">+            return -code error "Invalid variant selection"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span> 

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    post-patch {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        # patch Python Version

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-        reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-    }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        # determine Python-related variables

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        if {[variant_isset python35]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            set PYTHON_VERSION_WITH_DOT "3.5"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } elseif {[variant_isset python36]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            set PYTHON_VERSION_WITH_DOT "3.6"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } elseif {[variant_isset python37]} {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            set PYTHON_VERSION_WITH_DOT "3.7"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        } else {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            set PYTHON_VERSION_WITH_DOT "3.8"

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        set PYTHON_VERSION_NO_DOT [join [split ${PYTHON_VERSION_WITH_DOT} "."] ""]

</span> 

<span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        post-patch {

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            # patch Python Version

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+            reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+        }

</span><span style="display:block; white-space:pre;background:#e0ffe0;" class="">+    }

</span> }

<span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 4d26bd8..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,11 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/CMakeFindFrameworks.cmake.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/CMakeFindFrameworks.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -22,7 +22,7 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             ${CMAKE_FRAMEWORK_PATH}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             ${_cmff_CMAKE_FRAMEWORK_PATH}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             ~/Library/Frameworks

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--            /usr/local/Frameworks

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            __PREFIX__/Library/Frameworks/${fwk}.framework

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             /Library/Frameworks

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             /System/Library/Frameworks

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-             /Network/Library/Frameworks

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 0338cf7..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-Modules-noArchCheck.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,72 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -23,15 +23,3 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if("@CVF_ARCH_INDEPENDENT@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION_UNSUITABLE TRUE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/BasicConfigVersion-ExactVersion.cmake.in

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -38,15 +38,3 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if("@CVF_ARCH_INDEPENDENT@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION_UNSUITABLE TRUE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -37,15 +37,3 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if("@CVF_ARCH_INDEPENDENT@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION_UNSUITABLE TRUE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -41,15 +41,3 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if("@CVF_ARCH_INDEPENDENT@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--# 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;" class="">--if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(PACKAGE_VERSION_UNSUITABLE TRUE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 1b5b3db..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-Source_Modules_FindLibUV.cmake.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,13 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/Modules/FindLibUV.cmake.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/Modules/FindLibUV.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -61,7 +61,9 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #-----------------------------------------------------------------------------

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">- # Extract version number if possible.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 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;" class="">--if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index ce70486..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-cmake-leopard-tiger.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,119 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-<a href="mailto:kencu@macports.org" class="">kencu@macports.org</a>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-The <memory> header seems to be needed if building with gcc/libstdc++ on MacOS

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-adding it does no harm to clang/libc++ builds

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-it must be somehow automatically included with the libc++ headers

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-diff --git Source/cmMachO.h Source/cmMachO.h

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-index 0c44b55..06c39db 100644

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/cmMachO.h

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/cmMachO.h

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -7,6 +7,7 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <iosfwd>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <string>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#include <memory>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #if !defined(CMAKE_USE_MACH_PARSER)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #  error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">----

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-<a href="mailto:kencu@macports.org" class="">kencu@macports.org</a>

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-The patches below match the tiger patches in the libuv port.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-Although cmake is configured to use the system libuv, it appears that the

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-bootstrap version of cmake uses a more current version, and that is a moving

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-target as libuv advances.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-At some point we may have to switch to an older bootstrap version of cmake,

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-if libuv becomes too difficult to keep up-to-date.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-diff --git Utilities/cmlibuv/src/unix/core.c Utilities/cmlibuv/src/unix/core.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-index cf7dea0..b48ca73 100644

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Utilities/cmlibuv/src/unix/core.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Utilities/cmlibuv/src/unix/core.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -525,10 +525,24 @@ skip:

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-  * will unwind the thread when it's in the cancel state. Work around that

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-  * by making the system call directly. Musl libc is unaffected.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-  */

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(__GNUC__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#define GCC_VERSION \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+/* gcc diagnostic pragmas available */

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# define GCC_DIAGNOSTIC_AVAILABLE

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- int uv__close_nocancel(int fd) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#if defined(__APPLE__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(GCC_DIAGNOSTIC_AVAILABLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #pragma GCC diagnostic push

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #if defined(__LP64__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   extern int close$NOCANCEL(int);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return close$NOCANCEL(fd);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -536,7 +550,11 @@ int uv__close_nocancel(int fd) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   extern int close$NOCANCEL$UNIX2003(int);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return close$NOCANCEL$UNIX2003(fd);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(GCC_DIAGNOSTIC_AVAILABLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #pragma GCC diagnostic pop

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #elif defined(__linux__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return syscall(SYS_close, fd);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #else

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -1306,8 +1324,12 @@ int uv_os_unsetenv(const char* name) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   if (name == NULL)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     return UV_EINVAL;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    unsetenv(name);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#else

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   if (unsetenv(name) != 0)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     return UV__ERR(errno);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return 0;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-diff --git Utilities/cmlibuv/src/unix/fs.c Utilities/cmlibuv/src/unix/fs.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-index 5fb34f1..7453980 100644

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Utilities/cmlibuv/src/unix/fs.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Utilities/cmlibuv/src/unix/fs.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -743,7 +743,7 @@ static ssize_t uv__fs_sendfile(uv_fs_t* req) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     return -1;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#elif defined(__APPLE__)           || \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       defined(__DragonFly__)       || \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       defined(__FreeBSD__)         || \

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       defined(__FreeBSD_kernel__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -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;" class="">-   dst->st_blksize = src->st_blksize;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   dst->st_blocks = src->st_blocks;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#if defined(__APPLE__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   dst->st_atim.tv_sec = src->st_atimespec.tv_sec;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-diff --git Utilities/cmlibuv/src/unix/tty.c Utilities/cmlibuv/src/unix/tty.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-index db479d6..5a7a86b 100644

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Utilities/cmlibuv/src/unix/tty.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Utilities/cmlibuv/src/unix/tty.c

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -44,7 +44,7 @@ static int uv__tty_is_slave(const int fd) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   int dummy;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   result = ioctl(fd, TIOCGPTN, &dummy) != 0;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#elif defined(__APPLE__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   char dummy[256];

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 2f78ccd..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-fix-clock_gettime-test.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,15 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/kwsys/kwsysPlatformTestsC.c.orig   2020-03-04 06:50:44.000000000 -0700

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/kwsys/kwsysPlatformTestsC.c        2020-03-17 03:35:40.000000000 -0700

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -56,12 +56,6 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #ifdef TEST_KWSYS_C_HAS_CLOCK_GETTIME_MONOTONIC

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#  if defined(__APPLE__)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#    include <AvailabilityMacros.h>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#    if MAC_OS_X_VERSION_MIN_REQUIRED < 101200

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#      error "clock_gettime not available on macOS < 10.12"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#    endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--#  endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #  include <time.h>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- int KWSYS_PLATFORM_TEST_C_MAIN()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- {

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 0b2221e..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-fix-system-prefix-path.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,75 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/Platform/Darwin.cmake.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/Platform/Darwin.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -207,6 +207,12 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   ${_apps_paths})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- unset(_apps_paths)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# add to CMAKE_SYSTEM_PREFIX_PATH

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# might already exist before this if the user has specified it

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+list(APPEND CMAKE_SYSTEM_PREFIX_PATH

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  __PREFIX__ # MacPorts

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- include(Platform/UnixPaths)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if(_CMAKE_OSX_SYSROOT_PATH AND EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -214,7 +220,3 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endforeach()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--list(APPEND CMAKE_SYSTEM_PREFIX_PATH

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  /sw        # Fink

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  /opt/local # MacPorts

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  )

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Modules/Platform/UnixPaths.cmake.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Modules/Platform/UnixPaths.cmake

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -23,22 +23,39 @@

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">- # search types.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- list(APPEND CMAKE_SYSTEM_PREFIX_PATH

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   # Standard

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  /usr/local /usr /

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  /usr /

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  # CMake install location

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  "${_CMAKE_INSTALL_DIR}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  )

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# CMake install location

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+# append the _CMAKE_INSTALL_DIR if not already in the list

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+list(FIND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}" HAS_ENTRY)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(${HAS_ENTRY} EQUAL -1)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   list(APPEND CMAKE_SYSTEM_PREFIX_PATH

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    # Project install destination.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    "${CMAKE_INSTALL_PREFIX}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    "${_CMAKE_INSTALL_DIR}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   )

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(CMAKE_STAGING_PREFIX)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+unset(HAS_ENTRY)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(NOT CMAKE_FIND_NO_INSTALL_PREFIX)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  # append the CMAKE_INSTALL_PREFIX if not already in the list

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" HAS_ENTRY)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  if(${HAS_ENTRY} EQUAL -1)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     list(APPEND CMAKE_SYSTEM_PREFIX_PATH

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      # User-supplied staging prefix.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      "${CMAKE_STAGING_PREFIX}"

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+      # Project install destination.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+      "${CMAKE_INSTALL_PREFIX}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     )

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  unset(HAS_ENTRY)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  if(CMAKE_STAGING_PREFIX)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    # append the CMAKE_STAGING_PREFIX if not already in the list

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_STAGING_PREFIX}" HAS_ENTRY)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    if(${HAS_ENTRY} EQUAL -1)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+      list(APPEND CMAKE_SYSTEM_PREFIX_PATH

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+        # User-supplied staging prefix.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+        "${CMAKE_STAGING_PREFIX}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+      )

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- # Non "standard" but common install prefixes

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 931fedd..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,63 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/Checks/cm_cxx14_check.cpp.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/Checks/cm_cxx14_check.cpp

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -1,9 +1,18 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// actually use c++14 feature to force the compiler to do something,

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// since it might otherwise try to optimize all of this out even if it

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// doesn't understand it.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#include <iostream>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <cstdio>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <iterator>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <memory>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- int main()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  std::unique_ptr < int > foo = std::make_unique < int > (4);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  std::cout << "std::make_unique < int >(4) is '"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            << *foo << "'" << std::endl;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   int a[] = { 0, 1, 2 };

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   auto ai = std::cbegin(a);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/Checks/cm_cxx17_check.cpp.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/Checks/cm_cxx17_check.cpp

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -1,3 +1,9 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// actually use c++17 feature to force the compiler to do something,

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// since it might otherwise try to optimize all of this out even if it

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+// doesn't understand it.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#include <iostream>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+#include <string>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <cstdio>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <iterator>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #include <memory>

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -15,6 +21,15 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return item.get();

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+std::optional < std::string >

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+create

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+(bool b) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  if (b) {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+    return "foo!";

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  }

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  return {};

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- int main()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- {

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   int a[] = { 0, 1, 2 };

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -38,6 +53,13 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   IDispatchPtr disp(ptr);

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- #endif

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  std::cout << "create(false) returned "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            << create(false).value_or("empty")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            << std::endl;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  std::cout << "create(true) returned "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            << create(true).value_or("empty")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+            << std::endl;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   std::optional<int> oi = 0;

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci)) + oi.value();

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index 058a917..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-qt4gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,172 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/QtDialog/CMakeLists.txt.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/QtDialog/CMakeLists.txt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -3,100 +3,6 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- project(QtDialog)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- CMake_OPTIONAL_COMPONENT(cmake-gui)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--find_package(Qt5Widgets QUIET)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if (Qt5Widgets_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  include_directories(${Qt5Widgets_INCLUDE_DIRS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  add_definitions(${Qt5Widgets_DEFINITONS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  macro(qt4_wrap_ui)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    qt5_wrap_ui(${ARGN})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endmacro()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  macro(qt4_wrap_cpp)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    qt5_wrap_cpp(${ARGN})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endmacro()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  macro(qt4_add_resources)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    qt5_add_resources(${ARGN})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endmacro()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  # Try to find the package WinExtras for the task bar progress

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    find_package(Qt5WinExtras QUIET)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    if (Qt5WinExtras_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      include_directories(${Qt5WinExtras_INCLUDE_DIRS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      add_definitions(-DQT_WINEXTRAS)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      list(APPEND CMake_QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  # Remove this when the minimum version of Qt is 4.6.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    set_property(SOURCE CMakeSetup.cxx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    set_property(SOURCE CMakeSetup.cxx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  # 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;" class="">--  # FIXME: This should be part of Qt5 CMake scripts, but unfortunately

<span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  # Qt5 support is missing there.

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      if(EXISTS "${_qt_plugin_path}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--          set(_qt_plugin_dir "PlugIns")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        elseif(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--          set(_qt_plugin_dir "plugins")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        install(FILES "${_qt_plugin_path}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--          DESTINATION "${_qt_plugin_dest}"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--          ${COMPONENT})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        set(${_qt_plugins_var}

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--          "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      else()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    endmacro()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        "[Paths]\nPlugins = ${_qt_plugin_dir}\n")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        ${COMPONENT})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        DESTINATION bin

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        ${COMPONENT})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(TARGET Qt5::Core)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    get_property(_Qt5_Core_LOCATION TARGET Qt5::Core PROPERTY LOCATION)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    get_filename_component(Qt_BIN_DIR "${_Qt5_Core_LOCATION}" PATH)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--else()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(QT_MIN_VERSION "4.4.0")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   find_package(Qt4 REQUIRED)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   if(NOT QT4_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -108,8 +14,6 @@ else()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(CMake_QT_LIBRARIES ${QT_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- set(SRCS

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   AddCacheEntry.cxx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   AddCacheEntry.h

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -154,7 +58,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(SRCS ${SRCS} CMakeSetup.rc)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(SRCS ${SRCS} CMakeSetup.icns)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set_source_files_properties(CMakeSetup.icns PROPERTIES

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -171,7 +75,7 @@ endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- set(CMAKE_INCLUDE_CURRENT_DIR ON)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -201,7 +105,7 @@ Checks: '-*,llvm-twine-local'

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ...

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -247,7 +151,7 @@ if(UNIX AND NOT APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     ${COMPONENT})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   install(CODE "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-         WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -258,7 +162,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   # install rules for including 3rd party libs such as Qt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   # 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;" class="">-   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   install(CODE "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- CMakeLists.txt.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ CMakeLists.txt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -718,12 +718,6 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       set(CMAKE_BUNDLE_VERSION

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-         "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      # make sure CMAKE_INSTALL_PREFIX ends in /

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      set(CMAKE_INSTALL_PREFIX

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;color:#808080;" class="">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;" class="">index c0b69d9b..0000000

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">--- a/devel/cmake/files/patch-qt5gui.devel.diff

</span><span style="display:block; white-space:pre;background:#e0e0ff;" class="">+++ /dev/null

</span><span style="display:block; white-space:pre;background:#e0e0e0;" class="">@@ -1,93 +0,0 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- Source/QtDialog/CMakeLists.txt.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ Source/QtDialog/CMakeLists.txt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -4,7 +4,9 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- project(QtDialog)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- CMake_OPTIONAL_COMPONENT(cmake-gui)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- find_package(Qt5Widgets QUIET)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if (Qt5Widgets_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(NOT Qt5Widgets_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  message(FATAL_ERROR "Qt5 required but not found")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   include_directories(${Qt5Widgets_INCLUDE_DIRS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   add_definitions(${Qt5Widgets_DEFINITONS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   macro(qt4_wrap_ui)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -96,19 +98,6 @@ if (Qt5Widgets_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--else()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(QT_MIN_VERSION "4.4.0")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  find_package(Qt4 REQUIRED)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(NOT QT4_FOUND)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    message(SEND_ERROR "Failed to find Qt 4.4 or greater.")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--    return()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  include(${QT_USE_FILE})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  set(CMake_QT_LIBRARIES ${QT_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- set(SRCS

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   AddCacheEntry.cxx

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -154,7 +143,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(SRCS ${SRCS} CMakeSetup.rc)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(SRCS ${SRCS} CMakeSetup.icns)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   set_source_files_properties(CMakeSetup.icns PROPERTIES

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -171,7 +160,7 @@ endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- set(CMAKE_INCLUDE_CURRENT_DIR ON)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS} ${MANIFEST_FILE})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+add_executable(cmake-gui WIN32 ${SRCS} ${MANIFEST_FILE})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- if(WIN32)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -201,7 +190,7 @@ Checks: '-*,llvm-twine-local'

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ...

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- ")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -247,7 +236,7 @@ if(UNIX AND NOT APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     ${COMPONENT})

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   install(CODE "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-         WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -258,7 +247,7 @@ if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   # install rules for including 3rd party libs such as Qt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   # 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;" class="">-   set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--  if(APPLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+  if(APPLEBUNDLE)

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/CMake")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   install(CODE "

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">---- CMakeLists.txt.orig

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-+++ CMakeLists.txt

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-@@ -718,12 +718,6 @@

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       set(CMAKE_BUNDLE_VERSION

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-         "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-       set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      # make sure CMAKE_INSTALL_PREFIX ends in /

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--      set(CMAKE_INSTALL_PREFIX

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">--        "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-     endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">-   endif()

</span><span style="display:block; white-space:pre;background:#ffe0e0;" class="">- 

</span></pre><pre style="margin:0" class="">

</pre>

</div></blockquote></div><br class=""></div></body></html>