3 files changed, 58 insertions, 45 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index bec4dc753883..c3ea46032c40 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -2,10 +2,9 @@
 
 PORTNAME=	gnuradio
 #MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
-DISTVERSION=	3.8tech-preview-381
-DISTVERSIONSUFFIX=	-g27dd99e49
-PORTREVISION=	2
+PORTVERSION=	3.8.0.0.r2
 CATEGORIES=	comms astro hamradio
+DISTNAME=	v3.8.0.0-rc2
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
@@ -24,6 +23,8 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
@@ -55,23 +56,25 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
 USES=		cmake compiler:c11 desktop-file-utils fortran gnome iconv \
 		perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix
+USE_GITHUB=	yes
+GH_TUPLE=	gnuradio:gnuradio:${DISTNAME} \
+		gnuradio:volk:d250816:volk/volk
+
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
-USE_GITHUB=	yes
-GH_TUPLE=	gnuradio:volk:d250816:volk/volk
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
+		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
-DOCSDIR=	share/doc/${PORTNAME}-3.8git
 USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index a2b31e0ab11f..def6c489a0ff 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1559503341
-SHA256 (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = a07897ebf6d68588ca5b3635f87f0251be9234a8adc4b9e89c372caaecd9a737
-SIZE (gnuradio-gnuradio-3.8tech-preview-381-g27dd99e49_GH0.tar.gz) = 3386872
+TIMESTAMP = 1565477657
+SHA256 (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 0dc466017101f39aa903780fa510c3cdf3a29ce75d12148fc449b12fe6324304
+SIZE (gnuradio-gnuradio-3.8.0.0.r2-v3.8.0.0-rc2_GH0.tar.gz) = 3400475
 SHA256 (gnuradio-volk-d250816_GH0.tar.gz) = 334da8910cfadc2e1487ef2a651f8eaa472262a4bfd3fa7c38d913c8fc32cbd8
 SIZE (gnuradio-volk-d250816_GH0.tar.gz) = 252477
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index cecfd1cc1d71..ed4ccd532478 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -21,6 +21,7 @@ bin/polar_channel_construction
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
+%%ETCDIR%%/conf.d/00-grc-docs.conf
 %%ETCDIR%%/conf.d/gnuradio-runtime.conf
 %%ETCDIR%%/conf.d/gr-audio-alsa.conf
 %%ETCDIR%%/conf.d/gr-audio-jack.conf
@@ -188,6 +189,7 @@ include/gnuradio/blocks/rms_ff.h
 include/gnuradio/blocks/rotator.h
 include/gnuradio/blocks/rotator_cc.h
 include/gnuradio/blocks/sample_and_hold.h
+include/gnuradio/blocks/selector.h
 include/gnuradio/blocks/short_to_char.h
 include/gnuradio/blocks/short_to_float.h
 include/gnuradio/blocks/skiphead.h
@@ -438,6 +440,7 @@ include/gnuradio/feval.h
 include/gnuradio/fft/api.h
 include/gnuradio/fft/ctrlport_probe_psd.h
 include/gnuradio/fft/fft.h
+include/gnuradio/fft/fft_shift.h
 include/gnuradio/fft/fft_vcc.h
 include/gnuradio/fft/fft_vfc.h
 include/gnuradio/fft/goertzel.h
@@ -994,59 +997,59 @@ lib/cmake/volk/VolkConfigVersion.cmake
 lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libgnuradio-analog.so
-lib/libgnuradio-analog.so.3.8git
-lib/libgnuradio-analog.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-analog.so.3.8.0
+lib/libgnuradio-analog.so.3.8.0.0-rc2
 lib/libgnuradio-audio.so
-lib/libgnuradio-audio.so.3.8git
-lib/libgnuradio-audio.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-audio.so.3.8.0
+lib/libgnuradio-audio.so.3.8.0.0-rc2
 lib/libgnuradio-blocks.so
-lib/libgnuradio-blocks.so.3.8git
-lib/libgnuradio-blocks.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-blocks.so.3.8.0
+lib/libgnuradio-blocks.so.3.8.0.0-rc2
 lib/libgnuradio-channels.so
-lib/libgnuradio-channels.so.3.8git
-lib/libgnuradio-channels.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-channels.so.3.8.0
+lib/libgnuradio-channels.so.3.8.0.0-rc2
 lib/libgnuradio-digital.so
-lib/libgnuradio-digital.so.3.8git
-lib/libgnuradio-digital.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-digital.so.3.8.0
+lib/libgnuradio-digital.so.3.8.0.0-rc2
 lib/libgnuradio-dtv.so
-lib/libgnuradio-dtv.so.3.8git
-lib/libgnuradio-dtv.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-dtv.so.3.8.0
+lib/libgnuradio-dtv.so.3.8.0.0-rc2
 lib/libgnuradio-fec.so
-lib/libgnuradio-fec.so.3.8git
-lib/libgnuradio-fec.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-fec.so.3.8.0
+lib/libgnuradio-fec.so.3.8.0.0-rc2
 lib/libgnuradio-fft.so
-lib/libgnuradio-fft.so.3.8git
-lib/libgnuradio-fft.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-fft.so.3.8.0
+lib/libgnuradio-fft.so.3.8.0.0-rc2
 lib/libgnuradio-filter.so
-lib/libgnuradio-filter.so.3.8git
-lib/libgnuradio-filter.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-filter.so.3.8.0
+lib/libgnuradio-filter.so.3.8.0.0-rc2
 lib/libgnuradio-pmt.so
-lib/libgnuradio-pmt.so.3.8git
-lib/libgnuradio-pmt.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-pmt.so.3.8.0
+lib/libgnuradio-pmt.so.3.8.0.0-rc2
 lib/libgnuradio-qtgui.so
-lib/libgnuradio-qtgui.so.3.8git
-lib/libgnuradio-qtgui.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-qtgui.so.3.8.0
+lib/libgnuradio-qtgui.so.3.8.0.0-rc2
 lib/libgnuradio-runtime.so
-lib/libgnuradio-runtime.so.3.8git
-lib/libgnuradio-runtime.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-runtime.so.3.8.0
+lib/libgnuradio-runtime.so.3.8.0.0-rc2
 lib/libgnuradio-trellis.so
-lib/libgnuradio-trellis.so.3.8git
-lib/libgnuradio-trellis.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-trellis.so.3.8.0
+lib/libgnuradio-trellis.so.3.8.0.0-rc2
 %%UHD%%lib/libgnuradio-uhd.so
-%%UHD%%lib/libgnuradio-uhd.so.3.8git
-%%UHD%%lib/libgnuradio-uhd.so.v3.8-compat-xxx-xunknown
+%%UHD%%lib/libgnuradio-uhd.so.3.8.0
+%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0-rc2
 lib/libgnuradio-video-sdl.so
-lib/libgnuradio-video-sdl.so.3.8git
-lib/libgnuradio-video-sdl.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-video-sdl.so.3.8.0
+lib/libgnuradio-video-sdl.so.3.8.0.0-rc2
 lib/libgnuradio-vocoder.so
-lib/libgnuradio-vocoder.so.3.8git
-lib/libgnuradio-vocoder.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-vocoder.so.3.8.0
+lib/libgnuradio-vocoder.so.3.8.0.0-rc2
 lib/libgnuradio-wavelet.so
-lib/libgnuradio-wavelet.so.3.8git
-lib/libgnuradio-wavelet.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-wavelet.so.3.8.0
+lib/libgnuradio-wavelet.so.3.8.0.0-rc2
 lib/libgnuradio-zeromq.so
-lib/libgnuradio-zeromq.so.3.8git
-lib/libgnuradio-zeromq.so.v3.8-compat-xxx-xunknown
+lib/libgnuradio-zeromq.so.3.8.0
+lib/libgnuradio-zeromq.so.3.8.0.0-rc2
 lib/libvolk.so
 lib/libvolk.so.1.4.1git
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
@@ -1415,6 +1418,12 @@ lib/libvolk.so.1.4.1git
 %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.py
 %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/fft/logpwrfft.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.py
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/CustomViewBox.pyo
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.py
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.pyc
+%%PYTHON_SITELIBDIR%%/gnuradio/filter/GrFilterPlotWidget.pyo
 %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/filter/__init__.pyo
@@ -2475,6 +2484,7 @@ share/applications/gnuradio-grc.desktop
 %%DATADIR%%/grc/blocks/blocks_rms_xx.block.yml
 %%DATADIR%%/grc/blocks/blocks_rotator_cc.block.yml
 %%DATADIR%%/grc/blocks/blocks_sample_and_hold_xx.block.yml
+%%DATADIR%%/grc/blocks/blocks_selector.block.yml
 %%DATADIR%%/grc/blocks/blocks_short_to_char.block.yml
 %%DATADIR%%/grc/blocks/blocks_short_to_float.block.yml
 %%DATADIR%%/grc/blocks/blocks_skiphead.block.yml