pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: adam
Date: Thu Feb 27 13:49:55 UTC 2025
Modified Files:
pkgsrc/ham: Makefile
pkgsrc/ham/gnuradio-channels: Makefile PLIST
pkgsrc/ham/gnuradio-companion: Makefile PLIST
pkgsrc/ham/gnuradio-core: Makefile Makefile.common PLIST buildlink3.mk
distinfo options.mk version.mk
pkgsrc/ham/gnuradio-core/patches: patch-cmake_Modules_GrPybind.cmake
patch-gnuradio-runtime_CMakeLists.txt
patch-gnuradio-runtime_lib_CMakeLists.txt
patch-gnuradio-runtime_lib_thread_thread.cc
pkgsrc/ham/gnuradio-digital: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-doxygen: Makefile
pkgsrc/ham/gnuradio-dtv: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-fec: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-network: Makefile PLIST
pkgsrc/ham/gnuradio-pdu: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-qtgui: Makefile PLIST
pkgsrc/ham/gnuradio-soapy-sdr: Makefile PLIST
pkgsrc/ham/gnuradio-trellis: Makefile PLIST
pkgsrc/ham/gnuradio-uhd: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-utils: Makefile PLIST
pkgsrc/ham/gnuradio-video-sdl: Makefile PLIST buildlink3.mk
pkgsrc/ham/gnuradio-vocoder: Makefile PLIST
pkgsrc/ham/gnuradio-wavelet: Makefile PLIST
pkgsrc/ham/gnuradio-zeromq: Makefile PLIST buildlink3.mk
pkgsrc/meta-pkgs/gnuradio: Makefile
Added Files:
pkgsrc/ham/gnuradio-core/patches: patch-CMakeLists.txt
patch-gr-channels_CMakeLists.txt
patch-gr-channels_lib_CMakeLists.txt
patch-gr-digital_CMakeLists.txt patch-gr-digital_lib_CMakeLists.txt
patch-gr-dtv_CMakeLists.txt patch-gr-dtv_lib_CMakeLists.txt
patch-gr-fec_CMakeLists.txt patch-gr-fec_lib_CMakeLists.txt
patch-gr-fec_lib_reed-solomon_CMakeLists.txt
patch-gr-filter_include_gnuradio_filter_CMakeLists.txt
patch-gr-network_CMakeLists.txt patch-gr-network_lib_CMakeLists.txt
patch-gr-pdu_CMakeLists.txt patch-gr-pdu_lib_CMakeLists.txt
patch-gr-qtgui_CMakeLists.txt patch-gr-qtgui_lib_CMakeLists.txt
patch-gr-soapy_CMakeLists.txt patch-gr-soapy_lib_CMakeLists.txt
patch-gr-trellis_CMakeLists.txt patch-gr-trellis_lib_CMakeLists.txt
patch-gr-uhd_CMakeLists.txt
patch-gr-uhd_examples_c++_CMakeLists.txt
patch-gr-uhd_lib_CMakeLists.txt patch-gr-utils_CMakeLists.txt
patch-gr-video-sdl_CMakeLists.txt
patch-gr-video-sdl_lib_CMakeLists.txt
patch-gr-vocoder_CMakeLists.txt patch-gr-vocoder_lib_CMakeLists.txt
patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt
patch-gr-wavelet_CMakeLists.txt patch-gr-wavelet_lib_CMakeLists.txt
patch-gr-zeromq_CMakeLists.txt patch-gr-zeromq_lib_CMakeLists.txt
patch-grc_CMakeLists.txt
Removed Files:
pkgsrc/ham/gnuradio-core: Nocore.mk
pkgsrc/ham/gnuradio-core/patches:
patch-gnuradio-runtime_lib_io__signature.cc
patch-gr-blocks_lib_message__debug__impl.cc
patch-gr-network_lib_socket__pdu__impl.cc
patch-gr-network_lib_tcp__sink__impl.cc
patch-gr-network_lib_udp__sink__impl.cc
patch-gr-network_lib_udp__source__impl.cc
pkgsrc/ham/gnuradio-ctrlport: DESCR Makefile PLIST buildlink3.mk
Log Message:
gnuradio: updated to 3.10.12.0
3.10.12.0
Unknown changes
3.10.11.0
Changed
Project
- Const (keyword) cleanup in a large number of files. QtGUI code uses const in many more places.
Runtime
- Add `persistent()` function to gr paths module. This function returns either the value of the `XDG_CACHE_HOME` environment variable, or `appdata()/.local/state`.
GRC
- Work continues on the Qt version of GRC (`gnuradio-companion --qt`). While the Gtk version is still the default, we're getting close to the point where the Qt version can be the default.
- Generated Python code now includes a startup event (`flowgraph_started`) to the top level class. This was added specifically to avoid a race in the Variable Function Probe block, and may be useful
elsewhere.
- Struct variables have not been usable since around v3.8. Fixed!
- Paths are now based on gr paths, where they were previous hardcoded to the user's home directory.
- C++ hier block code paths fixed (so hier blocks work again).
- Block connection line shape and width are now preferences.
gr-blocks
- New Burst To Stream block transforms a bursty tagged stream into a continuous stream by inserting zeros in the output between input packets whenever no packets are available at the input.
gr-digital
- FLL Band Edge power calculations fixed, along with thread safety issues.
gr-fec
- Unused RS code removed - unlikely anyone will notice.
gr-filter
- Numpy `float_` changed to `float64` for Numpy 2.0 compatibility.
gr-fft
- Vector version of FFT `fft_v` library function (calls fftw) thread safety improved.
gr-uhd
- Do not require PyQt5 for non-graphical configurations.
modtool
- Many bug fixes and cleanups, resulting in more reliable operation. That sounds really good, right?
- Remove dependency on the "click" package.
- Appending new blocks to CMake files respects closing parens.
Build system and packaging
- CMake minimum versions were out of sync in different places - fixed.
- Incorrect Qwt maximum version removed.
- Conda re-rendered.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/ham/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/ham/gnuradio-channels/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/ham/gnuradio-channels/PLIST
cvs rdiff -u -r1.92 -r1.93 pkgsrc/ham/gnuradio-companion/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/ham/gnuradio-companion/PLIST
cvs rdiff -u -r1.135 -r1.136 pkgsrc/ham/gnuradio-core/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/ham/gnuradio-core/Makefile.common
cvs rdiff -u -r1.10 -r0 pkgsrc/ham/gnuradio-core/Nocore.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/ham/gnuradio-core/PLIST
cvs rdiff -u -r1.40 -r1.41 pkgsrc/ham/gnuradio-core/buildlink3.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/ham/gnuradio-core/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/ham/gnuradio-core/options.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/ham/gnuradio-core/version.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/ham/gnuradio-core/patches/patch-CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_reed-solomon_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-filter_include_gnuradio_filter_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_examples_c++_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-utils_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_lib_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-grc_CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake \
pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt \
pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_io__signature.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_socket__pdu__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_tcp__sink__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__sink__impl.cc \
pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_udp__source__impl.cc
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc
cvs rdiff -u -r1.3 -r0 \
pkgsrc/ham/gnuradio-core/patches/patch-gr-blocks_lib_message__debug__impl.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/ham/gnuradio-ctrlport/DESCR
cvs rdiff -u -r1.74 -r0 pkgsrc/ham/gnuradio-ctrlport/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/ham/gnuradio-ctrlport/PLIST \
pkgsrc/ham/gnuradio-ctrlport/buildlink3.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/ham/gnuradio-digital/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/ham/gnuradio-digital/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/ham/gnuradio-digital/buildlink3.mk
cvs rdiff -u -r1.94 -r1.95 pkgsrc/ham/gnuradio-doxygen/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/ham/gnuradio-dtv/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/ham/gnuradio-dtv/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-dtv/buildlink3.mk
cvs rdiff -u -r1.75 -r1.76 pkgsrc/ham/gnuradio-fec/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/ham/gnuradio-fec/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-fec/buildlink3.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/ham/gnuradio-network/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/gnuradio-network/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/ham/gnuradio-pdu/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-pdu/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/ham/gnuradio-pdu/buildlink3.mk
cvs rdiff -u -r1.88 -r1.89 pkgsrc/ham/gnuradio-qtgui/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/ham/gnuradio-qtgui/PLIST
cvs rdiff -u -r1.46 -r1.47 pkgsrc/ham/gnuradio-soapy-sdr/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/ham/gnuradio-soapy-sdr/PLIST
cvs rdiff -u -r1.92 -r1.93 pkgsrc/ham/gnuradio-trellis/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/ham/gnuradio-trellis/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/ham/gnuradio-uhd/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/ham/gnuradio-uhd/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/ham/gnuradio-uhd/buildlink3.mk
cvs rdiff -u -r1.78 -r1.79 pkgsrc/ham/gnuradio-utils/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/ham/gnuradio-utils/PLIST
cvs rdiff -u -r1.90 -r1.91 pkgsrc/ham/gnuradio-video-sdl/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/ham/gnuradio-video-sdl/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk
cvs rdiff -u -r1.74 -r1.75 pkgsrc/ham/gnuradio-vocoder/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/ham/gnuradio-vocoder/PLIST
cvs rdiff -u -r1.73 -r1.74 pkgsrc/ham/gnuradio-wavelet/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/ham/gnuradio-wavelet/PLIST
cvs rdiff -u -r1.77 -r1.78 pkgsrc/ham/gnuradio-zeromq/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/ham/gnuradio-zeromq/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/ham/gnuradio-zeromq/buildlink3.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/meta-pkgs/gnuradio/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/ham/Makefile
diff -u pkgsrc/ham/Makefile:1.54 pkgsrc/ham/Makefile:1.55
--- pkgsrc/ham/Makefile:1.54 Mon Feb 24 11:57:08 2025
+++ pkgsrc/ham/Makefile Thu Feb 27 13:49:50 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2025/02/24 11:57:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.55 2025/02/27 13:49:50 adam Exp $
#
COMMENT= Wireless communication tools and applications
@@ -15,7 +15,6 @@ SUBDIR+= freedv
SUBDIR+= gnuradio-channels
SUBDIR+= gnuradio-companion
SUBDIR+= gnuradio-core
-SUBDIR+= gnuradio-ctrlport
SUBDIR+= gnuradio-digital
SUBDIR+= gnuradio-doxygen
SUBDIR+= gnuradio-dtv
Index: pkgsrc/ham/gnuradio-channels/Makefile
diff -u pkgsrc/ham/gnuradio-channels/Makefile:1.73 pkgsrc/ham/gnuradio-channels/Makefile:1.74
--- pkgsrc/ham/gnuradio-channels/Makefile:1.73 Wed Feb 12 06:45:12 2025
+++ pkgsrc/ham/gnuradio-channels/Makefile Thu Feb 27 13:49:50 2025
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.73 2025/02/12 06:45:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2025/02/27 13:49:50 adam Exp $
PKGNAME= gnuradio-channels-${VERSION}
-PKGREVISION= 13
COMMENT= Signal processing blocks to simulate channel models of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_CHANNELS=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-channels/python/channels/*.py
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-channels/PLIST
diff -u pkgsrc/ham/gnuradio-channels/PLIST:1.12 pkgsrc/ham/gnuradio-channels/PLIST:1.13
--- pkgsrc/ham/gnuradio-channels/PLIST:1.12 Tue Apr 11 11:20:51 2023
+++ pkgsrc/ham/gnuradio-channels/PLIST Thu Feb 27 13:49:50 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2023/04/11 11:20:51 mef Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/02/27 13:49:50 adam Exp $
include/gnuradio/channels/api.h
include/gnuradio/channels/channel_model.h
include/gnuradio/channels/channel_model2.h
@@ -8,42 +8,21 @@ include/gnuradio/channels/selective_fadi
lib/cmake/gnuradio/gnuradio-channelsConfig.cmake
lib/cmake/gnuradio/gnuradio-channelsTargets-release.cmake
lib/cmake/gnuradio/gnuradio-channelsTargets.cmake
-lib/libgnuradio-channels.so.${PKGVERSION}
-lib/libgnuradio-channels.so.${PKGVER_MICRO}
lib/libgnuradio-channels.so
lib/libgnuradio-channels.so.${PKGVERSION}
+lib/libgnuradio-channels.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-channels.pc
${PYSITELIB}/gnuradio/channels/__init__.py
-${PYSITELIB}/gnuradio/channels/__init__.pyc
-${PYSITELIB}/gnuradio/channels/__init__.pyo
${PYSITELIB}/gnuradio/channels/amp_bal.py
-${PYSITELIB}/gnuradio/channels/amp_bal.pyc
-${PYSITELIB}/gnuradio/channels/amp_bal.pyo
${PYSITELIB}/gnuradio/channels/channels_python.so
${PYSITELIB}/gnuradio/channels/conj_fs_iqcorr.py
-${PYSITELIB}/gnuradio/channels/conj_fs_iqcorr.pyc
-${PYSITELIB}/gnuradio/channels/conj_fs_iqcorr.pyo
${PYSITELIB}/gnuradio/channels/distortion_2_gen.py
-${PYSITELIB}/gnuradio/channels/distortion_2_gen.pyc
-${PYSITELIB}/gnuradio/channels/distortion_2_gen.pyo
${PYSITELIB}/gnuradio/channels/distortion_3_gen.py
-${PYSITELIB}/gnuradio/channels/distortion_3_gen.pyc
-${PYSITELIB}/gnuradio/channels/distortion_3_gen.pyo
${PYSITELIB}/gnuradio/channels/impairments.py
-${PYSITELIB}/gnuradio/channels/impairments.pyc
-${PYSITELIB}/gnuradio/channels/impairments.pyo
${PYSITELIB}/gnuradio/channels/iqbal_gen.py
-${PYSITELIB}/gnuradio/channels/iqbal_gen.pyc
-${PYSITELIB}/gnuradio/channels/iqbal_gen.pyo
${PYSITELIB}/gnuradio/channels/phase_bal.py
-${PYSITELIB}/gnuradio/channels/phase_bal.pyc
-${PYSITELIB}/gnuradio/channels/phase_bal.pyo
${PYSITELIB}/gnuradio/channels/phase_noise_gen.py
-${PYSITELIB}/gnuradio/channels/phase_noise_gen.pyc
-${PYSITELIB}/gnuradio/channels/phase_noise_gen.pyo
${PYSITELIB}/gnuradio/channels/quantizer.py
-${PYSITELIB}/gnuradio/channels/quantizer.pyc
-${PYSITELIB}/gnuradio/channels/quantizer.pyo
share/doc/gnuradio-${PKGVERSION}/README.channels
share/gnuradio/examples/channels/channel_tone_response.grc
share/gnuradio/examples/channels/demo_gmsk.grc
Index: pkgsrc/ham/gnuradio-companion/Makefile
diff -u pkgsrc/ham/gnuradio-companion/Makefile:1.92 pkgsrc/ham/gnuradio-companion/Makefile:1.93
--- pkgsrc/ham/gnuradio-companion/Makefile:1.92 Wed Feb 12 06:45:12 2025
+++ pkgsrc/ham/gnuradio-companion/Makefile Thu Feb 27 13:49:50 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2025/02/12 06:45:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2025/02/27 13:49:50 adam Exp $
PKGNAME= gnuradio-companion-${VERSION}
-PKGREVISION= 13
COMMENT= User interface entry of GNU Radio
DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
@@ -10,13 +9,15 @@ DEPENDS+= xdg-utils-[0-9]*:../../misc/xd
REPLACE_BASH= grc/scripts/freedesktop/grc_setup_freedesktop.in
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-# gnuradio-companion
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
ICON_THEMES= yes
+
+REPLACE_PYTHON+= grc/blocks/variable_struct.block.yml.py
+REPLACE_PYTHON+= grc/main.py
+
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-companion/PLIST
diff -u pkgsrc/ham/gnuradio-companion/PLIST:1.21 pkgsrc/ham/gnuradio-companion/PLIST:1.22
--- pkgsrc/ham/gnuradio-companion/PLIST:1.21 Sun Jan 7 12:24:20 2024
+++ pkgsrc/ham/gnuradio-companion/PLIST Thu Feb 27 13:49:50 2025
@@ -1,503 +1,156 @@
-@comment $NetBSD: PLIST,v 1.21 2024/01/07 12:24:20 mef Exp $
+@comment $NetBSD: PLIST,v 1.22 2025/02/27 13:49:50 adam Exp $
bin/gnuradio-companion
bin/grcc
${PYSITELIB}/gnuradio/grc/__init__.py
-${PYSITELIB}/gnuradio/grc/__init__.pyc
-${PYSITELIB}/gnuradio/grc/__init__.pyo
${PYSITELIB}/gnuradio/grc/__main__.py
-${PYSITELIB}/gnuradio/grc/__main__.pyc
-${PYSITELIB}/gnuradio/grc/__main__.pyo
${PYSITELIB}/gnuradio/grc/compiler.py
-${PYSITELIB}/gnuradio/grc/compiler.pyc
-${PYSITELIB}/gnuradio/grc/compiler.pyo
${PYSITELIB}/gnuradio/grc/converter/__init__.py
-${PYSITELIB}/gnuradio/grc/converter/__init__.pyc
-${PYSITELIB}/gnuradio/grc/converter/__init__.pyo
${PYSITELIB}/gnuradio/grc/converter/__main__.py
-${PYSITELIB}/gnuradio/grc/converter/__main__.pyc
-${PYSITELIB}/gnuradio/grc/converter/__main__.pyo
${PYSITELIB}/gnuradio/grc/converter/block.dtd
${PYSITELIB}/gnuradio/grc/converter/block.py
-${PYSITELIB}/gnuradio/grc/converter/block.pyc
-${PYSITELIB}/gnuradio/grc/converter/block.pyo
${PYSITELIB}/gnuradio/grc/converter/block_tree.dtd
${PYSITELIB}/gnuradio/grc/converter/block_tree.py
-${PYSITELIB}/gnuradio/grc/converter/block_tree.pyc
-${PYSITELIB}/gnuradio/grc/converter/block_tree.pyo
${PYSITELIB}/gnuradio/grc/converter/cheetah_converter.py
-${PYSITELIB}/gnuradio/grc/converter/cheetah_converter.pyc
-${PYSITELIB}/gnuradio/grc/converter/cheetah_converter.pyo
${PYSITELIB}/gnuradio/grc/converter/flow_graph.dtd
${PYSITELIB}/gnuradio/grc/converter/flow_graph.py
-${PYSITELIB}/gnuradio/grc/converter/flow_graph.pyc
-${PYSITELIB}/gnuradio/grc/converter/flow_graph.pyo
${PYSITELIB}/gnuradio/grc/converter/main.py
-${PYSITELIB}/gnuradio/grc/converter/main.pyc
-${PYSITELIB}/gnuradio/grc/converter/main.pyo
${PYSITELIB}/gnuradio/grc/converter/xml.py
-${PYSITELIB}/gnuradio/grc/converter/xml.pyc
-${PYSITELIB}/gnuradio/grc/converter/xml.pyo
${PYSITELIB}/gnuradio/grc/core/Config.py
-${PYSITELIB}/gnuradio/grc/core/Config.pyc
-${PYSITELIB}/gnuradio/grc/core/Config.pyo
${PYSITELIB}/gnuradio/grc/core/Connection.py
-${PYSITELIB}/gnuradio/grc/core/Connection.pyc
-${PYSITELIB}/gnuradio/grc/core/Connection.pyo
${PYSITELIB}/gnuradio/grc/core/Constants.py
-${PYSITELIB}/gnuradio/grc/core/Constants.pyc
-${PYSITELIB}/gnuradio/grc/core/Constants.pyo
${PYSITELIB}/gnuradio/grc/core/FlowGraph.py
-${PYSITELIB}/gnuradio/grc/core/FlowGraph.pyc
-${PYSITELIB}/gnuradio/grc/core/FlowGraph.pyo
${PYSITELIB}/gnuradio/grc/core/Messages.py
-${PYSITELIB}/gnuradio/grc/core/Messages.pyc
-${PYSITELIB}/gnuradio/grc/core/Messages.pyo
${PYSITELIB}/gnuradio/grc/core/__init__.py
-${PYSITELIB}/gnuradio/grc/core/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/base.py
-${PYSITELIB}/gnuradio/grc/core/base.pyc
-${PYSITELIB}/gnuradio/grc/core/base.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/__init__.py
-${PYSITELIB}/gnuradio/grc/core/blocks/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/_build.py
-${PYSITELIB}/gnuradio/grc/core/blocks/_build.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/_build.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/_flags.py
-${PYSITELIB}/gnuradio/grc/core/blocks/_flags.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/_flags.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/_templates.py
-${PYSITELIB}/gnuradio/grc/core/blocks/_templates.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/_templates.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/block.py
-${PYSITELIB}/gnuradio/grc/core/blocks/block.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/block.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/dummy.py
-${PYSITELIB}/gnuradio/grc/core/blocks/dummy.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/dummy.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/embedded_python.py
-${PYSITELIB}/gnuradio/grc/core/blocks/embedded_python.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/embedded_python.pyo
${PYSITELIB}/gnuradio/grc/core/blocks/virtual.py
-${PYSITELIB}/gnuradio/grc/core/blocks/virtual.pyc
-${PYSITELIB}/gnuradio/grc/core/blocks/virtual.pyo
${PYSITELIB}/gnuradio/grc/core/cache.py
-${PYSITELIB}/gnuradio/grc/core/cache.pyc
-${PYSITELIB}/gnuradio/grc/core/cache.pyo
${PYSITELIB}/gnuradio/grc/core/default_flow_graph.grc
${PYSITELIB}/gnuradio/grc/core/errors.py
-${PYSITELIB}/gnuradio/grc/core/errors.pyc
-${PYSITELIB}/gnuradio/grc/core/errors.pyo
${PYSITELIB}/gnuradio/grc/core/flow_graph.dtd
${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.py
-${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/FlowGraphProxy.pyo
${PYSITELIB}/gnuradio/grc/core/generator/Generator.py
-${PYSITELIB}/gnuradio/grc/core/generator/Generator.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/Generator.pyo
${PYSITELIB}/gnuradio/grc/core/generator/__init__.py
-${PYSITELIB}/gnuradio/grc/core/generator/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/generator/cpp_hier_block.py
-${PYSITELIB}/gnuradio/grc/core/generator/cpp_hier_block.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/cpp_hier_block.pyo
${PYSITELIB}/gnuradio/grc/core/generator/cpp_templates/CMakeLists.txt.mako
${PYSITELIB}/gnuradio/grc/core/generator/cpp_templates/flow_graph.cpp.mako
${PYSITELIB}/gnuradio/grc/core/generator/cpp_templates/flow_graph.hpp.mako
${PYSITELIB}/gnuradio/grc/core/generator/cpp_top_block.py
-${PYSITELIB}/gnuradio/grc/core/generator/cpp_top_block.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/cpp_top_block.pyo
${PYSITELIB}/gnuradio/grc/core/generator/flow_graph.py.mako
${PYSITELIB}/gnuradio/grc/core/generator/hier_block.py
-${PYSITELIB}/gnuradio/grc/core/generator/hier_block.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/hier_block.pyo
${PYSITELIB}/gnuradio/grc/core/generator/top_block.py
-${PYSITELIB}/gnuradio/grc/core/generator/top_block.pyc
-${PYSITELIB}/gnuradio/grc/core/generator/top_block.pyo
${PYSITELIB}/gnuradio/grc/core/io/__init__.py
-${PYSITELIB}/gnuradio/grc/core/io/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/io/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/io/yaml.py
-${PYSITELIB}/gnuradio/grc/core/io/yaml.pyc
-${PYSITELIB}/gnuradio/grc/core/io/yaml.pyo
${PYSITELIB}/gnuradio/grc/core/params/__init__.py
-${PYSITELIB}/gnuradio/grc/core/params/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/params/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/params/dtypes.py
-${PYSITELIB}/gnuradio/grc/core/params/dtypes.pyc
-${PYSITELIB}/gnuradio/grc/core/params/dtypes.pyo
${PYSITELIB}/gnuradio/grc/core/params/param.py
-${PYSITELIB}/gnuradio/grc/core/params/param.pyc
-${PYSITELIB}/gnuradio/grc/core/params/param.pyo
${PYSITELIB}/gnuradio/grc/core/params/template_arg.py
-${PYSITELIB}/gnuradio/grc/core/params/template_arg.pyc
-${PYSITELIB}/gnuradio/grc/core/params/template_arg.pyo
${PYSITELIB}/gnuradio/grc/core/platform.py
-${PYSITELIB}/gnuradio/grc/core/platform.pyc
-${PYSITELIB}/gnuradio/grc/core/platform.pyo
${PYSITELIB}/gnuradio/grc/core/ports/__init__.py
-${PYSITELIB}/gnuradio/grc/core/ports/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/ports/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/ports/_virtual_connections.py
-${PYSITELIB}/gnuradio/grc/core/ports/_virtual_connections.pyc
-${PYSITELIB}/gnuradio/grc/core/ports/_virtual_connections.pyo
${PYSITELIB}/gnuradio/grc/core/ports/clone.py
-${PYSITELIB}/gnuradio/grc/core/ports/clone.pyc
-${PYSITELIB}/gnuradio/grc/core/ports/clone.pyo
${PYSITELIB}/gnuradio/grc/core/ports/port.py
-${PYSITELIB}/gnuradio/grc/core/ports/port.pyc
-${PYSITELIB}/gnuradio/grc/core/ports/port.pyo
${PYSITELIB}/gnuradio/grc/core/schema_checker/__init__.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/schema_checker/block.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/block.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/block.pyo
${PYSITELIB}/gnuradio/grc/core/schema_checker/domain.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/domain.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/domain.pyo
${PYSITELIB}/gnuradio/grc/core/schema_checker/flow_graph.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/flow_graph.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/flow_graph.pyo
+${PYSITELIB}/gnuradio/grc/core/schema_checker/manifest.py
${PYSITELIB}/gnuradio/grc/core/schema_checker/utils.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/utils.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/utils.pyo
${PYSITELIB}/gnuradio/grc/core/schema_checker/validator.py
-${PYSITELIB}/gnuradio/grc/core/schema_checker/validator.pyc
-${PYSITELIB}/gnuradio/grc/core/schema_checker/validator.pyo
${PYSITELIB}/gnuradio/grc/core/utils/__init__.py
-${PYSITELIB}/gnuradio/grc/core/utils/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/utils/descriptors/__init__.py
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/__init__.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/__init__.pyo
${PYSITELIB}/gnuradio/grc/core/utils/descriptors/_lazy.py
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/_lazy.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/_lazy.pyo
${PYSITELIB}/gnuradio/grc/core/utils/descriptors/evaluated.py
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/evaluated.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/descriptors/evaluated.pyo
${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.py
-${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/epy_block_io.pyo
${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.py
-${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/expr_utils.pyo
${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.py
-${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/extract_docs.pyo
${PYSITELIB}/gnuradio/grc/core/utils/flow_graph_complexity.py
-${PYSITELIB}/gnuradio/grc/core/utils/flow_graph_complexity.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/flow_graph_complexity.pyo
${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.py
-${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.pyc
-${PYSITELIB}/gnuradio/grc/core/utils/hide_bokeh_gui_options_if_not_installed.pyo
${PYSITELIB}/gnuradio/grc/gui/Actions.py
-${PYSITELIB}/gnuradio/grc/gui/Actions.pyc
-${PYSITELIB}/gnuradio/grc/gui/Actions.pyo
${PYSITELIB}/gnuradio/grc/gui/Application.py
-${PYSITELIB}/gnuradio/grc/gui/Application.pyc
-${PYSITELIB}/gnuradio/grc/gui/Application.pyo
${PYSITELIB}/gnuradio/grc/gui/Bars.py
-${PYSITELIB}/gnuradio/grc/gui/Bars.pyc
-${PYSITELIB}/gnuradio/grc/gui/Bars.pyo
${PYSITELIB}/gnuradio/grc/gui/BlockTreeWindow.py
-${PYSITELIB}/gnuradio/grc/gui/BlockTreeWindow.pyc
-${PYSITELIB}/gnuradio/grc/gui/BlockTreeWindow.pyo
${PYSITELIB}/gnuradio/grc/gui/Config.py
-${PYSITELIB}/gnuradio/grc/gui/Config.pyc
-${PYSITELIB}/gnuradio/grc/gui/Config.pyo
${PYSITELIB}/gnuradio/grc/gui/Console.py
-${PYSITELIB}/gnuradio/grc/gui/Console.pyc
-${PYSITELIB}/gnuradio/grc/gui/Console.pyo
${PYSITELIB}/gnuradio/grc/gui/Constants.py
-${PYSITELIB}/gnuradio/grc/gui/Constants.pyc
-${PYSITELIB}/gnuradio/grc/gui/Constants.pyo
${PYSITELIB}/gnuradio/grc/gui/Dialogs.py
-${PYSITELIB}/gnuradio/grc/gui/Dialogs.pyc
-${PYSITELIB}/gnuradio/grc/gui/Dialogs.pyo
${PYSITELIB}/gnuradio/grc/gui/DrawingArea.py
-${PYSITELIB}/gnuradio/grc/gui/DrawingArea.pyc
-${PYSITELIB}/gnuradio/grc/gui/DrawingArea.pyo
${PYSITELIB}/gnuradio/grc/gui/Executor.py
-${PYSITELIB}/gnuradio/grc/gui/Executor.pyc
-${PYSITELIB}/gnuradio/grc/gui/Executor.pyo
${PYSITELIB}/gnuradio/grc/gui/FileDialogs.py
-${PYSITELIB}/gnuradio/grc/gui/FileDialogs.pyc
-${PYSITELIB}/gnuradio/grc/gui/FileDialogs.pyo
${PYSITELIB}/gnuradio/grc/gui/MainWindow.py
-${PYSITELIB}/gnuradio/grc/gui/MainWindow.pyc
-${PYSITELIB}/gnuradio/grc/gui/MainWindow.pyo
${PYSITELIB}/gnuradio/grc/gui/Notebook.py
-${PYSITELIB}/gnuradio/grc/gui/Notebook.pyc
-${PYSITELIB}/gnuradio/grc/gui/Notebook.pyo
${PYSITELIB}/gnuradio/grc/gui/ParamWidgets.py
-${PYSITELIB}/gnuradio/grc/gui/ParamWidgets.pyc
-${PYSITELIB}/gnuradio/grc/gui/ParamWidgets.pyo
${PYSITELIB}/gnuradio/grc/gui/ParserErrorsDialog.py
-${PYSITELIB}/gnuradio/grc/gui/ParserErrorsDialog.pyc
-${PYSITELIB}/gnuradio/grc/gui/ParserErrorsDialog.pyo
${PYSITELIB}/gnuradio/grc/gui/Platform.py
-${PYSITELIB}/gnuradio/grc/gui/Platform.pyc
-${PYSITELIB}/gnuradio/grc/gui/Platform.pyo
${PYSITELIB}/gnuradio/grc/gui/PropsDialog.py
-${PYSITELIB}/gnuradio/grc/gui/PropsDialog.pyc
-${PYSITELIB}/gnuradio/grc/gui/PropsDialog.pyo
${PYSITELIB}/gnuradio/grc/gui/StateCache.py
-${PYSITELIB}/gnuradio/grc/gui/StateCache.pyc
-${PYSITELIB}/gnuradio/grc/gui/StateCache.pyo
${PYSITELIB}/gnuradio/grc/gui/Utils.py
-${PYSITELIB}/gnuradio/grc/gui/Utils.pyc
-${PYSITELIB}/gnuradio/grc/gui/Utils.pyo
${PYSITELIB}/gnuradio/grc/gui/VariableEditor.py
-${PYSITELIB}/gnuradio/grc/gui/VariableEditor.pyc
-${PYSITELIB}/gnuradio/grc/gui/VariableEditor.pyo
${PYSITELIB}/gnuradio/grc/gui/__init__.py
-${PYSITELIB}/gnuradio/grc/gui/__init__.pyc
-${PYSITELIB}/gnuradio/grc/gui/__init__.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/__init__.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/__init__.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/__init__.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/block.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/block.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/block.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/colors.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/colors.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/colors.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/connection.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/connection.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/connection.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/drawable.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/drawable.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/drawable.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/flowgraph.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/flowgraph.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/flowgraph.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/param.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/param.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/param.pyo
${PYSITELIB}/gnuradio/grc/gui/canvas/port.py
-${PYSITELIB}/gnuradio/grc/gui/canvas/port.pyc
-${PYSITELIB}/gnuradio/grc/gui/canvas/port.pyo
${PYSITELIB}/gnuradio/grc/gui/external_editor.py
-${PYSITELIB}/gnuradio/grc/gui/external_editor.pyc
-${PYSITELIB}/gnuradio/grc/gui/external_editor.pyo
${PYSITELIB}/gnuradio/grc/gui/icon.png
+${PYSITELIB}/gnuradio/grc/gui_qt/Config.py
+${PYSITELIB}/gnuradio/grc/gui_qt/Constants.py
+${PYSITELIB}/gnuradio/grc/gui_qt/Platform.py
+${PYSITELIB}/gnuradio/grc/gui_qt/Utils.py
+${PYSITELIB}/gnuradio/grc/gui_qt/__init__.py
+${PYSITELIB}/gnuradio/grc/gui_qt/base.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/__init__.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/block_library.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/__init__.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/block.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/colors.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/connection.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/flowgraph.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/canvas/port.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/console.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/dialogs.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/example_browser.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/executor.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/flowgraph_view.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/oot_browser.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/preferences.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/undoable_actions.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/variable_editor.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/wiki_tab.py
+${PYSITELIB}/gnuradio/grc/gui_qt/components/window.py
+${PYSITELIB}/gnuradio/grc/gui_qt/external_editor.py
+${PYSITELIB}/gnuradio/grc/gui_qt/grc.py
+${PYSITELIB}/gnuradio/grc/gui_qt/helpers/__init__.py
+${PYSITELIB}/gnuradio/grc/gui_qt/helpers/logging.py
+${PYSITELIB}/gnuradio/grc/gui_qt/helpers/profiling.py
+${PYSITELIB}/gnuradio/grc/gui_qt/helpers/qt.py
+${PYSITELIB}/gnuradio/grc/gui_qt/properties.py
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/available_preferences.yml
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/cpp_cmd_fg.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/cpp_fg.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/cpp_qt_fg.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/data/rx_logo.grc
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/example_browser.ui
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/example_browser_widget.ui
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/language/en_US/LC_MESSAGES/grc.mo
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/logo/gnuradio_logo_icon-square.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/oot_browser.ui
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/py_cmd_fg.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/py_fg.png
+${PYSITELIB}/gnuradio/grc/gui_qt/resources/py_qt_fg.png
${PYSITELIB}/gnuradio/grc/main.py
-${PYSITELIB}/gnuradio/grc/main.pyc
-${PYSITELIB}/gnuradio/grc/main.pyo
share/gnuradio/examples/00-grc-docs.conf
share/gnuradio/examples/grc.conf
-share/gnuradio/grc/blocks/analog.tree.yml
-share/gnuradio/grc/blocks/analog_agc2_xx.block.yml
-share/gnuradio/grc/blocks/analog_agc3_xx.block.yml
-share/gnuradio/grc/blocks/analog_agc_xx.block.yml
-share/gnuradio/grc/blocks/analog_am_demod_cf.block.yml
-share/gnuradio/grc/blocks/analog_const_source_x.block.yml
-share/gnuradio/grc/blocks/analog_cpfsk_bc.block.yml
-share/gnuradio/grc/blocks/analog_ctcss_squelch_ff.block.yml
-share/gnuradio/grc/blocks/analog_dpll_bb.block.yml
-share/gnuradio/grc/blocks/analog_fastnoise_source_x.block.yml
-share/gnuradio/grc/blocks/analog_feedforward_agc_cc.block.yml
-share/gnuradio/grc/blocks/analog_fm_deemph.block.yml
-share/gnuradio/grc/blocks/analog_fm_demod_cf.block.yml
-share/gnuradio/grc/blocks/analog_fm_preemph.block.yml
-share/gnuradio/grc/blocks/analog_fmdet_cf.block.yml
-share/gnuradio/grc/blocks/analog_frequency_modulator_fc.block.yml
-share/gnuradio/grc/blocks/analog_nbfm_rx.block.yml
-share/gnuradio/grc/blocks/analog_nbfm_tx.block.yml
-share/gnuradio/grc/blocks/analog_noise_source_x.block.yml
-share/gnuradio/grc/blocks/analog_phase_modulator_fc.block.yml
-share/gnuradio/grc/blocks/analog_pll_carriertracking_cc.block.yml
-share/gnuradio/grc/blocks/analog_pll_freqdet_cf.block.yml
-share/gnuradio/grc/blocks/analog_pll_refout_cc.block.yml
-share/gnuradio/grc/blocks/analog_probe_avg_mag_sqrd_x.block.yml
-share/gnuradio/grc/blocks/analog_pwr_squelch_xx.block.yml
-share/gnuradio/grc/blocks/analog_quadrature_demod_cf.block.yml
-share/gnuradio/grc/blocks/analog_rail_ff.block.yml
-share/gnuradio/grc/blocks/analog_random_source_x.block.yml
-share/gnuradio/grc/blocks/analog_random_uniform_source_x.block.yml
-share/gnuradio/grc/blocks/analog_sig_source_x.block.yml
-share/gnuradio/grc/blocks/analog_simple_squelch_cc.block.yml
-share/gnuradio/grc/blocks/analog_standard_squelch.block.yml
-share/gnuradio/grc/blocks/analog_wfm_rcv.block.yml
-share/gnuradio/grc/blocks/analog_wfm_rcv_pll.block.yml
-share/gnuradio/grc/blocks/analog_wfm_tx.block.yml
-share/gnuradio/grc/blocks/audio_sink.block.yml
-share/gnuradio/grc/blocks/audio_source.block.yml
-share/gnuradio/grc/blocks/blocks.tree.yml
-share/gnuradio/grc/blocks/blocks_abs_xx.block.yml
-share/gnuradio/grc/blocks/blocks_add_const_vxx.block.yml
-share/gnuradio/grc/blocks/blocks_add_xx.block.yml
-share/gnuradio/grc/blocks/blocks_and_const_xx.block.yml
-share/gnuradio/grc/blocks/blocks_and_xx.block.yml
-share/gnuradio/grc/blocks/blocks_argmax_xx.block.yml
-share/gnuradio/grc/blocks/blocks_blockinterleaver_xx.block.yml
-share/gnuradio/grc/blocks/blocks_burst_tagger.block.yml
-share/gnuradio/grc/blocks/blocks_char_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_char_to_short.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_arg.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_imag.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_interleaved_char.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_interleaved_short.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_mag.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_mag_squared.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_magphase.block.yml
-share/gnuradio/grc/blocks/blocks_complex_to_real.block.yml
-share/gnuradio/grc/blocks/blocks_conjugate_cc.block.yml
-share/gnuradio/grc/blocks/blocks_copy.block.yml
-share/gnuradio/grc/blocks/blocks_correctiq.block.yml
-share/gnuradio/grc/blocks/blocks_correctiq_auto.block.yml
-share/gnuradio/grc/blocks/blocks_correctiq_man.block.yml
-share/gnuradio/grc/blocks/blocks_correctiq_swapiq.block.yml
-share/gnuradio/grc/blocks/blocks_ctrlport_performance.block.yml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe2_c.block.yml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe2_x.block.yml
-share/gnuradio/grc/blocks/blocks_ctrlport_probe_c.block.yml
-share/gnuradio/grc/blocks/blocks_ctrlport_viewer.block.yml
-share/gnuradio/grc/blocks/blocks_deinterleave.block.yml
-share/gnuradio/grc/blocks/blocks_delay.block.yml
-share/gnuradio/grc/blocks/blocks_divide_XX.block.yml
-share/gnuradio/grc/blocks/blocks_endian_swap.block.yml
-share/gnuradio/grc/blocks/blocks_exponentiate_const_cci.block.yml
-share/gnuradio/grc/blocks/blocks_file_descriptor_sink.block.yml
-share/gnuradio/grc/blocks/blocks_file_descriptor_source.block.yml
-share/gnuradio/grc/blocks/blocks_file_meta_sink.block.yml
-share/gnuradio/grc/blocks/blocks_file_meta_source.block.yml
-share/gnuradio/grc/blocks/blocks_file_sink.block.yml
-share/gnuradio/grc/blocks/blocks_file_source.block.yml
-share/gnuradio/grc/blocks/blocks_float_to_char.block.yml
-share/gnuradio/grc/blocks/blocks_float_to_complex.block.yml
-share/gnuradio/grc/blocks/blocks_float_to_int.block.yml
-share/gnuradio/grc/blocks/blocks_float_to_short.block.yml
-share/gnuradio/grc/blocks/blocks_float_uchar.block.yml
-share/gnuradio/grc/blocks/blocks_freqshift_cc.block.yml
-share/gnuradio/grc/blocks/blocks_head.block.yml
-share/gnuradio/grc/blocks/blocks_int_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_integrate_xx.block.yml
-share/gnuradio/grc/blocks/blocks_interleave.block.yml
-share/gnuradio/grc/blocks/blocks_interleaved_char_to_complex.block.yml
-share/gnuradio/grc/blocks/blocks_interleaved_short_to_complex.block.yml
-share/gnuradio/grc/blocks/blocks_keep_m_in_n.block.yml
-share/gnuradio/grc/blocks/blocks_keep_one_in_n.block.yml
-share/gnuradio/grc/blocks/blocks_magphase_to_complex.block.yml
-share/gnuradio/grc/blocks/blocks_matrix_interleaver.block.yml
-share/gnuradio/grc/blocks/blocks_max_xx.block.yml
-share/gnuradio/grc/blocks/blocks_message_debug.block.yml
-share/gnuradio/grc/blocks/blocks_message_strobe.block.yml
-share/gnuradio/grc/blocks/blocks_message_strobe_random.block.yml
-share/gnuradio/grc/blocks/blocks_meta_to_pair.block.yml
-share/gnuradio/grc/blocks/blocks_min_xx.block.yml
-share/gnuradio/grc/blocks/blocks_moving_average_xx.block.yml
-share/gnuradio/grc/blocks/blocks_msg_pair_to_var.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_by_tag_value_cc.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_conjugate_cc.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_const_vxx.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_const_xx.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_matrix_xx.block.yml
-share/gnuradio/grc/blocks/blocks_multiply_xx.block.yml
-share/gnuradio/grc/blocks/blocks_mute_xx.block.yml
-share/gnuradio/grc/blocks/blocks_nlog10_ff.block.yml
-share/gnuradio/grc/blocks/blocks_nop.block.yml
-share/gnuradio/grc/blocks/blocks_not_xx.block.yml
-share/gnuradio/grc/blocks/blocks_null_sink.block.yml
-share/gnuradio/grc/blocks/blocks_null_source.block.yml
-share/gnuradio/grc/blocks/blocks_or_xx.block.yml
-share/gnuradio/grc/blocks/blocks_pack_k_bits_bb.block.yml
-share/gnuradio/grc/blocks/blocks_packed_to_unpacked_xx.block.yml
-share/gnuradio/grc/blocks/blocks_patterned_interleaver.block.yml
-share/gnuradio/grc/blocks/blocks_peak_detector2_fb.block.yml
-share/gnuradio/grc/blocks/blocks_peak_detector_xb.block.yml
-share/gnuradio/grc/blocks/blocks_phase_shift.block.yml
-share/gnuradio/grc/blocks/blocks_plateau_detector_fb.block.yml
-share/gnuradio/grc/blocks/blocks_probe_rate.block.yml
-share/gnuradio/grc/blocks/blocks_probe_signal_vx.block.yml
-share/gnuradio/grc/blocks/blocks_probe_signal_x.block.yml
-share/gnuradio/grc/blocks/blocks_regenerate_bb.block.yml
-share/gnuradio/grc/blocks/blocks_repack_bits_bb.block.yml
-share/gnuradio/grc/blocks/blocks_repeat.block.yml
-share/gnuradio/grc/blocks/blocks_rms_xx.block.yml
-share/gnuradio/grc/blocks/blocks_rotator_cc.block.yml
-share/gnuradio/grc/blocks/blocks_sample_and_hold_xx.block.yml
-share/gnuradio/grc/blocks/blocks_selector.block.yml
-share/gnuradio/grc/blocks/blocks_short_to_char.block.yml
-share/gnuradio/grc/blocks/blocks_short_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_sigmf_sink_minimal.block.yml
-share/gnuradio/grc/blocks/blocks_sigmf_source_minimal.block.yml
-share/gnuradio/grc/blocks/blocks_skiphead.block.yml
-share/gnuradio/grc/blocks/blocks_stream_demux.block.yml
-share/gnuradio/grc/blocks/blocks_stream_mux.block.yml
-share/gnuradio/grc/blocks/blocks_stream_to_streams.block.yml
-share/gnuradio/grc/blocks/blocks_stream_to_tagged_stream.block.yml
-share/gnuradio/grc/blocks/blocks_stream_to_vector.block.yml
-share/gnuradio/grc/blocks/blocks_stream_to_vector_decimator.block.yml
-share/gnuradio/grc/blocks/blocks_streams_to_stream.block.yml
-share/gnuradio/grc/blocks/blocks_streams_to_vector.block.yml
-share/gnuradio/grc/blocks/blocks_stretch_ff.block.yml
-share/gnuradio/grc/blocks/blocks_sub_xx.block.yml
-share/gnuradio/grc/blocks/blocks_tag_debug.block.yml
-share/gnuradio/grc/blocks/blocks_tag_gate.block.yml
-share/gnuradio/grc/blocks/blocks_tag_object.block.yml
-share/gnuradio/grc/blocks/blocks_tag_share.block.yml
-share/gnuradio/grc/blocks/blocks_tagged_file_sink.block.yml
-share/gnuradio/grc/blocks/blocks_tagged_stream_align.block.yml
-share/gnuradio/grc/blocks/blocks_tagged_stream_multiply_length.block.yml
-share/gnuradio/grc/blocks/blocks_tagged_stream_mux.block.yml
-share/gnuradio/grc/blocks/blocks_tags_strobe.block.yml
-share/gnuradio/grc/blocks/blocks_test_tag_variable_rate_ff.block.yml
-share/gnuradio/grc/blocks/blocks_threshold_ff.block.yml
-share/gnuradio/grc/blocks/blocks_throttle.block.yml
-share/gnuradio/grc/blocks/blocks_throttle2.block.yml
-share/gnuradio/grc/blocks/blocks_transcendental.block.yml
-share/gnuradio/grc/blocks/blocks_uchar_to_float.block.yml
-share/gnuradio/grc/blocks/blocks_unpack_k_bits_bb.block.yml
-share/gnuradio/grc/blocks/blocks_unpacked_to_packed_xx.block.yml
-share/gnuradio/grc/blocks/blocks_var_to_msg.block.yml
-share/gnuradio/grc/blocks/blocks_vco_c.block.yml
-share/gnuradio/grc/blocks/blocks_vco_f.block.yml
-share/gnuradio/grc/blocks/blocks_vector_insert_x.block.yml
-share/gnuradio/grc/blocks/blocks_vector_sink_x.block.yml
-share/gnuradio/grc/blocks/blocks_vector_source_x.block.yml
-share/gnuradio/grc/blocks/blocks_vector_to_stream.block.yml
-share/gnuradio/grc/blocks/blocks_vector_to_streams.block.yml
-share/gnuradio/grc/blocks/blocks_wavfile_sink.block.yml
-share/gnuradio/grc/blocks/blocks_wavfile_source.block.yml
-share/gnuradio/grc/blocks/blocks_xor_xx.block.yml
-share/gnuradio/grc/blocks/fft.tree.yml
-share/gnuradio/grc/blocks/fft_ctrlport_probe_psd.block.yml
-share/gnuradio/grc/blocks/fft_fft_vxx.block.yml
-share/gnuradio/grc/blocks/fft_goertzel_fc.block.yml
-share/gnuradio/grc/blocks/fft_logpwrfft_x.block.yml
-share/gnuradio/grc/blocks/filter.tree.yml
-share/gnuradio/grc/blocks/filter_band_pass_filter.block.yml
-share/gnuradio/grc/blocks/filter_band_reject_filter.block.yml
-share/gnuradio/grc/blocks/filter_dc_blocker_xx.block.yml
-share/gnuradio/grc/blocks/filter_fft_filter_xxx.block.yml
-share/gnuradio/grc/blocks/filter_fft_low_pass_filter.block.yml
-share/gnuradio/grc/blocks/filter_fft_root_raised_cosine_filter.block.yml
-share/gnuradio/grc/blocks/filter_filter_delay_fc.block.yml
-share/gnuradio/grc/blocks/filter_filterbank_vcvcf.block.yml
-share/gnuradio/grc/blocks/filter_fir_filter_xxx.block.yml
-share/gnuradio/grc/blocks/filter_freq_xlating_fft_filter_ccc.block.yml
-share/gnuradio/grc/blocks/filter_freq_xlating_fir_filter_xxx.block.yml
-share/gnuradio/grc/blocks/filter_high_pass_filter.block.yml
-share/gnuradio/grc/blocks/filter_hilbert_fc.block.yml
-share/gnuradio/grc/blocks/filter_iir_filter_xxx.block.yml
-share/gnuradio/grc/blocks/filter_interp_fir_filter_xxx.block.yml
-share/gnuradio/grc/blocks/filter_ival_decimator.block.yml
-share/gnuradio/grc/blocks/filter_low_pass_filter.block.yml
-share/gnuradio/grc/blocks/filter_mmse_resampler_xx.block.yml
-share/gnuradio/grc/blocks/filter_pfb_arb_resampler.block.yml
-share/gnuradio/grc/blocks/filter_pfb_channelizer.block.yml
-share/gnuradio/grc/blocks/filter_pfb_channelizer_hier.block.yml
-share/gnuradio/grc/blocks/filter_pfb_decimator.block.yml
-share/gnuradio/grc/blocks/filter_pfb_interpolator.block.yml
-share/gnuradio/grc/blocks/filter_pfb_synthesizer.block.yml
-share/gnuradio/grc/blocks/filter_rational_resampler_xxx.block.yml
-share/gnuradio/grc/blocks/filter_root_raised_cosine_filter.block.yml
-share/gnuradio/grc/blocks/filter_single_pole_iir_filter_xx.block.yml
share/gnuradio/grc/blocks/grc.tree.yml
share/gnuradio/grc/blocks/import.block.yml
share/gnuradio/grc/blocks/json_config.block.yml
@@ -510,15 +163,7 @@ share/gnuradio/grc/blocks/parameter.bloc
share/gnuradio/grc/blocks/snippet.block.yml
share/gnuradio/grc/blocks/stream.domain.yml
share/gnuradio/grc/blocks/variable.block.yml
-share/gnuradio/grc/blocks/variable_band_pass_filter_taps.block.yml
-share/gnuradio/grc/blocks/variable_band_reject_filter_taps.block.yml
share/gnuradio/grc/blocks/variable_config.block.yml
-share/gnuradio/grc/blocks/variable_file_filter_taps.block.yml
share/gnuradio/grc/blocks/variable_function_probe.block.yml
-share/gnuradio/grc/blocks/variable_high_pass_filter_taps.block.yml
-share/gnuradio/grc/blocks/variable_low_pass_filter_taps.block.yml
-share/gnuradio/grc/blocks/variable_rrc_filter_taps.block.yml
share/gnuradio/grc/blocks/variable_struct.block.yml
-share/gnuradio/grc/blocks/xmlrpc_client.block.yml
-share/gnuradio/grc/blocks/xmlrpc_server.block.yml
share/gnuradio/grc/blocks/yaml_config.block.yml
Index: pkgsrc/ham/gnuradio-core/Makefile
diff -u pkgsrc/ham/gnuradio-core/Makefile:1.135 pkgsrc/ham/gnuradio-core/Makefile:1.136
--- pkgsrc/ham/gnuradio-core/Makefile:1.135 Wed Feb 12 06:45:12 2025
+++ pkgsrc/ham/gnuradio-core/Makefile Thu Feb 27 13:49:50 2025
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.135 2025/02/12 06:45:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.136 2025/02/27 13:49:50 adam Exp $
PKGNAME= gnuradio-core-${VERSION}
-PKGREVISION= 13
COMMENT= Core part of GNU Radio, all others need this
-PLIST_MINUS= # empty
.include "Makefile.common"
#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf
@@ -18,12 +16,23 @@ PLIST_MINUS= # empty
PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
.endif
-# set default as minimum
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
-
-# Take care CONF_FILES stuff (The same code in Nocore.mk)
-#post-install:
-# ${MV} ${DESTDIR}${PREFIX}/etc/gnuradio/conf.d/* \
-# ${DESTDIR}${PREFIX}/${EGDIR}/
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ANALOG=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_AUDIO=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKS=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_CTRLPORT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FFT=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FILTER=ON
+
+REPLACE_PYTHON+= gnuradio-runtime/apps/evaluation_random_numbers.py
+REPLACE_PYTHON+= gnuradio-runtime/lib/math/gen_sine_table.py
+REPLACE_PYTHON+= gnuradio-runtime/python/gnuradio/*.py
+REPLACE_PYTHON+= gnuradio-runtime/python/gnuradio/gr/*.py
+REPLACE_PYTHON+= gnuradio-runtime/python/gnuradio/ctrlport/*.py
+REPLACE_PYTHON+= gnuradio-runtime/python/pmt/*.py
+REPLACE_PYTHON+= gr-analog/python/analog/*.py
+REPLACE_PYTHON+= gr-blocks/python/blocks/*.py
+REPLACE_PYTHON+= gr-fft/python/fft/*.py
+REPLACE_PYTHON+= gr-filter/python/filter/*.py
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-core/Makefile.common
diff -u pkgsrc/ham/gnuradio-core/Makefile.common:1.55 pkgsrc/ham/gnuradio-core/Makefile.common:1.56
--- pkgsrc/ham/gnuradio-core/Makefile.common:1.55 Sat Feb 8 13:33:43 2025
+++ pkgsrc/ham/gnuradio-core/Makefile.common Thu Feb 27 13:49:50 2025
@@ -1,8 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2025/02/08 13:33:43 wiz Exp $
-# This Makefile fragment is included in the package Makefiles for
-# GNU Radio distributed packages (they all share common configure and build
-# settings).
-
+# $NetBSD: Makefile.common,v 1.56 2025/02/27 13:49:50 adam Exp $
# used by ham/gnuradio-channels/Makefile
# used by ham/gnuradio-companion/Makefile
# used by ham/gnuradio-core/Makefile
@@ -22,12 +18,23 @@
# used by ham/gnuradio-wavelet/Makefile
# used by ham/gnuradio-zeromq/Makefile
+# How to configure gnuradio modules to use a separate packages:
+# * gnuradio-core registers and install these modules:
+# - ENABLE_GNURADIO_RUNTIME
+# - ENABLE_GR_ANALOG
+# - ENABLE_GR_BLOCKS
+# - ENABLE_GR_FFT
+# - ENABLE_GR_FILTER
+# * In gr-<module>/CMakeLists.txt:
+# - remove above components in gr_register_component()
+# - remove 'if(ENABLE_GRC)' and 'endif(ENABLE_GRC)'
+# * In gr-<module>/lib/CMakeLists.txt:
+# - add missing libraries in target_link_libraries (PRIVATE)
+
.include "../../ham/gnuradio-core/version.mk"
DISTNAME?= gnuradio-${VERSION}
CATEGORIES+= ham
-#MASTER_SITES= http://s3-dist.gnuradio.org/
-#MASTER_SITES+= http://gnuradio.org/releases/gnuradio/
MASTER_SITES= ${MASTER_SITE_GITHUB:=gnuradio/}
GITHUB_PROJECT= gnuradio
GITHUB_TAG= v${VERSION}
@@ -36,13 +43,11 @@ MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE?= https://www.gnuradio.org/
LICENSE= gnu-gpl-v3
+USE_CXX_FEATURES= c++20
USE_LANGUAGES= c c++
-USE_CXX_FEATURES+= c++20
USE_TOOLS= gmake perl pkg-config
-.include "../../devel/cmake/build.mk"
-
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
@@ -59,15 +64,14 @@ DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:..
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+# filter designer
+DEPENDS+= ${PYPKGPREFIX}-qtgraph-qt5-[0-9]*:../../x11/py-qtgraph-qt5
DISTINFO_FILE= ${.CURDIR}/../../ham/gnuradio-core/distinfo
PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
-# see CMakeLists.txt GR_PYTHON_MIN_VERSION
-PYTHON_VERSIONS_INCOMPATIBLE= 27
-
# three digit version number for shared library ex 3.10.2.0 -> 3.10.2
-PKGVER_MICRO= ${PKGVERSION_NOREV:C/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\3/}
+PKGVER_MICRO= ${PKGVERSION_NOREV:R}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
@@ -87,22 +91,12 @@ CXXFLAGS.SunOS+= -pthreads
INSTALLATION_DIRS+= ${EGDIR}
-# -------- R E S E T CMAKE_CONFIGURE_ARGS H E R E -------------
-
-# \todo Explain why this is safe. Lots of mk fragments add content,
-# and clearing that seems wrong.
-CMAKE_CONFIGURE_ARGS=
-
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GNURADIO_RUNTIME=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ANALOG=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_AUDIO=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKS=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FFT=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FILTER=ON
CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
-
CMAKE_CONFIGURE_ARGS+= -DLIB_SUFFIX=""
+# Disable default components; see cmake/Modules/GrComponent.cmake
+CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
+
# Default setting (for pkgsrc)
CMAKE_CONFIGURE_ARGS+= -Wno-dev
CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
@@ -137,14 +131,12 @@ SUBST_MESSAGE.prefix= Substitute PREFIX
SUBST_FILES.prefix= gnuradio-runtime/lib/constants.cc.in
SUBST_VARS.prefix= PREFIX
-REPLACE_PYTHON= */*.py */*/*.py */*/*/*.py */*/*/*/*.py */*/*/*/*/*.py \
- */*/*/*/*/*/*.py */*/*/*/*/*/*/*.py */*/*/*/*/*/*/*/*.py
-
.include "../../audio/gsm/buildlink3.mk"
.include "../../audio/jack/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../devel/cppunit/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/spdlog/buildlink3.mk"
Index: pkgsrc/ham/gnuradio-core/PLIST
diff -u pkgsrc/ham/gnuradio-core/PLIST:1.41 pkgsrc/ham/gnuradio-core/PLIST:1.42
--- pkgsrc/ham/gnuradio-core/PLIST:1.41 Sat Oct 28 09:23:28 2023
+++ pkgsrc/ham/gnuradio-core/PLIST Thu Feb 27 13:49:50 2025
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.41 2023/10/28 09:23:28 mef Exp $
+@comment $NetBSD: PLIST,v 1.42 2025/02/27 13:49:50 adam Exp $
bin/gnuradio-config-info
+bin/gr-ctrlport-monitor
+bin/gr-perf-monitorx
bin/gr_filter_design
include/gnuradio/analog/agc.h
include/gnuradio/analog/agc2.h
@@ -63,6 +65,7 @@ include/gnuradio/blocks/argmax.h
include/gnuradio/blocks/blockinterleaver_xx.h
include/gnuradio/blocks/blockinterleaving.h
include/gnuradio/blocks/burst_tagger.h
+include/gnuradio/blocks/burst_to_stream.h
include/gnuradio/blocks/char_to_float.h
include/gnuradio/blocks/char_to_short.h
include/gnuradio/blocks/check_lfsr_32k_s.h
@@ -83,6 +86,12 @@ include/gnuradio/blocks/correctiq_auto.h
include/gnuradio/blocks/correctiq_man.h
include/gnuradio/blocks/correctiq_swapiq.h
include/gnuradio/blocks/count_bits.h
+include/gnuradio/blocks/ctrlport_probe2_b.h
+include/gnuradio/blocks/ctrlport_probe2_c.h
+include/gnuradio/blocks/ctrlport_probe2_f.h
+include/gnuradio/blocks/ctrlport_probe2_i.h
+include/gnuradio/blocks/ctrlport_probe2_s.h
+include/gnuradio/blocks/ctrlport_probe_c.h
include/gnuradio/blocks/deinterleave.h
include/gnuradio/blocks/delay.h
include/gnuradio/blocks/divide.h
@@ -206,6 +215,7 @@ include/gnuradio/dictionary_logger_backe
include/gnuradio/endianness.h
include/gnuradio/expj.h
include/gnuradio/fft/api.h
+include/gnuradio/fft/ctrlport_probe_psd.h
include/gnuradio/fft/fft.h
include/gnuradio/fft/fft_shift.h
include/gnuradio/fft/fft_v.h
@@ -234,6 +244,7 @@ include/gnuradio/filter/iir_filter_ccd.h
include/gnuradio/filter/iir_filter_ccf.h
include/gnuradio/filter/iir_filter_ccz.h
include/gnuradio/filter/iir_filter_ffd.h
+include/gnuradio/filter/interp_differentiator_taps.h
include/gnuradio/filter/interp_fir_filter.h
include/gnuradio/filter/interpolator_taps.h
include/gnuradio/filter/ival_decimator.h
@@ -309,6 +320,7 @@ include/gnuradio/top_block.h
include/gnuradio/tpb_detail.h
include/gnuradio/transfer_type.h
include/gnuradio/types.h
+include/gnuradio/version.h
include/gnuradio/xoroshiro128p.h
include/pmt/api.h
include/pmt/pmt.h
@@ -401,183 +413,75 @@ lib/pkgconfig/gnuradio-fft.pc
lib/pkgconfig/gnuradio-filter.pc
lib/pkgconfig/gnuradio-runtime.pc
${PYSITELIB}/gnuradio/__init__.py
-${PYSITELIB}/gnuradio/__init__.pyc
-${PYSITELIB}/gnuradio/__init__.pyo
${PYSITELIB}/gnuradio/analog/__init__.py
-${PYSITELIB}/gnuradio/analog/__init__.pyc
-${PYSITELIB}/gnuradio/analog/__init__.pyo
${PYSITELIB}/gnuradio/analog/am_demod.py
-${PYSITELIB}/gnuradio/analog/am_demod.pyc
-${PYSITELIB}/gnuradio/analog/am_demod.pyo
${PYSITELIB}/gnuradio/analog/analog_python.so
${PYSITELIB}/gnuradio/analog/fm_demod.py
-${PYSITELIB}/gnuradio/analog/fm_demod.pyc
-${PYSITELIB}/gnuradio/analog/fm_demod.pyo
${PYSITELIB}/gnuradio/analog/fm_emph.py
-${PYSITELIB}/gnuradio/analog/fm_emph.pyc
-${PYSITELIB}/gnuradio/analog/fm_emph.pyo
${PYSITELIB}/gnuradio/analog/nbfm_rx.py
-${PYSITELIB}/gnuradio/analog/nbfm_rx.pyc
-${PYSITELIB}/gnuradio/analog/nbfm_rx.pyo
${PYSITELIB}/gnuradio/analog/nbfm_tx.py
-${PYSITELIB}/gnuradio/analog/nbfm_tx.pyc
-${PYSITELIB}/gnuradio/analog/nbfm_tx.pyo
${PYSITELIB}/gnuradio/analog/standard_squelch.py
-${PYSITELIB}/gnuradio/analog/standard_squelch.pyc
-${PYSITELIB}/gnuradio/analog/standard_squelch.pyo
${PYSITELIB}/gnuradio/analog/wfm_rcv.py
-${PYSITELIB}/gnuradio/analog/wfm_rcv.pyc
-${PYSITELIB}/gnuradio/analog/wfm_rcv.pyo
${PYSITELIB}/gnuradio/analog/wfm_rcv_fmdet.py
-${PYSITELIB}/gnuradio/analog/wfm_rcv_fmdet.pyc
-${PYSITELIB}/gnuradio/analog/wfm_rcv_fmdet.pyo
${PYSITELIB}/gnuradio/analog/wfm_rcv_pll.py
-${PYSITELIB}/gnuradio/analog/wfm_rcv_pll.pyc
-${PYSITELIB}/gnuradio/analog/wfm_rcv_pll.pyo
${PYSITELIB}/gnuradio/analog/wfm_tx.py
-${PYSITELIB}/gnuradio/analog/wfm_tx.pyc
-${PYSITELIB}/gnuradio/analog/wfm_tx.pyo
${PYSITELIB}/gnuradio/audio/__init__.py
-${PYSITELIB}/gnuradio/audio/__init__.pyc
-${PYSITELIB}/gnuradio/audio/__init__.pyo
${PYSITELIB}/gnuradio/audio/audio_python.so
${PYSITELIB}/gnuradio/blocks/__init__.py
-${PYSITELIB}/gnuradio/blocks/__init__.pyc
-${PYSITELIB}/gnuradio/blocks/__init__.pyo
${PYSITELIB}/gnuradio/blocks/blocks_python.so
${PYSITELIB}/gnuradio/blocks/matrix_interleaver.py
-${PYSITELIB}/gnuradio/blocks/matrix_interleaver.pyc
-${PYSITELIB}/gnuradio/blocks/matrix_interleaver.pyo
${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.py
-${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.pyc
-${PYSITELIB}/gnuradio/blocks/msg_meta_to_pair.pyo
${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.py
-${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.pyc
-${PYSITELIB}/gnuradio/blocks/msg_pair_to_var.pyo
${PYSITELIB}/gnuradio/blocks/parse_file_metadata.py
-${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyc
-${PYSITELIB}/gnuradio/blocks/parse_file_metadata.pyo
${PYSITELIB}/gnuradio/blocks/pdu_compatibility.py
-${PYSITELIB}/gnuradio/blocks/pdu_compatibility.pyc
-${PYSITELIB}/gnuradio/blocks/pdu_compatibility.pyo
${PYSITELIB}/gnuradio/blocks/sigmf_sink_minimal.py
-${PYSITELIB}/gnuradio/blocks/sigmf_sink_minimal.pyc
-${PYSITELIB}/gnuradio/blocks/sigmf_sink_minimal.pyo
${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.py
-${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyc
-${PYSITELIB}/gnuradio/blocks/stream_to_vector_decimator.pyo
${PYSITELIB}/gnuradio/blocks/var_to_msg.py
-${PYSITELIB}/gnuradio/blocks/var_to_msg.pyc
-${PYSITELIB}/gnuradio/blocks/var_to_msg.pyo
+${PYSITELIB}/gnuradio/ctrlport/GNURadioControlPortClient.py
+${PYSITELIB}/gnuradio/ctrlport/GrDataPlotter.py
+${PYSITELIB}/gnuradio/ctrlport/RPCConnection.py
+${PYSITELIB}/gnuradio/ctrlport/__init__.py
+${PYSITELIB}/gnuradio/ctrlport/icon.png
+${PYSITELIB}/gnuradio/ctrlport/monitor.py
${PYSITELIB}/gnuradio/eng_arg.py
-${PYSITELIB}/gnuradio/eng_arg.pyc
-${PYSITELIB}/gnuradio/eng_arg.pyo
${PYSITELIB}/gnuradio/eng_notation.py
-${PYSITELIB}/gnuradio/eng_notation.pyc
-${PYSITELIB}/gnuradio/eng_notation.pyo
${PYSITELIB}/gnuradio/eng_option.py
-${PYSITELIB}/gnuradio/eng_option.pyc
-${PYSITELIB}/gnuradio/eng_option.pyo
${PYSITELIB}/gnuradio/fft/__init__.py
-${PYSITELIB}/gnuradio/fft/__init__.pyc
-${PYSITELIB}/gnuradio/fft/__init__.pyo
${PYSITELIB}/gnuradio/fft/fft_python.so
${PYSITELIB}/gnuradio/fft/fft_vcc.py
-${PYSITELIB}/gnuradio/fft/fft_vcc.pyc
-${PYSITELIB}/gnuradio/fft/fft_vcc.pyo
${PYSITELIB}/gnuradio/fft/fft_vfc.py
-${PYSITELIB}/gnuradio/fft/fft_vfc.pyc
-${PYSITELIB}/gnuradio/fft/fft_vfc.pyo
${PYSITELIB}/gnuradio/fft/logpwrfft.py
-${PYSITELIB}/gnuradio/fft/logpwrfft.pyc
-${PYSITELIB}/gnuradio/fft/logpwrfft.pyo
${PYSITELIB}/gnuradio/filter/CustomViewBox.py
-${PYSITELIB}/gnuradio/filter/CustomViewBox.pyc
-${PYSITELIB}/gnuradio/filter/CustomViewBox.pyo
${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.py
-${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.pyc
-${PYSITELIB}/gnuradio/filter/GrFilterPlotWidget.pyo
${PYSITELIB}/gnuradio/filter/__init__.py
-${PYSITELIB}/gnuradio/filter/__init__.pyc
-${PYSITELIB}/gnuradio/filter/__init__.pyo
${PYSITELIB}/gnuradio/filter/api_object.py
-${PYSITELIB}/gnuradio/filter/api_object.pyc
-${PYSITELIB}/gnuradio/filter/api_object.pyo
${PYSITELIB}/gnuradio/filter/bandgraphicsview.py
-${PYSITELIB}/gnuradio/filter/bandgraphicsview.pyc
-${PYSITELIB}/gnuradio/filter/bandgraphicsview.pyo
${PYSITELIB}/gnuradio/filter/banditems.py
-${PYSITELIB}/gnuradio/filter/banditems.pyc
-${PYSITELIB}/gnuradio/filter/banditems.pyo
${PYSITELIB}/gnuradio/filter/file_taps_loader.py
-${PYSITELIB}/gnuradio/filter/file_taps_loader.pyc
-${PYSITELIB}/gnuradio/filter/file_taps_loader.pyo
${PYSITELIB}/gnuradio/filter/filter_design.py
-${PYSITELIB}/gnuradio/filter/filter_design.pyc
-${PYSITELIB}/gnuradio/filter/filter_design.pyo
${PYSITELIB}/gnuradio/filter/filter_python.so
${PYSITELIB}/gnuradio/filter/filterbank.py
-${PYSITELIB}/gnuradio/filter/filterbank.pyc
-${PYSITELIB}/gnuradio/filter/filterbank.pyo
${PYSITELIB}/gnuradio/filter/fir_design.py
-${PYSITELIB}/gnuradio/filter/fir_design.pyc
-${PYSITELIB}/gnuradio/filter/fir_design.pyo
${PYSITELIB}/gnuradio/filter/freq_xlating_fft_filter.py
-${PYSITELIB}/gnuradio/filter/freq_xlating_fft_filter.pyc
-${PYSITELIB}/gnuradio/filter/freq_xlating_fft_filter.pyo
${PYSITELIB}/gnuradio/filter/icons_rc.py
-${PYSITELIB}/gnuradio/filter/icons_rc.pyc
-${PYSITELIB}/gnuradio/filter/icons_rc.pyo
${PYSITELIB}/gnuradio/filter/idealbanditems.py
-${PYSITELIB}/gnuradio/filter/idealbanditems.pyc
-${PYSITELIB}/gnuradio/filter/idealbanditems.pyo
${PYSITELIB}/gnuradio/filter/optfir.py
-${PYSITELIB}/gnuradio/filter/optfir.pyc
-${PYSITELIB}/gnuradio/filter/optfir.pyo
${PYSITELIB}/gnuradio/filter/pfb.py
-${PYSITELIB}/gnuradio/filter/pfb.pyc
-${PYSITELIB}/gnuradio/filter/pfb.pyo
${PYSITELIB}/gnuradio/filter/polezero_plot.py
-${PYSITELIB}/gnuradio/filter/polezero_plot.pyc
-${PYSITELIB}/gnuradio/filter/polezero_plot.pyo
${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.py
-${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.pyc
-${PYSITELIB}/gnuradio/filter/pyqt_filter_stacked.pyo
${PYSITELIB}/gnuradio/gr/__init__.py
-${PYSITELIB}/gnuradio/gr/__init__.pyc
-${PYSITELIB}/gnuradio/gr/__init__.pyo
${PYSITELIB}/gnuradio/gr/exceptions.py
-${PYSITELIB}/gnuradio/gr/exceptions.pyc
-${PYSITELIB}/gnuradio/gr/exceptions.pyo
${PYSITELIB}/gnuradio/gr/gateway.py
-${PYSITELIB}/gnuradio/gr/gateway.pyc
-${PYSITELIB}/gnuradio/gr/gateway.pyo
${PYSITELIB}/gnuradio/gr/gr_python.so
${PYSITELIB}/gnuradio/gr/hier_block2.py
-${PYSITELIB}/gnuradio/gr/hier_block2.pyc
-${PYSITELIB}/gnuradio/gr/hier_block2.pyo
${PYSITELIB}/gnuradio/gr/packet_utils.py
-${PYSITELIB}/gnuradio/gr/packet_utils.pyc
-${PYSITELIB}/gnuradio/gr/packet_utils.pyo
${PYSITELIB}/gnuradio/gr/pubsub.py
-${PYSITELIB}/gnuradio/gr/pubsub.pyc
-${PYSITELIB}/gnuradio/gr/pubsub.pyo
${PYSITELIB}/gnuradio/gr/tag_utils.py
-${PYSITELIB}/gnuradio/gr/tag_utils.pyc
-${PYSITELIB}/gnuradio/gr/tag_utils.pyo
${PYSITELIB}/gnuradio/gr/top_block.py
-${PYSITELIB}/gnuradio/gr/top_block.pyc
-${PYSITELIB}/gnuradio/gr/top_block.pyo
${PYSITELIB}/gnuradio/gr_unittest.py
-${PYSITELIB}/gnuradio/gr_unittest.pyc
-${PYSITELIB}/gnuradio/gr_unittest.pyo
${PYSITELIB}/pmt/__init__.py
-${PYSITELIB}/pmt/__init__.pyc
-${PYSITELIB}/pmt/__init__.pyo
${PYSITELIB}/pmt/pmt_python.so
${PYSITELIB}/pmt/pmt_to_python.py
-${PYSITELIB}/pmt/pmt_to_python.pyc
-${PYSITELIB}/pmt/pmt_to_python.pyo
share/doc/gnuradio-${PKGVERSION}/CHANGELOG.md
share/doc/gnuradio-${PKGVERSION}/CONTRIBUTING.md
share/doc/gnuradio-${PKGVERSION}/README.analog
@@ -608,6 +512,7 @@ share/gnuradio/examples/audio/multi_tone
share/gnuradio/examples/audio/noise.py
share/gnuradio/examples/audio/spectrum_inversion.py
share/gnuradio/examples/audio/test_resampler.py
+share/gnuradio/examples/blocks/burst_to_stream.grc
share/gnuradio/examples/blocks/matrix_interleaver.grc
share/gnuradio/examples/blocks/matrix_multiplexer.grc
share/gnuradio/examples/blocks/msg_to_var.grc
@@ -618,6 +523,13 @@ share/gnuradio/examples/blocks/stream_de
share/gnuradio/examples/blocks/stream_mux_demo.grc
share/gnuradio/examples/blocks/var_to_msg.grc
share/gnuradio/examples/blocks/vector_source_with_tags.grc
+share/gnuradio/examples/ctrlport/comparing_resamplers.grc
+share/gnuradio/examples/ctrlport/pfb_sync_test.grc
+share/gnuradio/examples/ctrlport/simple_copy.grc
+share/gnuradio/examples/ctrlport/simple_copy_controller.py
+share/gnuradio/examples/ctrlport/usrp_sink_controller.py
+share/gnuradio/examples/ctrlport/usrp_source_control.grc
+share/gnuradio/examples/ctrlport/usrp_source_controller.py
share/gnuradio/examples/filter/benchmark_filters.py
share/gnuradio/examples/filter/channelize.py
share/gnuradio/examples/filter/chirp_channelize.py
Index: pkgsrc/ham/gnuradio-core/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-core/buildlink3.mk:1.40 pkgsrc/ham/gnuradio-core/buildlink3.mk:1.41
--- pkgsrc/ham/gnuradio-core/buildlink3.mk:1.40 Tue Jul 16 10:02:01 2024
+++ pkgsrc/ham/gnuradio-core/buildlink3.mk Thu Feb 27 13:49:50 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.40 2024/07/16 10:02:01 prlw1 Exp $
+# $NetBSD: buildlink3.mk,v 1.41 2025/02/27 13:49:50 adam Exp $
BUILDLINK_TREE+= gnuradio-core
@@ -6,13 +6,15 @@ BUILDLINK_TREE+= gnuradio-core
GNURADIO_CORE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-core+= gnuradio-core>=3.10.2
-BUILDLINK_ABI_DEPENDS.gnuradio-core?= gnuradio-core>=3.10.9.2nb4
+BUILDLINK_ABI_DEPENDS.gnuradio-core+= gnuradio-core>=3.10.12.0
BUILDLINK_PKGSRCDIR.gnuradio-core?= ../../ham/gnuradio-core
+.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/spdlog/buildlink3.mk"
.include "../../lang/libunwind/buildlink3.mk"
.include "../../math/volk/buildlink3.mk"
+.include "../../textproc/fmtlib/buildlink3.mk"
.endif # GNURADIO_CORE_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-core
Index: pkgsrc/ham/gnuradio-core/distinfo
diff -u pkgsrc/ham/gnuradio-core/distinfo:1.60 pkgsrc/ham/gnuradio-core/distinfo:1.61
--- pkgsrc/ham/gnuradio-core/distinfo:1.60 Sat Feb 8 13:35:40 2025
+++ pkgsrc/ham/gnuradio-core/distinfo Thu Feb 27 13:49:50 2025
@@ -1,19 +1,48 @@
-$NetBSD: distinfo,v 1.60 2025/02/08 13:35:40 wiz Exp $
+$NetBSD: distinfo,v 1.61 2025/02/27 13:49:50 adam Exp $
-BLAKE2s (gnuradio-3.10.9.2.tar.gz) = 1ff9c9ee91f1feddc1c76fed6fa644c7b687e6e5a2ac97f86c69e0c28d76178d
-SHA512 (gnuradio-3.10.9.2.tar.gz) = 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd
-Size (gnuradio-3.10.9.2.tar.gz) = 4413832 bytes
-SHA1 (patch-cmake_Modules_GrPybind.cmake) = b585fc9bddad66f98d9e70db3d9335c937698df9
-SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = 3e4ae78cd722aa54a9626ca458cfe90ab11619a5
-SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = 8f29121bcff204fd4533c113cd05440a7d39477d
+BLAKE2s (gnuradio-3.10.12.0.tar.gz) = 747cd23869a908497f89424ceb8125ef4be99d168110a543772a6e363e7877bc
+SHA512 (gnuradio-3.10.12.0.tar.gz) = 6d94d5f755a12d79ea38b84ac869dbce86b66813ac40f7204afb24d6f70f867a258e9efde0cc24fcb1ab814129da6b941970b0c736870f99139ee65a7a8effa7
+Size (gnuradio-3.10.12.0.tar.gz) = 4978802 bytes
+SHA1 (patch-CMakeLists.txt) = 8034d45c42884de49f15a99384a11cdec63717ef
+SHA1 (patch-cmake_Modules_GrPybind.cmake) = 2357952221a06d95155c89a047b3afd5c15925bb
+SHA1 (patch-gnuradio-runtime_CMakeLists.txt) = 762a615f99fa1a46f3f6c1032e3e643692f06b6c
+SHA1 (patch-gnuradio-runtime_lib_CMakeLists.txt) = fb74a249e4672786dd8bc3ca1e39b37da46f6480
SHA1 (patch-gnuradio-runtime_lib_constants.cc.in) = fef80a546c713c565c3851ee7289b4fa3a49e45b
-SHA1 (patch-gnuradio-runtime_lib_io__signature.cc) = 296612c8b4d91877dbc0db2e9abf0f692f5f43b5
-SHA1 (patch-gnuradio-runtime_lib_thread_thread.cc) = e3679afc3b05879736c5d5683518405f407313a2
+SHA1 (patch-gnuradio-runtime_lib_thread_thread.cc) = f8cd748f3015cdbb0b1c079ee1f6c1a3367fd001
SHA1 (patch-gr-audio_lib_CMakeLists.txt) = d5acab47fdb007c50bb544af436102f0d38317aa
SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = cfa9b629e5cf21198cfd53cf27a908b5874866f4
-SHA1 (patch-gr-blocks_lib_message__debug__impl.cc) = ae36b039e0224185fdd317390fcdfc47acb28365
-SHA1 (patch-gr-network_lib_socket__pdu__impl.cc) = 105784fc874c20daba0a1b42c29cd83496d76229
-SHA1 (patch-gr-network_lib_tcp__sink__impl.cc) = 2bd9a0920b293a244ea295d08d02a9a3ea2eabfd
-SHA1 (patch-gr-network_lib_udp__sink__impl.cc) = 2ad59e9572467944924e7e9f5f4f77d349b37c90
-SHA1 (patch-gr-network_lib_udp__source__impl.cc) = 4aea2b0a4cf3702a108fb8511b9492eb453924b1
+SHA1 (patch-gr-channels_CMakeLists.txt) = 5dc111719a5d797991730a6715d8241ed64b77fe
+SHA1 (patch-gr-channels_lib_CMakeLists.txt) = 3b5b830d77fe15e1f41b1954f98ad6fea070be3f
+SHA1 (patch-gr-digital_CMakeLists.txt) = 385c0ad132efd61520d34a111043c378ee2bd8be
+SHA1 (patch-gr-digital_lib_CMakeLists.txt) = a5d41caaa25b9e50144791a03984ce494feacd7a
+SHA1 (patch-gr-dtv_CMakeLists.txt) = 00fb0adf49d81928ea9ffedf09fdc5f3595170e4
+SHA1 (patch-gr-dtv_lib_CMakeLists.txt) = 87104344567c4a756e6f97af667f1fedbb48e50d
+SHA1 (patch-gr-fec_CMakeLists.txt) = 8b8f7555eca3db72d6f3d48ed9b455dfba028594
+SHA1 (patch-gr-fec_lib_CMakeLists.txt) = 79bbb08fafb8392eef6a6fdff538cb824ccdb111
+SHA1 (patch-gr-fec_lib_reed-solomon_CMakeLists.txt) = de2470bae33089773eb41f57ebe972369530a4cd
+SHA1 (patch-gr-filter_include_gnuradio_filter_CMakeLists.txt) = dd726f3f7e1e35808335c0a3e624dde0291166ce
+SHA1 (patch-gr-network_CMakeLists.txt) = 9b249a1eb914dbe08d728f7363870e08e933b691
+SHA1 (patch-gr-network_lib_CMakeLists.txt) = 6896a4d0821833b0279e37cceb89fcfa752d57c6
+SHA1 (patch-gr-pdu_CMakeLists.txt) = efe1802074c0b12a0be2a401b9235f5cb03653bd
+SHA1 (patch-gr-pdu_lib_CMakeLists.txt) = 5cb8dfbf08fb65017bbc2f913e96a1a4483f507d
+SHA1 (patch-gr-qtgui_CMakeLists.txt) = fa846097cc5ec7ca0d021d8d84f660928cf5a365
SHA1 (patch-gr-qtgui_examples_c++_CMakeLists.txt) = 06a5885b5e661667cf4bfe936ff45723d0801c22
+SHA1 (patch-gr-qtgui_lib_CMakeLists.txt) = 35de84f2826d7759abe91bbe729bf140bd347fec
+SHA1 (patch-gr-soapy_CMakeLists.txt) = 189b74b64999104664b0122a00d958c361a12f5a
+SHA1 (patch-gr-soapy_lib_CMakeLists.txt) = 7a1aacc298d46be8dde5985549c11027baed7614
+SHA1 (patch-gr-trellis_CMakeLists.txt) = 76292cff737d87a4deaafb80da6e71757a13a707
+SHA1 (patch-gr-trellis_lib_CMakeLists.txt) = 15718e192e696db93fbda0bfd36131cf049294ba
+SHA1 (patch-gr-uhd_CMakeLists.txt) = e7e722a4785f2e2cd0a2c567fdf4acb9b145729d
+SHA1 (patch-gr-uhd_examples_c++_CMakeLists.txt) = 3a5fd7c123792616e455be2d966bc67e07ddc671
+SHA1 (patch-gr-uhd_lib_CMakeLists.txt) = 9dc85b0a987e2ecd3ca372169b96cb723085b254
+SHA1 (patch-gr-utils_CMakeLists.txt) = fd2a0033a17a1028b07142e8b3969630474c60e5
+SHA1 (patch-gr-video-sdl_CMakeLists.txt) = 7db78112f0c448995ae7df1be1e6a9d6571ac6eb
+SHA1 (patch-gr-video-sdl_lib_CMakeLists.txt) = 8ee0133e7a522046ace33d5862acdb5d2f993366
+SHA1 (patch-gr-vocoder_CMakeLists.txt) = 21d31583cf2f2a7d4134ebae0ef846277f35bc48
+SHA1 (patch-gr-vocoder_lib_CMakeLists.txt) = 754c23706d5e68f729726253b100b0ad8b8a1fdb
+SHA1 (patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt) = 8daa6d97e6fc58a601ebf51f706f8337b82c5801
+SHA1 (patch-gr-wavelet_CMakeLists.txt) = 2f38c361d09d90706781df56dbebb3c1530e1964
+SHA1 (patch-gr-wavelet_lib_CMakeLists.txt) = 5b0fbe08fdf17275aad357fb958c5e59ee58f622
+SHA1 (patch-gr-zeromq_CMakeLists.txt) = e0fa42b31d0b1c45503916a613a9eaeddfc6507f
+SHA1 (patch-gr-zeromq_lib_CMakeLists.txt) = 18d85bd856e3809c563116f5ff378753943a6907
+SHA1 (patch-grc_CMakeLists.txt) = 525c167657fc8c54aa47b10644f18eaf0bc40ea2
Index: pkgsrc/ham/gnuradio-core/options.mk
diff -u pkgsrc/ham/gnuradio-core/options.mk:1.16 pkgsrc/ham/gnuradio-core/options.mk:1.17
--- pkgsrc/ham/gnuradio-core/options.mk:1.16 Mon Oct 14 06:45:46 2024
+++ pkgsrc/ham/gnuradio-core/options.mk Thu Feb 27 13:49:51 2025
@@ -1,18 +1,11 @@
-# $NetBSD: options.mk,v 1.16 2024/10/14 06:45:46 wiz Exp $
+# $NetBSD: options.mk,v 1.17 2025/02/27 13:49:51 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
-PKG_SUPPORTED_OPTIONS= filter-design alsa
+PKG_SUPPORTED_OPTIONS= alsa
# alsa is said supported, but not good on NetBSD
-PKG_SUGGESTED_OPTIONS= filter-design
-
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mfilter-design)
-PYTHON_VERSIONS_INCOMPATIBLE+= 313
-DEPENDS+= ${PYPKGPREFIX}-qtgraph-qt5-[0-9]*:../../x11/py-qtgraph-qt5
-.endif
-
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
ALSA_ENABLED=
Index: pkgsrc/ham/gnuradio-core/version.mk
diff -u pkgsrc/ham/gnuradio-core/version.mk:1.15 pkgsrc/ham/gnuradio-core/version.mk:1.16
--- pkgsrc/ham/gnuradio-core/version.mk:1.15 Sat Jan 27 09:27:36 2024
+++ pkgsrc/ham/gnuradio-core/version.mk Thu Feb 27 13:49:51 2025
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.15 2024/01/27 09:27:36 mef Exp $
+# $NetBSD: version.mk,v 1.16 2025/02/27 13:49:51 adam Exp $
-VERSION= 3.10.9.2
+VERSION= 3.10.12.0
Index: pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake
diff -u pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake:1.2 pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake:1.3
--- pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake:1.2 Sun Oct 9 07:56:09 2022
+++ pkgsrc/ham/gnuradio-core/patches/patch-cmake_Modules_GrPybind.cmake Thu Feb 27 13:49:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_Modules_GrPybind.cmake,v 1.2 2022/10/09 07:56:09 adam Exp $
+$NetBSD: patch-cmake_Modules_GrPybind.cmake,v 1.3 2025/02/27 13:49:51 adam Exp $
Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
@@ -9,7 +9,7 @@ Disable use of precompiled headers; it d
# This should speed up building of the python bindings at least in larger modules
# This functionality is only available in CMake >= 3.16
- if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-+ if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++ if(FALSE)
target_precompile_headers(
${name}_python
PRIVATE
Index: pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt
diff -u pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt:1.2 pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt:1.3
--- pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt:1.2 Sun Oct 9 07:56:09 2022
+++ pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gnuradio-runtime_CMakeLists.txt,v 1.2 2022/10/09 07:56:09 adam Exp $
+$NetBSD: patch-gnuradio-runtime_CMakeLists.txt,v 1.3 2025/02/27 13:49:51 adam Exp $
Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
@@ -9,7 +9,7 @@ Disable use of precompiled headers; it d
# Setup precompiled header pseudo-component
########################################################################
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-+if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(FALSE)
set(GR_CMAKE_HAS_PCH ${CMAKE_VERSION})
endif()
Index: pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt
diff -u pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt:1.2 pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt:1.3
--- pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt:1.2 Sun Oct 9 07:56:09 2022
+++ pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-gnuradio-runtime_lib_CMakeLists.txt,v 1.2 2022/10/09 07:56:09 adam Exp $
+$NetBSD: patch-gnuradio-runtime_lib_CMakeLists.txt,v 1.3 2025/02/27 13:49:51 adam Exp $
Disable use of precompiled headers; it doesn't play nice with pkgsrc nor ccache.
@@ -9,7 +9,7 @@ Disable use of precompiled headers; it d
target_compile_definitions(gnuradio-runtime PRIVATE BOOST_DLL_USE_STD_FS)
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
-+if(FALSE AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
++if(FALSE)
target_precompile_headers(
gnuradio-runtime PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/sync_block.h)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc
diff -u pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc:1.1 pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc:1.2
--- pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc:1.1 Fri Jul 7 12:20:59 2023
+++ pkgsrc/ham/gnuradio-core/patches/patch-gnuradio-runtime_lib_thread_thread.cc Thu Feb 27 13:49:51 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-gnuradio-runtime_lib_thread_thread.cc,v 1.1 2023/07/07 12:20:59 jperkin Exp $
+$NetBSD: patch-gnuradio-runtime_lib_thread_thread.cc,v 1.2 2025/02/27 13:49:51 adam Exp $
Fix SunOS build.
---- gnuradio-runtime/lib/thread/thread.cc.orig 2023-04-01 10:49:26.000000000 +0000
+--- gnuradio-runtime/lib/thread/thread.cc.orig 2025-02-20 01:23:56.000000000 +0000
+++ gnuradio-runtime/lib/thread/thread.cc
-@@ -135,7 +135,7 @@ void set_thread_name(gr_thread_t thread,
-
+@@ -19,7 +19,7 @@
+ #include <windows.h>
#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \
defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
-- defined(__NetBSD__)
-+ defined(__NetBSD__) || defined(__sun)
-
- namespace gr {
- namespace thread {
+- defined(__NetBSD__) || defined(__OpenBSD__)
++ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
+ #define __GR_TARGET_BSD__
+ #include <pthread.h>
+ #ifdef __OpenBSD__
Index: pkgsrc/ham/gnuradio-digital/Makefile
diff -u pkgsrc/ham/gnuradio-digital/Makefile:1.74 pkgsrc/ham/gnuradio-digital/Makefile:1.75
--- pkgsrc/ham/gnuradio-digital/Makefile:1.74 Wed Feb 12 06:45:12 2025
+++ pkgsrc/ham/gnuradio-digital/Makefile Thu Feb 27 13:49:53 2025
@@ -1,18 +1,14 @@
-# $NetBSD: Makefile,v 1.74 2025/02/12 06:45:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-digital-${VERSION}
-PKGREVISION= 13
COMMENT= Digital related algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-# link to libgnuradio-fft.so.${PKGVERSON_NOREV}
-.include "../../ham/gnuradio-core/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DIGITAL=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-digital/examples/narrowband/*.py
+REPLACE_PYTHON+= gr-digital/python/digital/*.py
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-digital/PLIST
diff -u pkgsrc/ham/gnuradio-digital/PLIST:1.18 pkgsrc/ham/gnuradio-digital/PLIST:1.19
--- pkgsrc/ham/gnuradio-digital/PLIST:1.18 Tue Apr 11 11:20:51 2023
+++ pkgsrc/ham/gnuradio-digital/PLIST Thu Feb 27 13:49:53 2025
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2023/04/11 11:20:51 mef Exp $
+@comment $NetBSD: PLIST,v 1.19 2025/02/27 13:49:53 adam Exp $
include/gnuradio/digital/adaptive_algorithm.h
include/gnuradio/digital/adaptive_algorithm_cma.h
include/gnuradio/digital/adaptive_algorithm_lms.h
include/gnuradio/digital/adaptive_algorithm_nlms.h
+include/gnuradio/digital/additive_scrambler.h
include/gnuradio/digital/additive_scrambler_bb.h
include/gnuradio/digital/api.h
include/gnuradio/digital/binary_slicer_fb.h
@@ -88,79 +89,33 @@ lib/cmake/gnuradio/gnuradio-digitalConfi
lib/cmake/gnuradio/gnuradio-digitalTargets-release.cmake
lib/cmake/gnuradio/gnuradio-digitalTargets.cmake
lib/libgnuradio-digital.so
-lib/libgnuradio-digital.so.${PKGVER_MICRO}
lib/libgnuradio-digital.so.${PKGVERSION}
+lib/libgnuradio-digital.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-digital.pc
${PYSITELIB}/gnuradio/digital/__init__.py
-${PYSITELIB}/gnuradio/digital/__init__.pyc
-${PYSITELIB}/gnuradio/digital/__init__.pyo
${PYSITELIB}/gnuradio/digital/bpsk.py
-${PYSITELIB}/gnuradio/digital/bpsk.pyc
-${PYSITELIB}/gnuradio/digital/bpsk.pyo
${PYSITELIB}/gnuradio/digital/constellation_map_generator.py
-${PYSITELIB}/gnuradio/digital/constellation_map_generator.pyc
-${PYSITELIB}/gnuradio/digital/constellation_map_generator.pyo
${PYSITELIB}/gnuradio/digital/cpm.py
-${PYSITELIB}/gnuradio/digital/cpm.pyc
-${PYSITELIB}/gnuradio/digital/cpm.pyo
${PYSITELIB}/gnuradio/digital/digital_python.so
${PYSITELIB}/gnuradio/digital/generic_mod_demod.py
-${PYSITELIB}/gnuradio/digital/generic_mod_demod.pyc
-${PYSITELIB}/gnuradio/digital/generic_mod_demod.pyo
${PYSITELIB}/gnuradio/digital/gfsk.py
-${PYSITELIB}/gnuradio/digital/gfsk.pyc
-${PYSITELIB}/gnuradio/digital/gfsk.pyo
${PYSITELIB}/gnuradio/digital/gmsk.py
-${PYSITELIB}/gnuradio/digital/gmsk.pyc
-${PYSITELIB}/gnuradio/digital/gmsk.pyo
${PYSITELIB}/gnuradio/digital/modulation_utils.py
-${PYSITELIB}/gnuradio/digital/modulation_utils.pyc
-${PYSITELIB}/gnuradio/digital/modulation_utils.pyo
${PYSITELIB}/gnuradio/digital/ofdm_txrx.py
-${PYSITELIB}/gnuradio/digital/ofdm_txrx.pyc
-${PYSITELIB}/gnuradio/digital/ofdm_txrx.pyo
${PYSITELIB}/gnuradio/digital/packet_utils.py
-${PYSITELIB}/gnuradio/digital/packet_utils.pyc
-${PYSITELIB}/gnuradio/digital/packet_utils.pyo
${PYSITELIB}/gnuradio/digital/psk.py
-${PYSITELIB}/gnuradio/digital/psk.pyc
-${PYSITELIB}/gnuradio/digital/psk.pyo
${PYSITELIB}/gnuradio/digital/psk_constellations.py
-${PYSITELIB}/gnuradio/digital/psk_constellations.pyc
-${PYSITELIB}/gnuradio/digital/psk_constellations.pyo
${PYSITELIB}/gnuradio/digital/qam.py
-${PYSITELIB}/gnuradio/digital/qam.pyc
-${PYSITELIB}/gnuradio/digital/qam.pyo
${PYSITELIB}/gnuradio/digital/qam_constellations.py
-${PYSITELIB}/gnuradio/digital/qam_constellations.pyc
-${PYSITELIB}/gnuradio/digital/qam_constellations.pyo
${PYSITELIB}/gnuradio/digital/qamlike.py
-${PYSITELIB}/gnuradio/digital/qamlike.pyc
-${PYSITELIB}/gnuradio/digital/qamlike.pyo
${PYSITELIB}/gnuradio/digital/qpsk.py
-${PYSITELIB}/gnuradio/digital/qpsk.pyc
-${PYSITELIB}/gnuradio/digital/qpsk.pyo
${PYSITELIB}/gnuradio/digital/soft_dec_lut_gen.py
-${PYSITELIB}/gnuradio/digital/soft_dec_lut_gen.pyc
-${PYSITELIB}/gnuradio/digital/soft_dec_lut_gen.pyo
${PYSITELIB}/gnuradio/digital/utils/__init__.py
-${PYSITELIB}/gnuradio/digital/utils/__init__.pyc
-${PYSITELIB}/gnuradio/digital/utils/__init__.pyo
${PYSITELIB}/gnuradio/digital/utils/alignment.py
-${PYSITELIB}/gnuradio/digital/utils/alignment.pyc
-${PYSITELIB}/gnuradio/digital/utils/alignment.pyo
${PYSITELIB}/gnuradio/digital/utils/gray_code.py
-${PYSITELIB}/gnuradio/digital/utils/gray_code.pyc
-${PYSITELIB}/gnuradio/digital/utils/gray_code.pyo
${PYSITELIB}/gnuradio/digital/utils/lfsr.py
-${PYSITELIB}/gnuradio/digital/utils/lfsr.pyc
-${PYSITELIB}/gnuradio/digital/utils/lfsr.pyo
${PYSITELIB}/gnuradio/digital/utils/mod_codes.py
-${PYSITELIB}/gnuradio/digital/utils/mod_codes.pyc
-${PYSITELIB}/gnuradio/digital/utils/mod_codes.pyo
${PYSITELIB}/gnuradio/digital/utils/tagged_streams.py
-${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyc
-${PYSITELIB}/gnuradio/digital/utils/tagged_streams.pyo
share/doc/gnuradio-${PKGVERSION}/README.digital
share/gnuradio/examples/digital/berawgn.py
share/gnuradio/examples/digital/burst_shaper.grc
@@ -221,6 +176,7 @@ share/gnuradio/examples/digital/snr_esti
share/gnuradio/grc/blocks/digital.tree.yml
share/gnuradio/grc/blocks/digital_adaptive_algorithm.block.yml
share/gnuradio/grc/blocks/digital_additive_scrambler_bb.block.yml
+share/gnuradio/grc/blocks/digital_additive_scrambler_xx.block.yml
share/gnuradio/grc/blocks/digital_binary_slicer_fb.block.yml
share/gnuradio/grc/blocks/digital_burst_shaper.block.yml
share/gnuradio/grc/blocks/digital_chunks_to_symbols.block.yml
Index: pkgsrc/ham/gnuradio-digital/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.6 pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.7
--- pkgsrc/ham/gnuradio-digital/buildlink3.mk:1.6 Sat Mar 12 23:04:45 2022
+++ pkgsrc/ham/gnuradio-digital/buildlink3.mk Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/02/27 13:49:53 adam Exp $
BUILDLINK_TREE+= gnuradio-digital
@@ -7,6 +7,8 @@ GNURADIO_DIGITAL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-digital+= gnuradio-digital>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../ham/gnuradio-digital
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
.endif # GNURADIO_DIGITAL_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-digital
Index: pkgsrc/ham/gnuradio-doxygen/Makefile
diff -u pkgsrc/ham/gnuradio-doxygen/Makefile:1.94 pkgsrc/ham/gnuradio-doxygen/Makefile:1.95
--- pkgsrc/ham/gnuradio-doxygen/Makefile:1.94 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-doxygen/Makefile Thu Feb 27 13:49:53 2025
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.94 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-doxygen-${VERSION}
-PKGREVISION= 13
COMMENT= Doxygen documentation of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
TOOL_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
TOOL_DEPENDS+= doxygen>=1.9.5:../../devel/doxygen
@@ -15,7 +13,6 @@ TOOL_DEPENDS+= tex-xcolor-[0-9]*:../../p
TOOL_DEPENDS+= texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
TOOL_DEPENDS+= web2c-[0-9]*:../../print/web2c
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_DOXYGEN=ON
# Doxygen output is never reproducible.
Index: pkgsrc/ham/gnuradio-dtv/Makefile
diff -u pkgsrc/ham/gnuradio-dtv/Makefile:1.76 pkgsrc/ham/gnuradio-dtv/Makefile:1.77
--- pkgsrc/ham/gnuradio-dtv/Makefile:1.76 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-dtv/Makefile Thu Feb 27 13:49:53 2025
@@ -1,19 +1,13 @@
-# $NetBSD: Makefile,v 1.76 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-dtv-${VERSION}
-PKGREVISION= 13
COMMENT= Various digital television standards of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DTV=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FEC=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= fec companion
+REPLACE_PYTHON+= gr-dtv/python/dtv/*.py
.include "../../ham/gnuradio-fec/buildlink3.mk"
-.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-dtv/PLIST
diff -u pkgsrc/ham/gnuradio-dtv/PLIST:1.14 pkgsrc/ham/gnuradio-dtv/PLIST:1.15
--- pkgsrc/ham/gnuradio-dtv/PLIST:1.14 Thu May 26 15:20:09 2022
+++ pkgsrc/ham/gnuradio-dtv/PLIST Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2022/05/26 15:20:09 mef Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/02/27 13:49:53 adam Exp $
include/gnuradio/dtv/api.h
include/gnuradio/dtv/atsc_consts.h
include/gnuradio/dtv/atsc_deinterleaver.h
@@ -63,18 +63,12 @@ lib/cmake/gnuradio/gnuradio-dtvConfig.cm
lib/cmake/gnuradio/gnuradio-dtvTargets-release.cmake
lib/cmake/gnuradio/gnuradio-dtvTargets.cmake
lib/libgnuradio-dtv.so
-lib/libgnuradio-dtv.so.${PKGVER_MICRO}
lib/libgnuradio-dtv.so.${PKGVERSION}
+lib/libgnuradio-dtv.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-dtv.pc
${PYSITELIB}/gnuradio/dtv/__init__.py
-${PYSITELIB}/gnuradio/dtv/__init__.pyc
-${PYSITELIB}/gnuradio/dtv/__init__.pyo
${PYSITELIB}/gnuradio/dtv/atsc_rx.py
-${PYSITELIB}/gnuradio/dtv/atsc_rx.pyc
-${PYSITELIB}/gnuradio/dtv/atsc_rx.pyo
${PYSITELIB}/gnuradio/dtv/atsc_rx_filter.py
-${PYSITELIB}/gnuradio/dtv/atsc_rx_filter.pyc
-${PYSITELIB}/gnuradio/dtv/atsc_rx_filter.pyo
${PYSITELIB}/gnuradio/dtv/dtv_python.so
share/doc/gnuradio-${PKGVERSION}/README.dtv
share/gnuradio/examples/dtv/README.atsc
Index: pkgsrc/ham/gnuradio-dtv/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-dtv/buildlink3.mk:1.5 pkgsrc/ham/gnuradio-dtv/buildlink3.mk:1.6
--- pkgsrc/ham/gnuradio-dtv/buildlink3.mk:1.5 Sat Mar 12 23:04:45 2022
+++ pkgsrc/ham/gnuradio-dtv/buildlink3.mk Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/02/27 13:49:53 adam Exp $
BUILDLINK_TREE+= gnuradio-dtv
@@ -7,6 +7,8 @@ GNURADIO_DTV_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-dtv+= gnuradio-dtv>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-dtv?= ../../ham/gnuradio-dtv
+
+.include "../../ham/gnuradio-fec/buildlink3.mk"
.endif # GNURADIO_DTV_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-dtv
Index: pkgsrc/ham/gnuradio-fec/Makefile
diff -u pkgsrc/ham/gnuradio-fec/Makefile:1.75 pkgsrc/ham/gnuradio-fec/Makefile:1.76
--- pkgsrc/ham/gnuradio-fec/Makefile:1.75 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-fec/Makefile Thu Feb 27 13:49:53 2025
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.75 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.76 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-fec-${VERSION}
-PKGREVISION= 13
COMMENT= Forward Error Correction blocks, utilities, & examples of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_FEC=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-fec/python/fec/*.py
+REPLACE_PYTHON+= gr-fec/python/fec/LDPC/*.py
+REPLACE_PYTHON+= gr-fec/python/fec/polar/*.py
-.include "../../math/gsl/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-fec/PLIST
diff -u pkgsrc/ham/gnuradio-fec/PLIST:1.17 pkgsrc/ham/gnuradio-fec/PLIST:1.18
--- pkgsrc/ham/gnuradio-fec/PLIST:1.17 Tue Apr 11 11:20:51 2023
+++ pkgsrc/ham/gnuradio-fec/PLIST Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2023/04/11 11:20:51 mef Exp $
+@comment $NetBSD: PLIST,v 1.18 2025/02/27 13:49:53 adam Exp $
bin/polar_channel_construction
include/gnuradio/fec/alist.h
include/gnuradio/fec/api.h
@@ -54,82 +54,34 @@ lib/cmake/gnuradio/gnuradio-fecConfig.cm
lib/cmake/gnuradio/gnuradio-fecTargets-release.cmake
lib/cmake/gnuradio/gnuradio-fecTargets.cmake
lib/libgnuradio-fec.so
-lib/libgnuradio-fec.so.${PKGVER_MICRO}
lib/libgnuradio-fec.so.${PKGVERSION}
+lib/libgnuradio-fec.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-fec.pc
${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix.py
-${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix.pyc
-${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix.pyo
${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.py
-${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.pyc
-${PYSITELIB}/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.pyo
${PYSITELIB}/gnuradio/fec/LDPC/__init__.py
-${PYSITELIB}/gnuradio/fec/LDPC/__init__.pyc
-${PYSITELIB}/gnuradio/fec/LDPC/__init__.pyo
${PYSITELIB}/gnuradio/fec/__init__.py
-${PYSITELIB}/gnuradio/fec/__init__.pyc
-${PYSITELIB}/gnuradio/fec/__init__.pyo
${PYSITELIB}/gnuradio/fec/bercurve_generator.py
-${PYSITELIB}/gnuradio/fec/bercurve_generator.pyc
-${PYSITELIB}/gnuradio/fec/bercurve_generator.pyo
${PYSITELIB}/gnuradio/fec/bitflip.py
-${PYSITELIB}/gnuradio/fec/bitflip.pyc
-${PYSITELIB}/gnuradio/fec/bitflip.pyo
${PYSITELIB}/gnuradio/fec/capillary_threaded_decoder.py
-${PYSITELIB}/gnuradio/fec/capillary_threaded_decoder.pyc
-${PYSITELIB}/gnuradio/fec/capillary_threaded_decoder.pyo
${PYSITELIB}/gnuradio/fec/capillary_threaded_encoder.py
-${PYSITELIB}/gnuradio/fec/capillary_threaded_encoder.pyc
-${PYSITELIB}/gnuradio/fec/capillary_threaded_encoder.pyo
${PYSITELIB}/gnuradio/fec/extended_async_encoder.py
-${PYSITELIB}/gnuradio/fec/extended_async_encoder.pyc
-${PYSITELIB}/gnuradio/fec/extended_async_encoder.pyo
${PYSITELIB}/gnuradio/fec/extended_decoder.py
-${PYSITELIB}/gnuradio/fec/extended_decoder.pyc
-${PYSITELIB}/gnuradio/fec/extended_decoder.pyo
${PYSITELIB}/gnuradio/fec/extended_encoder.py
-${PYSITELIB}/gnuradio/fec/extended_encoder.pyc
-${PYSITELIB}/gnuradio/fec/extended_encoder.pyo
${PYSITELIB}/gnuradio/fec/extended_tagged_decoder.py
-${PYSITELIB}/gnuradio/fec/extended_tagged_decoder.pyc
-${PYSITELIB}/gnuradio/fec/extended_tagged_decoder.pyo
${PYSITELIB}/gnuradio/fec/extended_tagged_encoder.py
-${PYSITELIB}/gnuradio/fec/extended_tagged_encoder.pyc
-${PYSITELIB}/gnuradio/fec/extended_tagged_encoder.pyo
${PYSITELIB}/gnuradio/fec/fec_python.so
${PYSITELIB}/gnuradio/fec/fec_test.py
-${PYSITELIB}/gnuradio/fec/fec_test.pyc
-${PYSITELIB}/gnuradio/fec/fec_test.pyo
${PYSITELIB}/gnuradio/fec/polar/__init__.py
-${PYSITELIB}/gnuradio/fec/polar/__init__.pyc
-${PYSITELIB}/gnuradio/fec/polar/__init__.pyo
${PYSITELIB}/gnuradio/fec/polar/channel_construction.py
-${PYSITELIB}/gnuradio/fec/polar/channel_construction.pyc
-${PYSITELIB}/gnuradio/fec/polar/channel_construction.pyo
${PYSITELIB}/gnuradio/fec/polar/channel_construction_awgn.py
-${PYSITELIB}/gnuradio/fec/polar/channel_construction_awgn.pyc
-${PYSITELIB}/gnuradio/fec/polar/channel_construction_awgn.pyo
${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.py
-${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.pyc
-${PYSITELIB}/gnuradio/fec/polar/channel_construction_bec.pyo
${PYSITELIB}/gnuradio/fec/polar/common.py
-${PYSITELIB}/gnuradio/fec/polar/common.pyc
-${PYSITELIB}/gnuradio/fec/polar/common.pyo
${PYSITELIB}/gnuradio/fec/polar/decoder.py
-${PYSITELIB}/gnuradio/fec/polar/decoder.pyc
-${PYSITELIB}/gnuradio/fec/polar/decoder.pyo
${PYSITELIB}/gnuradio/fec/polar/encoder.py
-${PYSITELIB}/gnuradio/fec/polar/encoder.pyc
-${PYSITELIB}/gnuradio/fec/polar/encoder.pyo
${PYSITELIB}/gnuradio/fec/polar/helper_functions.py
-${PYSITELIB}/gnuradio/fec/polar/helper_functions.pyc
-${PYSITELIB}/gnuradio/fec/polar/helper_functions.pyo
${PYSITELIB}/gnuradio/fec/threaded_decoder.py
-${PYSITELIB}/gnuradio/fec/threaded_decoder.pyc
-${PYSITELIB}/gnuradio/fec/threaded_decoder.pyo
${PYSITELIB}/gnuradio/fec/threaded_encoder.py
-${PYSITELIB}/gnuradio/fec/threaded_encoder.pyc
-${PYSITELIB}/gnuradio/fec/threaded_encoder.pyo
share/doc/gnuradio-${PKGVERSION}/README.fec
share/gnuradio/examples/fec/ber_curve_gen.grc
share/gnuradio/examples/fec/ber_curve_gen_ldpc.grc
Index: pkgsrc/ham/gnuradio-fec/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-fec/buildlink3.mk:1.5 pkgsrc/ham/gnuradio-fec/buildlink3.mk:1.6
--- pkgsrc/ham/gnuradio-fec/buildlink3.mk:1.5 Sat Mar 12 23:04:45 2022
+++ pkgsrc/ham/gnuradio-fec/buildlink3.mk Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/02/27 13:49:53 adam Exp $
BUILDLINK_TREE+= gnuradio-fec
@@ -7,6 +7,9 @@ GNURADIO_FEC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-fec+= gnuradio-fec>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-fec?= ../../ham/gnuradio-fec
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
+.include "../../math/gsl/buildlink3.mk"
.endif # GNURADIO_FEC_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-fec
Index: pkgsrc/ham/gnuradio-network/Makefile
diff -u pkgsrc/ham/gnuradio-network/Makefile:1.52 pkgsrc/ham/gnuradio-network/Makefile:1.53
--- pkgsrc/ham/gnuradio-network/Makefile:1.52 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-network/Makefile Thu Feb 27 13:49:53 2025
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.52 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-network-${VERSION}
-PKGREVISION= 14
COMMENT= Network blocks for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_NETWORK=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-network/python/network/*.py
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-network/PLIST
diff -u pkgsrc/ham/gnuradio-network/PLIST:1.8 pkgsrc/ham/gnuradio-network/PLIST:1.9
--- pkgsrc/ham/gnuradio-network/PLIST:1.8 Tue Apr 11 11:20:51 2023
+++ pkgsrc/ham/gnuradio-network/PLIST Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2023/04/11 11:20:51 mef Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/02/27 13:49:53 adam Exp $
include/gnuradio/network/api.h
include/gnuradio/network/packet_headers.h
include/gnuradio/network/socket_pdu.h
@@ -11,16 +11,12 @@ lib/cmake/gnuradio/gnuradio-networkConfi
lib/cmake/gnuradio/gnuradio-networkTargets-release.cmake
lib/cmake/gnuradio/gnuradio-networkTargets.cmake
lib/libgnuradio-network.so
-lib/libgnuradio-network.so.${PKGVER_MICRO}
lib/libgnuradio-network.so.${PKGVERSION}
+lib/libgnuradio-network.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-network.pc
${PYSITELIB}/gnuradio/network/__init__.py
-${PYSITELIB}/gnuradio/network/__init__.pyc
-${PYSITELIB}/gnuradio/network/__init__.pyo
${PYSITELIB}/gnuradio/network/network_python.so
${PYSITELIB}/gnuradio/network/tcp_source.py
-${PYSITELIB}/gnuradio/network/tcp_source.pyc
-${PYSITELIB}/gnuradio/network/tcp_source.pyo
share/doc/gnuradio-${PKGVERSION}/README.network
share/gnuradio/examples/network/test_tcp_sink_client.grc
share/gnuradio/examples/network/test_tcp_sink_client_ipv6.grc
Index: pkgsrc/ham/gnuradio-pdu/Makefile
diff -u pkgsrc/ham/gnuradio-pdu/Makefile:1.26 pkgsrc/ham/gnuradio-pdu/Makefile:1.27
--- pkgsrc/ham/gnuradio-pdu/Makefile:1.26 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-pdu/Makefile Thu Feb 27 13:49:53 2025
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2025/02/27 13:49:53 adam Exp $
PKGNAME= gnuradio-pdu-${VERSION}
-PKGREVISION= 13
COMMENT= Protocol Data Units for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-# link to libgnuradio-fft.so.${PKGVERSON_NOREV}
-.include "../../ham/gnuradio-core/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_PDU=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-pdu/python/pdu/*.py
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-pdu/PLIST
diff -u pkgsrc/ham/gnuradio-pdu/PLIST:1.5 pkgsrc/ham/gnuradio-pdu/PLIST:1.6
--- pkgsrc/ham/gnuradio-pdu/PLIST:1.5 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-pdu/PLIST Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2025/02/27 13:49:53 adam Exp $
include/gnuradio/pdu/add_system_time.h
include/gnuradio/pdu/api.h
include/gnuradio/pdu/pdu_filter.h
@@ -16,15 +16,11 @@ lib/cmake/gnuradio/gnuradio-pduConfig.cm
lib/cmake/gnuradio/gnuradio-pduTargets-release.cmake
lib/cmake/gnuradio/gnuradio-pduTargets.cmake
lib/libgnuradio-pdu.so
-lib/libgnuradio-pdu.so.${PKGVER_MICRO}
lib/libgnuradio-pdu.so.${PKGVERSION}
+lib/libgnuradio-pdu.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-pdu.pc
${PYSITELIB}/gnuradio/pdu/__init__.py
-${PYSITELIB}/gnuradio/pdu/__init__.pyc
-${PYSITELIB}/gnuradio/pdu/__init__.pyo
${PYSITELIB}/gnuradio/pdu/pdu_lambda.py
-${PYSITELIB}/gnuradio/pdu/pdu_lambda.pyc
-${PYSITELIB}/gnuradio/pdu/pdu_lambda.pyo
${PYSITELIB}/gnuradio/pdu/pdu_python.so
share/gnuradio/examples/pdu/pdu_lambda_chirp_demo.grc
share/gnuradio/examples/pdu/pdu_lambda_example.grc
Index: pkgsrc/ham/gnuradio-pdu/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-pdu/buildlink3.mk:1.2 pkgsrc/ham/gnuradio-pdu/buildlink3.mk:1.3
--- pkgsrc/ham/gnuradio-pdu/buildlink3.mk:1.2 Sat Mar 12 23:04:45 2022
+++ pkgsrc/ham/gnuradio-pdu/buildlink3.mk Thu Feb 27 13:49:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/03/12 23:04:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/02/27 13:49:53 adam Exp $
BUILDLINK_TREE+= gnuradio-pdu
@@ -7,6 +7,8 @@ GNURADIO_PDU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-pdu+= gnuradio-pdu>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-pdu?= ../../ham/gnuradio-pdu
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
.endif # GNURADIO_PDU_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-pdu
Index: pkgsrc/ham/gnuradio-qtgui/Makefile
diff -u pkgsrc/ham/gnuradio-qtgui/Makefile:1.88 pkgsrc/ham/gnuradio-qtgui/Makefile:1.89
--- pkgsrc/ham/gnuradio-qtgui/Makefile:1.88 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-qtgui/Makefile Thu Feb 27 13:49:54 2025
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.88 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.89 2025/02/27 13:49:54 adam Exp $
PKGNAME= gnuradio-qtgui-${VERSION}
-PKGREVISION= 13
COMMENT= Qt GUI module of GNU Radio
DEPENDS+= ${PYPKGPREFIX}-qt5-[0-9]*:../../x11/py-qt5
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-#CONF_FILES+= ${EGDIR}/gr-qtgui.conf ${PKG_SYSCONFDIR}/gr-qtgui.conf
-
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_QTGUI=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-qtgui/apps/*.py
+REPLACE_PYTHON+= gr-qtgui/examples/*.py
+REPLACE_PYTHON+= gr-qtgui/grc/qtgui_time_sink_x.block.yml.py
+REPLACE_PYTHON+= gr-qtgui/python/qtgui/*.py
pre-configure: Qt5Qwt6.pc
.PHONY: Qt5Qwt6.pc
Qt5Qwt6.pc:
ln -sf ${QWT_DIR}/lib/pkgconfig/Qt5Qwt6.pc ${BUILDLINK_DIR}/lib/pkgconfig/Qt5Qwt6.pc
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qwt6-qt5/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-qtgui/PLIST
diff -u pkgsrc/ham/gnuradio-qtgui/PLIST:1.18 pkgsrc/ham/gnuradio-qtgui/PLIST:1.19
--- pkgsrc/ham/gnuradio-qtgui/PLIST:1.18 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-qtgui/PLIST Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.19 2025/02/27 13:49:54 adam Exp $
include/gnuradio/qtgui/ConstellationDisplayPlot.h
include/gnuradio/qtgui/DisplayPlot.h
include/gnuradio/qtgui/EyeDisplayPlot.h
@@ -54,67 +54,30 @@ lib/cmake/gnuradio/gnuradio-qtguiConfig.
lib/cmake/gnuradio/gnuradio-qtguiTargets-release.cmake
lib/cmake/gnuradio/gnuradio-qtguiTargets.cmake
lib/libgnuradio-qtgui.so
-lib/libgnuradio-qtgui.so.${PKGVER_MICRO}
lib/libgnuradio-qtgui.so.${PKGVERSION}
+lib/libgnuradio-qtgui.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-qtgui.pc
${PYSITELIB}/gnuradio/qtgui/__init__.py
-${PYSITELIB}/gnuradio/qtgui/__init__.pyc
-${PYSITELIB}/gnuradio/qtgui/__init__.pyo
${PYSITELIB}/gnuradio/qtgui/auto_correlator_sink.py
-${PYSITELIB}/gnuradio/qtgui/auto_correlator_sink.pyc
-${PYSITELIB}/gnuradio/qtgui/auto_correlator_sink.pyo
${PYSITELIB}/gnuradio/qtgui/azelplot.py
-${PYSITELIB}/gnuradio/qtgui/azelplot.pyc
-${PYSITELIB}/gnuradio/qtgui/azelplot.pyo
${PYSITELIB}/gnuradio/qtgui/compass.py
-${PYSITELIB}/gnuradio/qtgui/compass.pyc
-${PYSITELIB}/gnuradio/qtgui/compass.pyo
${PYSITELIB}/gnuradio/qtgui/dialcontrol.py
-${PYSITELIB}/gnuradio/qtgui/dialcontrol.pyc
-${PYSITELIB}/gnuradio/qtgui/dialcontrol.pyo
${PYSITELIB}/gnuradio/qtgui/dialgauge.py
-${PYSITELIB}/gnuradio/qtgui/dialgauge.pyc
-${PYSITELIB}/gnuradio/qtgui/dialgauge.pyo
${PYSITELIB}/gnuradio/qtgui/digitalnumbercontrol.py
-${PYSITELIB}/gnuradio/qtgui/digitalnumbercontrol.pyc
-${PYSITELIB}/gnuradio/qtgui/digitalnumbercontrol.pyo
${PYSITELIB}/gnuradio/qtgui/distanceradar.py
-${PYSITELIB}/gnuradio/qtgui/distanceradar.pyc
-${PYSITELIB}/gnuradio/qtgui/distanceradar.pyo
${PYSITELIB}/gnuradio/qtgui/graphicitem.py
-${PYSITELIB}/gnuradio/qtgui/graphicitem.pyc
-${PYSITELIB}/gnuradio/qtgui/graphicitem.pyo
${PYSITELIB}/gnuradio/qtgui/graphicoverlay.py
-${PYSITELIB}/gnuradio/qtgui/graphicoverlay.pyc
-${PYSITELIB}/gnuradio/qtgui/graphicoverlay.pyo
${PYSITELIB}/gnuradio/qtgui/ledindicator.py
-${PYSITELIB}/gnuradio/qtgui/ledindicator.pyc
-${PYSITELIB}/gnuradio/qtgui/ledindicator.pyo
${PYSITELIB}/gnuradio/qtgui/levelgauge.py
-${PYSITELIB}/gnuradio/qtgui/levelgauge.pyc
-${PYSITELIB}/gnuradio/qtgui/levelgauge.pyo
${PYSITELIB}/gnuradio/qtgui/msgcheckbox.py
-${PYSITELIB}/gnuradio/qtgui/msgcheckbox.pyc
-${PYSITELIB}/gnuradio/qtgui/msgcheckbox.pyo
${PYSITELIB}/gnuradio/qtgui/msgpushbutton.py
-${PYSITELIB}/gnuradio/qtgui/msgpushbutton.pyc
-${PYSITELIB}/gnuradio/qtgui/msgpushbutton.pyo
${PYSITELIB}/gnuradio/qtgui/qtgui_python.so
${PYSITELIB}/gnuradio/qtgui/range.py
-${PYSITELIB}/gnuradio/qtgui/range.pyc
-${PYSITELIB}/gnuradio/qtgui/range.pyo
${PYSITELIB}/gnuradio/qtgui/togglebutton.py
-${PYSITELIB}/gnuradio/qtgui/togglebutton.pyc
-${PYSITELIB}/gnuradio/qtgui/togglebutton.pyo
${PYSITELIB}/gnuradio/qtgui/toggleswitch.py
-${PYSITELIB}/gnuradio/qtgui/toggleswitch.pyc
-${PYSITELIB}/gnuradio/qtgui/toggleswitch.pyo
${PYSITELIB}/gnuradio/qtgui/util.py
-${PYSITELIB}/gnuradio/qtgui/util.pyc
-${PYSITELIB}/gnuradio/qtgui/util.pyo
share/doc/gnuradio-${PKGVERSION}/README.qtgui
share/gnuradio/examples/gr-qtgui.conf
-share/gnuradio/examples/qt-gui/display_qt
share/gnuradio/examples/qt-gui/earth.jpg
share/gnuradio/examples/qt-gui/gnuradio_logo.png
share/gnuradio/examples/qt-gui/pyqt_const_c.py
Index: pkgsrc/ham/gnuradio-soapy-sdr/Makefile
diff -u pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.46 pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.47
--- pkgsrc/ham/gnuradio-soapy-sdr/Makefile:1.46 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-soapy-sdr/Makefile Thu Feb 27 13:49:54 2025
@@ -1,17 +1,12 @@
-# $NetBSD: Makefile,v 1.46 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2025/02/27 13:49:54 adam Exp $
PKGNAME= gnuradio-soapy-sdr-${VERSION}
-PKGREVISION= 13
COMMENT= GNU Radio bindings for SoapySDR
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_SOAPY=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-
-PLIST_MINUS+= companion
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../ham/soapy-sdr/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-soapy-sdr/PLIST
diff -u pkgsrc/ham/gnuradio-soapy-sdr/PLIST:1.7 pkgsrc/ham/gnuradio-soapy-sdr/PLIST:1.8
--- pkgsrc/ham/gnuradio-soapy-sdr/PLIST:1.7 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-soapy-sdr/PLIST Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/02/27 13:49:54 adam Exp $
include/gnuradio/soapy/api.h
include/gnuradio/soapy/block.h
include/gnuradio/soapy/sink.h
@@ -8,12 +8,10 @@ lib/cmake/gnuradio/gnuradio-soapyConfig.
lib/cmake/gnuradio/gnuradio-soapyTargets-release.cmake
lib/cmake/gnuradio/gnuradio-soapyTargets.cmake
lib/libgnuradio-soapy.so
-lib/libgnuradio-soapy.so.${PKGVER_MICRO}
lib/libgnuradio-soapy.so.${PKGVERSION}
+lib/libgnuradio-soapy.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-soapy.pc
${PYSITELIB}/gnuradio/soapy/__init__.py
-${PYSITELIB}/gnuradio/soapy/__init__.pyc
-${PYSITELIB}/gnuradio/soapy/__init__.pyo
${PYSITELIB}/gnuradio/soapy/soapy_python.so
share/doc/gnuradio-${PKGVERSION}/README.soapy
share/gnuradio/examples/soapy/fm_radio_receiver_soapy.grc
Index: pkgsrc/ham/gnuradio-trellis/Makefile
diff -u pkgsrc/ham/gnuradio-trellis/Makefile:1.92 pkgsrc/ham/gnuradio-trellis/Makefile:1.93
--- pkgsrc/ham/gnuradio-trellis/Makefile:1.92 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-trellis/Makefile Thu Feb 27 13:49:54 2025
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.92 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2025/02/27 13:49:54 adam Exp $
PKGNAME= gnuradio-trellis-${VERSION}
-PKGREVISION= 13
COMMENT= Trellis-based encoding and decoding algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_TRELLIS=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_DIGITAL=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-DEPENDS+= gnuradio-digital-[0-9]*:../../ham/gnuradio-digital
DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-PLIST_MINUS+= companion digital
+REPLACE_PYTHON+= gr-trellis/docs/*.py
+REPLACE_PYTHON+= gr-trellis/examples/python/*.py
+REPLACE_PYTHON+= gr-trellis/python/trellis/*.py
+.include "../../ham/gnuradio-digital/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-trellis/PLIST
diff -u pkgsrc/ham/gnuradio-trellis/PLIST:1.16 pkgsrc/ham/gnuradio-trellis/PLIST:1.17
--- pkgsrc/ham/gnuradio-trellis/PLIST:1.16 Thu May 26 15:20:10 2022
+++ pkgsrc/ham/gnuradio-trellis/PLIST Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2022/05/26 15:20:10 mef Exp $
+@comment $NetBSD: PLIST,v 1.17 2025/02/27 13:49:54 adam Exp $
include/gnuradio/trellis/api.h
include/gnuradio/trellis/base.h
include/gnuradio/trellis/calc_metric.h
@@ -12,7 +12,6 @@ include/gnuradio/trellis/pccc_decoder_bl
include/gnuradio/trellis/pccc_decoder_combined_blk.h
include/gnuradio/trellis/pccc_encoder.h
include/gnuradio/trellis/permutation.h
-include/gnuradio/trellis/quicksort_index.h
include/gnuradio/trellis/sccc_decoder_blk.h
include/gnuradio/trellis/sccc_decoder_combined_blk.h
include/gnuradio/trellis/sccc_encoder.h
@@ -25,15 +24,11 @@ lib/cmake/gnuradio/gnuradio-trellisConfi
lib/cmake/gnuradio/gnuradio-trellisTargets-release.cmake
lib/cmake/gnuradio/gnuradio-trellisTargets.cmake
lib/libgnuradio-trellis.so
-lib/libgnuradio-trellis.so.${PKGVER_MICRO}
lib/libgnuradio-trellis.so.${PKGVERSION}
+lib/libgnuradio-trellis.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-trellis.pc
${PYSITELIB}/gnuradio/trellis/__init__.py
-${PYSITELIB}/gnuradio/trellis/__init__.pyc
-${PYSITELIB}/gnuradio/trellis/__init__.pyo
${PYSITELIB}/gnuradio/trellis/fsm_utils.py
-${PYSITELIB}/gnuradio/trellis/fsm_utils.pyc
-${PYSITELIB}/gnuradio/trellis/fsm_utils.pyo
${PYSITELIB}/gnuradio/trellis/trellis_python.so
share/doc/gnuradio-${PKGVERSION}/html/gr-trellis.html
share/doc/gnuradio-${PKGVERSION}/xml/test_tcm.py.xml
Index: pkgsrc/ham/gnuradio-uhd/Makefile
diff -u pkgsrc/ham/gnuradio-uhd/Makefile:1.76 pkgsrc/ham/gnuradio-uhd/Makefile:1.77
--- pkgsrc/ham/gnuradio-uhd/Makefile:1.76 Wed Feb 12 06:45:13 2025
+++ pkgsrc/ham/gnuradio-uhd/Makefile Thu Feb 27 13:49:54 2025
@@ -1,27 +1,24 @@
-# $NetBSD: Makefile,v 1.76 2025/02/12 06:45:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2025/02/27 13:49:54 adam Exp $
PKGNAME= gnuradio-uhd-${VERSION}
-PKGREVISION= 13
COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_UHD=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_PYTHON=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
-
-.if ${OPSYS} != "Darwin"
+#.if ${OPSYS} != "Darwin"
# XXX dbj -- i'm not sure why this is necessary, but hard coding
# the .so causes problems on Darwin. I've also set UHD_DIR in
# the uhd buildlink3.mk file, so it finds the buildlink header files.
+#CMAKE_CONFIGURE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
+#CMAKE_CONFIGURE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
+#.endif
+
+REPLACE_PYTHON+= gr-uhd/apps/*.py
+REPLACE_PYTHON+= gr-uhd/examples/python/*.py
+REPLACE_PYTHON+= gr-uhd/python/uhd/*.py
-CMAKE_CONFIGURE_ARGS+= -DUHD_LIBRARIES=${PREFIX}/lib/libuhd.so
-CMAKE_CONFIGURE_ARGS+= -DUHD_INCLUDE_DIRS=${PREFIX}/include/uhd/usrp
-.endif
-
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../ham/uhd/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-uhd/PLIST
diff -u pkgsrc/ham/gnuradio-uhd/PLIST:1.18 pkgsrc/ham/gnuradio-uhd/PLIST:1.19
--- pkgsrc/ham/gnuradio-uhd/PLIST:1.18 Sat Oct 28 09:23:28 2023
+++ pkgsrc/ham/gnuradio-uhd/PLIST Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2023/10/28 09:23:28 mef Exp $
+@comment $NetBSD: PLIST,v 1.19 2025/02/27 13:49:54 adam Exp $
bin/uhd_fft
bin/uhd_rx_cfile
bin/uhd_rx_nogui
@@ -18,21 +18,11 @@ lib/libgnuradio-uhd.so.${PKGVERSION}
lib/libgnuradio-uhd.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-uhd.pc
${PYSITELIB}/gnuradio/uhd/__init__.py
-${PYSITELIB}/gnuradio/uhd/__init__.pyc
-${PYSITELIB}/gnuradio/uhd/__init__.pyo
${PYSITELIB}/gnuradio/uhd/msgq_runner.py
-${PYSITELIB}/gnuradio/uhd/msgq_runner.pyc
-${PYSITELIB}/gnuradio/uhd/msgq_runner.pyo
${PYSITELIB}/gnuradio/uhd/replaymsgpushbutton.py
-${PYSITELIB}/gnuradio/uhd/replaymsgpushbutton.pyc
-${PYSITELIB}/gnuradio/uhd/replaymsgpushbutton.pyo
${PYSITELIB}/gnuradio/uhd/uhd_app.py
-${PYSITELIB}/gnuradio/uhd/uhd_app.pyc
-${PYSITELIB}/gnuradio/uhd/uhd_app.pyo
${PYSITELIB}/gnuradio/uhd/uhd_python.so
${PYSITELIB}/gnuradio/uhd/uhd_siggen_base.py
-${PYSITELIB}/gnuradio/uhd/uhd_siggen_base.pyc
-${PYSITELIB}/gnuradio/uhd/uhd_siggen_base.pyo
share/doc/gnuradio-${PKGVERSION}/README.uhd
share/gnuradio/examples/uhd/rfnoc_addsub.grc
share/gnuradio/examples/uhd/rfnoc_duc_radio.grc
Index: pkgsrc/ham/gnuradio-uhd/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-uhd/buildlink3.mk:1.6 pkgsrc/ham/gnuradio-uhd/buildlink3.mk:1.7
--- pkgsrc/ham/gnuradio-uhd/buildlink3.mk:1.6 Mon Aug 14 05:24:39 2023
+++ pkgsrc/ham/gnuradio-uhd/buildlink3.mk Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2023/08/14 05:24:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/02/27 13:49:54 adam Exp $
BUILDLINK_TREE+= gnuradio-uhd
@@ -8,6 +8,9 @@ GNURADIO_UHD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-uhd+= gnuradio-uhd>=3.10.1.1
BUILDLINK_ABI_DEPENDS.gnuradio-uhd?= gnuradio-uhd>=3.10.7.0nb1
BUILDLINK_PKGSRCDIR.gnuradio-uhd?= ../../ham/gnuradio-uhd
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
+.include "../../ham/uhd/buildlink3.mk"
.endif # GNURADIO_UHD_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-uhd
Index: pkgsrc/ham/gnuradio-utils/Makefile
diff -u pkgsrc/ham/gnuradio-utils/Makefile:1.78 pkgsrc/ham/gnuradio-utils/Makefile:1.79
--- pkgsrc/ham/gnuradio-utils/Makefile:1.78 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gnuradio-utils/Makefile Thu Feb 27 13:49:54 2025
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.78 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.79 2025/02/27 13:49:54 adam Exp $
PKGNAME= gnuradio-utils-${VERSION}
-PKGREVISION= 13
COMMENT= Utilities in GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
DEPENDS+= ${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-click-plugins-[0-9]*:../../devel/py-click-plugins
@@ -14,11 +12,11 @@ DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9
DEPENDS+= ${PYPKGPREFIX}-qwt-qt5-[0-9]*:../../x11/py-qwt-qt5
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-#CONF_FILES+= ${EGDIR}/modtool.conf ${PKG_SYSCONFDIR}/modtool.conf
-
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_BLOCKTOOL=ON
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_MODTOOL=ON
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_UTILS=ON
+REPLACE_PYTHON+= gr-utils/plot_tools/*.py
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-utils/PLIST
diff -u pkgsrc/ham/gnuradio-utils/PLIST:1.8 pkgsrc/ham/gnuradio-utils/PLIST:1.9
--- pkgsrc/ham/gnuradio-utils/PLIST:1.8 Sun Oct 9 07:56:11 2022
+++ pkgsrc/ham/gnuradio-utils/PLIST Thu Feb 27 13:49:54 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2022/10/09 07:56:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/02/27 13:49:54 adam Exp $
bin/gr_modtool
bin/gr_plot
bin/gr_plot_const
@@ -8,169 +8,64 @@ bin/gr_plot_psd
bin/gr_plot_qt
bin/gr_read_file_metadata
${PYSITELIB}/gnuradio/bindtool/__init__.py
-${PYSITELIB}/gnuradio/bindtool/__init__.pyc
-${PYSITELIB}/gnuradio/bindtool/__init__.pyo
${PYSITELIB}/gnuradio/bindtool/core/__init__.py
-${PYSITELIB}/gnuradio/bindtool/core/__init__.pyc
-${PYSITELIB}/gnuradio/bindtool/core/__init__.pyo
${PYSITELIB}/gnuradio/bindtool/core/base.py
-${PYSITELIB}/gnuradio/bindtool/core/base.pyc
-${PYSITELIB}/gnuradio/bindtool/core/base.pyo
${PYSITELIB}/gnuradio/bindtool/core/generator.py
-${PYSITELIB}/gnuradio/bindtool/core/generator.pyc
-${PYSITELIB}/gnuradio/bindtool/core/generator.pyo
${PYSITELIB}/gnuradio/bindtool/templates/CMakeLists.txt.mako
${PYSITELIB}/gnuradio/bindtool/templates/generic_python_cc.mako
${PYSITELIB}/gnuradio/bindtool/templates/license.mako
${PYSITELIB}/gnuradio/bindtool/templates/pydoc_h.mako
${PYSITELIB}/gnuradio/bindtool/templates/python_bindings_cc.mako
${PYSITELIB}/gnuradio/blocktool/__init__.py
-${PYSITELIB}/gnuradio/blocktool/__init__.pyc
-${PYSITELIB}/gnuradio/blocktool/__init__.pyo
${PYSITELIB}/gnuradio/blocktool/__main__.py
-${PYSITELIB}/gnuradio/blocktool/__main__.pyc
-${PYSITELIB}/gnuradio/blocktool/__main__.pyo
${PYSITELIB}/gnuradio/blocktool/cli.py
-${PYSITELIB}/gnuradio/blocktool/cli.pyc
-${PYSITELIB}/gnuradio/blocktool/cli.pyo
${PYSITELIB}/gnuradio/blocktool/core/Constants.py
-${PYSITELIB}/gnuradio/blocktool/core/Constants.pyc
-${PYSITELIB}/gnuradio/blocktool/core/Constants.pyo
${PYSITELIB}/gnuradio/blocktool/core/__init__.py
-${PYSITELIB}/gnuradio/blocktool/core/__init__.pyc
-${PYSITELIB}/gnuradio/blocktool/core/__init__.pyo
${PYSITELIB}/gnuradio/blocktool/core/base.py
-${PYSITELIB}/gnuradio/blocktool/core/base.pyc
-${PYSITELIB}/gnuradio/blocktool/core/base.pyo
${PYSITELIB}/gnuradio/blocktool/core/comments.py
-${PYSITELIB}/gnuradio/blocktool/core/comments.pyc
-${PYSITELIB}/gnuradio/blocktool/core/comments.pyo
${PYSITELIB}/gnuradio/blocktool/core/iosignature.py
-${PYSITELIB}/gnuradio/blocktool/core/iosignature.pyc
-${PYSITELIB}/gnuradio/blocktool/core/iosignature.pyo
${PYSITELIB}/gnuradio/blocktool/core/outputschema.py
-${PYSITELIB}/gnuradio/blocktool/core/outputschema.pyc
-${PYSITELIB}/gnuradio/blocktool/core/outputschema.pyo
${PYSITELIB}/gnuradio/blocktool/core/parseheader.py
-${PYSITELIB}/gnuradio/blocktool/core/parseheader.pyc
-${PYSITELIB}/gnuradio/blocktool/core/parseheader.pyo
${PYSITELIB}/gnuradio/blocktool/core/parseheader_generic.py
-${PYSITELIB}/gnuradio/blocktool/core/parseheader_generic.pyc
-${PYSITELIB}/gnuradio/blocktool/core/parseheader_generic.pyo
${PYSITELIB}/gnuradio/modtool/__init__.py
-${PYSITELIB}/gnuradio/modtool/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/__init__.pyo
${PYSITELIB}/gnuradio/modtool/cli/__init__.py
-${PYSITELIB}/gnuradio/modtool/cli/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/cli/__init__.pyo
${PYSITELIB}/gnuradio/modtool/cli/add.py
-${PYSITELIB}/gnuradio/modtool/cli/add.pyc
-${PYSITELIB}/gnuradio/modtool/cli/add.pyo
${PYSITELIB}/gnuradio/modtool/cli/base.py
-${PYSITELIB}/gnuradio/modtool/cli/base.pyc
-${PYSITELIB}/gnuradio/modtool/cli/base.pyo
${PYSITELIB}/gnuradio/modtool/cli/bind.py
-${PYSITELIB}/gnuradio/modtool/cli/bind.pyc
-${PYSITELIB}/gnuradio/modtool/cli/bind.pyo
${PYSITELIB}/gnuradio/modtool/cli/disable.py
-${PYSITELIB}/gnuradio/modtool/cli/disable.pyc
-${PYSITELIB}/gnuradio/modtool/cli/disable.pyo
+${PYSITELIB}/gnuradio/modtool/cli/help.py
${PYSITELIB}/gnuradio/modtool/cli/info.py
-${PYSITELIB}/gnuradio/modtool/cli/info.pyc
-${PYSITELIB}/gnuradio/modtool/cli/info.pyo
${PYSITELIB}/gnuradio/modtool/cli/makeyaml.py
-${PYSITELIB}/gnuradio/modtool/cli/makeyaml.pyc
-${PYSITELIB}/gnuradio/modtool/cli/makeyaml.pyo
${PYSITELIB}/gnuradio/modtool/cli/newmod.py
-${PYSITELIB}/gnuradio/modtool/cli/newmod.pyc
-${PYSITELIB}/gnuradio/modtool/cli/newmod.pyo
${PYSITELIB}/gnuradio/modtool/cli/rename.py
-${PYSITELIB}/gnuradio/modtool/cli/rename.pyc
-${PYSITELIB}/gnuradio/modtool/cli/rename.pyo
${PYSITELIB}/gnuradio/modtool/cli/rm.py
-${PYSITELIB}/gnuradio/modtool/cli/rm.pyc
-${PYSITELIB}/gnuradio/modtool/cli/rm.pyo
${PYSITELIB}/gnuradio/modtool/cli/update.py
-${PYSITELIB}/gnuradio/modtool/cli/update.pyc
-${PYSITELIB}/gnuradio/modtool/cli/update.pyo
${PYSITELIB}/gnuradio/modtool/core/__init__.py
-${PYSITELIB}/gnuradio/modtool/core/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/core/__init__.pyo
${PYSITELIB}/gnuradio/modtool/core/add.py
-${PYSITELIB}/gnuradio/modtool/core/add.pyc
-${PYSITELIB}/gnuradio/modtool/core/add.pyo
${PYSITELIB}/gnuradio/modtool/core/base.py
-${PYSITELIB}/gnuradio/modtool/core/base.pyc
-${PYSITELIB}/gnuradio/modtool/core/base.pyo
${PYSITELIB}/gnuradio/modtool/core/bind.py
-${PYSITELIB}/gnuradio/modtool/core/bind.pyc
-${PYSITELIB}/gnuradio/modtool/core/bind.pyo
${PYSITELIB}/gnuradio/modtool/core/disable.py
-${PYSITELIB}/gnuradio/modtool/core/disable.pyc
-${PYSITELIB}/gnuradio/modtool/core/disable.pyo
${PYSITELIB}/gnuradio/modtool/core/info.py
-${PYSITELIB}/gnuradio/modtool/core/info.pyc
-${PYSITELIB}/gnuradio/modtool/core/info.pyo
${PYSITELIB}/gnuradio/modtool/core/makeyaml.py
-${PYSITELIB}/gnuradio/modtool/core/makeyaml.pyc
-${PYSITELIB}/gnuradio/modtool/core/makeyaml.pyo
${PYSITELIB}/gnuradio/modtool/core/newmod.py
-${PYSITELIB}/gnuradio/modtool/core/newmod.pyc
-${PYSITELIB}/gnuradio/modtool/core/newmod.pyo
${PYSITELIB}/gnuradio/modtool/core/rename.py
-${PYSITELIB}/gnuradio/modtool/core/rename.pyc
-${PYSITELIB}/gnuradio/modtool/core/rename.pyo
${PYSITELIB}/gnuradio/modtool/core/rm.py
-${PYSITELIB}/gnuradio/modtool/core/rm.pyc
-${PYSITELIB}/gnuradio/modtool/core/rm.pyo
${PYSITELIB}/gnuradio/modtool/core/update.py
-${PYSITELIB}/gnuradio/modtool/core/update.pyc
-${PYSITELIB}/gnuradio/modtool/core/update.pyo
${PYSITELIB}/gnuradio/modtool/templates/__init__.py
-${PYSITELIB}/gnuradio/modtool/templates/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/templates/__init__.pyo
${PYSITELIB}/gnuradio/modtool/templates/templates.py
-${PYSITELIB}/gnuradio/modtool/templates/templates.pyc
-${PYSITELIB}/gnuradio/modtool/templates/templates.pyo
${PYSITELIB}/gnuradio/modtool/tools/__init__.py
-${PYSITELIB}/gnuradio/modtool/tools/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/tools/__init__.pyo
${PYSITELIB}/gnuradio/modtool/tools/cmakefile_editor.py
-${PYSITELIB}/gnuradio/modtool/tools/cmakefile_editor.pyc
-${PYSITELIB}/gnuradio/modtool/tools/cmakefile_editor.pyo
${PYSITELIB}/gnuradio/modtool/tools/code_generator.py
-${PYSITELIB}/gnuradio/modtool/tools/code_generator.pyc
-${PYSITELIB}/gnuradio/modtool/tools/code_generator.pyo
${PYSITELIB}/gnuradio/modtool/tools/cppfile_editor.py
-${PYSITELIB}/gnuradio/modtool/tools/cppfile_editor.pyc
-${PYSITELIB}/gnuradio/modtool/tools/cppfile_editor.pyo
${PYSITELIB}/gnuradio/modtool/tools/grc_yaml_generator.py
-${PYSITELIB}/gnuradio/modtool/tools/grc_yaml_generator.pyc
-${PYSITELIB}/gnuradio/modtool/tools/grc_yaml_generator.pyo
${PYSITELIB}/gnuradio/modtool/tools/parser_cc_block.py
-${PYSITELIB}/gnuradio/modtool/tools/parser_cc_block.pyc
-${PYSITELIB}/gnuradio/modtool/tools/parser_cc_block.pyo
${PYSITELIB}/gnuradio/modtool/tools/scm.py
-${PYSITELIB}/gnuradio/modtool/tools/scm.pyc
-${PYSITELIB}/gnuradio/modtool/tools/scm.pyo
${PYSITELIB}/gnuradio/modtool/tools/util_functions.py
-${PYSITELIB}/gnuradio/modtool/tools/util_functions.pyc
-${PYSITELIB}/gnuradio/modtool/tools/util_functions.pyo
${PYSITELIB}/gnuradio/plot_data.py
-${PYSITELIB}/gnuradio/plot_data.pyc
-${PYSITELIB}/gnuradio/plot_data.pyo
${PYSITELIB}/gnuradio/plot_fft_base.py
-${PYSITELIB}/gnuradio/plot_fft_base.pyc
-${PYSITELIB}/gnuradio/plot_fft_base.pyo
${PYSITELIB}/gnuradio/plot_psd_base.py
-${PYSITELIB}/gnuradio/plot_psd_base.pyc
-${PYSITELIB}/gnuradio/plot_psd_base.pyo
${PYSITELIB}/gnuradio/pyqt_filter.py
-${PYSITELIB}/gnuradio/pyqt_filter.pyc
-${PYSITELIB}/gnuradio/pyqt_filter.pyo
${PYSITELIB}/gnuradio/pyqt_plot.py
-${PYSITELIB}/gnuradio/pyqt_plot.pyc
-${PYSITELIB}/gnuradio/pyqt_plot.pyo
share/gnuradio/examples/modtool.conf
share/gnuradio/modtool/templates/gr-newmod/.conda/README.md
share/gnuradio/modtool/templates/gr-newmod/.conda/conda-forge.yml
@@ -179,7 +74,7 @@ share/gnuradio/modtool/templates/gr-newm
share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/conda_build_config.yaml
share/gnuradio/modtool/templates/gr-newmod/.conda/recipe/meta.yaml
share/gnuradio/modtool/templates/gr-newmod/CMakeLists.txt
-share/gnuradio/modtool/templates/gr-newmod/MANIFEST.md
+share/gnuradio/modtool/templates/gr-newmod/MANIFEST.yml
share/gnuradio/modtool/templates/gr-newmod/apps/CMakeLists.txt
share/gnuradio/modtool/templates/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
share/gnuradio/modtool/templates/gr-newmod/cmake/Modules/gnuradio-howtoConfig.cmake
@@ -203,6 +98,7 @@ share/gnuradio/modtool/templates/gr-newm
share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/other/main_page.dox
share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/pydoc_macros.h
share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/update_pydoc.py
+share/gnuradio/modtool/templates/gr-newmod/examples/CMakeLists.txt
share/gnuradio/modtool/templates/gr-newmod/examples/README
share/gnuradio/modtool/templates/gr-newmod/grc/CMakeLists.txt
share/gnuradio/modtool/templates/gr-newmod/include/gnuradio/howto/CMakeLists.txt
Index: pkgsrc/ham/gnuradio-video-sdl/Makefile
diff -u pkgsrc/ham/gnuradio-video-sdl/Makefile:1.90 pkgsrc/ham/gnuradio-video-sdl/Makefile:1.91
--- pkgsrc/ham/gnuradio-video-sdl/Makefile:1.90 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gnuradio-video-sdl/Makefile Thu Feb 27 13:49:55 2025
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.90 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.91 2025/02/27 13:49:55 adam Exp $
PKGNAME= gnuradio-video-sdl-${VERSION}
-PKGREVISION= 14
COMMENT= SDL (Simple DirectMedia Layer) bindings for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
CMAKE_CONFIGURE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-video-sdl/python/video_sdl/*.py
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/sdl12-compat/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-video-sdl/PLIST
diff -u pkgsrc/ham/gnuradio-video-sdl/PLIST:1.16 pkgsrc/ham/gnuradio-video-sdl/PLIST:1.17
--- pkgsrc/ham/gnuradio-video-sdl/PLIST:1.16 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-video-sdl/PLIST Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.17 2025/02/27 13:49:55 adam Exp $
include/gnuradio/video_sdl/api.h
include/gnuradio/video_sdl/sink_s.h
include/gnuradio/video_sdl/sink_uc.h
@@ -6,12 +6,10 @@ lib/cmake/gnuradio/gnuradio-video-sdlCon
lib/cmake/gnuradio/gnuradio-video-sdlTargets-release.cmake
lib/cmake/gnuradio/gnuradio-video-sdlTargets.cmake
lib/libgnuradio-video-sdl.so
-lib/libgnuradio-video-sdl.so.${PKGVER_MICRO}
lib/libgnuradio-video-sdl.so.${PKGVERSION}
+lib/libgnuradio-video-sdl.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-video-sdl.pc
${PYSITELIB}/gnuradio/video_sdl/__init__.py
-${PYSITELIB}/gnuradio/video_sdl/__init__.pyc
-${PYSITELIB}/gnuradio/video_sdl/__init__.pyo
${PYSITELIB}/gnuradio/video_sdl/video_sdl_python.so
share/gnuradio/grc/blocks/video.tree.yml
share/gnuradio/grc/blocks/video_sdl_sink.block.yml
Index: pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk:1.5 pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk:1.6
--- pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk:1.5 Sat Mar 12 23:04:46 2022
+++ pkgsrc/ham/gnuradio-video-sdl/buildlink3.mk Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/03/12 23:04:46 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/02/27 13:49:55 adam Exp $
BUILDLINK_TREE+= gnuradio-video-sdl
@@ -7,6 +7,8 @@ GNURADIO_VIDEO_SDL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-video-sdl+= gnuradio-video-sdl>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-video-sdl?= ../../ham/gnuradio-video-sdl
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
.endif # GNURADIO_VIDEO_SDL_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-video-sdl
Index: pkgsrc/ham/gnuradio-vocoder/Makefile
diff -u pkgsrc/ham/gnuradio-vocoder/Makefile:1.74 pkgsrc/ham/gnuradio-vocoder/Makefile:1.75
--- pkgsrc/ham/gnuradio-vocoder/Makefile:1.74 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gnuradio-vocoder/Makefile Thu Feb 27 13:49:55 2025
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.74 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2025/02/27 13:49:55 adam Exp $
PKGNAME= gnuradio-vocoder-${VERSION}
-PKGREVISION= 13
COMMENT= All available vocoders in GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_VOCODER=ON
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-vocoder/examples/*.py
+REPLACE_PYTHON+= gr-vocoder/python/vocoder/*.py
.include "../../devel/libusb1/buildlink3.mk"
.include "../../ham/codec2/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-vocoder/PLIST
diff -u pkgsrc/ham/gnuradio-vocoder/PLIST:1.14 pkgsrc/ham/gnuradio-vocoder/PLIST:1.15
--- pkgsrc/ham/gnuradio-vocoder/PLIST:1.14 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-vocoder/PLIST Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.15 2025/02/27 13:49:55 adam Exp $
include/gnuradio/vocoder/alaw_decode_bs.h
include/gnuradio/vocoder/alaw_encode_sb.h
include/gnuradio/vocoder/api.h
@@ -24,15 +24,11 @@ lib/cmake/gnuradio/gnuradio-vocoderConfi
lib/cmake/gnuradio/gnuradio-vocoderTargets-release.cmake
lib/cmake/gnuradio/gnuradio-vocoderTargets.cmake
lib/libgnuradio-vocoder.so
-lib/libgnuradio-vocoder.so.${PKGVER_MICRO}
lib/libgnuradio-vocoder.so.${PKGVERSION}
+lib/libgnuradio-vocoder.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-vocoder.pc
${PYSITELIB}/gnuradio/vocoder/__init__.py
-${PYSITELIB}/gnuradio/vocoder/__init__.pyc
-${PYSITELIB}/gnuradio/vocoder/__init__.pyo
${PYSITELIB}/gnuradio/vocoder/cvsd.py
-${PYSITELIB}/gnuradio/vocoder/cvsd.pyc
-${PYSITELIB}/gnuradio/vocoder/cvsd.pyo
${PYSITELIB}/gnuradio/vocoder/vocoder_python.so
share/doc/gnuradio-${PKGVERSION}/README.vocoder
share/gnuradio/examples/vocoder/alaw_audio_loopback.py
Index: pkgsrc/ham/gnuradio-wavelet/Makefile
diff -u pkgsrc/ham/gnuradio-wavelet/Makefile:1.73 pkgsrc/ham/gnuradio-wavelet/Makefile:1.74
--- pkgsrc/ham/gnuradio-wavelet/Makefile:1.73 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gnuradio-wavelet/Makefile Thu Feb 27 13:49:55 2025
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.73 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2025/02/27 13:49:55 adam Exp $
PKGNAME= gnuradio-wavelet-${VERSION}
-PKGREVISION= 13
COMMENT= Wavelet transform of GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_WAVELET=ON
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-wavelet/PLIST
diff -u pkgsrc/ham/gnuradio-wavelet/PLIST:1.10 pkgsrc/ham/gnuradio-wavelet/PLIST:1.11
--- pkgsrc/ham/gnuradio-wavelet/PLIST:1.10 Thu May 26 15:20:10 2022
+++ pkgsrc/ham/gnuradio-wavelet/PLIST Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2022/05/26 15:20:10 mef Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/02/27 13:49:55 adam Exp $
include/gnuradio/wavelet/api.h
include/gnuradio/wavelet/squash_ff.h
include/gnuradio/wavelet/wavelet_ff.h
@@ -7,10 +7,8 @@ lib/cmake/gnuradio/gnuradio-waveletConfi
lib/cmake/gnuradio/gnuradio-waveletTargets-release.cmake
lib/cmake/gnuradio/gnuradio-waveletTargets.cmake
lib/libgnuradio-wavelet.so
-lib/libgnuradio-wavelet.so.${PKGVER_MICRO}
lib/libgnuradio-wavelet.so.${PKGVERSION}
+lib/libgnuradio-wavelet.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-wavelet.pc
${PYSITELIB}/gnuradio/wavelet/__init__.py
-${PYSITELIB}/gnuradio/wavelet/__init__.pyc
-${PYSITELIB}/gnuradio/wavelet/__init__.pyo
${PYSITELIB}/gnuradio/wavelet/wavelet_python.so
Index: pkgsrc/ham/gnuradio-zeromq/Makefile
diff -u pkgsrc/ham/gnuradio-zeromq/Makefile:1.77 pkgsrc/ham/gnuradio-zeromq/Makefile:1.78
--- pkgsrc/ham/gnuradio-zeromq/Makefile:1.77 Wed Feb 12 06:45:14 2025
+++ pkgsrc/ham/gnuradio-zeromq/Makefile Thu Feb 27 13:49:55 2025
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.77 2025/02/12 06:45:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.78 2025/02/27 13:49:55 adam Exp $
PKGNAME= gnuradio-zeromq-${VERSION}
-PKGREVISION= 14
COMMENT= All of the zeromq blocks, utilities, and examples
.include "../../ham/gnuradio-core/Makefile.common"
-.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_CONFIGURE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_CONFIGURE_ARGS+= -DENABLE_GR_ZEROMQ=ON
CMAKE_CONFIGURE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
-CMAKE_CONFIGURE_ARGS+= -DENABLE_GRC=ON
-PLIST_MINUS+= companion
+REPLACE_PYTHON+= gr-zeromq/examples/python/*.py
+REPLACE_PYTHON+= gr-zeromq/python/zeromq/*.py
.include "../../net/zeromq/buildlink3.mk"
.include "../../net/cppzmq/buildlink3.mk"
+.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/ham/gnuradio-zeromq/PLIST
diff -u pkgsrc/ham/gnuradio-zeromq/PLIST:1.13 pkgsrc/ham/gnuradio-zeromq/PLIST:1.14
--- pkgsrc/ham/gnuradio-zeromq/PLIST:1.13 Tue Apr 11 11:20:52 2023
+++ pkgsrc/ham/gnuradio-zeromq/PLIST Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2023/04/11 11:20:52 mef Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/02/27 13:49:55 adam Exp $
include/gnuradio/zeromq/api.h
include/gnuradio/zeromq/pub_msg_sink.h
include/gnuradio/zeromq/pub_sink.h
@@ -16,18 +16,12 @@ lib/cmake/gnuradio/gnuradio-zeromqConfig
lib/cmake/gnuradio/gnuradio-zeromqTargets-release.cmake
lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake
lib/libgnuradio-zeromq.so
-lib/libgnuradio-zeromq.so.${PKGVER_MICRO}
lib/libgnuradio-zeromq.so.${PKGVERSION}
+lib/libgnuradio-zeromq.so.${PKGVER_MICRO}
lib/pkgconfig/gnuradio-zeromq.pc
${PYSITELIB}/gnuradio/zeromq/__init__.py
-${PYSITELIB}/gnuradio/zeromq/__init__.pyc
-${PYSITELIB}/gnuradio/zeromq/__init__.pyo
${PYSITELIB}/gnuradio/zeromq/probe_manager.py
-${PYSITELIB}/gnuradio/zeromq/probe_manager.pyc
-${PYSITELIB}/gnuradio/zeromq/probe_manager.pyo
${PYSITELIB}/gnuradio/zeromq/rpc_manager.py
-${PYSITELIB}/gnuradio/zeromq/rpc_manager.pyc
-${PYSITELIB}/gnuradio/zeromq/rpc_manager.pyo
${PYSITELIB}/gnuradio/zeromq/zeromq_python.so
share/gnuradio/examples/zeromq/zeromq_pubsub.grc
share/gnuradio/examples/zeromq/zeromq_pushpull.grc
Index: pkgsrc/ham/gnuradio-zeromq/buildlink3.mk
diff -u pkgsrc/ham/gnuradio-zeromq/buildlink3.mk:1.5 pkgsrc/ham/gnuradio-zeromq/buildlink3.mk:1.6
--- pkgsrc/ham/gnuradio-zeromq/buildlink3.mk:1.5 Sat Mar 12 23:04:46 2022
+++ pkgsrc/ham/gnuradio-zeromq/buildlink3.mk Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2022/03/12 23:04:46 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2025/02/27 13:49:55 adam Exp $
BUILDLINK_TREE+= gnuradio-zeromq
@@ -7,6 +7,8 @@ GNURADIO_ZEROMQ_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-zeromq+= gnuradio-zeromq>=3.10.1.1
BUILDLINK_PKGSRCDIR.gnuradio-zeromq?= ../../ham/gnuradio-zeromq
+
+.include "../../ham/gnuradio-core/buildlink3.mk"
.endif # GNURADIO_ZEROMQ_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-zeromq
Index: pkgsrc/meta-pkgs/gnuradio/Makefile
diff -u pkgsrc/meta-pkgs/gnuradio/Makefile:1.25 pkgsrc/meta-pkgs/gnuradio/Makefile:1.26
--- pkgsrc/meta-pkgs/gnuradio/Makefile:1.25 Sun Jan 16 18:06:28 2022
+++ pkgsrc/meta-pkgs/gnuradio/Makefile Thu Feb 27 13:49:55 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/01/16 18:06:28 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2025/02/27 13:49:55 adam Exp $
META_PACKAGE= yes
@@ -15,14 +15,13 @@ HOMEPAGE= https://www.gnu.org/software/g
COMMENT= Collection of GNU Radio (meta package, easy to install whole thing)
DEPENDS+= gnuradio-channels-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-channels
-DEPENDS+= gnuradio-network-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-network
DEPENDS+= gnuradio-companion-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-companion
DEPENDS+= gnuradio-core-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-core
-DEPENDS+= gnuradio-ctrlport-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-ctrlport
DEPENDS+= gnuradio-digital-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-digital
DEPENDS+= gnuradio-doxygen-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-doxygen
DEPENDS+= gnuradio-dtv-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-dtv
DEPENDS+= gnuradio-fec-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-fec
+DEPENDS+= gnuradio-network-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-network
DEPENDS+= gnuradio-pdu-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-pdu
DEPENDS+= gnuradio-qtgui-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-qtgui
DEPENDS+= gnuradio-soapy-sdr-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-soapy-sdr
Added files:
Index: pkgsrc/ham/gnuradio-core/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,41 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Common file are installed only for gnuradio-core (ENABLE_GNURADIO_RUNTIME is set).
+
+--- CMakeLists.txt.orig 2025-02-20 01:23:56.000000000 +0000
++++ CMakeLists.txt
+@@ -396,6 +396,7 @@ endif(HAVE_CX_LIMITED_RANGE)
+ ########################################################################
+ # Distribute the README file
+ ########################################################################
++if(ENABLE_GNURADIO_RUNTIME)
+ install(FILES README.md CONTRIBUTING.md CHANGELOG.md DESTINATION ${GR_PKG_DOC_DIR})
+
+ install(
+@@ -403,6 +404,7 @@ install(
+ RENAME clang-format.conf
+ DESTINATION ${GR_PKG_DATA_DIR})
+ install(FILES .cmake-format.py DESTINATION ${GR_PKG_DATA_DIR})
++endif(ENABLE_GNURADIO_RUNTIME)
+
+ ########################################################################
+ # The following dependency libraries are needed by all gr modules:
+@@ -487,7 +489,9 @@ configure_file(${PROJECT_SOURCE_DIR}/cma
+ set(cmake_configs ${PROJECT_BINARY_DIR}/cmake/Modules/GnuradioConfig.cmake
+ ${PROJECT_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake)
+
++if(ENABLE_GNURADIO_RUNTIME)
+ install(FILES ${cmake_configs} ${cmake_others} DESTINATION ${CMAKE_MODULES_DIR}/gnuradio)
++endif(ENABLE_GNURADIO_RUNTIME)
+
+ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/grc/grc.conf
+ "enabled_components = ${_gr_enabled_components}")
+@@ -508,6 +512,8 @@ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-runtime/lib/constants.cc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime/lib/constants.cc ESCAPE_QUOTES @ONLY)
+
++if(ENABLE_GNURADIO_RUNTIME)
+ # Install config.h in include/gnuradio
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime/include/gnuradio/config.h
+ DESTINATION ${GR_INCLUDE_DIR}/gnuradio)
++endif(ENABLE_GNURADIO_RUNTIME)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-gr-channels_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Let pkgsrc handle components.
+
+--- gr-channels/CMakeLists.txt.orig 2025-02-20 01:23:56.000000000 +0000
++++ gr-channels/CMakeLists.txt
+@@ -16,12 +16,7 @@ include(GrComponent)
+
+ gr_register_component(
+ "gr-channels"
+- ENABLE_GR_CHANNELS
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_BLOCKS
+- ENABLE_GR_FFT
+- ENABLE_GR_FILTER
+- ENABLE_GR_ANALOG)
++ ENABLE_GR_CHANNELS)
+
+ set(GR_PKG_CHANNELS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/channels)
+
+@@ -41,9 +36,7 @@ if(ENABLE_GR_CHANNELS)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+ add_subdirectory(docs)
+
+ ########################################################################
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-channels_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-channels_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-channels/lib/CMakeLists.txt.orig 2025-02-26 12:26:11.960923475 +0000
++++ gr-channels/lib/CMakeLists.txt
+@@ -23,7 +23,7 @@ add_library(
+ target_link_libraries(
+ gnuradio-channels
+ PUBLIC gnuradio-runtime
+- PRIVATE gnuradio-filter gnuradio-analog gnuradio-blocks)
++ PRIVATE gnuradio-filter gnuradio-analog gnuradio-blocks gnuradio-pmt Volk::volk)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-channels PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,30 @@
+$NetBSD: patch-gr-digital_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-digital/CMakeLists.txt.orig 2025-02-26 16:55:20.077534202 +0000
++++ gr-digital/CMakeLists.txt
+@@ -17,12 +17,7 @@ include(GrComponent)
+ gr_register_component(
+ "gr-digital"
+ ENABLE_GR_DIGITAL
+- Boost_FOUND
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_FFT
+- ENABLE_GR_FILTER
+- ENABLE_GR_BLOCKS
+- ENABLE_GR_ANALOG)
++ Boost_FOUND)
+
+ set(GR_PKG_DIGITAL_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/digital)
+
+@@ -48,9 +43,7 @@ if(ENABLE_GR_DIGITAL)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-digital_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-gr-digital_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-digital/lib/CMakeLists.txt.orig 2025-02-26 17:11:34.838940329 +0000
++++ gr-digital/lib/CMakeLists.txt
+@@ -93,7 +93,8 @@ add_library(
+
+ target_link_libraries(
+ gnuradio-digital PUBLIC gnuradio-runtime gnuradio-filter gnuradio-blocks
+- gnuradio-analog Boost::boost Volk::volk)
++ gnuradio-analog Boost::boost Volk::volk
++ PRIVATE fmt gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-digital PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-gr-dtv_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-dtv/CMakeLists.txt.orig 2025-02-26 14:30:35.787481115 +0000
++++ gr-dtv/CMakeLists.txt
+@@ -14,8 +14,7 @@
+ ########################################################################
+ include(GrComponent)
+
+-gr_register_component("gr-dtv" ENABLE_GR_DTV ENABLE_GNURADIO_RUNTIME ENABLE_GR_ANALOG
+- ENABLE_GR_FILTER ENABLE_GR_FEC)
++gr_register_component("gr-dtv" ENABLE_GR_DTV)
+
+ set(GR_PKG_DTV_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/dtv)
+
+@@ -36,9 +35,7 @@ if(ENABLE_GR_DTV)
+ endif(ENABLE_EXAMPLES)
+ add_subdirectory(apps)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+ add_subdirectory(docs)
+
+ ########################################################################
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-dtv_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-dtv_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-dtv/lib/CMakeLists.txt.orig 2025-02-26 14:37:38.517173813 +0000
++++ gr-dtv/lib/CMakeLists.txt
+@@ -72,7 +72,7 @@ add_library(
+ target_link_libraries(
+ gnuradio-dtv
+ PUBLIC gnuradio-runtime
+- PRIVATE gnuradio-analog gnuradio-filter gnuradio-fec Volk::volk)
++ PRIVATE fmt gnuradio-analog gnuradio-filter gnuradio-fec gnuradio-fft gnuradio-pmt Volk::volk)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-dtv PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-gr-fec_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-fec/CMakeLists.txt.orig 2025-02-20 01:23:56.000000000 +0000
++++ gr-fec/CMakeLists.txt
+@@ -16,7 +16,7 @@ include(GrComponent)
+
+ find_package(GSL)
+
+-gr_register_component("gr-fec" ENABLE_GR_FEC ENABLE_GNURADIO_RUNTIME ENABLE_GR_BLOCKS)
++gr_register_component("gr-fec" ENABLE_GR_FEC)
+
+ set(GR_PKG_FEC_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/fec)
+
+@@ -37,9 +37,7 @@ if(ENABLE_GR_FEC)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+ add_subdirectory(docs)
+ add_subdirectory(ldpc_alist)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-fec_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-fec/lib/CMakeLists.txt.orig 2025-02-26 13:41:02.100400280 +0000
++++ gr-fec/lib/CMakeLists.txt
+@@ -75,7 +75,7 @@ if(MSVC)
+ target_sources(gnuradio-fec PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fec.rc)
+ endif(MSVC)
+
+-target_link_libraries(gnuradio-fec PUBLIC gnuradio-runtime gnuradio-blocks)
++target_link_libraries(gnuradio-fec PUBLIC gnuradio-runtime gnuradio-blocks PRIVATE fmt gnuradio-pmt Volk::volk)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-fec PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_reed-solomon_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_reed-solomon_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-fec_lib_reed-solomon_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-gr-fec_lib_reed-solomon_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires external includes.
+
+--- gr-fec/lib/reed-solomon/CMakeLists.txt.orig 2025-02-26 13:38:32.553754304 +0000
++++ gr-fec/lib/reed-solomon/CMakeLists.txt
+@@ -29,8 +29,7 @@ add_library(
+ ${CMAKE_CURRENT_SOURCE_DIR}/init_rs.c)
+ target_include_directories(
+ gr_fec_rs
+- PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+- PRIVATE $<TARGET_PROPERTY:gnuradio-runtime,INCLUDE_DIRECTORIES>)
++ PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>)
+ set_target_properties(gr_fec_rs PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+ target_sources(gnuradio-fec PRIVATE $<TARGET_OBJECTS:gr_fec_rs>)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-filter_include_gnuradio_filter_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-filter_include_gnuradio_filter_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-filter_include_gnuradio_filter_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-filter_include_gnuradio_filter_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Install auto-generated interp_differentiator_taps.h.
+It is needed for gnuradio-digital.
+
+--- gr-filter/include/gnuradio/filter/CMakeLists.txt.orig 2025-02-26 16:59:27.801916087 +0000
++++ gr-filter/include/gnuradio/filter/CMakeLists.txt
+@@ -18,6 +18,7 @@ install(
+ ival_decimator.h
+ iir_filter.h
+ interpolator_taps.h
++ interp_differentiator_taps.h
+ interp_fir_filter.h
+ mmse_fir_interpolator_cc.h
+ mmse_fir_interpolator_ff.h
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-gr-network_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-network/CMakeLists.txt.orig 2025-02-26 14:42:06.433678954 +0000
++++ gr-network/CMakeLists.txt
+@@ -14,7 +14,7 @@ include(GrBoost)
+ # Register component
+ ########################################################################
+ include(GrComponent)
+-gr_register_component("gr-network" ENABLE_GR_NETWORK Boost_FOUND ENABLE_GNURADIO_RUNTIME)
++gr_register_component("gr-network" ENABLE_GR_NETWORK Boost_FOUND)
+
+ set(GR_PKG_NETWORK_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/network)
+
+@@ -38,9 +38,7 @@ if(ENABLE_GR_NETWORK)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-network_lib_CMakeLists.txt Thu Feb 27 13:49:51 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-network_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:51 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-network/lib/CMakeLists.txt.orig 2025-02-26 14:43:25.285517672 +0000
++++ gr-network/lib/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library(
+ udp_sink_impl.cc
+ udp_source_impl.cc)
+
+-target_link_libraries(gnuradio-network PUBLIC gnuradio-runtime)
++target_link_libraries(gnuradio-network PUBLIC gnuradio-runtime PRIVATE fmt gnuradio-pmt Boost::thread)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-network PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-gr-pdu_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-pdu/CMakeLists.txt.orig 2025-02-26 14:47:05.754914814 +0000
++++ gr-pdu/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ # Register component
+ ########################################################################
+ include(GrComponent)
+-gr_register_component("gr-pdu" ENABLE_GR_PDU ENABLE_GNURADIO_RUNTIME)
++gr_register_component("gr-pdu" ENABLE_GR_PDU)
+
+ set(GR_PKG_PDU_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/pdu)
+
+@@ -33,9 +33,7 @@ if(ENABLE_GR_PDU)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-pdu_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-pdu_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-pdu/lib/CMakeLists.txt.orig 2025-02-26 14:47:46.246302803 +0000
++++ gr-pdu/lib/CMakeLists.txt
+@@ -33,7 +33,7 @@ if(MSVC)
+ target_sources(gnuradio-pdu PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-pdu.rc)
+ endif(MSVC)
+
+-target_link_libraries(gnuradio-pdu PUBLIC gnuradio-runtime)
++target_link_libraries(gnuradio-pdu PUBLIC gnuradio-runtime PRIVATE fmt gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-pdu PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-gr-qtgui_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-qtgui/CMakeLists.txt.orig 2025-02-26 16:23:07.950072102 +0000
++++ gr-qtgui/CMakeLists.txt
+@@ -34,9 +34,6 @@ gr_register_component(
+ ENABLE_GR_QTGUI
+ QT_FOUND
+ QWT_FOUND
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_FFT
+- ENABLE_GR_FILTER
+ PYTHONLIBS_FOUND
+ ${qt_gui_python_deps})
+
+@@ -63,9 +60,7 @@ if(ENABLE_GR_QTGUI)
+ endif(ENABLE_EXAMPLES)
+ add_subdirectory(apps)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-qtgui_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-qtgui_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-qtgui/lib/CMakeLists.txt.orig 2025-02-20 01:23:56.000000000 +0000
++++ gr-qtgui/lib/CMakeLists.txt
+@@ -89,7 +89,7 @@ target_include_directories(
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ target_link_libraries(gnuradio-qtgui
+ PUBLIC ${QTGUI_LIBS}
+- PRIVATE ${PRIVATE_LIBS}
++ PRIVATE ${PRIVATE_LIBS} fmt gnuradio-pmt
+ )
+
+ set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/qtgui)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-gr-soapy_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-soapy/CMakeLists.txt.orig 2025-02-26 16:48:34.058650664 +0000
++++ gr-soapy/CMakeLists.txt
+@@ -18,7 +18,7 @@ find_package(SoapySDR 0.7.2)
+ # Register component
+ ########################################################################
+ include(GrComponent)
+-gr_register_component("gr-soapy" ENABLE_GR_SOAPY SoapySDR_FOUND ENABLE_GNURADIO_RUNTIME)
++gr_register_component("gr-soapy" ENABLE_GR_SOAPY SoapySDR_FOUND)
+ set(GR_PKG_SOAPY_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/soapy)
+
+ ########################################################################
+@@ -39,9 +39,7 @@ if(ENABLE_GR_SOAPY)
+ add_subdirectory(examples/grc)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-soapy_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-soapy_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-soapy/lib/CMakeLists.txt.orig 2025-02-26 16:49:33.717342484 +0000
++++ gr-soapy/lib/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_library(gnuradio-soapy block_impl.cc
+
+ target_compile_features(gnuradio-soapy PRIVATE ${GR_CXX_VERSION_FEATURE})
+
+-target_link_libraries(gnuradio-soapy PUBLIC gnuradio-runtime ${SoapySDR_LIBRARIES})
++target_link_libraries(gnuradio-soapy PUBLIC gnuradio-runtime ${SoapySDR_LIBRARIES} PRIVATE fmt gmp gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-soapy PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-gr-trellis_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-trellis/CMakeLists.txt.orig 2025-02-26 17:15:40.262691440 +0000
++++ gr-trellis/CMakeLists.txt
+@@ -14,8 +14,7 @@
+ # Register component
+ ########################################################################
+ include(GrComponent)
+-gr_register_component("gr-trellis" ENABLE_GR_TRELLIS ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_ANALOG ENABLE_GR_BLOCKS ENABLE_GR_DIGITAL)
++gr_register_component("gr-trellis" ENABLE_GR_TRELLIS)
+
+ set(GR_PKG_TRELLIS_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/trellis)
+
+@@ -37,9 +36,7 @@ if(ENABLE_GR_TRELLIS)
+ add_subdirectory(examples/grc)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-trellis_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gr-trellis_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-trellis/lib/CMakeLists.txt.orig 2025-02-26 17:16:38.776706038 +0000
++++ gr-trellis/lib/CMakeLists.txt
+@@ -31,6 +31,7 @@ add_library(
+ viterbi_combined_impl.cc)
+
+ target_link_libraries(gnuradio-trellis PUBLIC gnuradio-runtime gnuradio-digital)
++target_link_libraries(gnuradio-trellis PRIVATE fmt gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-trellis PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-gr-uhd_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-uhd/CMakeLists.txt.orig 2025-02-26 22:13:41.784399423 +0000
++++ gr-uhd/CMakeLists.txt
+@@ -28,10 +28,7 @@ gr_register_component(
+ ENABLE_GR_UHD
+ Boost_FOUND
+ UHD_FOUND
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_FILTER
+- ENABLE_GR_BLOCKS
+- ENABLE_GR_ANALOG)
++)
+ set(GR_PKG_UHD_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/uhd)
+
+ gr_register_component("gr-uhd UHD 4.0 RFNoC" ENABLE_UHD_RFNOC ENABLE_GR_UHD
+@@ -59,9 +56,7 @@ if(ENABLE_GR_UHD)
+ add_subdirectory(examples/grc)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+- if(ENABLE_GRC)
+ add_subdirectory(grc)
+- endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_examples_c++_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_examples_c++_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_examples_c++_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gr-uhd_examples_c++_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-uhd/examples/c++/CMakeLists.txt.orig 2025-02-26 22:19:00.070971892 +0000
++++ gr-uhd/examples/c++/CMakeLists.txt
+@@ -9,6 +9,6 @@
+ # Build executable
+ ########################################################################
+ add_executable(tags_demo tags_demo.cc)
+-target_link_libraries(tags_demo gnuradio-uhd Boost::program_options)
++target_link_libraries(tags_demo fmt gnuradio-pmt gnuradio-uhd Boost::program_options)
+
+ install(TARGETS tags_demo DESTINATION ${GR_PKG_UHD_EXAMPLES_DIR})
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-uhd_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gr-uhd_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-uhd/lib/CMakeLists.txt.orig 2025-02-26 22:14:57.809324457 +0000
++++ gr-uhd/lib/CMakeLists.txt
+@@ -33,6 +33,7 @@ endif(ENABLE_UHD_RFNOC)
+ add_library(gnuradio-uhd ${LIB_GR_UHD_SOURCES})
+
+ target_link_libraries(gnuradio-uhd PUBLIC gnuradio-runtime UHD::UHD)
++target_link_libraries(gnuradio-uhd PRIVATE Boost::thread fmt gnuradio-pmt)
+
+ target_include_directories(
+ gnuradio-uhd PUBLIC $<INSTALL_INTERFACE:include>
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-utils_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-utils_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-utils_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-gr-utils_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-utils/CMakeLists.txt.orig 2025-02-27 08:54:33.038694303 +0000
++++ gr-utils/CMakeLists.txt
+@@ -27,13 +27,13 @@ if(NOT CMAKE_CROSSCOMPILING)
+
+ endif(NOT CMAKE_CROSSCOMPILING)
+
+-gr_register_component("gr-utils" ENABLE_GR_UTILS ENABLE_GNURADIO_RUNTIME ENABLE_PYTHON
++gr_register_component("gr-utils" ENABLE_GR_UTILS ENABLE_PYTHON
+ ${utils_python_deps})
+
+-gr_register_component("gr_modtool" ENABLE_GR_MODTOOL ENABLE_GNURADIO_RUNTIME
++gr_register_component("gr_modtool" ENABLE_GR_MODTOOL
+ ENABLE_PYTHON ${utils_modtool_deps})
+
+-gr_register_component("gr_blocktool" ENABLE_GR_BLOCKTOOL ENABLE_GNURADIO_RUNTIME
++gr_register_component("gr_blocktool" ENABLE_GR_BLOCKTOOL
+ ENABLE_PYTHON)
+
+ ########################################################################
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-gr-video-sdl_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-video-sdl/CMakeLists.txt.orig 2025-02-26 17:20:12.014007676 +0000
++++ gr-video-sdl/CMakeLists.txt
+@@ -16,7 +16,6 @@ find_package(SDL)
+ include(GrComponent)
+ GR_REGISTER_COMPONENT("gr-video-sdl" ENABLE_GR_VIDEO_SDL
+ SDL_FOUND
+- ENABLE_GNURADIO_RUNTIME
+ )
+
+ ########################################################################
+@@ -32,9 +31,7 @@ add_subdirectory(lib)
+ if(ENABLE_PYTHON)
+ add_subdirectory(python/video_sdl)
+ endif(ENABLE_PYTHON)
+-if(ENABLE_GRC)
+ add_subdirectory(grc)
+-endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-video-sdl_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-video-sdl_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-video-sdl/lib/CMakeLists.txt.orig 2025-02-26 17:24:50.927850162 +0000
++++ gr-video-sdl/lib/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_library(gnuradio-video-sdl sink_s_im
+ target_link_libraries(
+ gnuradio-video-sdl
+ PUBLIC gnuradio-runtime
+- PRIVATE ${SDL_LIBRARY})
++ PRIVATE ${SDL_LIBRARY} fmt gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-video-sdl PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-gr-vocoder_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-vocoder/CMakeLists.txt.orig 2025-02-26 22:24:12.368674726 +0000
++++ gr-vocoder/CMakeLists.txt
+@@ -15,11 +15,6 @@
+ ########################################################################
+ include(GrComponent)
+ GR_REGISTER_COMPONENT("gr-vocoder" ENABLE_GR_VOCODER
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_FFT
+- ENABLE_GR_BLOCKS
+- ENABLE_GR_FILTER
+- ENABLE_GR_ANALOG
+ )
+
+ SET(GR_PKG_VOCODER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/vocoder)
+@@ -65,9 +60,7 @@ if(ENABLE_PYTHON)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+-if(ENABLE_GRC)
+ add_subdirectory(grc)
+-endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gr-vocoder_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-vocoder/lib/CMakeLists.txt.orig 2025-02-26 22:48:39.030204846 +0000
++++ gr-vocoder/lib/CMakeLists.txt
+@@ -27,6 +27,7 @@ target_include_directories(
+ PUBLIC $<INSTALL_INTERFACE:include>
+ PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
+ target_link_libraries(gnuradio-vocoder PUBLIC gnuradio-runtime)
++target_link_libraries(gnuradio-vocoder PRIVATE fmt gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-vocoder PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gr-vocoder_python_vocoder_bindings_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-vocoder/python/vocoder/bindings/CMakeLists.txt.orig 2025-02-26 22:37:05.708201539 +0000
++++ gr-vocoder/python/vocoder/bindings/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ ########################################################################
+ # Python Bindings
+ ########################################################################
++include(GrPybind)
+
+ list(APPEND vocoder_python_files
+ alaw_decode_bs_python.cc
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-wavelet_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-wavelet/CMakeLists.txt.orig 2025-02-27 08:51:07.263741558 +0000
++++ gr-wavelet/CMakeLists.txt
+@@ -16,9 +16,6 @@ find_package(GSL)
+ include(GrComponent)
+
+ GR_REGISTER_COMPONENT("gr-wavelet" ENABLE_GR_WAVELET
+- ENABLE_GNURADIO_RUNTIME
+- ENABLE_GR_BLOCKS
+- ENABLE_GR_ANALOG
+ GSL_FOUND
+ )
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-wavelet_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-wavelet_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-wavelet/lib/CMakeLists.txt.orig 2025-02-27 08:52:57.097781764 +0000
++++ gr-wavelet/lib/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif(MSVC)
+ target_link_libraries(
+ gnuradio-wavelet
+ PUBLIC gnuradio-runtime
+- PRIVATE GSL::gsl)
++ PRIVATE GSL::gsl gnuradio-pmt)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-wavelet PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-gr-zeromq_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- gr-zeromq/CMakeLists.txt.orig 2025-02-26 22:33:57.035514676 +0000
++++ gr-zeromq/CMakeLists.txt
+@@ -17,7 +17,6 @@ find_package(ZeroMQ)
+ include(GrComponent)
+
+ GR_REGISTER_COMPONENT("gr-zeromq" ENABLE_GR_ZEROMQ
+- ENABLE_GNURADIO_RUNTIME
+ ZEROMQ_FOUND
+ CPPZMQ_HAS_SHUTDOWN
+ )
+@@ -40,9 +39,7 @@ if(ENABLE_PYTHON)
+ add_subdirectory(examples)
+ endif(ENABLE_EXAMPLES)
+ endif(ENABLE_PYTHON)
+-if(ENABLE_GRC)
+ add_subdirectory(grc)
+-endif(ENABLE_GRC)
+
+ ########################################################################
+ # Create Pkg Config File
Index: pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_lib_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_lib_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-gr-zeromq_lib_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gr-zeromq_lib_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Splitting gnuradio into separate packages requires explicit linking.
+
+--- gr-zeromq/lib/CMakeLists.txt.orig 2025-02-26 22:35:37.706145863 +0000
++++ gr-zeromq/lib/CMakeLists.txt
+@@ -28,7 +28,7 @@ add_library(
+ target_link_libraries(
+ gnuradio-zeromq
+ PUBLIC gnuradio-runtime
+- PRIVATE ZeroMQ::ZeroMQ)
++ PRIVATE fmt gnuradio-pmt ZeroMQ::ZeroMQ)
+
+ if(ENABLE_COMMON_PCH)
+ target_link_libraries(gnuradio-zeromq PRIVATE common-precompiled-headers)
Index: pkgsrc/ham/gnuradio-core/patches/patch-grc_CMakeLists.txt
diff -u /dev/null pkgsrc/ham/gnuradio-core/patches/patch-grc_CMakeLists.txt:1.1
--- /dev/null Thu Feb 27 13:49:56 2025
+++ pkgsrc/ham/gnuradio-core/patches/patch-grc_CMakeLists.txt Thu Feb 27 13:49:52 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-grc_CMakeLists.txt,v 1.1 2025/02/27 13:49:52 adam Exp $
+
+Let pkgsrc handle components as separate packages.
+
+--- grc/CMakeLists.txt.orig 2025-02-26 12:08:33.284866597 +0000
++++ grc/CMakeLists.txt
+@@ -79,7 +79,6 @@ if(NOT CMAKE_CROSSCOMPILING)
+ endif(NOT CMAKE_CROSSCOMPILING)
+
+ GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC
+- ENABLE_GNURADIO_RUNTIME
+ ENABLE_PYTHON
+ ${grc_python_deps}
+ )
Home |
Main Index |
Thread Index |
Old Index