git: 32ef1d3da473 - main - comms/uhd: unbreak build with boost-1.85

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32ef1d3da4730fed0763c0ecee35f28a5f360144

commit 32ef1d3da4730fed0763c0ecee35f28a5f360144
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-10-02 23:23:55 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-10-03 10:24:52 +0000

    comms/uhd: unbreak build with boost-1.85
    
    With hat:       office
    Sponsored by:   Future Crew, LLC
---
 comms/uhd/Makefile                                 |  4 ++-
 ...p__clock_octoclock_octoclock__image__loader.cpp | 11 +++++++
 ...atch-host_lib_usrp_mpmd_mpmd__image__loader.cpp | 35 ++++++++++++++++++++++
 ...atch-host_lib_usrp_x300_x300__image__loader.cpp | 13 ++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index 55c5592138e3..d66529807ab6 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	uhd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.6.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 DIST_SUBDIR=	${PORTNAME}
 
@@ -53,10 +53,12 @@ OPTIONS_DEFINE=		DOCS DOXYGEN
 OPTIONS_DEFAULT=	DOCS
 
 OPTIONS_SUB=		yes
+
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 			-DENABLE_MANUAL:STRING="OFF"
+DOXYGEN_PORTDOCS=	doxygen
 
 do-install:
 # install host component
diff --git a/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp
new file mode 100644
index 000000000000..00a812518ac3
--- /dev/null
+++ b/comms/uhd/files/patch-host_lib_usrp__clock_octoclock_octoclock__image__loader.cpp
@@ -0,0 +1,11 @@
+--- host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp.orig	2024-06-10 22:29:18 UTC
++++ host/lib/usrp_clock/octoclock/octoclock_image_loader.cpp
+@@ -95,7 +95,7 @@ static void octoclock_validate_firmware_image(octocloc
+                                      % session.image_filepath));
+     }
+ 
+-    std::string extension = fs::extension(session.image_filepath);
++    const std::string extension = fs::path(session.image_filepath).extension().string();
+     if (extension == ".bin") {
+         octoclock_read_bin(session);
+     } else if (extension == ".hex") {
diff --git a/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp
new file mode 100644
index 000000000000..632806091c8e
--- /dev/null
+++ b/comms/uhd/files/patch-host_lib_usrp_mpmd_mpmd__image__loader.cpp
@@ -0,0 +1,35 @@
+--- host/lib/usrp/mpmd/mpmd_image_loader.cpp.orig	2024-06-10 22:29:18 UTC
++++ host/lib/usrp/mpmd/mpmd_image_loader.cpp
+@@ -21,14 +21,11 @@
+ #include <boost/algorithm/string.hpp>
+ #include <boost/archive/iterators/binary_from_base64.hpp>
+ #include <boost/archive/iterators/transform_width.hpp>
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/optional.hpp>
+ #include <boost/property_tree/xml_parser.hpp>
+ #include <cctype>
+ #include <fstream>
+ #include <iterator>
+-#include <sstream>
+-#include <streambuf>
+ #include <string>
+ #include <vector>
+ 
+@@ -271,7 +268,7 @@ static uhd::usrp::component_files_t bin_dts_to_compone
+     // DTS component struct
+     // First, we need to determine the name
+     const std::string base_name =
+-        boost::filesystem::change_extension(fpga_path, "").string();
++        boost::filesystem::path(fpga_path).replace_extension("").string();
+     if (base_name == fpga_path) {
+         const std::string err_msg(
+             "Can't cut extension from FPGA filename... " + fpga_path);
+@@ -340,7 +337,7 @@ static void mpmd_send_fpga_to_device(
+         UHD_LOG_TRACE("MPMD IMAGE LOADER", "FPGA path: " << fpga_path);
+ 
+         // If the fpga_path is a lvbitx file, parse it as such
+-        if (boost::filesystem::extension(fpga_path) == ".lvbitx") {
++        if (boost::filesystem::path(fpga_path).extension() == ".lvbitx") {
+             all_component_files = lvbitx_to_component_files(fpga_path, delay_reload);
+         } else {
+             all_component_files = bin_dts_to_component_files(fpga_path, delay_reload);
diff --git a/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp b/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp
new file mode 100644
index 000000000000..1824c11eb4af
--- /dev/null
+++ b/comms/uhd/files/patch-host_lib_usrp_x300_x300__image__loader.cpp
@@ -0,0 +1,13 @@
+--- host/lib/usrp/x300/x300_image_loader.cpp.orig	2024-06-10 22:29:18 UTC
++++ host/lib/usrp/x300/x300_image_loader.cpp
+@@ -138,8 +138,8 @@ static void x300_validate_image(x300_session_t& sessio
+             boost::format("Could not find image at path \"%s\".") % session.filepath));
+     }
+ 
+-    std::string extension = fs::extension(session.filepath);
+-    session.lvbitx        = (extension == ".lvbitx");
++    const std::string extension = fs::path(session.filepath).extension().string();
++    session.lvbitx              = (extension == ".lvbitx");
+ 
+     if (session.lvbitx) {
+         extract_from_lvbitx(session);