7 files changed, 33 insertions, 38 deletions

diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index c3ea46032c40..e7db8a94d62d 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-#MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
-PORTVERSION=	3.8.0.0.r2
+PORTVERSION=	3.8.0.0
 CATEGORIES=	comms astro hamradio
-DISTNAME=	v3.8.0.0-rc2
+MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
@@ -56,9 +55,6 @@ 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 \
diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo
index def6c489a0ff..35beaf2af245 100644
--- a/comms/gnuradio/distinfo
+++ b/comms/gnuradio/distinfo
@@ -1,5 +1,3 @@
-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
+TIMESTAMP = 1565539118
+SHA256 (gnuradio-3.8.0.0.tar.gz) = 3a9c90111f22f2f6f30450731dc671ad28ce824fc1a7bc8ea0783da9b95a7092
+SIZE (gnuradio-3.8.0.0.tar.gz) = 3557884
diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake
index 8ad804608fcf..7e7554ea678b 100644
--- a/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake
+++ b/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake
@@ -1,6 +1,6 @@
---- cmake/Modules/GrPython.cmake.orig	2019-03-09 13:28:14 UTC
+--- cmake/Modules/GrPython.cmake.orig	2019-08-09 21:40:34 UTC
 +++ cmake/Modules/GrPython.cmake
-@@ -101,11 +101,15 @@ if(NOT DEFINED GR_PYTHON_DIR)
+@@ -111,11 +111,15 @@ if(NOT DEFINED GR_PYTHON_DIR)
  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
  import os
  import sys
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index 8cc97c16529b..b8e9761d703e 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -1,6 +1,6 @@
---- docs/doxygen/Doxyfile.in.orig	2019-03-09 13:28:14 UTC
+--- docs/doxygen/Doxyfile.in.orig	2019-08-09 21:40:34 UTC
 +++ docs/doxygen/Doxyfile.in
-@@ -1852,7 +1852,7 @@ DOT_FONTSIZE           = 10
+@@ -1848,7 +1848,7 @@ DOT_FONTSIZE           = 10
  # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
  # set the path where dot can find it.
  
diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
index 526dd4a51cd7..ed0dc385e100 100644
--- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
+++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
@@ -1,9 +1,9 @@
---- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-05-29 03:34:08 UTC
+--- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-08-09 21:40:34 UTC
 +++ gr-vocoder/lib/gsm_fr_decode_ps_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_decode_ps.h>
  
- extern "C"{
+ extern "C" {
 +#ifdef __FreeBSD__
 +#include <gsm.h>
 +#else
diff --git a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
index 2d1096501144..8b32b26bc512 100644
--- a/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
+++ b/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
@@ -1,9 +1,9 @@
---- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-05-29 03:34:08 UTC
+--- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-08-11 18:52:58 UTC
 +++ gr-vocoder/lib/gsm_fr_encode_sp_impl.h
 @@ -26,7 +26,11 @@
  #include <gnuradio/vocoder/gsm_fr_encode_sp.h>
  
- extern "C"{
+ extern "C" {
 +#ifdef __FreeBSD__
 +#include <gsm.h>
 +#else
diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist
index ed4ccd532478..3a497edce6bf 100644
--- a/comms/gnuradio/pkg-plist
+++ b/comms/gnuradio/pkg-plist
@@ -757,6 +757,7 @@ include/pmt/pmt.h
 include/pmt/pmt_pool.h
 include/pmt/pmt_serial_tags.h
 include/pmt/pmt_sugar.h
+include/volk/constants.h
 include/volk/saturation_arithmetic.h
 include/volk/volk.h
 include/volk/volk_16i_32fc_dot_prod_32fc.h
@@ -998,60 +999,60 @@ lib/cmake/volk/VolkTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/volk/VolkTargets.cmake
 lib/libgnuradio-analog.so
 lib/libgnuradio-analog.so.3.8.0
-lib/libgnuradio-analog.so.3.8.0.0-rc2
+lib/libgnuradio-analog.so.3.8.0.0
 lib/libgnuradio-audio.so
 lib/libgnuradio-audio.so.3.8.0
-lib/libgnuradio-audio.so.3.8.0.0-rc2
+lib/libgnuradio-audio.so.3.8.0.0
 lib/libgnuradio-blocks.so
 lib/libgnuradio-blocks.so.3.8.0
-lib/libgnuradio-blocks.so.3.8.0.0-rc2
+lib/libgnuradio-blocks.so.3.8.0.0
 lib/libgnuradio-channels.so
 lib/libgnuradio-channels.so.3.8.0
-lib/libgnuradio-channels.so.3.8.0.0-rc2
+lib/libgnuradio-channels.so.3.8.0.0
 lib/libgnuradio-digital.so
 lib/libgnuradio-digital.so.3.8.0
-lib/libgnuradio-digital.so.3.8.0.0-rc2
+lib/libgnuradio-digital.so.3.8.0.0
 lib/libgnuradio-dtv.so
 lib/libgnuradio-dtv.so.3.8.0
-lib/libgnuradio-dtv.so.3.8.0.0-rc2
+lib/libgnuradio-dtv.so.3.8.0.0
 lib/libgnuradio-fec.so
 lib/libgnuradio-fec.so.3.8.0
-lib/libgnuradio-fec.so.3.8.0.0-rc2
+lib/libgnuradio-fec.so.3.8.0.0
 lib/libgnuradio-fft.so
 lib/libgnuradio-fft.so.3.8.0
-lib/libgnuradio-fft.so.3.8.0.0-rc2
+lib/libgnuradio-fft.so.3.8.0.0
 lib/libgnuradio-filter.so
 lib/libgnuradio-filter.so.3.8.0
-lib/libgnuradio-filter.so.3.8.0.0-rc2
+lib/libgnuradio-filter.so.3.8.0.0
 lib/libgnuradio-pmt.so
 lib/libgnuradio-pmt.so.3.8.0
-lib/libgnuradio-pmt.so.3.8.0.0-rc2
+lib/libgnuradio-pmt.so.3.8.0.0
 lib/libgnuradio-qtgui.so
 lib/libgnuradio-qtgui.so.3.8.0
-lib/libgnuradio-qtgui.so.3.8.0.0-rc2
+lib/libgnuradio-qtgui.so.3.8.0.0
 lib/libgnuradio-runtime.so
 lib/libgnuradio-runtime.so.3.8.0
-lib/libgnuradio-runtime.so.3.8.0.0-rc2
+lib/libgnuradio-runtime.so.3.8.0.0
 lib/libgnuradio-trellis.so
 lib/libgnuradio-trellis.so.3.8.0
-lib/libgnuradio-trellis.so.3.8.0.0-rc2
+lib/libgnuradio-trellis.so.3.8.0.0
 %%UHD%%lib/libgnuradio-uhd.so
 %%UHD%%lib/libgnuradio-uhd.so.3.8.0
-%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0-rc2
+%%UHD%%lib/libgnuradio-uhd.so.3.8.0.0
 lib/libgnuradio-video-sdl.so
 lib/libgnuradio-video-sdl.so.3.8.0
-lib/libgnuradio-video-sdl.so.3.8.0.0-rc2
+lib/libgnuradio-video-sdl.so.3.8.0.0
 lib/libgnuradio-vocoder.so
 lib/libgnuradio-vocoder.so.3.8.0
-lib/libgnuradio-vocoder.so.3.8.0.0-rc2
+lib/libgnuradio-vocoder.so.3.8.0.0
 lib/libgnuradio-wavelet.so
 lib/libgnuradio-wavelet.so.3.8.0
-lib/libgnuradio-wavelet.so.3.8.0.0-rc2
+lib/libgnuradio-wavelet.so.3.8.0.0
 lib/libgnuradio-zeromq.so
 lib/libgnuradio-zeromq.so.3.8.0
-lib/libgnuradio-zeromq.so.3.8.0.0-rc2
+lib/libgnuradio-zeromq.so.3.8.0.0
 lib/libvolk.so
-lib/libvolk.so.1.4.1git
+lib/libvolk.so.2.0
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo