gnuradio-zeromq: 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:21:40 2020 +0200
Changeset:	d5fc0674c2100bbcd042adeb36a7f67525ab4127

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

Log Message:
gnuradio-zeromq: 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=d5fc0674c2100bbcd042adeb36a7f67525ab4127

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

diffstat:
 gnuradio-zeromq/Makefile      |  5 ++---
 gnuradio-zeromq/PLIST         | 45 ++++++++++++++++++++++++++++++-------------
 gnuradio-zeromq/buildlink3.mk |  6 +++---
 3 files changed, 37 insertions(+), 19 deletions(-)

diffs:
diff --git a/gnuradio-zeromq/Makefile b/gnuradio-zeromq/Makefile
index 3938951798..e793aca17e 100644
--- a/gnuradio-zeromq/Makefile
+++ b/gnuradio-zeromq/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.19 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-zeromq-${VERSION}
-PKGREVISION=	2
 COMMENT=	All of the zeromq blocks, utilities, and examples
 
 #  zmq.hpp: No such file or directory
@@ -12,8 +11,8 @@ COMMENT=	All of the zeromq blocks, utilities, and examples
 #GIT_MODULE.master=	cppzmq
 # for work around, the file is copied to files directory
 
-.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_ZEROMQ=True
diff --git a/gnuradio-zeromq/PLIST b/gnuradio-zeromq/PLIST
index 3643be883b..d03665d50e 100644
--- a/gnuradio-zeromq/PLIST
+++ b/gnuradio-zeromq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/09/01 04:14:55 mef Exp $
+@comment $NetBSD$
 include/gnuradio/swig/zeromq_swig.i
 include/gnuradio/swig/zeromq_swig_doc.i
 include/gnuradio/zeromq/api.h
@@ -14,7 +14,11 @@ include/gnuradio/zeromq/req_msg_source.h
 include/gnuradio/zeromq/req_source.h
 include/gnuradio/zeromq/sub_msg_source.h
 include/gnuradio/zeromq/sub_source.h
+lib/cmake/gnuradio/gnuradio-zeromqConfig.cmake
+lib/cmake/gnuradio/gnuradio-zeromqTargets-release.cmake
+lib/cmake/gnuradio/gnuradio-zeromqTargets.cmake
 lib/libgnuradio-zeromq.so
+lib/libgnuradio-zeromq.so.3.8.1
 lib/libgnuradio-zeromq.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-zeromq.pc
 ${PYSITELIB}/gnuradio/zeromq/__init__.py
@@ -35,15 +39,30 @@ share/gnuradio/examples/zeromq/zeromq_pushpull.grc
 share/gnuradio/examples/zeromq/zeromq_reqrep.grc
 share/gnuradio/examples/zeromq/zmq_msg.grc
 share/gnuradio/examples/zeromq/zmq_stream.grc
-share/gnuradio/grc/blocks/zeromq_pub_msg_sink.xml
-share/gnuradio/grc/blocks/zeromq_pub_sink.xml
-share/gnuradio/grc/blocks/zeromq_pull_msg_source.xml
-share/gnuradio/grc/blocks/zeromq_pull_source.xml
-share/gnuradio/grc/blocks/zeromq_push_msg_sink.xml
-share/gnuradio/grc/blocks/zeromq_push_sink.xml
-share/gnuradio/grc/blocks/zeromq_rep_msg_sink.xml
-share/gnuradio/grc/blocks/zeromq_rep_sink.xml
-share/gnuradio/grc/blocks/zeromq_req_msg_source.xml
-share/gnuradio/grc/blocks/zeromq_req_source.xml
-share/gnuradio/grc/blocks/zeromq_sub_msg_source.xml
-share/gnuradio/grc/blocks/zeromq_sub_source.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 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-zeromq/buildlink3.mk b/gnuradio-zeromq/buildlink3.mk
index e6f3439b5d..35b380e952 100644
--- a/gnuradio-zeromq/buildlink3.mk
+++ b/gnuradio-zeromq/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-zeromq
 .if !defined(GNURADIO_ZEROMQ_BUILDLINK3_MK)
 GNURADIO_ZEROMQ_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-zeromq?=	../../ham/gnuradio-zeromq
+BUILDLINK_API_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-zeromq+=	gnuradio-zeromq>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-zeromq?=	../../wip/gnuradio-zeromq
 .endif # GNURADIO_ZEROMQ_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-zeromq