comms/uhd: Fix pkg-plist and update

Try to unbreak the build and update to 4.2.0.0

4 files changed, 24 insertions, 138 deletions

diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index c96d00b65fb4..d764e224e0ca 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	uhd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.1.0.5
+DISTVERSION=	4.2.0.0
 CATEGORIES=	comms hamradio
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/comms/uhd/distinfo b/comms/uhd/distinfo
index 4c1d99b1b8b4..62ac93623e3d 100644
--- a/comms/uhd/distinfo
+++ b/comms/uhd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647299451
-SHA256 (uhd/EttusResearch-uhd-v4.1.0.5_GH0.tar.gz) = 73580bb8823338dbc0ffe2840088cb15d7496ef7d402a4816df17a8e5c8d0221
-SIZE (uhd/EttusResearch-uhd-v4.1.0.5_GH0.tar.gz) = 37975618
+TIMESTAMP = 1653841976
+SHA256 (uhd/EttusResearch-uhd-v4.2.0.0_GH0.tar.gz) = ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
+SIZE (uhd/EttusResearch-uhd-v4.2.0.0_GH0.tar.gz) = 38124395
diff --git a/comms/uhd/files/patch-host_cmake_Modules_UHDAtomics.cmake b/comms/uhd/files/patch-host_cmake_Modules_UHDAtomics.cmake
new file mode 100644
index 000000000000..ef5f6f1b90be
--- /dev/null
+++ b/comms/uhd/files/patch-host_cmake_Modules_UHDAtomics.cmake
@@ -0,0 +1,15 @@
+--- host/cmake/Modules/UHDAtomics.cmake.orig	2022-05-30 13:45:17 UTC
++++ host/cmake/Modules/UHDAtomics.cmake
+@@ -102,9 +102,9 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var)
+                     message(FATAL_ERROR "Host compiler must support std::atomic!")
+                 endif()
+             else()
+-                message(
+-                    FATAL_ERROR
+-                    "Boost appears to require libatomic, but cannot find it.")
++                # message(
++                #     FATAL_ERROR
++                #     "Boost appears to require libatomic, but cannot find it.")
+             endif()
+         endif()
+     endif()
diff --git a/comms/uhd/pkg-plist b/comms/uhd/pkg-plist
index 34cd3d81ea6a..824997969775 100644
--- a/comms/uhd/pkg-plist
+++ b/comms/uhd/pkg-plist
@@ -1,5 +1,3 @@
-bin/aurora_bist_test.py
-bin/e320_bist
 bin/rfnoc_image_builder
 bin/uhd_adc_self_cal
 bin/uhd_cal_rx_iq_balance
@@ -9,8 +7,7 @@ bin/uhd_config_info
 bin/uhd_find_devices
 bin/uhd_image_loader
 bin/uhd_usrp_probe
-bin/usrp_hwd.py
-bin/usrp_update_fs
+bin/usrpctl
 include/uhd.h
 include/uhd/build_info.hpp
 include/uhd/cal/cal_metadata_generated.h
@@ -87,7 +84,6 @@ include/uhd/transport/buffer_pool.hpp
 include/uhd/transport/chdr.hpp
 include/uhd/transport/frame_buff.hpp
 include/uhd/transport/if_addrs.hpp
-include/uhd/transport/tcp_zero_copy.hpp
 include/uhd/transport/udp_constants.hpp
 include/uhd/transport/udp_simple.hpp
 include/uhd/transport/udp_zero_copy.hpp
@@ -181,122 +177,10 @@ lib/cmake/uhd/UHDBoost.cmake
 lib/cmake/uhd/UHDConfig.cmake
 lib/cmake/uhd/UHDConfigVersion.cmake
 lib/libuhd.so
-lib/libuhd.so.4.1.0
-%%PYTHON_SITELIBDIR%%/usrp_mpm/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/aurora_control.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/bfrfs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/bist.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/adf400x.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/ds125df410.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/ic_reg_maps/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/lmk03328.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/lmk04828.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/lmk04832.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/lmk05318.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/lmx2572.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/chips/max10_cpld_flash_ctrl.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/components.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/cores/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/cores/eyescan.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/cores/nijesdcore.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/cores/tdc_sync.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/cores/white_rabbit.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/adc_rh.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/base.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/dac_rh.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/dboard_iface.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/e31x_db.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/eiscat.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/empty_slot.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/gain_rh.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/gaintables_rh.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/lmk_eiscat.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/lmk_mg.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/lmk_rh.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/magnesium.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/magnesium_update_cpld.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/mg_init.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/mg_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/neon.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/rh_init.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/rh_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/rhodium.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/rhodium_update_cpld.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/test.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/unknown.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/x4xx_db_iface.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/x4xx_debug_db.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/x4xx_if_test_cca.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/zbx.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/dboard_manager/zbx_update_cpld.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/discovery.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/e31x_legacy_eeprom.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/eeprom.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/ethdispatch.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/fpga_bit_to_bin.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/gpsd_iface.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/mpmlog.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/mpmtypes.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/mpmutils.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/base.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/common.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/e31x.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/e31x_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/e320.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/e320_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/n3xx.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/n3xx_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/sim.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_clk_aux.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_clk_mgr.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_gps_mgr.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_mb_cpld.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_periphs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_reference_pll.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_rfdc_ctrl.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_rfdc_regs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_sample_pll.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/periph_manager/x4xx_update_cpld.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/prefs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/process_manager.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/rpc_server.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/chdr_endpoint.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/chdr_stream.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/config.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/hardware_presets.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/noc_block_regs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/rfnoc_common.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/rfnoc_graph.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/sample_source.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/sim_dboard.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/stream_endpoint_node.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/simulator/stream_ep_regs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/db_flash.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/dtoverlay.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/ectool.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/filesystem_status.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/gpio.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/i2c_dev.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/mount.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/net.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/sysfs_gpio.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/sysfs_thermal.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/udev.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/uio.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/sys_utils/watchdog.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/test_bfrfs.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/tlv_eeprom.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/user_eeprom.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/xports/__init__.py
-%%PYTHON_SITELIBDIR%%/usrp_mpm/xports/xportmgr_udp.py
+lib/libuhd.so.4.2.0
 libdata/pkgconfig/uhd.pc
-share/man/man1/octoclock_firmware_burner.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 share/man/man1/uhd_cal_rx_iq_balance.1.gz
 share/man/man1/uhd_cal_tx_dc_offset.1.gz
 share/man/man1/uhd_cal_tx_iq_balance.1.gz
@@ -307,7 +191,6 @@ share/man/man1/uhd_images_downloader.1.gz
 share/man/man1/uhd_usrp_probe.1.gz
 share/man/man1/usrp2_card_burner.1.gz
 share/man/man1/usrp_n2xx_simple_net_burner.1.gz
-share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/cal/cal_metadata.fbs
 %%DATADIR%%/cal/dsa_cal.fbs
 %%DATADIR%%/cal/iq_cal.fbs
@@ -316,11 +199,6 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/examples/gpio
 %%DATADIR%%/examples/latency_test
 %%DATADIR%%/examples/network_relay
-%%DATADIR%%/examples/python/benchmark_rate.py
-%%DATADIR%%/examples/python/curses_fft.py
-%%DATADIR%%/examples/python/rx_to_file.py
-%%DATADIR%%/examples/python/tx_waveforms.py
-%%DATADIR%%/examples/python/usrp_power_meter.py
 %%DATADIR%%/examples/rfnoc_nullsource_ce_rx
 %%DATADIR%%/examples/rfnoc_radio_loopback
 %%DATADIR%%/examples/rfnoc_replay_samples_from_file
@@ -331,6 +209,7 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/examples/rx_samples_to_file
 %%DATADIR%%/examples/rx_samples_to_udp
 %%DATADIR%%/examples/rx_timed_samples
+%%DATADIR%%/examples/spi
 %%DATADIR%%/examples/sync_to_gps
 %%DATADIR%%/examples/test_clock_synch
 %%DATADIR%%/examples/test_dboard_coercion
@@ -347,8 +226,6 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/examples/usrp_list_sensors
 %%DATADIR%%/rfnoc/blocks/addsub.yml
 %%DATADIR%%/rfnoc/blocks/axi_ram_fifo.yml
-%%DATADIR%%/rfnoc/blocks/axi_ram_fifo_2x64.yml
-%%DATADIR%%/rfnoc/blocks/axi_ram_fifo_4x64.yml
 %%DATADIR%%/rfnoc/blocks/ddc.yml
 %%DATADIR%%/rfnoc/blocks/duc.yml
 %%DATADIR%%/rfnoc/blocks/fft_1x64.yml
@@ -359,8 +236,6 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/rfnoc/blocks/moving_avg.yml
 %%DATADIR%%/rfnoc/blocks/null_src_sink.yml
 %%DATADIR%%/rfnoc/blocks/radio.yml
-%%DATADIR%%/rfnoc/blocks/radio_1x64.yml
-%%DATADIR%%/rfnoc/blocks/radio_2x64.yml
 %%DATADIR%%/rfnoc/blocks/replay.yml
 %%DATADIR%%/rfnoc/blocks/siggen.yml
 %%DATADIR%%/rfnoc/blocks/split_stream.yml
@@ -450,8 +325,6 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/tests/packet_handler_benchmark
 %%DATADIR%%/tests/paths_test
 %%DATADIR%%/tests/property_test
-%%DATADIR%%/tests/pychdr_parse_test.py
-%%DATADIR%%/tests/pyranges_test.py
 %%DATADIR%%/tests/pwr_cal_mgr_test
 %%DATADIR%%/tests/ranges_c_test
 %%DATADIR%%/tests/ranges_test
@@ -488,9 +361,7 @@ share/man/man1/usrp_x3xx_fpga_burner.1.gz
 %%DATADIR%%/tests/time_spec_test
 %%DATADIR%%/tests/transport_test
 %%DATADIR%%/tests/tx_streamer_test
-%%DATADIR%%/tests/uhd_image_downloader_test.py
 %%DATADIR%%/tests/vector_iir_block_test
-%%DATADIR%%/tests/verify_fbs_test.py
 %%DATADIR%%/tests/vrt_test
 %%DATADIR%%/tests/window_block_test
 %%DATADIR%%/tests/x400_rfdc_control_test