(pkgsrc)

 - Following patch added to give sphinx-build name (with ${PYVERSSUFFIX) attached)
   gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
 - Depending doxygen-1.8.9.1nb1 now
 - gnuradio-doxygen is updated 3.7.5.2nb1 to 3.7.6
(upstream)
 - Update gnuradio-* from 3.7.5.2 to 3.7.6
  ---------------------------------------
GNU Radio releases 3.7.6 and 3.7.5.2 are available for download:

   (several tens of lines omitted for URL and List of contributors)

Release 3.7.5.2 is a bug-fix only maintenance patch following 3.7.5.1,
and will be the last one for the 3.7.5 release.  Release 3.7.6
incorporates all these fixes and adds significant new features.

5 files changed, 50 insertions, 10 deletions

diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index af696916381..d4598db2cb4 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2015/01/26 00:43:45 mef Exp $
+# $NetBSD: Makefile.common,v 1.7 2015/03/07 05:10:45 mef Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -33,8 +33,7 @@
 
 DISTNAME?=	gnuradio-${VERSION}
 CATEGORIES+=	ham
-#ASTER_SITES?=	http://gnuradio.org/releases/gnuradio/
-MASTER_SITES?=	http://s3-dist.gnuradio.org/
+MASTER_SITES=  http://s3-dist.gnuradio.org/
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://www.gnu.org/software/gnuradio/
@@ -108,6 +107,12 @@ SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
 SUBST_STAGE.alsa=	post-patch
 
+SUBST_CLASSES+=		pyvers
+SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
+SUBST_MESSAGE.pyvers=	Fix SPHINX_EXECUTABLE NAMES(sphinx-build)
+SUBST_VARS.pyvers+=	PYVERSSUFFIX
+SUBST_STAGE.pyvers=	pre-configure
+
 # REPLACE_PYTHON is some 600 files
 .include	"../../ham/gnuradio-core/files/REPLACE_PYTHON"
 
diff --git a/ham/gnuradio-core/Makefile.version b/ham/gnuradio-core/Makefile.version
index 82bf2592f9b..7f4947b2571 100644
--- a/ham/gnuradio-core/Makefile.version
+++ b/ham/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.4 2015/01/24 12:22:05 mef Exp $
+# $NetBSD: Makefile.version,v 1.5 2015/03/07 05:10:45 mef Exp $
 
-VERSION=        3.7.5.2
+VERSION=        3.7.6
diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST
index 834f211a47f..2cae50bbebc 100644
--- a/ham/gnuradio-core/PLIST
+++ b/ham/gnuradio-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/01/27 06:01:44 dbj Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/03/07 05:10:45 mef Exp $
 bin/gnuradio-config-info
 bin/gr_filter_design
 bin/volk-config-info
@@ -494,12 +494,19 @@ include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
 include/volk/volk_16ic_s32f_deinterleave_real_32f.h
 include/volk/volk_16ic_s32f_magnitude_32f.h
 include/volk/volk_16u_byteswap.h
+include/volk/volk_16u_byteswappuppet_16u.h
 include/volk/volk_32f_accumulator_s32f.h
+include/volk/volk_32f_acos_32f.h
+include/volk/volk_32f_asin_32f.h
+include/volk/volk_32f_atan_32f.h
 include/volk/volk_32f_binary_slicer_32i.h
 include/volk/volk_32f_binary_slicer_8i.h
 include/volk/volk_32f_convert_64f.h
+include/volk/volk_32f_cos_32f.h
+include/volk/volk_32f_expfast_32f.h
 include/volk/volk_32f_index_max_16u.h
 include/volk/volk_32f_invsqrt_32f.h
+include/volk/volk_32f_log2_32f.h
 include/volk/volk_32f_s32f_32f_fm_detect_32f.h
 include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
 include/volk/volk_32f_s32f_convert_16i.h
@@ -509,8 +516,11 @@ include/volk/volk_32f_s32f_multiply_32f.h
 include/volk/volk_32f_s32f_normalize.h
 include/volk/volk_32f_s32f_power_32f.h
 include/volk/volk_32f_s32f_stddev_32f.h
+include/volk/volk_32f_sin_32f.h
 include/volk/volk_32f_sqrt_32f.h
 include/volk/volk_32f_stddev_and_mean_32f_x2.h
+include/volk/volk_32f_tan_32f.h
+include/volk/volk_32f_tanh_32f.h
 include/volk/volk_32f_x2_add_32f.h
 include/volk/volk_32f_x2_divide_32f.h
 include/volk/volk_32f_x2_dot_prod_16i.h
@@ -519,6 +529,7 @@ include/volk/volk_32f_x2_interleave_32fc.h
 include/volk/volk_32f_x2_max_32f.h
 include/volk/volk_32f_x2_min_32f.h
 include/volk/volk_32f_x2_multiply_32f.h
+include/volk/volk_32f_x2_pow_32f.h
 include/volk/volk_32f_x2_s32f_interleave_16ic.h
 include/volk/volk_32f_x2_subtract_32f.h
 include/volk/volk_32f_x3_sum_of_poly_32f.h
@@ -552,12 +563,16 @@ include/volk/volk_32i_s32f_convert_32f.h
 include/volk/volk_32i_x2_and_32i.h
 include/volk/volk_32i_x2_or_32i.h
 include/volk/volk_32u_byteswap.h
+include/volk/volk_32u_byteswappuppet_32u.h
 include/volk/volk_32u_popcnt.h
+include/volk/volk_32u_popcntpuppet_32u.h
 include/volk/volk_64f_convert_32f.h
 include/volk/volk_64f_x2_max_64f.h
 include/volk/volk_64f_x2_min_64f.h
 include/volk/volk_64u_byteswap.h
+include/volk/volk_64u_byteswappuppet_64u.h
 include/volk/volk_64u_popcnt.h
+include/volk/volk_64u_popcntpuppet_64u.h
 include/volk/volk_8i_convert_16i.h
 include/volk/volk_8i_s32f_convert_32f.h
 include/volk/volk_8ic_deinterleave_16i_x2.h
@@ -898,6 +913,8 @@ share/gnuradio/examples/audio/multi_tone.py
 share/gnuradio/examples/audio/noise.py
 share/gnuradio/examples/audio/spectrum_inversion.py
 share/gnuradio/examples/audio/test_resampler.py
+share/gnuradio/examples/blocks/matrix_multiplexer.grc
+share/gnuradio/examples/blocks/vector_source_with_tags.grc
 share/gnuradio/examples/filter/channelize.py
 share/gnuradio/examples/filter/chirp_channelize.py
 share/gnuradio/examples/filter/decimate.py
diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo
index 00df106080c..641a7798627 100644
--- a/ham/gnuradio-core/distinfo
+++ b/ham/gnuradio-core/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2015/01/24 12:22:05 mef Exp $
+$NetBSD: distinfo,v 1.20 2015/03/07 05:10:45 mef Exp $
 
-SHA1 (gnuradio-3.7.5.2.tar.gz) = 9cbd04c0cf205e51bbed47c09ee0cb4861d1f885
-RMD160 (gnuradio-3.7.5.2.tar.gz) = ffff01d148b73ca498ea786a3d9f95996c53cb32
-Size (gnuradio-3.7.5.2.tar.gz) = 3550717 bytes
+SHA1 (gnuradio-3.7.6.tar.gz) = aaec56a3b9bfcf6bba1e4f7a9336579171811554
+RMD160 (gnuradio-3.7.6.tar.gz) = c0726c1c709c5414d4efa698f5396e6173862727
+Size (gnuradio-3.7.6.tar.gz) = 3579734 bytes
+SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
 SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
 SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = c05628aa88ac968928f9eabd8c56d4527e258767
 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 00ff8c14658acd2d1dc8be18ea6a19ace8d12968
diff --git a/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
new file mode 100644
index 00000000000..4473cd6c75a
--- /dev/null
+++ b/ham/gnuradio-core/patches/patch-cmake_Modules_FindSphinx.cmake
@@ -0,0 +1,17 @@
+$NetBSD: patch-cmake_Modules_FindSphinx.cmake,v 1.1 2015/03/07 05:10:45 mef Exp $
+
+(Starting with gnuradio-3.7.6), cmake wants sphinx-build exact executable
+name. With SUBST_CLASSES.pyvers in Makefile.common, tell the name.
+(The problem without this fix is in gnuradio-doxygen).
+
+--- cmake/Modules/FindSphinx.cmake.orig	2013-05-02 08:57:50.000000000 +0900
++++ cmake/Modules/FindSphinx.cmake	2015-03-06 22:08:44.000000000 +0900
+@@ -19,7 +19,7 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
+-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
++find_program(SPHINX_EXECUTABLE NAMES sphinx-build@PYVERSSUFFIX@
+   HINTS
+   $ENV{SPHINX_DIR}
+   PATH_SUFFIXES bin