pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnuradio-utils: catch up w/ gnuradio-core

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

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

Log Message:
gnuradio-utils: 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=dc52c0b5e602d77550969cdce5dfba4ffaa966ca

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

diffstat:
 gnuradio-utils/Makefile      |  11 ++--
 gnuradio-utils/PLIST         | 138 ++++++++++---------------------------------
 gnuradio-utils/buildlink3.mk |   6 +-
 3 files changed, 38 insertions(+), 117 deletions(-)

diffs:
diff --git a/gnuradio-utils/Makefile b/gnuradio-utils/Makefile
index 4a5f0cb778..9aef42b19a 100644
--- a/gnuradio-utils/Makefile
+++ b/gnuradio-utils/Makefile
@@ -1,16 +1,13 @@
 # $NetBSD: Makefile,v 1.19 2019/08/22 12:23:23 ryoon Exp $
 
 PKGNAME=	gnuradio-utils-${VERSION}
-PKGREVISION=	2
 COMMENT=	Utilities in 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"
 
-#BROKEN=		MatPlotLib requires Python 3.x.
-
-#DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
-#ONF_FILES+=	${EGDIR}/modtool.conf	${PKG_SYSCONFDIR}/modtool.conf
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+#CONF_FILES+=	${EGDIR}/modtool.conf	${PKG_SYSCONFDIR}/modtool.conf
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_UTILS=True
diff --git a/gnuradio-utils/PLIST b/gnuradio-utils/PLIST
index 19e511e59c..b101dca04b 100644
--- a/gnuradio-utils/PLIST
+++ b/gnuradio-utils/PLIST
@@ -1,71 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2015/12/08 21:28:57 wiedi Exp $
+@comment $NetBSD$
 bin/gr_modtool
-bin/gr_plot_char
+bin/gr_plot
 bin/gr_plot_const
 bin/gr_plot_fft
-bin/gr_plot_fft_c
-bin/gr_plot_fft_f
-bin/gr_plot_float
-bin/gr_plot_int
 bin/gr_plot_iq
 bin/gr_plot_psd
-bin/gr_plot_psd_c
-bin/gr_plot_psd_f
 bin/gr_plot_qt
-bin/gr_plot_short
 bin/gr_read_file_metadata
-bin/grcc
-${PYSITELIB}/gnuradio/modtool/__init__.py
-${PYSITELIB}/gnuradio/modtool/__init__.pyc
-${PYSITELIB}/gnuradio/modtool/__init__.pyo
-${PYSITELIB}/gnuradio/modtool/cmakefile_editor.py
-${PYSITELIB}/gnuradio/modtool/cmakefile_editor.pyc
-${PYSITELIB}/gnuradio/modtool/cmakefile_editor.pyo
-${PYSITELIB}/gnuradio/modtool/code_generator.py
-${PYSITELIB}/gnuradio/modtool/code_generator.pyc
-${PYSITELIB}/gnuradio/modtool/code_generator.pyo
-${PYSITELIB}/gnuradio/modtool/grc_xml_generator.py
-${PYSITELIB}/gnuradio/modtool/grc_xml_generator.pyc
-${PYSITELIB}/gnuradio/modtool/grc_xml_generator.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_add.py
-${PYSITELIB}/gnuradio/modtool/modtool_add.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_add.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_base.py
-${PYSITELIB}/gnuradio/modtool/modtool_base.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_base.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_disable.py
-${PYSITELIB}/gnuradio/modtool/modtool_disable.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_disable.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_help.py
-${PYSITELIB}/gnuradio/modtool/modtool_help.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_help.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_info.py
-${PYSITELIB}/gnuradio/modtool/modtool_info.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_info.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_makexml.py
-${PYSITELIB}/gnuradio/modtool/modtool_makexml.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_makexml.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_newmod.py
-${PYSITELIB}/gnuradio/modtool/modtool_newmod.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_newmod.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_rename.py
-${PYSITELIB}/gnuradio/modtool/modtool_rename.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_rename.pyo
-${PYSITELIB}/gnuradio/modtool/modtool_rm.py
-${PYSITELIB}/gnuradio/modtool/modtool_rm.pyc
-${PYSITELIB}/gnuradio/modtool/modtool_rm.pyo
-${PYSITELIB}/gnuradio/modtool/parser_cc_block.py
-${PYSITELIB}/gnuradio/modtool/parser_cc_block.pyc
-${PYSITELIB}/gnuradio/modtool/parser_cc_block.pyo
-${PYSITELIB}/gnuradio/modtool/scm.py
-${PYSITELIB}/gnuradio/modtool/scm.pyc
-${PYSITELIB}/gnuradio/modtool/scm.pyo
-${PYSITELIB}/gnuradio/modtool/templates.py
-${PYSITELIB}/gnuradio/modtool/templates.pyc
-${PYSITELIB}/gnuradio/modtool/templates.pyo
-${PYSITELIB}/gnuradio/modtool/util_functions.py
-${PYSITELIB}/gnuradio/modtool/util_functions.pyc
-${PYSITELIB}/gnuradio/modtool/util_functions.pyo
 ${PYSITELIB}/gnuradio/plot_data.py
 ${PYSITELIB}/gnuradio/plot_data.pyc
 ${PYSITELIB}/gnuradio/plot_data.pyo
@@ -81,49 +22,32 @@ ${PYSITELIB}/gnuradio/pyqt_filter.pyo
 ${PYSITELIB}/gnuradio/pyqt_plot.py
 ${PYSITELIB}/gnuradio/pyqt_plot.pyc
 ${PYSITELIB}/gnuradio/pyqt_plot.pyo
-share/gnuradio/examples/modtool.conf
-share/gnuradio/modtool/gr-newmod/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/MANIFEST.md
-share/gnuradio/modtool/gr-newmod/apps/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/FindCppUnit.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/FindGnuradioRuntime.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/GrMiscUtils.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/GrPython.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/GrSwig.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/GrTest.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/UseSWIG.cmake
-share/gnuradio/modtool/gr-newmod/cmake/Modules/howtoConfig.cmake
-share/gnuradio/modtool/gr-newmod/cmake/cmake_uninstall.cmake.in
-share/gnuradio/modtool/gr-newmod/docs/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/docs/README.howto
-share/gnuradio/modtool/gr-newmod/docs/doxygen/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/docs/doxygen/Doxyfile.in
-share/gnuradio/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/__init__.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/base.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/doxyindex.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated/__init__.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated/compound.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated/index.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/text.py
-share/gnuradio/modtool/gr-newmod/docs/doxygen/other/group_defs.dox
-share/gnuradio/modtool/gr-newmod/docs/doxygen/other/main_page.dox
-share/gnuradio/modtool/gr-newmod/docs/doxygen/swig_doc.py
-share/gnuradio/modtool/gr-newmod/examples/README
-share/gnuradio/modtool/gr-newmod/grc/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/include/howto/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/include/howto/api.h
-share/gnuradio/modtool/gr-newmod/lib/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/lib/qa_howto.cc
-share/gnuradio/modtool/gr-newmod/lib/qa_howto.h
-share/gnuradio/modtool/gr-newmod/lib/test_howto.cc
-share/gnuradio/modtool/gr-newmod/python/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/python/__init__.py
-share/gnuradio/modtool/gr-newmod/python/build_utils.py
-share/gnuradio/modtool/gr-newmod/python/build_utils_codes.py
-share/gnuradio/modtool/gr-newmod/swig/CMakeLists.txt
-share/gnuradio/modtool/gr-newmod/swig/howto_swig.i
+@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
diff --git a/gnuradio-utils/buildlink3.mk b/gnuradio-utils/buildlink3.mk
index bdc93a276d..841dbb78df 100644
--- a/gnuradio-utils/buildlink3.mk
+++ b/gnuradio-utils/buildlink3.mk
@@ -5,9 +5,9 @@ BUILDLINK_TREE+=	gnuradio-utils
 .if !defined(GNURADIO_UTILS_BUILDLINK3_MK)
 GNURADIO_UTILS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.7.5
-BUILDLINK_ABI_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-utils?=	../../ham/gnuradio-utils
+BUILDLINK_API_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.8.1.0
+BUILDLINK_ABI_DEPENDS.gnuradio-utils+=	gnuradio-utils>=3.8.1.0
+BUILDLINK_PKGSRCDIR.gnuradio-utils?=	../../wip/gnuradio-utils
 .endif # GNURADIO_UTILS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-utils
Home | Main Index | Thread Index | Old Index