<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/84b91b8d46c12cdd36af0a3d3d0a06c9aa753bd4">https://github.com/macports/macports-ports/commit/84b91b8d46c12cdd36af0a3d3d0a06c9aa753bd4</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 84b91b8d46c cmake-devel: update to 20221019-3.25.0-rc2-7d710abc
</span>84b91b8d46c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 84b91b8d46c12cdd36af0a3d3d0a06c9aa753bd4
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Oct 22 16:16:28 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 20221019-3.25.0-rc2-7d710abc
</span>---
devel/cmake-devel/Portfile | 10 +++++-----
.../cmake-devel/files/patch-CMakeFindFrameworks.cmake.diff | 4 ++--
devel/cmake-devel/files/patch-cmake-leopard-tiger.diff | 14 +++++++-------
devel/cmake-devel/files/patch-qt5gui.diff | 12 +++++-------
4 files changed, 19 insertions(+), 21 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 d34db58a9e7..8022658843b 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;'>@@ -36,11 +36,11 @@ homepage https://cmake.org
</span> platforms darwin freebsd
gitlab.instance https://gitlab.kitware.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup cmake cmake 31f835410efeea50acd43512eb9e5646a26ea177
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20220913-3.24.2-[string range ${gitlab.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9146a07e43a9595245cc406520213eedd216bbd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7668de6ff09a64c135805b7a54dd61c497f6e7c769756ed9968038fc22000850 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7953559
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup cmake cmake 7d710abc87a83d96bb3b0f504338c2110d9afa19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20221019-3.25.0-rc2-[string range ${gitlab.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 82457ffb2d99259973e7d6d6fec4834b0ae93c1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d2ca1aff452aa67284d17c5d648027de6ac1616dc42b1b2ba54be1b6856e209e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8053968
</span> revision 0
# switched from "3.23.0" to "date-ver-hash"
<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><span style='display:block; white-space:pre;color:#808080;'>index d0e0df01251..0ec3d089168 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-CMakeFindFrameworks.cmake.diff
</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;'>@@ -1,10 +1,10 @@
</span> --- Modules/CMakeFindFrameworks.cmake.orig
+++ Modules/CMakeFindFrameworks.cmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span> ${CMAKE_FRAMEWORK_PATH}
${_cmff_CMAKE_FRAMEWORK_PATH}
~/Library/Frameworks
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${_brew_framework_path}
</span> + __FRAMEWORKS_DIR__
/Library/Frameworks
/System/Library/Frameworks
<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><span style='display:block; white-space:pre;color:#808080;'>index a93b888c96a..1d7ec651ceb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-cmake-leopard-tiger.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- Utilities/cmlibuv/src/unix/core.c
+++ Utilities/cmlibuv/src/unix/core.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -537,10 +537,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -559,10 +559,24 @@
</span> * will unwind the thread when it's in the cancel state. Work around that
* by making the system call directly. Musl libc is unaffected.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> #if defined(__LP64__) || TARGET_OS_IPHONE
extern int close$NOCANCEL(int);
return close$NOCANCEL(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -548,7 +562,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -570,7 +584,9 @@
</span> extern int close$NOCANCEL$UNIX2003(int);
return close$NOCANCEL$UNIX2003(fd);
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> #elif defined(__linux__) && defined(__SANITIZE_THREAD__) && defined(__clang__)
long rc;
__sanitizer_syscall_pre_close(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1365,8 +1381,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1368,8 +1384,12 @@
</span> if (name == NULL)
return UV_EINVAL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@
</span> }
--- Utilities/cmlibuv/src/unix/fs.c
+++ Utilities/cmlibuv/src/unix/fs.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1071,7 +1071,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1072,7 +1072,7 @@
</span>
return -1;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1184,7 +1184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1198,7 +1198,7 @@
</span> ts[0] = uv__fs_to_timespec(req->atime);
ts[1] = uv__fs_to_timespec(req->mtime);
return utimensat(AT_FDCWD, req->path, ts, AT_SYMLINK_NOFOLLOW);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@
</span> defined(__DragonFly__) || \
defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1438,7 +1438,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1452,7 +1452,7 @@
</span> dst->st_blksize = src->st_blksize;
dst->st_blocks = src->st_blocks;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@
</span> dst->st_mtim.tv_sec = src->st_mtimespec.tv_sec;
--- Utilities/cmlibuv/src/unix/tty.c
+++ Utilities/cmlibuv/src/unix/tty.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -87,7 +87,7 @@
</span> int dummy;
result = ioctl(fd, TIOCGPTN, &dummy) != 0;
<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><span style='display:block; white-space:pre;color:#808080;'>index 60b22d3b9a2..ba1d0d6a968 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake-devel/files/patch-qt5gui.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,7 +302,8 @@
</span> OUTPUT_NAME CMake
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_BUNDLE_VERSION}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> MACOSX_BUNDLE_COPYRIGHT "${copyright_line}"
MACOSX_BUNDLE_GUI_IDENTIFIER "org.cmake.cmake"
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -327,8 +328,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,8 +340,12 @@
</span> endif()
if(APPLE)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,14 +53,14 @@
</span> <key>CFBundleSignature</key>
--- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -810,13 +810,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -406,12 +406,20 @@
</span> if(APPLE)
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
- set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
- # make sure CMAKE_INSTALL_PREFIX ends in /
- if(NOT CMAKE_INSTALL_PREFIX MATCHES "/$")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(APPEND CMAKE_INSTALL_PREFIX "/")
</span> + if(CMAKE_BUNDLE_LOCATION)
+ message(STATUS "Using provided bundle location: ${CMAKE_BUNDLE_LOCATION}")
+ message(STATUS "Using default install prefix: ${CMAKE_INSTALL_PREFIX}")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,8 +75,6 @@
</span> + message(STATUS "Using default Qt bundle location: ${CMAKE_BUNDLE_LOCATION}")
+ message(STATUS "Using special install prefix: ${CMAKE_INSTALL_PREFIX}")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${CMAKE_INSTALL_PREFIX}CMake.app/Contents")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(APPEND CMAKE_INSTALL_PREFIX "CMake.app/Contents")
</span> endif()
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>