gnuradio-pager: 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:49:27 2020 +0200
Changeset:	8c6fdc95213475dd823a9d9a18fcd1c37ce95e92

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

Log Message:
gnuradio-pager: 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=8c6fdc95213475dd823a9d9a18fcd1c37ce95e92

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

diffstat:
 gnuradio-pager/Makefile      |  5 ++--
 gnuradio-pager/PLIST         | 62 ++++++++++++++++++++++----------------------
 gnuradio-pager/buildlink3.mk |  6 ++---
 3 files changed, 36 insertions(+), 37 deletions(-)

diffs:
diff --git a/gnuradio-pager/Makefile b/gnuradio-pager/Makefile
index 7be428e0e1..6677cf0f35 100644
--- a/gnuradio-pager/Makefile
+++ b/gnuradio-pager/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2019/08/22 12:23:22 ryoon Exp $
 
 PKGNAME=	gnuradio-pager-${VERSION}
-PKGREVISION=	2
 COMMENT=	FLEX radiopager receiver/demodulator 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_PAGER=ON
diff --git a/gnuradio-pager/PLIST b/gnuradio-pager/PLIST
index 9dc0337f03..43ba218c18 100644
--- a/gnuradio-pager/PLIST
+++ b/gnuradio-pager/PLIST
@@ -1,31 +1,31 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:33 mef Exp $
-bin/usrp_flex
-bin/usrp_flex_all
-bin/usrp_flex_band
-include/gnuradio/pager/api.h
-include/gnuradio/pager/flex_deinterleave.h
-include/gnuradio/pager/flex_frame.h
-include/gnuradio/pager/flex_parse.h
-include/gnuradio/pager/flex_sync.h
-include/gnuradio/pager/slicer_fb.h
-include/gnuradio/swig/pager_swig.i
-include/gnuradio/swig/pager_swig_doc.i
-lib/libgnuradio-pager.so
-lib/libgnuradio-pager.so.${PKGVERSION}
-lib/pkgconfig/gnuradio-pager.pc
-${PYSITELIB}/gnuradio/pager/__init__.py
-${PYSITELIB}/gnuradio/pager/__init__.pyc
-${PYSITELIB}/gnuradio/pager/__init__.pyo
-${PYSITELIB}/gnuradio/pager/_pager_swig.so
-${PYSITELIB}/gnuradio/pager/flex_demod.py
-${PYSITELIB}/gnuradio/pager/flex_demod.pyc
-${PYSITELIB}/gnuradio/pager/flex_demod.pyo
-${PYSITELIB}/gnuradio/pager/pager_swig.py
-${PYSITELIB}/gnuradio/pager/pager_swig.pyc
-${PYSITELIB}/gnuradio/pager/pager_swig.pyo
-${PYSITELIB}/gnuradio/pager/pager_utils.py
-${PYSITELIB}/gnuradio/pager/pager_utils.pyc
-${PYSITELIB}/gnuradio/pager/pager_utils.pyo
-share/gnuradio/grc/blocks/pager_flex_deinterleave.xml
-share/gnuradio/grc/blocks/pager_flex_sync.xml
-share/gnuradio/grc/blocks/pager_slicer_fb.xml
+@comment $NetBSD$
+@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/fft
+@pkgdir include/gnuradio/blocks
+@pkgdir include/gnuradio/audio
+@pkgdir include/gnuradio/analog
+@pkgdir bin
diff --git a/gnuradio-pager/buildlink3.mk b/gnuradio-pager/buildlink3.mk
index f227a5a817..e6dc276d36 100644
--- a/gnuradio-pager/buildlink3.mk
+++ b/gnuradio-pager/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-pager
 .if !defined(GNURADIO_PAGER_BUILDLINK3_MK)
 GNURADIO_PAGER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-pager?=	../../ham/gnuradio-pager
+BUILDLINK_API_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-pager+=	gnuradio-pager>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-pager?=	../../wip/gnuradio-pager
 
 #.include "../../devel/boost-headers/buildlink3.mk"
 #.include "../../devel/boost-libs/buildlink3.mk"