gnuradio-ctrlport: catch up w/ gnuradio-core

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 08:22:09 2020 +0200
Changeset:	7ebe966a2ac9774b1dabba2645444ffc91fb6ea9

Modified Files:
	gnuradio-ctrlport/Makefile
	gnuradio-ctrlport/PLIST
	gnuradio-ctrlport/buildlink3.mk

Log Message:
gnuradio-ctrlport: catch up w/ gnuradio-core

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ebe966a2ac9774b1dabba2645444ffc91fb6ea9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-ctrlport/Makefile      |  5 ++---
 gnuradio-ctrlport/PLIST         | 33 ++++++++++++++++++++++++++++-----
 gnuradio-ctrlport/buildlink3.mk | 16 ++++++++--------
 3 files changed, 38 insertions(+), 16 deletions(-)

diffs:
diff --git a/gnuradio-ctrlport/Makefile b/gnuradio-ctrlport/Makefile
index 8dae2c1be0..fc2a363634 100644
--- a/gnuradio-ctrlport/Makefile
+++ b/gnuradio-ctrlport/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.16 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-ctrlport-${VERSION}
-PKGREVISION=	2
 COMMENT=	New set of hooks into GNU Radio to allow a remote client to attach
-.include	"../../ham/gnuradio-core/Makefile.common"
-.include	"../../ham/gnuradio-core/Nocore.mk"
+.include	"../../wip/gnuradio-core/Makefile.common"
+.include	"../../wip/gnuradio-core/Nocore.mk"
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_CTRLPORT=True
diff --git a/gnuradio-ctrlport/PLIST b/gnuradio-ctrlport/PLIST
index 0006bc4fdd..78a52c5c9f 100644
--- a/gnuradio-ctrlport/PLIST
+++ b/gnuradio-ctrlport/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2016/03/07 13:14:31 mef Exp $
+@comment $NetBSD$
 bin/gr-ctrlport-monitor
-bin/gr-ctrlport-monitorc
-bin/gr-ctrlport-monitoro
 bin/gr-perf-monitorx
-bin/gr-perf-monitorxc
-bin/gr-perf-monitorxo
 include/gnuradio/blocks/ctrlport_probe2_b.h
 include/gnuradio/blocks/ctrlport_probe2_c.h
 include/gnuradio/blocks/ctrlport_probe2_f.h
@@ -34,3 +30,30 @@ share/gnuradio/examples/ctrlport/simple_copy.grc
 share/gnuradio/examples/ctrlport/simple_copy_controller.py
 share/gnuradio/examples/ctrlport/usrp_source_control.grc
 share/gnuradio/examples/ctrlport/usrp_source_controller.py
+@pkgdir share/gnuradio/examples/volk_benchmark
+@pkgdir share/gnuradio/examples/tags
+@pkgdir share/gnuradio/examples/network
+@pkgdir share/gnuradio/examples/mp-sched
+@pkgdir share/gnuradio/examples/metadata
+@pkgdir share/gnuradio/examples/filter
+@pkgdir share/gnuradio/examples/blocks
+@pkgdir share/gnuradio/examples/audio
+@pkgdir share/gnuradio/examples/analog
+@pkgdir share/doc/gnuradio-${PKGVERSION}
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
+@pkgdir lib/pkgconfig
+@pkgdir lib/cmake/gnuradio
+@pkgdir include/pmt
+@pkgdir include/gnuradio/thread
+@pkgdir include/gnuradio/swig
+@pkgdir include/gnuradio/messages
+@pkgdir include/gnuradio/filter
+@pkgdir include/gnuradio/audio
+@pkgdir include/gnuradio/analog
diff --git a/gnuradio-ctrlport/buildlink3.mk b/gnuradio-ctrlport/buildlink3.mk
index d5adb88912..a50e0a2c93 100644
--- a/gnuradio-ctrlport/buildlink3.mk
+++ b/gnuradio-ctrlport/buildlink3.mk
@@ -1,13 +1,13 @@
 # $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:08 mef Exp $
 
-BUILDLINK_TREE+=	gnuradio-dtv
+BUILDLINK_TREE+=	gnuradio-ctrlport
 
-.if !defined(GNURADIO_DTV_BUILDLINK3_MK)
-GNURADIO_DTV_BUILDLINK3_MK:=
+.if !defined(GNURADIO_CTRLPORT_BUILDLINK3_MK)
+GNURADIO_CTRLPORT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-dtv+=	gnuradio-dtv>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-dtv?=	../../ham/gnuradio-dtv
-.endif # GNURADIO_DTV_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.gnuradio-ctrlport+=	gnuradio-ctrlport>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-ctrlport+=	gnuradio-ctrlport>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-ctrlport?=	../../wip/gnuradio-ctrlport
+.endif # GNURADIO_CTRLPORT_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-gnuradio-dtv
+BUILDLINK_TREE+=	-gnuradio-ctrlport