<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/cb2671f50d23112a090fbdf2489634f3510e4431">https://github.com/macports/macports-ports/commit/cb2671f50d23112a090fbdf2489634f3510e4431</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 cb2671f50d2 cmake-devel-gui: fix CMAKE_ROOT for cmake-gui
</span>cb2671f50d2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cb2671f50d23112a090fbdf2489634f3510e4431
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Tue Jul 25 12:00:19 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel-gui: fix CMAKE_ROOT for cmake-gui
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> CMake code for cmake-gui looks inside app bundle for CMAKE_ROOT,
</span><span style='display:block; white-space:pre;color:#404040;'> this patches it to look in MacPorts $prefix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62855
</span>---
devel/cmake-devel/Portfile | 8 +++++---
devel/cmake-devel/files/patch-cmakeroot-with-app.diff | 13 +++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/Portfile b/devel/cmake-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d86e42add1c..093cf59c116 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/Portfile
</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;'>@@ -41,7 +41,7 @@ version 20230810-3.27.2-[string range ${gitlab.version} 0 7]
</span> checksums rmd160 7a30991369c51f9d0e6875d6ba40d10c31730fb6 \
sha256 4ecc149a24251b3d6ba12e00893b5265fff580755c8630e8512cc56692cfff98 \
size 8423256
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,8 @@ patchfiles-append \
</span> patch-fix-clock_gettime-test.diff \
patch-qt5gui.diff \
patch-cmake-cmInstallRuntime-initializer-fix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-uv_spawn.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-uv_spawn.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmakeroot-with-app.diff
</span>
depends_lib-append \
port:curl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,7 +189,8 @@ post-patch {
</span> # patch PREFIX
reinplace "s|__PREFIX__|${prefix}|g" \
${worksrcpath}/macports.cmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Modules/Platform/Darwin.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;'>+ ${worksrcpath}/Source/cmSystemTools.cxx
</span>
# patch FRAMEWORKS
reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake-devel/files/patch-cmakeroot-with-app.diff b/devel/cmake-devel/files/patch-cmakeroot-with-app.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3a839adbbb6
</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-cmakeroot-with-app.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;'>+Addresses https://trac.macports.org/ticket/62855
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmSystemTools.cxx.orig 2023-03-08 20:04:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmSystemTools.cxx 2023-07-25 11:24:23.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2570,6 +2570,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exe_dir = cmSystemTools::GetFilenamePath(exe_dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (cmSystemTools::FileExists(exe_dir + CMAKE_BIN_DIR "/cmake")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exe_dir += CMAKE_BIN_DIR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else if (cmSystemTools::FileExists("__PREFIX__" CMAKE_BIN_DIR "/cmake")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exe_dir = cmSystemTools::GetFilenamePath("__PREFIX__" CMAKE_BIN_DIR "/cmake");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exe_dir = cmSystemTools::GetFilenamePath(exe_dir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exe_dir = cmSystemTools::GetFilenamePath(exe_dir);
</span></pre><pre style='margin:0'>
</pre>