<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9ee316fca381f59f2c97f19baa6f66da84adbbfe">https://github.com/macports/macports-ports/commit/9ee316fca381f59f2c97f19baa6f66da84adbbfe</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 9ee316fca38 cmake-devel: sync changes with cmake port
</span>9ee316fca38 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9ee316fca381f59f2c97f19baa6f66da84adbbfe
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Apr 1 13:01:33 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: sync changes with cmake port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix build on Tiger
</span><span style='display:block; white-space:pre;color:#404040;'> minor other changes
</span>---
devel/cmake-devel/Portfile | 19 +++++++++++++++++--
.../files/patch-cmake-3290-posixcsource.diff | 16 ++++++++++++++++
2 files changed, 33 insertions(+), 2 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 1daa3658192..370afb51985 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;'>@@ -79,6 +79,11 @@ patchfiles-append \
</span> patch-cmakeroot-with-app.diff \
patch-remove-homebrew-references.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Tiger doesn't have _DARWIN_C_SOURCE macro so have to disable _POSIX_C_SOURCE instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cmake-3290-posixcsource.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:curl \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,6 +138,12 @@ platform darwin {
</span> configure.cxxflags-append \
-D_DARWIN_C_SOURCE
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 8 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # prevent conflicting opentransport header from being pulled in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -D__OPENTRANSPORTPROVIDERS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# https://trac.macports.org/ticket/67943
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,7 +283,7 @@ subport ${subport_docs} {
</span> }
# Supported pythons
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_versions {38 39 310 311}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions {38 39 310 311 312}
</span>
# declare all +python* variants, with conflicts
foreach pyver ${python_versions} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -306,7 +317,7 @@ subport ${subport_docs} {
</span> # set default +python* variant if none were already selected
if {!${python_isset}} {
set python_isset true
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python312
</span> }
# make sure one of the +python* variants is set
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,6 +369,10 @@ subport ${subport_docs} {
</span> ui_info "${subport}: deleting dir: ${d}"
delete ${d}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installed by the cmake-gui port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/share/doc/cmake
</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-cmake-3290-posixcsource.diff b/devel/cmake-devel/files/patch-cmake-3290-posixcsource.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c4c50a4f6e6
</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-3290-posixcsource.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/cmSystemTools.cxx.orig 2024-04-01 07:17:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/cmSystemTools.cxx 2024-04-01 07:37:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define _DARWIN_C_SOURCE
</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(__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_MAX_ALLOWED < 1050
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef _POSIX_C_SOURCE
</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;'>+ #include "cmSystemTools.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cm/optional>
</span></pre><pre style='margin:0'>
</pre>