5 files changed, 60 insertions, 59 deletions
diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile
index c38c4b42730..984425cbbe3 100644
--- a/ham/gnuradio-trellis/Makefile
+++ b/ham/gnuradio-trellis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/07/14 12:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/12 12:21:40 markd Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
 COMMENT=	Trellis-based encoding and decoding algorithms for GNU Radio
@@ -8,6 +8,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
 CONFIGURE_ARGS+=--enable-gr-trellis
+CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 PYTHON_PATCH_SCRIPTS+=	gr-trellis/doc/make_numbered_listing.py
 PYTHON_PATCH_SCRIPTS+=	gr-trellis/doc/test_tcm.py
diff --git a/ham/gnuradio-trellis/PLIST b/ham/gnuradio-trellis/PLIST
index 08d4b91eb79..312e306df28 100644
--- a/ham/gnuradio-trellis/PLIST
+++ b/ham/gnuradio-trellis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/13 17:30:30 wulf Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/08/12 12:21:40 markd Exp $
 include/gnuradio/base.h
 include/gnuradio/fsm.h
 include/gnuradio/interleaver.h
@@ -21,9 +21,18 @@ 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_b.i
-include/gnuradio/swig/trellis_viterbi_combined_i.i
-include/gnuradio/swig/trellis_viterbi_combined_s.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
@@ -43,12 +52,50 @@ 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_b.h
-include/gnuradio/trellis_viterbi_combined_i.h
-include/gnuradio/trellis_viterbi_combined_s.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
 ${PYSITELIB}/gnuradio/_trellis.la
 ${PYSITELIB}/gnuradio/trellis.py
 ${PYSITELIB}/gnuradio/trellis.pyc
 ${PYSITELIB}/gnuradio/trellis.pyo
+share/gnuradio/examples/trellis/README
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_128.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_16.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_4.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn1o2_8.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_16.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_4.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msb.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_4_msbG.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o3_8.fsm
+share/gnuradio/examples/trellis/fsm_files/awgn2o4_4.fsm
+share/gnuradio/examples/trellis/fsm_files/disconnected.fsm
+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/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
+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
diff --git a/ham/gnuradio-trellis/distinfo b/ham/gnuradio-trellis/distinfo
index 1b2e0f6eb3a..70b6cae6e9c 100644
--- a/ham/gnuradio-trellis/distinfo
+++ b/ham/gnuradio-trellis/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2007/08/08 14:47:20 wulf Exp $
+$NetBSD: distinfo,v 1.4 2009/08/12 12:21:40 markd Exp $
 
-SHA1 (gnuradio-3.0.4.tar.gz) = ce2d0bd4c5217cdda8c675c80a446ca38f274121
-RMD160 (gnuradio-3.0.4.tar.gz) = a1d4ae0495f51c5b7349dd8d1305b4bfb16056dc
-Size (gnuradio-3.0.4.tar.gz) = 3381051 bytes
-SHA1 (patch-aa) = 2dd396d139b02a1991825956d4a7d5e6376ca135
-SHA1 (patch-ab) = aedce9436a5f1334ddbd3e7678d295ae884e20b3
+SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
+RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
+Size (gnuradio-3.2.tar.gz) = 6864952 bytes
diff --git a/ham/gnuradio-trellis/patches/patch-aa b/ham/gnuradio-trellis/patches/patch-aa
deleted file mode 100644
index 9cf7c040004..00000000000
--- a/ham/gnuradio-trellis/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/08/08 14:47:20 wulf Exp $
-
---- Makefile.common.orig	2007-08-08 04:40:14.000000000 +0930
-+++ Makefile.common	2007-08-08 04:40:47.000000000 +0930
-@@ -52,7 +52,7 @@
- 	            $(FFTW3F_CFLAGS)
- 
- # How to link in GNU Radio core library from inside the tree
--GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la
-+GNURADIO_CORE_LA = -lgnuradio-core
- 
- # This is a dependency for many swig operations
- GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
-@@ -60,7 +60,7 @@
- # How to link in the USRP library from inside the tree
- USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
- 		-I$(top_srcdir)/usrp/firmware/include
--USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la
-+USRP_LA = -lusrp
- 
- # This used to be set in configure.ac but is now defined here for all 
- # Makefiles when this fragment is included.
diff --git a/ham/gnuradio-trellis/patches/patch-ab b/ham/gnuradio-trellis/patches/patch-ab
deleted file mode 100644
index bfd3205956e..00000000000
--- a/ham/gnuradio-trellis/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/08/08 03:17:20 wulf Exp $
-
---- gr-trellis/doc/Makefile.am.orig	2007-07-31 13:07:27.000000000 +0930
-+++ gr-trellis/doc/Makefile.am	2007-07-31 13:07:42.000000000 +0930
-@@ -50,12 +50,12 @@
- %.xml : % make_numbered_listing.py
- 	./make_numbered_listing.py $<
- 
--install-data-local:
--	mkdir -p $(DESTDIR)$(docdir)/html
--	@for i in $(HTML_FILES); do \
--		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
--		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
--	done
-+#install-data-local:
-+#	mkdir -p $(DESTDIR)$(docdir)/html
-+#	@for i in $(HTML_FILES); do \
-+#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
-+#		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
-+#	done
- 
- uninstall-local:
- 	@for i in $(HTML_FILES); do \