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.

4 files changed, 123 insertions, 91 deletions

diff --git a/ham/gnuradio-trellis/DESCR b/ham/gnuradio-trellis/DESCR
index f8fde1fc6de..7874a3cc0e8 100644
--- a/ham/gnuradio-trellis/DESCR
+++ b/ham/gnuradio-trellis/DESCR
@@ -4,5 +4,4 @@ received are defined by software. What this means is that it turns the digital
 modulation schemes used in today's high performance wireless devices into
 software problems.
 
-This module contains trellis-based encoding and decoding algorithms for
-GNU Radio.
+Blocks and utilities for trellis-based encoding and decoding algorithms.
diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile
index c7923282cf8..b986b023ec9 100644
--- a/ham/gnuradio-trellis/Makefile
+++ b/ham/gnuradio-trellis/Makefile
@@ -1,20 +1,16 @@
-# $NetBSD: Makefile,v 1.17 2014/08/13 10:57:36 adam Exp $
+# $NetBSD: Makefile,v 1.18 2014/10/13 12:51:10 mef Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
-PKGREVISION=	11
 COMMENT=	Trellis-based encoding and decoding algorithms for GNU Radio
 
-.include "../../meta-pkgs/gnuradio/Makefile.common"
+.include	"../../ham/gnuradio-core/Makefile.common"
+.include	"../../ham/gnuradio-core/Nocore.mk"
 
-CONFIGURE_ARGS+=--enable-gr-trellis
-CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
-CONFIGURE_ENV+=XMLTO=no
+CMAKE_ARGS+=	-DENABLE_DEFAULT=False
+CMAKE_ARGS+=	-DENABLE_GR_TRELLIS=True
+CMAKE_ARGS+=	-DENABLE_GR_DIGITAL=True
 
-REPLACE_PYTHON+=	gr-trellis/doc/make_numbered_listing.py
-REPLACE_PYTHON+=	gr-trellis/doc/test_tcm.py
-REPLACE_PYTHON+=	gr-trellis/doc/test_viterbi_equalization1.py
-REPLACE_PYTHON+=	gr-trellis/src/python/qa_trellis.py
-REPLACE_PYTHON+=	gr-trellis/src/examples/*.py
+DEPENDS+=	gnuradio-digital-[0-9]*:../../ham/gnuradio-digital
+PLIST_MINUS+=	digital
 
-.include "../../ham/gnuradio-core/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+.include	"../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-trellis/PLIST b/ham/gnuradio-trellis/PLIST
index 95077ac4550..51627ebf554 100644
--- a/ham/gnuradio-trellis/PLIST
+++ b/ham/gnuradio-trellis/PLIST
@@ -1,77 +1,85 @@
-@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:44 markd Exp $
-include/gnuradio/base.h
-include/gnuradio/fsm.h
-include/gnuradio/interleaver.h
-include/gnuradio/quicksort_index.h
-include/gnuradio/swig/fsm.i
-include/gnuradio/swig/interleaver.i
-include/gnuradio/swig/trellis.i
-include/gnuradio/swig/trellis_encoder_bb.i
-include/gnuradio/swig/trellis_encoder_bi.i
-include/gnuradio/swig/trellis_encoder_bs.i
-include/gnuradio/swig/trellis_encoder_ii.i
-include/gnuradio/swig/trellis_encoder_si.i
-include/gnuradio/swig/trellis_encoder_ss.i
-include/gnuradio/swig/trellis_generated.i
-include/gnuradio/swig/trellis_metrics_c.i
-include/gnuradio/swig/trellis_metrics_f.i
-include/gnuradio/swig/trellis_metrics_i.i
-include/gnuradio/swig/trellis_metrics_s.i
-include/gnuradio/swig/trellis_permutation.i
-include/gnuradio/swig/trellis_siso_combined_f.i
-include/gnuradio/swig/trellis_siso_f.i
-include/gnuradio/swig/trellis_viterbi_b.i
-include/gnuradio/swig/trellis_viterbi_combined_cb.i
-include/gnuradio/swig/trellis_viterbi_combined_ci.i
-include/gnuradio/swig/trellis_viterbi_combined_cs.i
-include/gnuradio/swig/trellis_viterbi_combined_fb.i
-include/gnuradio/swig/trellis_viterbi_combined_fi.i
-include/gnuradio/swig/trellis_viterbi_combined_fs.i
-include/gnuradio/swig/trellis_viterbi_combined_ib.i
-include/gnuradio/swig/trellis_viterbi_combined_ii.i
-include/gnuradio/swig/trellis_viterbi_combined_is.i
-include/gnuradio/swig/trellis_viterbi_combined_sb.i
-include/gnuradio/swig/trellis_viterbi_combined_si.i
-include/gnuradio/swig/trellis_viterbi_combined_ss.i
-include/gnuradio/swig/trellis_viterbi_i.i
-include/gnuradio/swig/trellis_viterbi_s.i
-include/gnuradio/trellis_calc_metric.h
-include/gnuradio/trellis_encoder_bb.h
-include/gnuradio/trellis_encoder_bi.h
-include/gnuradio/trellis_encoder_bs.h
-include/gnuradio/trellis_encoder_ii.h
-include/gnuradio/trellis_encoder_si.h
-include/gnuradio/trellis_encoder_ss.h
-include/gnuradio/trellis_metric_type.h
-include/gnuradio/trellis_metrics_c.h
-include/gnuradio/trellis_metrics_f.h
-include/gnuradio/trellis_metrics_i.h
-include/gnuradio/trellis_metrics_s.h
-include/gnuradio/trellis_permutation.h
-include/gnuradio/trellis_siso_combined_f.h
-include/gnuradio/trellis_siso_f.h
-include/gnuradio/trellis_siso_type.h
-include/gnuradio/trellis_viterbi_b.h
-include/gnuradio/trellis_viterbi_combined_cb.h
-include/gnuradio/trellis_viterbi_combined_ci.h
-include/gnuradio/trellis_viterbi_combined_cs.h
-include/gnuradio/trellis_viterbi_combined_fb.h
-include/gnuradio/trellis_viterbi_combined_fi.h
-include/gnuradio/trellis_viterbi_combined_fs.h
-include/gnuradio/trellis_viterbi_combined_ib.h
-include/gnuradio/trellis_viterbi_combined_ii.h
-include/gnuradio/trellis_viterbi_combined_is.h
-include/gnuradio/trellis_viterbi_combined_sb.h
-include/gnuradio/trellis_viterbi_combined_si.h
-include/gnuradio/trellis_viterbi_combined_ss.h
-include/gnuradio/trellis_viterbi_i.h
-include/gnuradio/trellis_viterbi_s.h
-lib/libgnuradio-trellis.la
+@comment $NetBSD: PLIST,v 1.4 2014/10/13 12:51:10 mef Exp $
+include/gnuradio/swig/trellis_swig.i
+include/gnuradio/swig/trellis_swig_doc.i
+include/gnuradio/trellis/api.h
+include/gnuradio/trellis/base.h
+include/gnuradio/trellis/calc_metric.h
+include/gnuradio/trellis/constellation_metrics_cf.h
+include/gnuradio/trellis/core_algorithms.h
+include/gnuradio/trellis/encoder_bb.h
+include/gnuradio/trellis/encoder_bi.h
+include/gnuradio/trellis/encoder_bs.h
+include/gnuradio/trellis/encoder_ii.h
+include/gnuradio/trellis/encoder_si.h
+include/gnuradio/trellis/encoder_ss.h
+include/gnuradio/trellis/fsm.h
+include/gnuradio/trellis/interleaver.h
+include/gnuradio/trellis/metrics_c.h
+include/gnuradio/trellis/metrics_f.h
+include/gnuradio/trellis/metrics_i.h
+include/gnuradio/trellis/metrics_s.h
+include/gnuradio/trellis/pccc_decoder_b.h
+include/gnuradio/trellis/pccc_decoder_combined_cb.h
+include/gnuradio/trellis/pccc_decoder_combined_ci.h
+include/gnuradio/trellis/pccc_decoder_combined_cs.h
+include/gnuradio/trellis/pccc_decoder_combined_fb.h
+include/gnuradio/trellis/pccc_decoder_combined_fi.h
+include/gnuradio/trellis/pccc_decoder_combined_fs.h
+include/gnuradio/trellis/pccc_decoder_i.h
+include/gnuradio/trellis/pccc_decoder_s.h
+include/gnuradio/trellis/pccc_encoder_bb.h
+include/gnuradio/trellis/pccc_encoder_bi.h
+include/gnuradio/trellis/pccc_encoder_bs.h
+include/gnuradio/trellis/pccc_encoder_ii.h
+include/gnuradio/trellis/pccc_encoder_si.h
+include/gnuradio/trellis/pccc_encoder_ss.h
+include/gnuradio/trellis/permutation.h
+include/gnuradio/trellis/quicksort_index.h
+include/gnuradio/trellis/sccc_decoder_b.h
+include/gnuradio/trellis/sccc_decoder_combined_cb.h
+include/gnuradio/trellis/sccc_decoder_combined_ci.h
+include/gnuradio/trellis/sccc_decoder_combined_cs.h
+include/gnuradio/trellis/sccc_decoder_combined_fb.h
+include/gnuradio/trellis/sccc_decoder_combined_fi.h
+include/gnuradio/trellis/sccc_decoder_combined_fs.h
+include/gnuradio/trellis/sccc_decoder_i.h
+include/gnuradio/trellis/sccc_decoder_s.h
+include/gnuradio/trellis/sccc_encoder_bb.h
+include/gnuradio/trellis/sccc_encoder_bi.h
+include/gnuradio/trellis/sccc_encoder_bs.h
+include/gnuradio/trellis/sccc_encoder_ii.h
+include/gnuradio/trellis/sccc_encoder_si.h
+include/gnuradio/trellis/sccc_encoder_ss.h
+include/gnuradio/trellis/siso_combined_f.h
+include/gnuradio/trellis/siso_f.h
+include/gnuradio/trellis/siso_type.h
+include/gnuradio/trellis/viterbi_b.h
+include/gnuradio/trellis/viterbi_combined_cb.h
+include/gnuradio/trellis/viterbi_combined_ci.h
+include/gnuradio/trellis/viterbi_combined_cs.h
+include/gnuradio/trellis/viterbi_combined_fb.h
+include/gnuradio/trellis/viterbi_combined_fi.h
+include/gnuradio/trellis/viterbi_combined_fs.h
+include/gnuradio/trellis/viterbi_combined_ib.h
+include/gnuradio/trellis/viterbi_combined_ii.h
+include/gnuradio/trellis/viterbi_combined_is.h
+include/gnuradio/trellis/viterbi_combined_sb.h
+include/gnuradio/trellis/viterbi_combined_si.h
+include/gnuradio/trellis/viterbi_combined_ss.h
+include/gnuradio/trellis/viterbi_i.h
+include/gnuradio/trellis/viterbi_s.h
+lib/libgnuradio-trellis.so
+lib/libgnuradio-trellis.so.${PKGVERSION}
 lib/pkgconfig/gnuradio-trellis.pc
-${PYSITELIB}/gnuradio/_trellis.la
-${PYSITELIB}/gnuradio/trellis.py
-${PYSITELIB}/gnuradio/trellis.pyc
-${PYSITELIB}/gnuradio/trellis.pyo
+${PYSITELIB}/gnuradio/trellis/__init__.py
+${PYSITELIB}/gnuradio/trellis/__init__.pyc
+${PYSITELIB}/gnuradio/trellis/__init__.pyo
+${PYSITELIB}/gnuradio/trellis/_trellis_swig.so
+${PYSITELIB}/gnuradio/trellis/trellis_swig.py
+${PYSITELIB}/gnuradio/trellis/trellis_swig.pyc
+${PYSITELIB}/gnuradio/trellis/trellis_swig.pyo
+share/doc/gnuradio-${PKGVERSION}/xml/test_tcm.py.xml
+share/doc/gnuradio-${PKGVERSION}/xml/test_viterbi_equalization1.py.xml
 share/gnuradio/examples/trellis/README
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_128.fsm
 share/gnuradio/examples/trellis/fsm_files/awgn1o2_16.fsm
@@ -88,12 +96,16 @@ share/gnuradio/examples/trellis/fsm_files/rep3.fsm
 share/gnuradio/examples/trellis/fsm_files/rep5.fsm
 share/gnuradio/examples/trellis/fsm_files/simple.fsm
 share/gnuradio/examples/trellis/fsm_utils.py
+share/gnuradio/examples/trellis/interference_cancellation.grc
+share/gnuradio/examples/trellis/pccc.grc
+share/gnuradio/examples/trellis/pccc1.grc
+share/gnuradio/examples/trellis/readme.txt
+share/gnuradio/examples/trellis/sccc.grc
+share/gnuradio/examples/trellis/sccc1.grc
 share/gnuradio/examples/trellis/test_sccc_hard.py
 share/gnuradio/examples/trellis/test_sccc_soft.py
 share/gnuradio/examples/trellis/test_sccc_turbo.py
 share/gnuradio/examples/trellis/test_tcm.py
-share/gnuradio/examples/trellis/test_tcm1.py
-share/gnuradio/examples/trellis/test_tcm2.py
 share/gnuradio/examples/trellis/test_tcm_combined.py
 share/gnuradio/examples/trellis/test_tcm_parallel.py
 share/gnuradio/examples/trellis/test_turbo_equalization.py
@@ -101,4 +113,16 @@ share/gnuradio/examples/trellis/test_turbo_equalization1.py
 share/gnuradio/examples/trellis/test_turbo_equalization2.py
 share/gnuradio/examples/trellis/test_viterbi_equalization.py
 share/gnuradio/examples/trellis/test_viterbi_equalization1.py
-@pkgdir share/doc/gnuradio-${PKGVERSION}/html
+share/gnuradio/grc/blocks/trellis_encoder_xx.xml
+share/gnuradio/grc/blocks/trellis_metrics_x.xml
+share/gnuradio/grc/blocks/trellis_pccc_decoder_combined_xx.xml
+share/gnuradio/grc/blocks/trellis_pccc_decoder_x.xml
+share/gnuradio/grc/blocks/trellis_pccc_encoder_xx.xml
+share/gnuradio/grc/blocks/trellis_permutation.xml
+share/gnuradio/grc/blocks/trellis_sccc_decoder_combined_xx.xml
+share/gnuradio/grc/blocks/trellis_sccc_decoder_x.xml
+share/gnuradio/grc/blocks/trellis_sccc_encoder_xx.xml
+share/gnuradio/grc/blocks/trellis_siso_combined_f.xml
+share/gnuradio/grc/blocks/trellis_siso_f.xml
+share/gnuradio/grc/blocks/trellis_viterbi_combined_xx.xml
+share/gnuradio/grc/blocks/trellis_viterbi_x.xml
diff --git a/ham/gnuradio-trellis/buildlink3.mk b/ham/gnuradio-trellis/buildlink3.mk
new file mode 100644
index 00000000000..1ea4c1434d3
--- /dev/null
+++ b/ham/gnuradio-trellis/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $
+
+BUILDLINK_TREE+=	gnuradio-trellis
+
+.if !defined(GNURADIO_TRELLIS_BUILDLINK3_MK)
+GNURADIO_TRELLIS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
+BUILDLINK_ABI_DEPENDS.gnuradio-trellis+=	gnuradio-trellis>=3.7.5
+BUILDLINK_PKGSRCDIR.gnuradio-trellis?=	../../ham/gnuradio-trellis
+.endif # GNURADIO_TRELLIS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-gnuradio-trellis