<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9374c5fa27a9fb2c33c88138ccf19ad5da6bead1">https://github.com/macports/macports-ports/commit/9374c5fa27a9fb2c33c88138ccf19ad5da6bead1</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 9374c5fa27a nmail: fix build on macOS< 10.8
</span>9374c5fa27a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9374c5fa27a9fb2c33c88138ccf19ad5da6bead1
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Mar 6 20:10:26 2024 +0700
<span style='display:block; white-space:pre;color:#404040;'> nmail: fix build on macOS< 10.8
</span>---
mail/nmail/Portfile | 13 ++++++++++
mail/nmail/files/patch-CFNetwork.diff | 46 +++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/nmail/Portfile b/mail/nmail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a4c639e0fd..a57bc80328d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/nmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/nmail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,4 +29,17 @@ depends_lib-append port:cyrus-sasl2 \
</span> port:sqlite3 \
port:xapian-core
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/d99kris/nmail/discussions/153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/dinhvh/libetpan/issues/445
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CFNetwork.diff
</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|COMMAND cp -a|COMMAND cp -pPR|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/ext/libetpan/CMakeLists.txt
</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> compiler.cxx_standard 2014
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/nmail/files/patch-CFNetwork.diff b/mail/nmail/files/patch-CFNetwork.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1cdf4efc2cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/nmail/files/patch-CFNetwork.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7be152f5b18678355cbf55bf9f8470deabff77cb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 6 Mar 2024 19:36:29 +0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Drop apparently unrequired CFNetwork linkage
</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;'>+ CMakeLists.txt | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/libetpan/CMakeLists.txt | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 33b43cb..59a8a05 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,9 +102,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND OPENSSL_ROOT_DIR /usr/local/opt/openssl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND OPENSSL_ROOT_DIR /opt/homebrew/opt/openssl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_LIBRARY(CARBON_LIBRARY CoreFoundation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_LIBRARY(CARBON_LIBRARY CFNetwork)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FIND_LIBRARY(CARBON_LIBRARY Security)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(nmail PUBLIC z iconv "-framework CoreFoundation" "-framework Security" "-framework CFNetwork")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(nmail PUBLIC z iconv "-framework CoreFoundation" "-framework Security")
</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;'>+ # Headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ext/libetpan/CMakeLists.txt ext/libetpan/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9cdd8a6..be3b486 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/libetpan/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/libetpan/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -359,7 +359,6 @@ target_include_directories(${LIBNAME} PRIVATE ${CYRUS_SASL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find Dependencies - System Libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(CARBON_LIBRARY CoreFoundation REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(CARBON_LIBRARY CFNetwork REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(CARBON_LIBRARY Security REQUIRED)
</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;'>+@@ -375,7 +374,7 @@ target_link_libraries(${LIBNAME} PUBLIC ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${Z
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Linking (macOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_link_libraries(${LIBNAME} PUBLIC "-framework CoreFoundation" "-framework Security" "-framework CFNetwork")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(${LIBNAME} PUBLIC "-framework CoreFoundation" "-framework Security")
</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;'>+ # Install
</span></pre><pre style='margin:0'>
</pre>