Update GNU Radio 3.3.0 (2010-09-15) to 3.7.5

  See the thread for modularity issues etc:
  http://mail-index.netbsd.org/pkgsrc-users/2014/09/07/msg020346.html
See more info at recent  gnuradio-core/Makefile commit log, thanks.

3 files changed, 51 insertions, 28 deletions

diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index 2e16b068428..fe6325b276d 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,28 +1,18 @@
-# $NetBSD: Makefile,v 1.52 2014/08/13 10:57:32 adam Exp $
+# $NetBSD: Makefile,v 1.53 2014/10/13 12:51:10 mef Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
-PKGREVISION=	29
-COMMENT=	GUI framework for GNU Radio based on wxPython
+COMMENT=	WxGTK Toolkit module of GNU Radio
 
-REPLACE_PYTHON+=	gr-wxgui/src/python/form.py
-REPLACE_PYTHON+=	gr-wxgui/src/python/powermate.py
-REPLACE_PYTHON+=	gr-wxgui/src/python/slider.py
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-wxWidgets
+CONF_FILES+=	${EGDIR}/gr-wxgui.conf	${PKG_SYSCONFDIR}/gr-wxgui.conf
 
-SUBST_CLASSES+=		py-exec
-SUBST_STAGE.py-exec=	pre-configure
-SUBST_MESSAGE.py-exec=	Fixing python exec name
-SUBST_FILES.py-exec=	configure
-SUBST_SED.py-exec=	-e 's,python -c,${PYTHONBIN} -c,g'
+CMAKE_ARGS+=	-DENABLE_DEFAULT=False
+CMAKE_ARGS+=	-DENABLE_GR_WXGUI=True
+CMAKE_ARGS+=	-DENABLE_PYTHON=True
 
-.include "../../meta-pkgs/gnuradio/Makefile.common"
+.include	"../../x11/wxGTK28/buildlink3.mk"
+.include	"../../x11/py-wxWidgets/buildlink3.mk"
 
-CONF_FILES+=	${EGDIR}/gr-wxgui.conf ${PKG_SYSCONFDIR}/gr-wxgui.conf
-CONFIGURE_ARGS+=--enable-gr-wxgui
-CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
-
-.include "../../ham/gnuradio-core/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
-.include "../../x11/py-wxWidgets/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include	"../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-wxgui/PLIST b/ham/gnuradio-wxgui/PLIST
index 0b36c82139e..9dd2507ca73 100644
--- a/ham/gnuradio-wxgui/PLIST
+++ b/ham/gnuradio-wxgui/PLIST
@@ -1,8 +1,19 @@
-@comment $NetBSD: PLIST,v 1.7 2010/09/15 09:38:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/10/13 12:51:10 mef Exp $
+include/gnuradio/swig/wxgui_swig.i
+include/gnuradio/swig/wxgui_swig_doc.i
+include/gnuradio/wxgui/api.h
+include/gnuradio/wxgui/histo_sink_f.h
+include/gnuradio/wxgui/oscope_guts.h
+include/gnuradio/wxgui/oscope_sink_f.h
+include/gnuradio/wxgui/oscope_sink_x.h
+include/gnuradio/wxgui/trigger_mode.h
+lib/libgnuradio-wxgui.so
+lib/libgnuradio-wxgui.so.${PKGVERSION}
 lib/pkgconfig/gr-wxgui.pc
 ${PYSITELIB}/gnuradio/wxgui/__init__.py
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyc
 ${PYSITELIB}/gnuradio/wxgui/__init__.pyo
+${PYSITELIB}/gnuradio/wxgui/_wxgui_swig.so
 ${PYSITELIB}/gnuradio/wxgui/common.py
 ${PYSITELIB}/gnuradio/wxgui/common.pyc
 ${PYSITELIB}/gnuradio/wxgui/common.pyo
@@ -120,4 +131,29 @@ ${PYSITELIB}/gnuradio/wxgui/waterfallsink_gl.pyo
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.py
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyc
 ${PYSITELIB}/gnuradio/wxgui/waterfallsink_nongl.pyo
+${PYSITELIB}/gnuradio/wxgui/wxgui_swig.py
+${PYSITELIB}/gnuradio/wxgui/wxgui_swig.pyc
+${PYSITELIB}/gnuradio/wxgui/wxgui_swig.pyo
+${PYSITELIB}/grc_gnuradio/wxgui/__init__.py
+${PYSITELIB}/grc_gnuradio/wxgui/__init__.pyc
+${PYSITELIB}/grc_gnuradio/wxgui/__init__.pyo
+${PYSITELIB}/grc_gnuradio/wxgui/panel.py
+${PYSITELIB}/grc_gnuradio/wxgui/panel.pyc
+${PYSITELIB}/grc_gnuradio/wxgui/panel.pyo
+${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.py
+${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.pyc
+${PYSITELIB}/grc_gnuradio/wxgui/top_block_gui.pyo
 share/examples/gnuradio/conf.d/gr-wxgui.conf
+share/gnuradio/grc/blocks/notebook.xml
+share/gnuradio/grc/blocks/variable_check_box.xml
+share/gnuradio/grc/blocks/variable_chooser.xml
+share/gnuradio/grc/blocks/variable_slider.xml
+share/gnuradio/grc/blocks/variable_static_text.xml
+share/gnuradio/grc/blocks/variable_text_box.xml
+share/gnuradio/grc/blocks/wxgui_constellationsink2.xml
+share/gnuradio/grc/blocks/wxgui_fftsink2.xml
+share/gnuradio/grc/blocks/wxgui_histosink2.xml
+share/gnuradio/grc/blocks/wxgui_numbersink2.xml
+share/gnuradio/grc/blocks/wxgui_scopesink2.xml
+share/gnuradio/grc/blocks/wxgui_termsink.xml
+share/gnuradio/grc/blocks/wxgui_waterfallsink2.xml
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index ebbb5e60b90..9a498a7d2e0 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,16 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.44 2014/08/13 10:57:32 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.45 2014/10/13 12:51:10 mef Exp $
 
 BUILDLINK_TREE+=	gnuradio-wxgui
 
 .if !defined(GNURADIO_WXGUI_BUILDLINK3_MK)
 GNURADIO_WXGUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.0.4
-BUILDLINK_ABI_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.3.0nb29
+BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.7.5
+BUILDLINK_ABI_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.7.5
 BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../ham/gnuradio-wxgui
-
-.include "../../ham/gnuradio-core/buildlink3.mk"
-.include "../../x11/py-wxWidgets/buildlink3.mk"
 .endif # GNURADIO_WXGUI_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnuradio-wxgui