<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b98cd0efc774b55cb3a03976766c54ea6940f662">https://github.com/macports/macports-ports/commit/b98cd0efc774b55cb3a03976766c54ea6940f662</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b98cd0efc77 cmake-devel: new port for testing - Migrate variants 'qt5' and 'docs', to new subports 'gui' and docs', respectively. See: https://trac.macports.org/ticket/63830
</span>b98cd0efc77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b98cd0efc774b55cb3a03976766c54ea6940f662
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Nov 7 10:53:31 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: new port for testing
</span><span style='display:block; white-space:pre;color:#404040;'> - Migrate variants 'qt5' and 'docs', to new subports 'gui' and docs', respectively.
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63830
</span>---
devel/cmake-devel/Portfile | 361 +++++++++++++++++++++
devel/cmake-devel/files/macports.cmake | 35 ++
.../files/patch-CMakeFindFrameworks.cmake.diff | 11 +
.../files/patch-Modules-Platform-Darwin.cmake.diff | 12 +
.../files/patch-Modules-noArchCheck.diff | 72 ++++
.../patch-Source_Modules_FindLibUV.cmake.diff | 13 +
...tch-cmake-cmInstallRuntime-initializer-fix.diff | 13 +
.../files/patch-cmake-leopard-tiger.diff | 103 ++++++
.../files/patch-fix-clock_gettime-test.diff | 15 +
.../files/patch-fix-system-prefix-path.diff | 68 ++++
.../files/patch-fix_cxx14_17_checks.diff | 63 ++++
devel/cmake-devel/files/patch-qt5gui.diff | 82 +++++
12 files changed, 848 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..971c0ce7902
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,361 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cmake does not build universal on BigSur Intel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} >= 20 && ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake is a dependency of clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name cmake-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {michaelld @michaelld} {mascguy @mascguy}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Cross-platform make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set base_long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "An extensible, open-source system that manages the build\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process in an operating system and compiler independent manner.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Unlike many cross-platform systems, CMake is designed to be\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ used in conjunction with the native build environment."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Devel-specific additions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set base_long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "*** IMPORTANT NOTE: Unlike most Devel ports, this one is NOT\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intended to be a drop-in replacement. (At least not at this\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ point in time.) AS SUCH, DON'T ATTEMPT TO USE THIS PORT! ***\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${base_long_description}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://cmake.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.kitware.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup cmake cmake 3.21.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bd08dd00a6a8ffff6d3d21b80f39d4afe6dd4e70 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 069cfdbb57d9f22dc8706f1fb71ae79249ab37f2c1d2afc3fdf6232073840748 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7418791
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.livecheck.regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!((${os.major} < 9) || ${build_arch} eq "ppc" ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build_arch} eq "ppc64")} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OSX <= 10.11 does not provide "clock_gettime"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/59832
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/60885
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins cmake ccmake cpack ctest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${base_long_description} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The ${subport} release port is updated roughly every few months.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Modules-noArchCheck.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeFindFrameworks.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Source_Modules_FindLibUV.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_cxx14_17_checks.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-system-prefix-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-leopard-tiger.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-clock_gettime-test.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qt5gui.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-cmInstallRuntime-initializer-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libarchive \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libuv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure is just a shell script that passes directly to bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bootstrap takes cmake-style args for the build of the cmake to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# be installed. the args are passed as usual for cmake, after
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "--", so we pass them as post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_PREFIX_PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_INCLUDE_PATH=${prefix}/include/ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# On Lion, Clang 3.3 produces bad stream reading code when using
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libc++. See https://trac.macports.org/ticket/44129 . Clang 3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# works. But Clang 3.7 doesn't work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} == 11 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang 3.4 can't build certain parts of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cmake self-testing infrastructure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/59782
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.compiler} eq "macports-clang-3.4"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TESTING=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDKROOT=/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.arch} eq "i386" && ${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The old system headers do some bit shifting on Intel about which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # newer compilers throw errors:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SecKeychain.h:102:46: error: shift expression '(1853123693 << 8)' overflows [-fpermissive]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fpermissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 11 && ${os.major} <= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some functions in xlocale.h are hidden without this define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/60885
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# jsoncpp 1.0+ requires CMake for building; circular dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# are not possible in MacPorts. In addition, jsoncpp uses C++, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it would not be possible for CMake, which uses libc++ on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.6-10.8, to link with a MacPorts copy of jsoncpp, which would
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# usually use libstdc++ on those systems. Fortunately CMake comes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bundled with its own internal copy of jsoncpp, so we use that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --docdir=share/doc/cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --parallel=${build.jobs} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --init=${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --system-libs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-qt-gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-system-jsoncpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-system-librhash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake's configure script doesn't recognize `--host`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set merger_host {i386 {} x86_64 {} ppc {} ppc64 {} arm64 {}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wl,-framework -Wl,ApplicationServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Leopard's Rosetta has some difficulties configuring the ppc slice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global universal_archs_supported
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${build_arch} eq "ppc" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_archs_supported ${supported_archs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args VERBOSE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # copy cmake init file, ready to be patched below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/macports.cmake ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/macports.cmake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch FRAMEWORKS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch APPLICATIONS_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/emacs/site-lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach type {syntax indent} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc remove_parent_contents {p_subport p_parent} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global destroot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${p_subport}: removing files unrelated to parent ${p_parent}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [exec port contents ${p_parent}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set subport_gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set subport_docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${subport_gui} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMake QT-based GUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${description}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-qt-gui \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qt-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --qt-qmake=${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Deconflict with parent port contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove_parent_contents \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${subport_docs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMake Documentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${description}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PYTHON_VERSION_WITH_DOT__|${PYTHON_VERSION_WITH_DOT}|g" ${worksrcpath}/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Supported pythons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions {27 35 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # declare all +python* variants, with conflicts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Conflicting python versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set other_python_versions {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach other_pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${other_pyver} ne ${pyver}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${other_pyver} ni ${other_python_versions}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend other_python_versions python${other_pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch "[string index ${pyver} 0].[string range ${pyver} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${pyver} conflicts {*}${other_python_versions} description "Build documentation using ${python_branch} sphinx" {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Docs requires one +python* variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${python_isset}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset [variant_isset python${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset_ver_no_dot ${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[variant_isset python${pyver}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nDetected multiple +python* variants: +python${python_isset_ver_no_dot} and +python${pyver}.\nCannot have multiple +python* variants set.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set default +python* variant if none were already selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${python_isset}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure one of the +python* variants is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${python_isset}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_isset [variant_isset python${pyver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch "[string index ${pyver} 0].[string range ${pyver} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!${python_isset}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\nYou must select one of the python variants when building ${subport}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid variant selection"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_WITH_DOT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PYTHON_VERSION_NO_DOT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --mandir=share/man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sphinx-build=${prefix}/bin/sphinx-build-${PYTHON_VERSION_WITH_DOT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-applehelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-devhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-htmlhelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-jsmath \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-qthelp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-serializinghtml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${PYTHON_VERSION_NO_DOT}-sphinxcontrib-websupport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Deconflict with parent port contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remove_parent_contents \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${subport} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The CMake Gui and Docs are now provided as subports '${subport_gui}' and '${subport_docs}', respectively.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/macports.cmake b/devel/cmake-devel/files/macports.cmake
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0e227b8a73d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/macports.cmake
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: have patch in the Portfile post-patch stage once this file is installed!!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Where to install CMake.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CMAKE_BUNDLE_LOCATION "__APPLICATIONS_DIR__" CACHE PATH "Where to install CMake.app bundle" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerge CMake to use MacPorts' BZIP2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(BZIP2_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The BZIP2 include directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(BZIP2_LIBRARY_RELEASE "__PREFIX__/lib/libbz2.dylib" CACHE FILEPATH "The BZIP2 Release Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(BZIP2_LIBRARY_DEBUG "BZIP2_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The BZIP2 Debug Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerge CMake to use MacPorts' CURL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURL_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The CURL include directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURL_LIBRARY "__PREFIX__/lib/libcurl.dylib" CACHE FILEPATH "The CURL Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerce CMake to use MacPorts' CURSES / NCURSES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURSES_INCLUDE_PATH "__PREFIX__/include" CACHE PATH "The Curses Include Directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURSES_FORM_LIBRARY "__PREFIX__/lib/libform.dylib" CACHE FILEPATH "The Form Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(CURSES_NCURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The NCurses Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerge CMake to use MacPorts' EXPAT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(EXPAT_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The EXPAT include directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(EXPAT_LIBRARY "__PREFIX__/lib/libexpat.dylib" CACHE FILEPATH "The EXPAT Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerge CMake to use MacPorts' LibArchive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(LibArchive_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The LibArchive include directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(LibArchive_LIBRARY "__PREFIX__/lib/libarchive.dylib" CACHE FILEPATH "The LibArchive Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerce CMake to use MacPorts' Python Executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(PYTHON_EXECUTABLE "__PREFIX__/bin/python__PYTHON_VERSION_WITH_DOT__" CACHE FILEPATH "The Python Executable to use" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Coerge CMake to use MacPorts' ZLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(ZLIB_INCLUDE_DIR "__PREFIX__/include" CACHE PATH "The ZLIB include directory" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(ZLIB_LIBRARY_RELEASE "__PREFIX__/lib/libz.dylib" CACHE FILEPATH "The ZLIB Release Library" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set(ZLIB_LIBRARY_DEBUG "ZLIB_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The ZLIB Debug Library" FORCE)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-CMakeFindFrameworks.cmake.diff b/devel/cmake-devel/files/patch-CMakeFindFrameworks.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d0e0df01251
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-CMakeFindFrameworks.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/CMakeFindFrameworks.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/CMakeFindFrameworks.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${_cmff_CMAKE_FRAMEWORK_PATH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __FRAMEWORKS_DIR__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /System/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /Network/Library/Frameworks
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-Modules-Platform-Darwin.cmake.diff b/devel/cmake-devel/files/patch-Modules-Platform-Darwin.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ed2ca6e88d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-Modules-Platform-Darwin.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/Platform/Darwin.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_sdk_ver "${CMAKE_MATCH_1}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif("${_CMAKE_OSX_SYSROOT_ORIG}" MATCHES "^macosx([0-9]+\\.[0-9]+)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_sdk_ver "${CMAKE_MATCH_1}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif("${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "/" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${_CMAKE_OSX_SYSROOT_ORIG}" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_sdk_ver "${_CURRENT_OSX_VERSION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-Modules-noArchCheck.diff b/devel/cmake-devel/files/patch-Modules-noArchCheck.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9f84f526092
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-Modules-noArchCheck.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,72 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,15 +34,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-ExactVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,15 +74,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,15 +56,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/BasicConfigVersion-SameMinorVersion.cmake.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/BasicConfigVersion-SameMinorVersion.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,15 +76,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("@CVF_ARCH_INDEPENDENT@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# 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:#e0ffe0;'>+-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-Source_Modules_FindLibUV.cmake.diff b/devel/cmake-devel/files/patch-Source_Modules_FindLibUV.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1b5b3dbb8ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-Source_Modules_FindLibUV.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/Modules/FindLibUV.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/Modules/FindLibUV.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,7 +61,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract version number if possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-cmake-cmInstallRuntime-initializer-fix.diff b/devel/cmake-devel/files/patch-cmake-cmInstallRuntime-initializer-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..269ddb74355
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-cmake-cmInstallRuntime-initializer-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/cmInstallRuntimeDependencySet.cxx Source/cmInstallRuntimeDependencySet.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0cef49a..5f826f3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmInstallRuntimeDependencySet.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmInstallRuntimeDependencySet.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ const std::set<const cmGeneratorTarget*>& GetTargetDependsClosure(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ targetDepends,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const cmGeneratorTarget* tgt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- auto it = targetDepends.insert({ tgt, {} });
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto it = targetDepends.insert({ tgt, std::set<const cmGeneratorTarget*>{} });
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto& retval = it.first->second;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (it.second) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto const& deps = tgt->GetGlobalGenerator()->GetTargetDirectDepends(tgt);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff b/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aadcdb2b6c3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmMachO.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iosfwd>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(CMake_USE_MACH_PARSER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error "This file may be included only if CMake_USE_MACH_PARSER is enabled."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/core.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -530,10 +530,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * will unwind the thread when it's in the cancel state. Work around that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * by making the system call directly. Musl libc is unaffected.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__GNUC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define GCC_VERSION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__clang__) || (defined(GCC_VERSION) && (GCC_VERSION >= 40500))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* gcc diagnostic pragmas available */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define GCC_DIAGNOSTIC_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int uv__close_nocancel(int fd) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic ignored "-Wdollar-in-identifier-extension"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__LP64__) || TARGET_OS_IPHONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -541,7 +555,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int close$NOCANCEL$UNIX2003(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return close$NOCANCEL$UNIX2003(fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(GCC_DIAGNOSTIC_AVAILABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__linux__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return syscall(SYS_close, fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1352,8 +1370,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (name == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV_EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ( defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsetenv(name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (unsetenv(name) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UV__ERR(errno);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/fs.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -951,7 +951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD_kernel__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1067,7 +1067,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts[0] = uv__fs_to_timespec(req->atime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ts[1] = uv__fs_to_timespec(req->mtime);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return utimensat(AT_FDCWD, req->path, ts, AT_SYMLINK_NOFOLLOW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050 || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__DragonFly__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defined(__FreeBSD_kernel__) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1328,7 +1328,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blksize = src->st_blksize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_blocks = src->st_blocks;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_sec = src->st_atimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_atim.tv_nsec = src->st_atimespec.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Utilities/cmlibuv/src/unix/tty.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int dummy;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCGPTN, &dummy) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char dummy[256];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = ioctl(fd, TIOCPTYGNAME, &dummy) != 0;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-fix-clock_gettime-test.diff b/devel/cmake-devel/files/patch-fix-clock_gettime-test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2f78ccde8e7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-fix-clock_gettime-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/kwsys/kwsysPlatformTestsC.c.orig 2020-03-04 06:50:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/kwsys/kwsysPlatformTestsC.c 2020-03-17 03:35:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,12 +56,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef TEST_KWSYS_C_HAS_CLOCK_GETTIME_MONOTONIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if MAC_OS_X_VERSION_MIN_REQUIRED < 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# error "clock_gettime not available on macOS < 10.12"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int KWSYS_PLATFORM_TEST_C_MAIN()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-fix-system-prefix-path.diff b/devel/cmake-devel/files/patch-fix-system-prefix-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..94479ab9e0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-fix-system-prefix-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/Platform/Darwin.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/Platform/Darwin.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,7 +235,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw # Fink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/local # MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# prepend the MacPorts prefix to CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# might already exist after this if the user has specified it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Modules/Platform/UnixPaths.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Modules/Platform/UnixPaths.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,22 +27,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # synchronized
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local /usr /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # CMake install location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${_CMAKE_INSTALL_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# CMake install location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# append the _CMAKE_INSTALL_DIR if not already in the list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++list(FIND CMAKE_SYSTEM_PREFIX_PATH "${_CMAKE_INSTALL_DIR}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Project install destination.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_INSTALL_PREFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${_CMAKE_INSTALL_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(CMAKE_STAGING_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++unset(HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT CMAKE_FIND_NO_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # append the CMAKE_INSTALL_PREFIX if not already in the list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # User-supplied staging prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_STAGING_PREFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Project install destination.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_INSTALL_PREFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unset(HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_STAGING_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # append the CMAKE_STAGING_PREFIX if not already in the list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(FIND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_STAGING_PREFIX}" HAS_ENTRY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${HAS_ENTRY} EQUAL -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # User-supplied staging prefix.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_STAGING_PREFIX}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Non "standard" but common install prefixes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-fix_cxx14_17_checks.diff b/devel/cmake-devel/files/patch-fix_cxx14_17_checks.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..931feddc139
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-fix_cxx14_17_checks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,63 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/Checks/cm_cxx14_check.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/Checks/cm_cxx14_check.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// actually use c++14 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// doesn't understand it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr < int > foo = std::make_unique < int > (4);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "std::make_unique < int >(4) is '"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << *foo << "'" << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/Checks/cm_cxx17_check.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/Checks/cm_cxx17_check.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// actually use c++17 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// doesn't understand it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +21,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return item.get();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++std::optional < std::string >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++create
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++(bool b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "foo!";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return {};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +53,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IDispatchPtr disp(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(false) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(false).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::cout << "create(true) returned "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << create(true).value_or("empty")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::optional<int> oi = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci)) + oi.value();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-qt5gui.diff b/devel/cmake-devel/files/patch-qt5gui.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f0a2b4127b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake-devel/files/patch-qt5gui.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,82 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/QtDialog/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/QtDialog/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,7 +288,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT_NAME CMake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # TBD: MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_BUNDLE_LONG_VERSION_STRING "${CMAKE_BUNDLE_VERSION}-MacPorts"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_BUNDLE_VERSION}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_COPYRIGHT "${copyright_line}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_BUNDLE_GUI_IDENTIFIER "org.cmake.cmake"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,8 +328,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # at install time, create a symlink from the CMake executable to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # bin/cmake-gui. Note that there is a build-time symlink created
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # above, but it is used just during build and test, and not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # installed. This one is created in the installation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(CODE "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ execute_process(COMMAND ln -s \"${CMAKE_BUNDLE_LOCATION}/CMake.app/Contents/MacOS/CMake\" cmake-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " ${COMPONENT})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/QtDialog/Info.plist.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/QtDialog/Info.plist.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,8 +2,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <plist version="1.0">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>${CMAKE_INSTALL_PREFIX}/bin:${CMAKE_INSTALL_PREFIX}/sbin:/usr/bin:/bin:/usr/sbin:/sbin</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>English</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>CFBundleGetInfoString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>CMake - Cross Platform Makefile Generator</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,6 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundlePackageType</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>APPL</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>CFBundleLongVersionString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleShortVersionString</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleSignature</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -780,13 +780,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_BUNDLE_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_BUNDLE_LOCATION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using provided bundle location: ${CMAKE_BUNDLE_LOCATION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using default install prefix: ${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # make sure CMAKE_INSTALL_PREFIX ends in /
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using default Qt bundle location: ${CMAKE_BUNDLE_LOCATION}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using special install prefix: ${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>