Wed Apr 8 08:07:18 2020 UTC ()
uhd: fix building when py-numpy is also installed; docs/CMakeLists.txt is not necessary any more


(adam)
diff -r1.54 -r1.55 pkgsrc/ham/uhd/Makefile
diff -r1.16 -r1.17 pkgsrc/ham/uhd/PLIST
diff -r1.23 -r1.24 pkgsrc/ham/uhd/distinfo
diff -r1.2 -r1.3 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt
diff -r1.2 -r0 pkgsrc/ham/uhd/patches/patch-docs_CMakeLists.txt
cvs diff -r1.54 -r1.55 pkgsrc/ham/uhd/Makefile (switch to unified diff)

--- pkgsrc/ham/uhd/Makefile 2020/04/07 15:57:02 1.54
+++ pkgsrc/ham/uhd/Makefile 2020/04/08 08:07:17 1.55
@@ -1,74 +1,75 @@ @@ -1,74 +1,75 @@
1# $NetBSD: Makefile,v 1.54 2020/04/07 15:57:02 mef Exp $ 1# $NetBSD: Makefile,v 1.55 2020/04/08 08:07:17 adam Exp $
2 2
3DISTNAME= uhd-3.15.0.0 3DISTNAME= uhd-3.15.0.0
4CATEGORIES= ham 4CATEGORIES= ham
5MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=EttusResearch/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/EttusResearch/uhd 9HOMEPAGE= https://github.com/EttusResearch/uhd
10COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers 10COMMENT= USRP (Universal Software Radio Peripheral) Hardware Drivers
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako 13DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
14DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests 14DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
15 15
 16CMAKE_ARGS+= -DENABLE_MAN_PAGE_COMPRESSION=OFF
16CMAKE_ARGS+= -DPKG_MAN_DIR=${PKGMANDIR}/man1 17CMAKE_ARGS+= -DPKG_MAN_DIR=${PKGMANDIR}/man1
17CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py 18CMAKE_ARGS+= -DRST2HTML_EXECUTABLE=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
18CMAKE_ARGS+= -Wno-dev 19CMAKE_ARGS+= -Wno-dev
19.include "../../lang/python/pyversion.mk" 20.include "../../lang/python/pyversion.mk"
20CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN} 21CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
21.if !empty(_PYTHON_VERSION:M3*) 22.if !empty(_PYTHON_VERSION:M3*)
22CMAKE_ARGS+= -DENABLE_PYTHON3=ON 23CMAKE_ARGS+= -DENABLE_PYTHON3=ON
23.endif 24.endif
24 25
25# Upstream says C++11 is required, even though it is not documented. 26# Upstream says C++11 is required, even though it is not documented.
26# It is documented that gcc 4.8 is required, when using gcc. 27# It is documented that gcc 4.8 is required, when using gcc.
27# https://github.com/EttusResearch/uhd/issues/236 28# https://github.com/EttusResearch/uhd/issues/236
28# 29#
29# Upstream does not seem to have any documentation that gnu++11 is 30# Upstream does not seem to have any documentation that gnu++11 is
30# required, but it builds with tha and not with c++11 on netbsd-8. No 31# required, but it builds with tha and not with c++11 on netbsd-8. No
31# ticket filed because #236 resulted in in-ticket clarification only 32# ticket filed because #236 resulted in in-ticket clarification only
32# (and not a doc edit), and having experimented no clarification is 33# (and not a doc edit), and having experimented no clarification is
33# needed. 34# needed.
34USE_CMAKE= yes 35USE_CMAKE= yes
35USE_LANGUAGES= c gnu++11 36USE_LANGUAGES= c gnu++14
36USE_TOOLS+= pkg-config 37USE_TOOLS+= pkg-config
37GCC_REQD+= 4.8 38GCC_REQD+= 4.8
38# to avoid extra pax_global_header 39# to avoid extra pax_global_header
39EXTRACT_USING= gtar 40EXTRACT_USING= gtar
40WRKSRC= ${WRKDIR}/${DISTNAME}/host 41WRKSRC= ${WRKDIR}/${DISTNAME}/host
41 42
42# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process. 43# The files with their name uhd-xxxx, are moved down from uhd/xxxx for this process.
43REPLACE_PYTHON+= utils/converter_benchmark.py 44REPLACE_PYTHON+= utils/converter_benchmark.py
44REPLACE_PYTHON+= utils/latency/graph.py 45REPLACE_PYTHON+= utils/latency/graph.py
45REPLACE_PYTHON+= utils/latency/run_tests.py 46REPLACE_PYTHON+= utils/latency/run_tests.py
46REPLACE_PYTHON+= utils/uhd_images_downloader.py.in 47REPLACE_PYTHON+= utils/uhd_images_downloader.py.in
47REPLACE_PYTHON+= utils/usrp2_card_burner.py 48REPLACE_PYTHON+= utils/usrp2_card_burner.py
48REPLACE_PYTHON+= utils/usrp2_card_burner_gui.py 49REPLACE_PYTHON+= utils/usrp2_card_burner_gui.py
49REPLACE_PYTHON+= tests/devtest/benchmark_rate_test.py 50REPLACE_PYTHON+= tests/devtest/benchmark_rate_test.py
50REPLACE_PYTHON+= tests/devtest/multi_usrp_test.py 51REPLACE_PYTHON+= tests/devtest/multi_usrp_test.py
51REPLACE_PYTHON+= tests/devtest/python_api_test.py 52REPLACE_PYTHON+= tests/devtest/python_api_test.py
52REPLACE_PYTHON+= tests/devtest/run_testsuite.py 53REPLACE_PYTHON+= tests/devtest/run_testsuite.py
53REPLACE_PYTHON+= tests/devtest/rx_samples_to_file_test.py 54REPLACE_PYTHON+= tests/devtest/rx_samples_to_file_test.py
54REPLACE_PYTHON+= tests/devtest/test_messages_test.py 55REPLACE_PYTHON+= tests/devtest/test_messages_test.py
55REPLACE_PYTHON+= tests/devtest/test_pps_test.py 56REPLACE_PYTHON+= tests/devtest/test_pps_test.py
56REPLACE_PYTHON+= tests/devtest/tx_bursts_test.py 57REPLACE_PYTHON+= tests/devtest/tx_bursts_test.py
57REPLACE_PYTHON+= tests/devtest/tx_waveforms_test.py 58REPLACE_PYTHON+= tests/devtest/tx_waveforms_test.py
58REPLACE_PYTHON+= tests/devtest/uhd_test_base.py 59REPLACE_PYTHON+= tests/devtest/uhd_test_base.py
59REPLACE_PYTHON+= tests/devtest/usrp_probe.py 60REPLACE_PYTHON+= tests/devtest/usrp_probe.py
60REPLACE_PYTHON+= tests/devtest/usrp_probe_test.py 61REPLACE_PYTHON+= tests/devtest/usrp_probe_test.py
61 62
62INSTALLATION_DIRS+= share/uhd 63INSTALLATION_DIRS+= share/uhd
63INSTALLATION_DIRS+= share/uhd/firmware 64INSTALLATION_DIRS+= share/uhd/firmware
64INSTALLATION_DIRS+= share/uhd/fpga 65INSTALLATION_DIRS+= share/uhd/fpga
65INSTALLATION_DIRS+= share/uhd/images 66INSTALLATION_DIRS+= share/uhd/images
66 67
67.include "options.mk" 68.include "options.mk"
68 69
69.include "../../devel/boost-libs/buildlink3.mk" 70.include "../../devel/boost-libs/buildlink3.mk"
70.include "../../devel/libusb1/buildlink3.mk" 71.include "../../devel/libusb1/buildlink3.mk"
71.include "../../devel/orc/buildlink3.mk" 72.include "../../devel/orc/buildlink3.mk"
72.include "../../lang/python/application.mk" 73.include "../../lang/python/application.mk"
73.include "../../mk/curses.buildlink3.mk" 74.include "../../mk/curses.buildlink3.mk"
74.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/ham/uhd/PLIST (switch to unified diff)

--- pkgsrc/ham/uhd/PLIST 2020/04/07 15:51:50 1.16
+++ pkgsrc/ham/uhd/PLIST 2020/04/08 08:07:17 1.17
@@ -1,307 +1,307 @@ @@ -1,307 +1,307 @@
1@comment $NetBSD: PLIST,v 1.16 2020/04/07 15:51:50 mef Exp $ 1@comment $NetBSD: PLIST,v 1.17 2020/04/08 08:07:17 adam Exp $
2bin/uhd_cal_rx_iq_balance 2bin/uhd_cal_rx_iq_balance
3bin/uhd_cal_tx_dc_offset 3bin/uhd_cal_tx_dc_offset
4bin/uhd_cal_tx_iq_balance 4bin/uhd_cal_tx_iq_balance
5bin/uhd_config_info 5bin/uhd_config_info
6bin/uhd_find_devices 6bin/uhd_find_devices
7bin/uhd_image_loader 7bin/uhd_image_loader
8bin/uhd_usrp_probe 8bin/uhd_usrp_probe
9include/uhd.h 9include/uhd.h
10include/uhd/build_info.hpp 10include/uhd/build_info.hpp
11include/uhd/config.h 11include/uhd/config.h
12include/uhd/config.hpp 12include/uhd/config.hpp
13include/uhd/convert.hpp 13include/uhd/convert.hpp
14include/uhd/deprecated.hpp 14include/uhd/deprecated.hpp
15include/uhd/device.hpp 15include/uhd/device.hpp
16include/uhd/device3.hpp 16include/uhd/device3.hpp
17include/uhd/error.h 17include/uhd/error.h
18include/uhd/exception.hpp 18include/uhd/exception.hpp
19include/uhd/property_tree.hpp 19include/uhd/property_tree.hpp
20include/uhd/property_tree.ipp 20include/uhd/property_tree.ipp
21include/uhd/rfnoc/block_ctrl.hpp 21include/uhd/rfnoc/block_ctrl.hpp
22include/uhd/rfnoc/block_ctrl_base.hpp 22include/uhd/rfnoc/block_ctrl_base.hpp
23include/uhd/rfnoc/block_id.hpp 23include/uhd/rfnoc/block_id.hpp
24include/uhd/rfnoc/blockdef.hpp 24include/uhd/rfnoc/blockdef.hpp
25include/uhd/rfnoc/constants.hpp 25include/uhd/rfnoc/constants.hpp
26include/uhd/rfnoc/ddc_block_ctrl.hpp 26include/uhd/rfnoc/ddc_block_ctrl.hpp
27include/uhd/rfnoc/dma_fifo_block_ctrl.hpp 27include/uhd/rfnoc/dma_fifo_block_ctrl.hpp
28include/uhd/rfnoc/duc_block_ctrl.hpp 28include/uhd/rfnoc/duc_block_ctrl.hpp
29include/uhd/rfnoc/fir_block_ctrl.hpp 29include/uhd/rfnoc/fir_block_ctrl.hpp
30include/uhd/rfnoc/graph.hpp 30include/uhd/rfnoc/graph.hpp
31include/uhd/rfnoc/node_ctrl_base.hpp 31include/uhd/rfnoc/node_ctrl_base.hpp
32include/uhd/rfnoc/node_ctrl_base.ipp 32include/uhd/rfnoc/node_ctrl_base.ipp
33include/uhd/rfnoc/null_block_ctrl.hpp 33include/uhd/rfnoc/null_block_ctrl.hpp
34include/uhd/rfnoc/radio_ctrl.hpp 34include/uhd/rfnoc/radio_ctrl.hpp
35include/uhd/rfnoc/rate_node_ctrl.hpp 35include/uhd/rfnoc/rate_node_ctrl.hpp
36include/uhd/rfnoc/replay_block_ctrl.hpp 36include/uhd/rfnoc/replay_block_ctrl.hpp
37include/uhd/rfnoc/scalar_node_ctrl.hpp 37include/uhd/rfnoc/scalar_node_ctrl.hpp
38include/uhd/rfnoc/siggen_block_ctrl.hpp 38include/uhd/rfnoc/siggen_block_ctrl.hpp
39include/uhd/rfnoc/sink_block_ctrl_base.hpp 39include/uhd/rfnoc/sink_block_ctrl_base.hpp
40include/uhd/rfnoc/sink_node_ctrl.hpp 40include/uhd/rfnoc/sink_node_ctrl.hpp
41include/uhd/rfnoc/source_block_ctrl_base.hpp 41include/uhd/rfnoc/source_block_ctrl_base.hpp
42include/uhd/rfnoc/source_node_ctrl.hpp 42include/uhd/rfnoc/source_node_ctrl.hpp
43include/uhd/rfnoc/stream_sig.hpp 43include/uhd/rfnoc/stream_sig.hpp
44include/uhd/rfnoc/terminator_node_ctrl.hpp 44include/uhd/rfnoc/terminator_node_ctrl.hpp
45include/uhd/rfnoc/tick_node_ctrl.hpp 45include/uhd/rfnoc/tick_node_ctrl.hpp
46include/uhd/rfnoc/window_block_ctrl.hpp 46include/uhd/rfnoc/window_block_ctrl.hpp
47include/uhd/stream.hpp 47include/uhd/stream.hpp
48include/uhd/transport/bounded_buffer.hpp 48include/uhd/transport/bounded_buffer.hpp
49include/uhd/transport/bounded_buffer.ipp 49include/uhd/transport/bounded_buffer.ipp
50include/uhd/transport/buffer_pool.hpp 50include/uhd/transport/buffer_pool.hpp
51include/uhd/transport/chdr.hpp 51include/uhd/transport/chdr.hpp
52include/uhd/transport/if_addrs.hpp 52include/uhd/transport/if_addrs.hpp
53include/uhd/transport/tcp_zero_copy.hpp 53include/uhd/transport/tcp_zero_copy.hpp
54include/uhd/transport/udp_constants.hpp 54include/uhd/transport/udp_constants.hpp
55include/uhd/transport/udp_simple.hpp 55include/uhd/transport/udp_simple.hpp
56include/uhd/transport/udp_zero_copy.hpp 56include/uhd/transport/udp_zero_copy.hpp
57include/uhd/transport/usb_control.hpp 57include/uhd/transport/usb_control.hpp
58include/uhd/transport/usb_device_handle.hpp 58include/uhd/transport/usb_device_handle.hpp
59include/uhd/transport/usb_zero_copy.hpp 59include/uhd/transport/usb_zero_copy.hpp
60include/uhd/transport/vrt_if_packet.hpp 60include/uhd/transport/vrt_if_packet.hpp
61include/uhd/transport/zero_copy.hpp 61include/uhd/transport/zero_copy.hpp
62include/uhd/transport/zero_copy_flow_ctrl.hpp 62include/uhd/transport/zero_copy_flow_ctrl.hpp
63include/uhd/types/byte_vector.hpp 63include/uhd/types/byte_vector.hpp
64include/uhd/types/clock_config.hpp 64include/uhd/types/clock_config.hpp
65include/uhd/types/device_addr.hpp 65include/uhd/types/device_addr.hpp
66include/uhd/types/dict.hpp 66include/uhd/types/dict.hpp
67include/uhd/types/dict.ipp 67include/uhd/types/dict.ipp
68include/uhd/types/direction.hpp 68include/uhd/types/direction.hpp
69include/uhd/types/endianness.hpp 69include/uhd/types/endianness.hpp
70include/uhd/types/filters.hpp 70include/uhd/types/filters.hpp
71include/uhd/types/io_type.hpp 71include/uhd/types/io_type.hpp
72include/uhd/types/mac_addr.hpp 72include/uhd/types/mac_addr.hpp
73include/uhd/types/metadata.h 73include/uhd/types/metadata.h
74include/uhd/types/metadata.hpp 74include/uhd/types/metadata.hpp
75include/uhd/types/otw_type.hpp 75include/uhd/types/otw_type.hpp
76include/uhd/types/ranges.h 76include/uhd/types/ranges.h
77include/uhd/types/ranges.hpp 77include/uhd/types/ranges.hpp
78include/uhd/types/ref_vector.hpp 78include/uhd/types/ref_vector.hpp
79include/uhd/types/sensors.h 79include/uhd/types/sensors.h
80include/uhd/types/sensors.hpp 80include/uhd/types/sensors.hpp
81include/uhd/types/serial.hpp 81include/uhd/types/serial.hpp
82include/uhd/types/sid.hpp 82include/uhd/types/sid.hpp
83include/uhd/types/stream_cmd.hpp 83include/uhd/types/stream_cmd.hpp
84include/uhd/types/string_vector.h 84include/uhd/types/string_vector.h
85include/uhd/types/time_spec.hpp 85include/uhd/types/time_spec.hpp
86include/uhd/types/tune_request.h 86include/uhd/types/tune_request.h
87include/uhd/types/tune_request.hpp 87include/uhd/types/tune_request.hpp
88include/uhd/types/tune_result.h 88include/uhd/types/tune_result.h
89include/uhd/types/tune_result.hpp 89include/uhd/types/tune_result.hpp
90include/uhd/types/usrp_info.h 90include/uhd/types/usrp_info.h
91include/uhd/types/wb_iface.hpp 91include/uhd/types/wb_iface.hpp
92include/uhd/usrp/dboard_base.hpp 92include/uhd/usrp/dboard_base.hpp
93include/uhd/usrp/dboard_eeprom.h 93include/uhd/usrp/dboard_eeprom.h
94include/uhd/usrp/dboard_eeprom.hpp 94include/uhd/usrp/dboard_eeprom.hpp
95include/uhd/usrp/dboard_id.hpp 95include/uhd/usrp/dboard_id.hpp
96include/uhd/usrp/dboard_iface.hpp 96include/uhd/usrp/dboard_iface.hpp
97include/uhd/usrp/dboard_manager.hpp 97include/uhd/usrp/dboard_manager.hpp
98include/uhd/usrp/fe_connection.hpp 98include/uhd/usrp/fe_connection.hpp
99include/uhd/usrp/gpio_defs.hpp 99include/uhd/usrp/gpio_defs.hpp
100include/uhd/usrp/gps_ctrl.hpp 100include/uhd/usrp/gps_ctrl.hpp
101include/uhd/usrp/mboard_eeprom.h 101include/uhd/usrp/mboard_eeprom.h
102include/uhd/usrp/mboard_eeprom.hpp 102include/uhd/usrp/mboard_eeprom.hpp
103include/uhd/usrp/multi_usrp.hpp 103include/uhd/usrp/multi_usrp.hpp
104include/uhd/usrp/subdev_spec.h 104include/uhd/usrp/subdev_spec.h
105include/uhd/usrp/subdev_spec.hpp 105include/uhd/usrp/subdev_spec.hpp
106include/uhd/usrp/usrp.h 106include/uhd/usrp/usrp.h
107include/uhd/usrp_clock/multi_usrp_clock.hpp 107include/uhd/usrp_clock/multi_usrp_clock.hpp
108include/uhd/usrp_clock/octoclock_eeprom.hpp 108include/uhd/usrp_clock/octoclock_eeprom.hpp
109include/uhd/usrp_clock/usrp_clock.h 109include/uhd/usrp_clock/usrp_clock.h
110include/uhd/utils/algorithm.hpp 110include/uhd/utils/algorithm.hpp
111include/uhd/utils/assert_has.hpp 111include/uhd/utils/assert_has.hpp
112include/uhd/utils/assert_has.ipp 112include/uhd/utils/assert_has.ipp
113include/uhd/utils/byteswap.hpp 113include/uhd/utils/byteswap.hpp
114include/uhd/utils/byteswap.ipp 114include/uhd/utils/byteswap.ipp
115include/uhd/utils/cast.hpp 115include/uhd/utils/cast.hpp
116include/uhd/utils/csv.hpp 116include/uhd/utils/csv.hpp
117include/uhd/utils/fp_compare_delta.ipp 117include/uhd/utils/fp_compare_delta.ipp
118include/uhd/utils/fp_compare_epsilon.ipp 118include/uhd/utils/fp_compare_epsilon.ipp
119include/uhd/utils/gain_group.hpp 119include/uhd/utils/gain_group.hpp
120include/uhd/utils/log.h 120include/uhd/utils/log.h
121include/uhd/utils/log.hpp 121include/uhd/utils/log.hpp
122include/uhd/utils/log_add.hpp 122include/uhd/utils/log_add.hpp
123include/uhd/utils/math.hpp 123include/uhd/utils/math.hpp
124include/uhd/utils/msg_task.hpp 124include/uhd/utils/msg_task.hpp
125include/uhd/utils/noncopyable.hpp 125include/uhd/utils/noncopyable.hpp
126include/uhd/utils/paths.hpp 126include/uhd/utils/paths.hpp
127include/uhd/utils/pimpl.hpp 127include/uhd/utils/pimpl.hpp
128include/uhd/utils/platform.hpp 128include/uhd/utils/platform.hpp
129include/uhd/utils/safe_call.hpp 129include/uhd/utils/safe_call.hpp
130include/uhd/utils/safe_main.hpp 130include/uhd/utils/safe_main.hpp
131include/uhd/utils/scope_exit.hpp 131include/uhd/utils/scope_exit.hpp
132include/uhd/utils/static.hpp 132include/uhd/utils/static.hpp
133include/uhd/utils/tasks.hpp 133include/uhd/utils/tasks.hpp
134include/uhd/utils/thread.hpp 134include/uhd/utils/thread.hpp
135include/uhd/utils/thread_priority.h 135include/uhd/utils/thread_priority.h
136include/uhd/utils/thread_priority.hpp 136include/uhd/utils/thread_priority.hpp
137include/uhd/version.h 137include/uhd/version.h
138include/uhd/version.hpp 138include/uhd/version.hpp
139lib/cmake/uhd/UHDBoost.cmake 139lib/cmake/uhd/UHDBoost.cmake
140lib/cmake/uhd/UHDConfig.cmake 140lib/cmake/uhd/UHDConfig.cmake
141lib/cmake/uhd/UHDConfigVersion.cmake 141lib/cmake/uhd/UHDConfigVersion.cmake
142lib/libuhd.so 142lib/libuhd.so
143lib/libuhd.so.3.15.0 143lib/libuhd.so.${PKGVERSION}
144lib/pkgconfig/uhd.pc 144lib/pkgconfig/uhd.pc
145lib/uhd/examples/benchmark_rate 145lib/uhd/examples/benchmark_rate
146lib/uhd/examples/benchmark_streamer 146lib/uhd/examples/benchmark_streamer
147lib/uhd/examples/gpio 147lib/uhd/examples/gpio
148lib/uhd/examples/latency_test 148lib/uhd/examples/latency_test
149lib/uhd/examples/network_relay 149lib/uhd/examples/network_relay
150lib/uhd/examples/replay_samples_from_file 150lib/uhd/examples/replay_samples_from_file
151lib/uhd/examples/rfnoc_nullsource_ce_rx 151lib/uhd/examples/rfnoc_nullsource_ce_rx
152lib/uhd/examples/rfnoc_radio_loopback 152lib/uhd/examples/rfnoc_radio_loopback
153lib/uhd/examples/rfnoc_rx_to_file 153lib/uhd/examples/rfnoc_rx_to_file
154lib/uhd/examples/rx_ascii_art_dft 154lib/uhd/examples/rx_ascii_art_dft
155lib/uhd/examples/rx_multi_samples 155lib/uhd/examples/rx_multi_samples
156lib/uhd/examples/rx_samples_c 156lib/uhd/examples/rx_samples_c
157lib/uhd/examples/rx_samples_to_file 157lib/uhd/examples/rx_samples_to_file
158lib/uhd/examples/rx_samples_to_udp 158lib/uhd/examples/rx_samples_to_udp
159lib/uhd/examples/rx_timed_samples 159lib/uhd/examples/rx_timed_samples
160lib/uhd/examples/sync_to_gps 160lib/uhd/examples/sync_to_gps
161lib/uhd/examples/test_clock_synch 161lib/uhd/examples/test_clock_synch
162lib/uhd/examples/test_dboard_coercion 162lib/uhd/examples/test_dboard_coercion
163lib/uhd/examples/test_messages 163lib/uhd/examples/test_messages
164lib/uhd/examples/test_pps_input 164lib/uhd/examples/test_pps_input
165lib/uhd/examples/test_timed_commands 165lib/uhd/examples/test_timed_commands
166lib/uhd/examples/twinrx_freq_hopping 166lib/uhd/examples/twinrx_freq_hopping
167lib/uhd/examples/tx_bursts 167lib/uhd/examples/tx_bursts
168lib/uhd/examples/tx_samples_c 168lib/uhd/examples/tx_samples_c
169lib/uhd/examples/tx_samples_from_file 169lib/uhd/examples/tx_samples_from_file
170lib/uhd/examples/tx_timed_samples 170lib/uhd/examples/tx_timed_samples
171lib/uhd/examples/tx_waveforms 171lib/uhd/examples/tx_waveforms
172lib/uhd/examples/txrx_loopback_to_file 172lib/uhd/examples/txrx_loopback_to_file
173lib/uhd/examples/usrp_list_sensors 173lib/uhd/examples/usrp_list_sensors
174lib/uhd/tests/addr_test 174lib/uhd/tests/addr_test
175lib/uhd/tests/block_id_test 175lib/uhd/tests/block_id_test
176lib/uhd/tests/blockdef_test 176lib/uhd/tests/blockdef_test
177lib/uhd/tests/buffer_test 177lib/uhd/tests/buffer_test
178lib/uhd/tests/byteswap_test 178lib/uhd/tests/byteswap_test
179lib/uhd/tests/cast_test 179lib/uhd/tests/cast_test
180lib/uhd/tests/chdr_test 180lib/uhd/tests/chdr_test
181lib/uhd/tests/config_parser_test 181lib/uhd/tests/config_parser_test
182lib/uhd/tests/constrained_device_args_test 182lib/uhd/tests/constrained_device_args_test
183lib/uhd/tests/convert_test 183lib/uhd/tests/convert_test
184lib/uhd/tests/device3_test 184lib/uhd/tests/device3_test
185lib/uhd/tests/devtest/benchmark_rate_test.py 185lib/uhd/tests/devtest/benchmark_rate_test.py
186lib/uhd/tests/devtest/bitbang_test.py 186lib/uhd/tests/devtest/bitbang_test.py
187lib/uhd/tests/devtest/devtest_b2xx.py 187lib/uhd/tests/devtest/devtest_b2xx.py
188lib/uhd/tests/devtest/devtest_e320.py 188lib/uhd/tests/devtest/devtest_e320.py
189lib/uhd/tests/devtest/devtest_e3xx.py 189lib/uhd/tests/devtest/devtest_e3xx.py
190lib/uhd/tests/devtest/devtest_n3x0.py 190lib/uhd/tests/devtest/devtest_n3x0.py
191lib/uhd/tests/devtest/devtest_x3x0.py 191lib/uhd/tests/devtest/devtest_x3x0.py
192lib/uhd/tests/devtest/gpio_test.py 192lib/uhd/tests/devtest/gpio_test.py
193lib/uhd/tests/devtest/list_sensors_test.py 193lib/uhd/tests/devtest/list_sensors_test.py
194lib/uhd/tests/devtest/multi_usrp_test.py 194lib/uhd/tests/devtest/multi_usrp_test.py
195lib/uhd/tests/devtest/python_api_test.py 195lib/uhd/tests/devtest/python_api_test.py
196lib/uhd/tests/devtest/run_testsuite.py 196lib/uhd/tests/devtest/run_testsuite.py
197lib/uhd/tests/devtest/rx_samples_to_file_test.py 197lib/uhd/tests/devtest/rx_samples_to_file_test.py
198lib/uhd/tests/devtest/test_messages_test.py 198lib/uhd/tests/devtest/test_messages_test.py
199lib/uhd/tests/devtest/test_pps_test.py 199lib/uhd/tests/devtest/test_pps_test.py
200lib/uhd/tests/devtest/tx_bursts_test.py 200lib/uhd/tests/devtest/tx_bursts_test.py
201lib/uhd/tests/devtest/tx_waveforms_test.py 201lib/uhd/tests/devtest/tx_waveforms_test.py
202lib/uhd/tests/devtest/uhd_test_base.py 202lib/uhd/tests/devtest/uhd_test_base.py
203lib/uhd/tests/devtest/usrp_probe.py 203lib/uhd/tests/devtest/usrp_probe.py
204lib/uhd/tests/devtest/usrp_probe_test.py 204lib/uhd/tests/devtest/usrp_probe_test.py
205lib/uhd/tests/dict_test 205lib/uhd/tests/dict_test
206lib/uhd/tests/eeprom_c_test 206lib/uhd/tests/eeprom_c_test
207lib/uhd/tests/eeprom_utils_test 207lib/uhd/tests/eeprom_utils_test
208lib/uhd/tests/error_c_test 208lib/uhd/tests/error_c_test
209lib/uhd/tests/error_test 209lib/uhd/tests/error_test
210lib/uhd/tests/expert_test 210lib/uhd/tests/expert_test
211lib/uhd/tests/fe_conn_test 211lib/uhd/tests/fe_conn_test
212lib/uhd/tests/fp_compare_delta_test 212lib/uhd/tests/fp_compare_delta_test
213lib/uhd/tests/fp_compare_epsilon_test 213lib/uhd/tests/fp_compare_epsilon_test
214lib/uhd/tests/gain_group_test 214lib/uhd/tests/gain_group_test
215lib/uhd/tests/graph_search_test 215lib/uhd/tests/graph_search_test
216lib/uhd/tests/isatty_test 216lib/uhd/tests/isatty_test
217lib/uhd/tests/log_test 217lib/uhd/tests/log_test
218lib/uhd/tests/math_test 218lib/uhd/tests/math_test
219lib/uhd/tests/narrow_cast_test 219lib/uhd/tests/narrow_cast_test
220lib/uhd/tests/nocscript_expr_test 220lib/uhd/tests/nocscript_expr_test
221lib/uhd/tests/nocscript_ftable_test 221lib/uhd/tests/nocscript_ftable_test
222lib/uhd/tests/nocscript_parser_test 222lib/uhd/tests/nocscript_parser_test
223lib/uhd/tests/node_connect_test 223lib/uhd/tests/node_connect_test
224lib/uhd/tests/packet_handler_benchmark 224lib/uhd/tests/packet_handler_benchmark
225lib/uhd/tests/paths_test 225lib/uhd/tests/paths_test
226lib/uhd/tests/property_test 226lib/uhd/tests/property_test
227lib/uhd/tests/ranges_c_test 227lib/uhd/tests/ranges_c_test
228lib/uhd/tests/ranges_test 228lib/uhd/tests/ranges_test
229lib/uhd/tests/rate_node_test 229lib/uhd/tests/rate_node_test
230lib/uhd/tests/scope_exit_test 230lib/uhd/tests/scope_exit_test
231lib/uhd/tests/sensors_c_test 231lib/uhd/tests/sensors_c_test
232lib/uhd/tests/sensors_test 232lib/uhd/tests/sensors_test
233lib/uhd/tests/sid_t_test 233lib/uhd/tests/sid_t_test
234lib/uhd/tests/soft_reg_test 234lib/uhd/tests/soft_reg_test
235lib/uhd/tests/sph_recv_test 235lib/uhd/tests/sph_recv_test
236lib/uhd/tests/sph_send_test 236lib/uhd/tests/sph_send_test
237lib/uhd/tests/stream_sig_test 237lib/uhd/tests/stream_sig_test
238lib/uhd/tests/string_vector_c_test 238lib/uhd/tests/string_vector_c_test
239lib/uhd/tests/subdev_spec_c_test 239lib/uhd/tests/subdev_spec_c_test
240lib/uhd/tests/subdev_spec_test 240lib/uhd/tests/subdev_spec_test
241lib/uhd/tests/tasks_test 241lib/uhd/tests/tasks_test
242lib/uhd/tests/tick_node_test 242lib/uhd/tests/tick_node_test
243lib/uhd/tests/time_spec_test 243lib/uhd/tests/time_spec_test
244lib/uhd/tests/vrt_test 244lib/uhd/tests/vrt_test
245lib/uhd/utils/b2xx_fx3_utils 245lib/uhd/utils/b2xx_fx3_utils
246lib/uhd/utils/converter_benchmark 246lib/uhd/utils/converter_benchmark
247lib/uhd/utils/converter_benchmark.py 247lib/uhd/utils/converter_benchmark.py
248lib/uhd/utils/fx2_init_eeprom 248lib/uhd/utils/fx2_init_eeprom
249lib/uhd/utils/latency/graph.py 249lib/uhd/utils/latency/graph.py
250lib/uhd/utils/latency/responder 250lib/uhd/utils/latency/responder
251lib/uhd/utils/latency/run_tests.py 251lib/uhd/utils/latency/run_tests.py
252lib/uhd/utils/octoclock_burn_eeprom 252lib/uhd/utils/octoclock_burn_eeprom
253lib/uhd/utils/query_gpsdo_sensors 253lib/uhd/utils/query_gpsdo_sensors
254lib/uhd/utils/uhd_images_downloader.py 254lib/uhd/utils/uhd_images_downloader.py
255lib/uhd/utils/usrp2_card_burner.py 255lib/uhd/utils/usrp2_card_burner.py
256lib/uhd/utils/usrp_burn_db_eeprom 256lib/uhd/utils/usrp_burn_db_eeprom
257lib/uhd/utils/usrp_burn_mb_eeprom 257lib/uhd/utils/usrp_burn_mb_eeprom
258man/man1/octoclock_firmware_burner.1 258man/man1/octoclock_firmware_burner.1
259man/man1/uhd_cal_rx_iq_balance.1 259man/man1/uhd_cal_rx_iq_balance.1
260man/man1/uhd_cal_tx_dc_offset.1 260man/man1/uhd_cal_tx_dc_offset.1
261man/man1/uhd_cal_tx_iq_balance.1 261man/man1/uhd_cal_tx_iq_balance.1
262man/man1/uhd_config_info.1 262man/man1/uhd_config_info.1
263man/man1/uhd_find_devices.1 263man/man1/uhd_find_devices.1
264man/man1/uhd_image_loader.1 264man/man1/uhd_image_loader.1
265man/man1/uhd_images_downloader.1 265man/man1/uhd_images_downloader.1
266man/man1/uhd_usrp_probe.1 266man/man1/uhd_usrp_probe.1
267man/man1/usrp2_card_burner.1 267man/man1/usrp2_card_burner.1
268man/man1/usrp_n2xx_simple_net_burner.1 268man/man1/usrp_n2xx_simple_net_burner.1
269man/man1/usrp_x3xx_fpga_burner.1 269man/man1/usrp_x3xx_fpga_burner.1
270share/doc/uhd/LICENSE 270share/doc/uhd/LICENSE
271share/doc/uhd/README.md 271share/doc/uhd/README.md
272share/uhd/rfnoc/blocks/addsub.xml 272share/uhd/rfnoc/blocks/addsub.xml
273share/uhd/rfnoc/blocks/block.xml 273share/uhd/rfnoc/blocks/block.xml
274share/uhd/rfnoc/blocks/ddc.xml 274share/uhd/rfnoc/blocks/ddc.xml
275share/uhd/rfnoc/blocks/ddc_eiscat.xml 275share/uhd/rfnoc/blocks/ddc_eiscat.xml
276share/uhd/rfnoc/blocks/ddc_single.xml 276share/uhd/rfnoc/blocks/ddc_single.xml
277share/uhd/rfnoc/blocks/debug.xml 277share/uhd/rfnoc/blocks/debug.xml
278share/uhd/rfnoc/blocks/digital_gain.xml 278share/uhd/rfnoc/blocks/digital_gain.xml
279share/uhd/rfnoc/blocks/dma_fifo.xml 279share/uhd/rfnoc/blocks/dma_fifo.xml
280share/uhd/rfnoc/blocks/dma_fifo_x4.xml 280share/uhd/rfnoc/blocks/dma_fifo_x4.xml
281share/uhd/rfnoc/blocks/duc.xml 281share/uhd/rfnoc/blocks/duc.xml
282share/uhd/rfnoc/blocks/duc_single.xml 282share/uhd/rfnoc/blocks/duc_single.xml
283share/uhd/rfnoc/blocks/fft.xml 283share/uhd/rfnoc/blocks/fft.xml
284share/uhd/rfnoc/blocks/fifo.xml 284share/uhd/rfnoc/blocks/fifo.xml
285share/uhd/rfnoc/blocks/fir.xml 285share/uhd/rfnoc/blocks/fir.xml
286share/uhd/rfnoc/blocks/fosphor.xml 286share/uhd/rfnoc/blocks/fosphor.xml
287share/uhd/rfnoc/blocks/keep_one_in_n.xml 287share/uhd/rfnoc/blocks/keep_one_in_n.xml
288share/uhd/rfnoc/blocks/logpwr.xml 288share/uhd/rfnoc/blocks/logpwr.xml
289share/uhd/rfnoc/blocks/moving_avg.xml 289share/uhd/rfnoc/blocks/moving_avg.xml
290share/uhd/rfnoc/blocks/nullblock.xml 290share/uhd/rfnoc/blocks/nullblock.xml
291share/uhd/rfnoc/blocks/ofdmeq.xml 291share/uhd/rfnoc/blocks/ofdmeq.xml
292share/uhd/rfnoc/blocks/packetresizer.xml 292share/uhd/rfnoc/blocks/packetresizer.xml
293share/uhd/rfnoc/blocks/radio_e31x.xml 293share/uhd/rfnoc/blocks/radio_e31x.xml
294share/uhd/rfnoc/blocks/radio_e320.xml 294share/uhd/rfnoc/blocks/radio_e320.xml
295share/uhd/rfnoc/blocks/radio_eiscat.xml 295share/uhd/rfnoc/blocks/radio_eiscat.xml
296share/uhd/rfnoc/blocks/radio_magnesium.xml 296share/uhd/rfnoc/blocks/radio_magnesium.xml
297share/uhd/rfnoc/blocks/radio_rhodium.xml 297share/uhd/rfnoc/blocks/radio_rhodium.xml
298share/uhd/rfnoc/blocks/radio_x300.xml 298share/uhd/rfnoc/blocks/radio_x300.xml
299share/uhd/rfnoc/blocks/replay.xml 299share/uhd/rfnoc/blocks/replay.xml
300share/uhd/rfnoc/blocks/replay_x2.xml 300share/uhd/rfnoc/blocks/replay_x2.xml
301share/uhd/rfnoc/blocks/replay_x4.xml 301share/uhd/rfnoc/blocks/replay_x4.xml
302share/uhd/rfnoc/blocks/schmidlcox.xml 302share/uhd/rfnoc/blocks/schmidlcox.xml
303share/uhd/rfnoc/blocks/serialdemod.xml 303share/uhd/rfnoc/blocks/serialdemod.xml
304share/uhd/rfnoc/blocks/siggen.xml 304share/uhd/rfnoc/blocks/siggen.xml
305share/uhd/rfnoc/blocks/splitstream.xml 305share/uhd/rfnoc/blocks/splitstream.xml
306share/uhd/rfnoc/blocks/vector_iir.xml 306share/uhd/rfnoc/blocks/vector_iir.xml
307share/uhd/rfnoc/blocks/window.xml 307share/uhd/rfnoc/blocks/window.xml
cvs diff -r1.23 -r1.24 pkgsrc/ham/uhd/distinfo (switch to unified diff)

--- pkgsrc/ham/uhd/distinfo 2020/04/07 15:51:50 1.23
+++ pkgsrc/ham/uhd/distinfo 2020/04/08 08:07:17 1.24
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.23 2020/04/07 15:51:50 mef Exp $ 1$NetBSD: distinfo,v 1.24 2020/04/08 08:07:17 adam Exp $
2 2
3SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f 3SHA1 (uhd-3.15.0.0.tar.gz) = 17286a52a591038af16e870962c1767c5935ec2f
4RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae 4RMD160 (uhd-3.15.0.0.tar.gz) = b05282c4b3f25bd201e9b91b3652fba9b150c7ae
5SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0 5SHA512 (uhd-3.15.0.0.tar.gz) = ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
6Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes 6Size (uhd-3.15.0.0.tar.gz) = 12895934 bytes
7SHA1 (patch-CMakeLists.txt) = 2ba015aad8e08963a2bba8e1fc421aae53207cc5 7SHA1 (patch-CMakeLists.txt) = 5691ddd6a98f92e649a184cfc092a4eb721c6fe7
8SHA1 (patch-docs_CMakeLists.txt) = 27b04f5b3ef7b0604b43d50d95dd948535d4b434 
9SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7 8SHA1 (patch-lib_transport_nirio_lvbitx_process-lvbitx.py) = 350af0f9ed999f64105a42195d2df037faef87c7
cvs diff -r1.2 -r1.3 pkgsrc/ham/uhd/patches/patch-CMakeLists.txt (switch to unified diff)

--- pkgsrc/ham/uhd/patches/patch-CMakeLists.txt 2020/04/07 15:51:50 1.2
+++ pkgsrc/ham/uhd/patches/patch-CMakeLists.txt 2020/04/08 08:07:17 1.3
@@ -1,18 +1,32 @@ @@ -1,18 +1,32 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2020/04/07 15:51:50 mef Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2020/04/08 08:07:17 adam Exp $
2 2
3Allow overrides on PKG_DOC_DIR and PKG_MAN_DIR. 3Allow overrides on PKG_MAN_DIR.
4https://github.com/EttusResearch/uhd/issues/301 4https://github.com/EttusResearch/uhd/issues/301
5 5
6--- host/CMakeLists.txt.orig 2020-01-01 13:21:49.000000000 +0900 6Do not use Numpy.
7+++ CMakeLists.txt 2020-04-08 00:03:10.169349083 +0900 7
8@@ -124,8 +124,9 @@ 8--- CMakeLists.txt.orig 2020-01-01 04:21:49.000000000 +0000
 9+++ CMakeLists.txt
 10@@ -124,8 +124,9 @@ endif()
9 if(NOT DEFINED PKG_DOC_DIR) 11 if(NOT DEFINED PKG_DOC_DIR)
10 set(PKG_DOC_DIR share/doc/uhd) 12 set(PKG_DOC_DIR share/doc/uhd)
11 endif() 13 endif()
12+if(NOT DEFINED PKG_MAN_DIR) 14+if(NOT DEFINED PKG_MAN_DIR)
13 set(PKG_MAN_DIR share/man/man1) 15 set(PKG_MAN_DIR share/man/man1)
14- 16-
15+endif() 17+endif()
16 ######################################################################## 18 ########################################################################
17 # UHD config files 19 # UHD config files
18 ######################################################################## 20 ########################################################################
 21@@ -329,11 +330,6 @@ PYTHON_CHECK_MODULE(
 22 HAVE_PYTHON_MODULE_REQUESTS
 23 )
 24
 25-PYTHON_CHECK_MODULE(
 26- "numpy ${NUMPY_MIN_VERSION} or greater"
 27- "numpy" "LooseVersion(numpy.__version__) >= LooseVersion('${NUMPY_MIN_VERSION}')"
 28- HAVE_PYTHON_MODULE_NUMPY
 29-)
 30
 31 ########################################################################
 32 # Create Uninstall Target
File Deleted: pkgsrc/ham/uhd/patches/Attic/patch-docs_CMakeLists.txt