4 files changed, 42 insertions, 16 deletions
diff --git a/ham/gnuradio-howto/Makefile b/ham/gnuradio-howto/Makefile
index af8a9db12be..5e160290ffd 100644
--- a/ham/gnuradio-howto/Makefile
+++ b/ham/gnuradio-howto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/09/11 16:23:29 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/09/15 09:38:44 markd Exp $
 
 DISTNAME=	gr-howto-write-a-block-${VERSION}
 CATEGORIES=	ham
@@ -13,9 +13,6 @@ DISTINFO_FILE=		${.CURDIR}/distinfo
 PATCHDIR=		${.CURDIR}/patches
 
 PY_PATCHPLIST=  yes
-PYTHON_PATCH_SCRIPTS+=	src/python/qa_howto.py
-PYTHON_PATCH_SCRIPTS+=	doc/qa_howto_1.py
-PYTHON_PATCH_SCRIPTS+=	doc/make_numbered_listing.py
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-howto/PLIST b/ham/gnuradio-howto/PLIST
index bc1d79e6c8a..5b45c0d8f09 100644
--- a/ham/gnuradio-howto/PLIST
+++ b/ham/gnuradio-howto/PLIST
@@ -1,8 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2007/08/08 03:13:37 wulf Exp $
-include/gnuradio/howto_square2_ff.h
-include/gnuradio/howto_square_ff.h
-include/gnuradio/swig/howto.i
-${PYSITELIB}/gnuradio/_howto.la
-${PYSITELIB}/gnuradio/howto.py
-${PYSITELIB}/gnuradio/howto.pyc
-${PYSITELIB}/gnuradio/howto.pyo
+@comment $NetBSD: PLIST,v 1.3 2010/09/15 09:38:44 markd Exp $
+bin/howto_square.py
+include/howto/howto_square2_ff.h
+include/howto/howto_square_ff.h
+include/howto/swig/howto.i
+include/howto/swig/howto_square2_ff.i
+include/howto/swig/howto_square_ff.i
+lib/libgnuradio-howto.la
+${PYSITELIB}/howto/__init__.py
+${PYSITELIB}/howto/__init__.pyc
+${PYSITELIB}/howto/__init__.pyo
+${PYSITELIB}/howto/_howto_swig.la
+${PYSITELIB}/howto/howto_swig.py
+${PYSITELIB}/howto/howto_swig.pyc
+${PYSITELIB}/howto/howto_swig.pyo
+share/gnuradio/grc/blocks/howto_square2_ff.xml
+share/gnuradio/grc/blocks/howto_square_ff.xml
diff --git a/ham/gnuradio-howto/distinfo b/ham/gnuradio-howto/distinfo
index 2cbf412a6d2..8d310a9ea86 100644
--- a/ham/gnuradio-howto/distinfo
+++ b/ham/gnuradio-howto/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:40 markd Exp $
+$NetBSD: distinfo,v 1.8 2010/09/15 09:38:44 markd Exp $
 
-SHA1 (gr-howto-write-a-block-3.2.tar.gz) = 6ab7f12c1c6f071db395f12bfcdf56c9acfbaada
-RMD160 (gr-howto-write-a-block-3.2.tar.gz) = 19c42d3029242478c091d4f724a0b8b7e2135d10
-Size (gr-howto-write-a-block-3.2.tar.gz) = 400018 bytes
+SHA1 (gr-howto-write-a-block-3.3.0.tar.gz) = dbf5b2538066c019f09850368e7583453cb093a5
+RMD160 (gr-howto-write-a-block-3.3.0.tar.gz) = 9e0bab8346a0828dcdbc9b7c6b51a756fd4a0c69
+Size (gr-howto-write-a-block-3.3.0.tar.gz) = 415280 bytes
+SHA1 (patch-aa) = b3dea570d91c59178622dabdc61b8620c42fd8bd
diff --git a/ham/gnuradio-howto/patches/patch-aa b/ham/gnuradio-howto/patches/patch-aa
new file mode 100644
index 00000000000..636dc06d99c
--- /dev/null
+++ b/ham/gnuradio-howto/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.3 2010/09/15 09:38:44 markd Exp $
+
+--- configure.orig	2010-06-03 07:17:38.000000000 +0000
++++ configure
+@@ -2798,12 +2798,12 @@ $as_echo "not found" >&6; }
+   fi
+ 
+ 
+-    if test "$MINOR_VERSION" == "git"; then
++    if test "$MINOR_VERSION" = "git"; then
+                 RELEASE=$GIT_DESCRIBE
+     DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+     LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION
+   else
+-    if test "$MAINT_VERSION" == "git" ; then
++    if test "$MAINT_VERSION" = "git" ; then
+                         RELEASE=$GIT_DESCRIBE
+       DOCVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION
+       LIBVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION