gnuradio-channels: 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 09:21:27 2020 +0200
Changeset:	76fc7d69bb9918e6a8339fb7e10028b61a3b3613

Modified Files:
	gnuradio-channels/Makefile
	gnuradio-channels/PLIST

Log Message:
gnuradio-channels: 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=76fc7d69bb9918e6a8339fb7e10028b61a3b3613

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

diffstat:
 gnuradio-channels/Makefile |  5 ++---
 gnuradio-channels/PLIST    | 50 +++++++++++++++++++++++++++++-----------------
 2 files changed, 34 insertions(+), 21 deletions(-)

diffs:
diff --git a/gnuradio-channels/Makefile b/gnuradio-channels/Makefile
index b557cef3f5..f74d9ebf3a 100644
--- a/gnuradio-channels/Makefile
+++ b/gnuradio-channels/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2019/08/22 12:23:21 ryoon Exp $
 
 PKGNAME=	gnuradio-channels-${VERSION}
-PKGREVISION=	2
 COMMENT=	Signal processing blocks to simulate channel models of GNU Radio
 
-.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=OFF
 CMAKE_ARGS+=	-DENABLE_GR_CHANNELS=ON
diff --git a/gnuradio-channels/PLIST b/gnuradio-channels/PLIST
index 0d9e64311e..ec23b014a1 100644
--- a/gnuradio-channels/PLIST
+++ b/gnuradio-channels/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
+@comment $NetBSD$
 include/gnuradio/channels/api.h
 include/gnuradio/channels/channel_model.h
 include/gnuradio/channels/channel_model2.h
 include/gnuradio/channels/fading_model.h
 include/gnuradio/channels/selective_fading_model.h
+include/gnuradio/channels/selective_fading_model2.h
 include/gnuradio/swig/channels_swig.i
 include/gnuradio/swig/channels_swig_doc.i
+lib/cmake/gnuradio/gnuradio-channelsConfig.cmake
+lib/cmake/gnuradio/gnuradio-channelsTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-channelsTargets.cmake
 lib/libgnuradio-channels.so
+lib/libgnuradio-channels.so.3.8.1
 lib/libgnuradio-channels.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-channels.pc
 ${PYSITELIB}/gnuradio/channels/__init__.py
@@ -51,20 +56,29 @@ share/gnuradio/examples/channels/demo_qam.grc
 share/gnuradio/examples/channels/demo_quantization.grc
 share/gnuradio/examples/channels/demo_spec_an.grc
 share/gnuradio/examples/channels/demo_two_tone.grc
-share/gnuradio/grc/blocks/channels_amp_bal.xml
-share/gnuradio/grc/blocks/channels_block_tree.xml
-share/gnuradio/grc/blocks/channels_cfo_model.xml
-share/gnuradio/grc/blocks/channels_channel_model.xml
-share/gnuradio/grc/blocks/channels_channel_model2.xml
-share/gnuradio/grc/blocks/channels_conj_fs_iqcorr.xml
-share/gnuradio/grc/blocks/channels_distortion_2_gen.xml
-share/gnuradio/grc/blocks/channels_distortion_3_gen.xml
-share/gnuradio/grc/blocks/channels_dynamic_channel_model.xml
-share/gnuradio/grc/blocks/channels_fading_model.xml
-share/gnuradio/grc/blocks/channels_impairments.xml
-share/gnuradio/grc/blocks/channels_iqbal_gen.xml
-share/gnuradio/grc/blocks/channels_phase_bal.xml
-share/gnuradio/grc/blocks/channels_phase_noise_gen.xml
-share/gnuradio/grc/blocks/channels_quantizer.xml
-share/gnuradio/grc/blocks/channels_selective_fading_model.xml
-share/gnuradio/grc/blocks/channels_sro_model.xml
+@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 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 include/pmt
+@pkgdir include/gnuradio/thread
+@pkgdir include/gnuradio/messages
+@pkgdir include/gnuradio/filter
+@pkgdir include/gnuradio/fft
+@pkgdir include/gnuradio/blocks
+@pkgdir include/gnuradio/audio
+@pkgdir include/gnuradio/analog
+@pkgdir bin