gnuradio-wavelet: 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:23:40 2020 +0200
Changeset:	2b4156d790397360836067e3db40778fd605266a

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

Log Message:
gnuradio-wavelet: 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=2b4156d790397360836067e3db40778fd605266a

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

diffstat:
 gnuradio-wavelet/Makefile      |  5 ++---
 gnuradio-wavelet/PLIST         | 33 ++++++++++++++++++++++++++++++++-
 gnuradio-wavelet/buildlink3.mk |  6 +++---
 3 files changed, 37 insertions(+), 7 deletions(-)

diffs:
diff --git a/gnuradio-wavelet/Makefile b/gnuradio-wavelet/Makefile
index 384be7082b..b5d61bf65a 100644
--- a/gnuradio-wavelet/Makefile
+++ b/gnuradio-wavelet/Makefile
@@ -1,11 +1,10 @@
 # $NetBSD: Makefile,v 1.16 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-wavelet-${VERSION}
-PKGREVISION=	2
 COMMENT=	Wavelet transform 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=False
 CMAKE_ARGS+=	-DENABLE_GR_WAVELET=True
diff --git a/gnuradio-wavelet/PLIST b/gnuradio-wavelet/PLIST
index 35280a9ada..3fab3c2a87 100644
--- a/gnuradio-wavelet/PLIST
+++ b/gnuradio-wavelet/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/28 16:59:34 mef Exp $
+@comment $NetBSD$
 include/gnuradio/swig/wavelet_swig.i
 include/gnuradio/swig/wavelet_swig_doc.i
 include/gnuradio/wavelet/api.h
 include/gnuradio/wavelet/squash_ff.h
 include/gnuradio/wavelet/wavelet_ff.h
 include/gnuradio/wavelet/wvps_ff.h
+lib/cmake/gnuradio/gnuradio-waveletConfig.cmake
+lib/cmake/gnuradio/gnuradio-waveletTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-waveletTargets.cmake
 lib/libgnuradio-wavelet.so
+lib/libgnuradio-wavelet.so.3.8.1
 lib/libgnuradio-wavelet.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-wavelet.pc
 ${PYSITELIB}/gnuradio/wavelet/__init__.py
@@ -15,3 +19,30 @@ ${PYSITELIB}/gnuradio/wavelet/_wavelet_swig.so
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.py
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.pyc
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.pyo
+@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 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
diff --git a/gnuradio-wavelet/buildlink3.mk b/gnuradio-wavelet/buildlink3.mk
index 76fbf75cff..8c5d88c345 100644
--- a/gnuradio-wavelet/buildlink3.mk
+++ b/gnuradio-wavelet/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-wavelet
 .if !defined(GNURADIO_WAVELET_BUILDLINK3_MK)
 GNURADIO_WAVELET_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-wavelet?=		../../ham/gnuradio-wavelet
+BUILDLINK_API_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+=	gnuradio-wavelet>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-wavelet?=		../../wip/gnuradio-wavelet
 .endif # GNURADIO_WAVELET_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-wavelet