summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ham/gnuradio-uhd/Makefile12
-rw-r--r--ham/gnuradio-uhd/PLIST47
-rw-r--r--ham/gnuradio-uhd/buildlink3.mk6
3 files changed, 19 insertions, 46 deletions
diff --git a/ham/gnuradio-uhd/Makefile b/ham/gnuradio-uhd/Makefile
index fa695d68762..9dd81b59627 100644
--- a/ham/gnuradio-uhd/Makefile
+++ b/ham/gnuradio-uhd/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2020/08/18 17:58:04 leot Exp $
+# $NetBSD: Makefile,v 1.22 2020/08/30 21:07:13 tnn Exp $
PKGNAME= gnuradio-uhd-${VERSION}
-PKGREVISION= 5
COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio
.include "../../ham/gnuradio-core/Makefile.common"
.include "../../ham/gnuradio-core/Nocore.mk"
-CMAKE_ARGS+= -DENABLE_DEFAULT=False
-CMAKE_ARGS+= -DENABLE_GR_UHD=True
-CMAKE_ARGS+= -DENABLE_PYTHON=True
+CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
+CMAKE_ARGS+= -DENABLE_GR_UHD=ON
+CMAKE_ARGS+= -DENABLE_PYTHON=ON
+CMAKE_ARGS+= -DENABLE_GRC=ON
+
+PLIST_MINUS+= companion
.if ${OPSYS} != "Darwin"
# XXX dbj -- i'm not sure why this is necessary, but hard coding
diff --git a/ham/gnuradio-uhd/PLIST b/ham/gnuradio-uhd/PLIST
index 5798f8071cf..26b6c28be7d 100644
--- a/ham/gnuradio-uhd/PLIST
+++ b/ham/gnuradio-uhd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/03/07 13:14:31 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/08/30 21:07:13 tnn Exp $
bin/uhd_fft
bin/uhd_rx_cfile
bin/uhd_rx_nogui
@@ -11,7 +11,11 @@ include/gnuradio/uhd/api.h
include/gnuradio/uhd/usrp_block.h
include/gnuradio/uhd/usrp_sink.h
include/gnuradio/uhd/usrp_source.h
+lib/cmake/gnuradio/gnuradio-uhdConfig.cmake
+lib/cmake/gnuradio/gnuradio-uhdTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-uhdTargets.cmake
lib/libgnuradio-uhd.so
+lib/libgnuradio-uhd.so.3.8.1
lib/libgnuradio-uhd.so.${PKGVERSION}
lib/pkgconfig/gnuradio-uhd.pc
${PYSITELIB}/gnuradio/uhd/__init__.py
@@ -28,45 +32,12 @@ ${PYSITELIB}/gnuradio/uhd/uhd_swig.py
${PYSITELIB}/gnuradio/uhd/uhd_swig.pyc
${PYSITELIB}/gnuradio/uhd/uhd_swig.pyo
share/doc/gnuradio-${PKGVERSION}/README.uhd
-share/gnuradio/examples/hf_explorer/README
-share/gnuradio/examples/hf_explorer/hfx.py
-share/gnuradio/examples/hf_explorer/hfx_help
-share/gnuradio/examples/hf_radio/README.TXT
-share/gnuradio/examples/hf_radio/hfir.sci
-share/gnuradio/examples/hf_radio/input.py
-share/gnuradio/examples/hf_radio/output.py
-share/gnuradio/examples/hf_radio/radio.py
-share/gnuradio/examples/hf_radio/radio.xml
-share/gnuradio/examples/hf_radio/ssb_taps
-share/gnuradio/examples/hf_radio/ssbagc.py
-share/gnuradio/examples/hf_radio/ssbdemod.py
-share/gnuradio/examples/hf_radio/startup.py
-share/gnuradio/examples/hf_radio/ui.py
-share/gnuradio/examples/uhd/fm_tx4.py
-share/gnuradio/examples/uhd/fm_tx_2_daughterboards.py
-share/gnuradio/examples/uhd/max_power.py
share/gnuradio/examples/uhd/tags_demo
share/gnuradio/examples/uhd/uhd_const_wave.grc
-share/gnuradio/examples/uhd/uhd_dpsk_mod.grc
share/gnuradio/examples/uhd/uhd_fft.grc
-share/gnuradio/examples/uhd/uhd_rx_dpsk.grc
share/gnuradio/examples/uhd/uhd_two_tone_loopback.grc
-share/gnuradio/examples/uhd/uhd_tx_dpsk.grc
share/gnuradio/examples/uhd/uhd_wbfm_receive.grc
-share/gnuradio/examples/uhd/usrp_am_mw_rcv.py
-share/gnuradio/examples/uhd/usrp_nbfm_ptt.py
-share/gnuradio/examples/uhd/usrp_nbfm_rcv.py
-share/gnuradio/examples/uhd/usrp_spectrum_sense.py
-share/gnuradio/examples/uhd/usrp_tv_rcv.py
-share/gnuradio/examples/uhd/usrp_tv_rcv_nogui.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv2_nogui.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv_fmdet.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv_nogui.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv_pll.py
-share/gnuradio/examples/uhd/usrp_wfm_rcv_sca.py
-share/gnuradio/examples/uhd/usrp_wxapt_rcv.py
-share/gnuradio/grc/blocks/uhd_amsg_source.xml
-share/gnuradio/grc/blocks/uhd_block_tree.xml
-share/gnuradio/grc/blocks/uhd_usrp_sink.xml
-share/gnuradio/grc/blocks/uhd_usrp_source.xml
+share/gnuradio/grc/blocks/uhd.tree.yml
+share/gnuradio/grc/blocks/uhd_amsg_source.block.yml
+share/gnuradio/grc/blocks/uhd_usrp_sink.block.yml
+share/gnuradio/grc/blocks/uhd_usrp_source.block.yml
diff --git a/ham/gnuradio-uhd/buildlink3.mk b/ham/gnuradio-uhd/buildlink3.mk
index 46f93f8e35a..c401bacb0ba 100644
--- a/ham/gnuradio-uhd/buildlink3.mk
+++ b/ham/gnuradio-uhd/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/08/30 21:07:13 tnn Exp $
BUILDLINK_TREE+= gnuradio-uhd
.if !defined(GNURADIO_UHD_BUILDLINK3_MK)
GNURADIO_UHD_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gnuradio-uhd+= gnuradio-uhd>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-uhd+= gnuradio-uhd>=3.7.5
+BUILDLINK_API_DEPENDS.gnuradio-uhd+= gnuradio-uhd>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-uhd+= gnuradio-uhd>=3.8.1.0
BUILDLINK_PKGSRCDIR.gnuradio-uhd?= ../../ham/gnuradio-uhd
.endif # GNURADIO_UHD_BUILDLINK3_MK