drop CFNetwork dependency for macOS

CMakeLists.txt

@@ -101,10 +101,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   list(APPEND CMAKE_PREFIX_PATH /opt/homebrew/opt/ncurses)
   list(APPEND OPENSSL_ROOT_DIR /usr/local/opt/openssl)
   list(APPEND OPENSSL_ROOT_DIR /opt/homebrew/opt/openssl)
-  FIND_LIBRARY(CARBON_LIBRARY CoreFoundation)
-  FIND_LIBRARY(CARBON_LIBRARY CFNetwork)
-  FIND_LIBRARY(CARBON_LIBRARY Security)
-  target_link_libraries(nmail PUBLIC z iconv "-framework CoreFoundation" "-framework Security" "-framework CFNetwork")
 endif()
 
 # Headers
@@ -205,6 +201,16 @@ else()
   message(STATUS "Found libuuid: ${LIBUUID_LIBRARIES} and ${LIBUUID_HEADERS}")
 endif()
 
+# Dependency platform specifics
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  if (NOT HAS_CUSTOM_LIBETPAN)
+    FIND_LIBRARY(CARBON_LIBRARY CoreFoundation)
+    FIND_LIBRARY(CARBON_LIBRARY Security)
+    FIND_LIBRARY(CARBON_LIBRARY CFNetwork)
+    target_link_libraries(nmail PUBLIC z iconv "-framework CoreFoundation" "-framework Security" "-framework CFNetwork")
+  endif()
+endif()
+
 # Includes
 target_include_directories(nmail PRIVATE ${LIBETPAN_INCLUDE_DIR} ${XAPIAN_INCLUDE_DIR}
                            ${MAGIC_HEADERS} ${CYRUS_SASL_INCLUDE_DIR}

ext/libetpan/CMakeLists.txt

@@ -298,6 +298,7 @@ check_include_add_define("unistd.h" HAVE_UNISTD_H WARNING)
 
 # Headers - Others (Disabled)
 #check_include_add_define("lmdb.h" HAVE_LMDB_H NOTICE)
+#check_include_add_define("CFNetwork/CFNetwork.h" HAVE_CFNETWORK NOTICE)
 
 # Capabilities - Required
 target_compile_definitions(${LIBNAME} PRIVATE HAVE___ATTRIBUTE__=1)
@@ -359,7 +360,9 @@ target_include_directories(${LIBNAME} PRIVATE ${CYRUS_SASL_INCLUDE_DIR})
 # Find Dependencies - System Libs
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   find_library(CARBON_LIBRARY CoreFoundation REQUIRED)
-  find_library(CARBON_LIBRARY CFNetwork REQUIRED)
+  if(${HAVE_CFNETWORK})
+    find_library(CARBON_LIBRARY CFNetwork REQUIRED)
+  endif()
   find_library(CARBON_LIBRARY Security REQUIRED)
 endif()
 
@@ -375,7 +378,10 @@ target_link_libraries(${LIBNAME} PUBLIC ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${Z
 
 # Linking (macOS)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  target_link_libraries(${LIBNAME} PUBLIC "-framework CoreFoundation" "-framework Security" "-framework CFNetwork")
+  target_link_libraries(${LIBNAME} PUBLIC iconv "-framework CoreFoundation" "-framework Security")
+  if(${HAVE_CFNETWORK})
+    target_link_libraries(${LIBNAME} PUBLIC "-framework CFNetwork")
+  endif()
 endif()
 
 # Install

src/nmail.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man.
-.TH NMAIL "1" "March 2024" "nmail v4.52" "User Commands"
+.TH NMAIL "1" "March 2024" "nmail v4.53" "User Commands"
 .SH NAME
 nmail \- ncurses mail
 .SH SYNOPSIS

src/version.cpp

@@ -7,7 +7,7 @@
 
 #include "version.h"
 
-#define NMAIL_VERSION "4.52"
+#define NMAIL_VERSION "4.53"
 
 std::string Version::GetBuildOs()
 {