No need to have two variables for the same logic.

Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.

12 files changed, 132 insertions, 132 deletions

diff --git a/ham/gnuradio-audio-jack/Makefile b/ham/gnuradio-audio-jack/Makefile
index 73e07a680b6..01bfa008bbf 100644
--- a/ham/gnuradio-audio-jack/Makefile
+++ b/ham/gnuradio-audio-jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:45:18 wiz Exp $
 
 PKGNAME=	gnuradio-audio-jack-${VERSION}
 PKGREVISION=	10
@@ -10,7 +10,7 @@ CONF_FILES+=    ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf
 CONFIGURE_ARGS+=--enable-gr-audio-jack
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gr-audio-jack/src/python/qa_jack.py
+REPLACE_PYTHON+=	gr-audio-jack/src/python/qa_jack.py
 
 .include "../../audio/jack/buildlink3.mk"
 .include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gnuradio-audio-oss/Makefile b/ham/gnuradio-audio-oss/Makefile
index 70af78c6325..3006fe143e1 100644
--- a/ham/gnuradio-audio-oss/Makefile
+++ b/ham/gnuradio-audio-oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.23 2014/01/25 10:45:18 wiz Exp $
 
 PKGNAME=	gnuradio-audio-oss-${VERSION}
 PKGREVISION=	9
@@ -10,7 +10,7 @@ CONF_FILES+=	${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
 CONFIGURE_ARGS+=--enable-gr-audio-oss
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gr-audio-oss/src/qa_oss.py
+REPLACE_PYTHON+=	gr-audio-oss/src/qa_oss.py
 #LDFLAGS = -lgnuradio-core ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/ham/gnuradio-audio-portaudio/Makefile b/ham/gnuradio-audio-portaudio/Makefile
index 03c3f50fee6..2fc2f9a0552 100644
--- a/ham/gnuradio-audio-portaudio/Makefile
+++ b/ham/gnuradio-audio-portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/25 10:45:18 wiz Exp $
 
 PKGNAME=	gnuradio-audio-portaudio-${VERSION}
 PKGREVISION=	9
@@ -10,7 +10,7 @@ CONF_FILES+=    ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-port
 CONFIGURE_ARGS+=--enable-gr-audio-portaudio
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gr-audio-portaudio/src/qa_portaudio.py
+REPLACE_PYTHON+=	gr-audio-portaudio/src/qa_portaudio.py
 
 .include "../../audio/portaudio-devel/buildlink3.mk"
 .include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile
index 4e5916b69e4..ff510a39216 100644
--- a/ham/gnuradio-core/Makefile
+++ b/ham/gnuradio-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:10 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:18 wiz Exp $
 
 PKGNAME=	gnuradio-core-${VERSION}
 PKGREVISION=	10
@@ -15,68 +15,68 @@ CONFIGURE_ARGS+=	--enable-gnuradio-core
 CONFIGURE_ARGS+=	--enable-omnithread
 CONFIGURE_ARGS+=	--enable-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/swig/gen-swig-bug-fix
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/bin/microtune.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/general/gen_sine_table.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_XXX.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_all.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_interp_fir_filter_XXX.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_filter_XXX.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_rational_resampler_base_XXX.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig_generic.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_fir_util.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/lib/filter/generate_gr_freq_xlating_fir_filter_XXX.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/pubsub.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_agc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_complex_to_xxx.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_fft_filter.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_feval.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_encoder.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_phasor_cc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_frequency_modulator.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_filter_delay_fc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_interp_fir_filter.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_fsk_stuff.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_head.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_hilbert.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_iir.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_interleave.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_kludge_copy.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_message.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_mute.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_nlog10.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_packed_to_unpacked.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_pipe_fittings.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_sig_source.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir_cc.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr/qa_unpack_k_bits.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gruimpl/lmx2306.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/python/gnuradio/gr_unittest.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-core/src/tests/test_buffers.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/swig/gen-swig-bug-fix
+REPLACE_PYTHON+=	gnuradio-core/src/python/bin/microtune.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/general/gen_sine_table.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_fir_XXX.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_all.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_interp_fir_filter_XXX.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_fir_filter_XXX.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_rational_resampler_base_XXX.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig_generic.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_fir_util.py
+REPLACE_PYTHON+=	gnuradio-core/src/lib/filter/generate_gr_freq_xlating_fir_filter_XXX.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/pubsub.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_agc.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_complex_to_xxx.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_fft_filter.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_feval.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_encoder.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_diff_phasor_cc.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_frequency_modulator.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_filter_delay_fc.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_interp_fir_filter.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_fsk_stuff.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_head.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_hilbert.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_iir.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_interleave.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_kludge_copy.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_message.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_mute.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_nlog10.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_packed_to_unpacked.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_pipe_fittings.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_sig_source.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir_cc.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr/qa_unpack_k_bits.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gruimpl/lmx2306.py
+REPLACE_PYTHON+=	gnuradio-core/src/python/gnuradio/gr_unittest.py
+REPLACE_PYTHON+=	gnuradio-core/src/tests/test_buffers.py
 
 .include "../../devel/swig/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index 6890bbf7788..9d0fe6a12a9 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-examples-${VERSION}
 PKGREVISION=	25
@@ -12,33 +12,33 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 EXAMPLE_DIR=	${LOCALBASE}/share/examples/gnuradio/python
 
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/apps/hf_explorer/hfx2.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/apps/hf_radio/radio.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/apps/hf_radio/ui.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_copy.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_fft.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_play.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/audio_to_file.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/dial_tone.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/mono_tone.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/multi_tone.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/spectrum_inversion.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/audio/test_resampler.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/benchmark_rx.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/benchmark_tx.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/gen_whitener.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/pick_bitrate.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/receive_path.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/rx_voice.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/transmit_path.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/tunnel.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital/tx_voice.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/digital_voice/encdec.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi-antenna/multi_fft.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi-antenna/multi_file.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi-antenna/multi_scope.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py
-PYTHON_PATCH_SCRIPTS+=	gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py
+REPLACE_PYTHON+=	gnuradio-examples/python/apps/hf_explorer/hfx2.py
+REPLACE_PYTHON+=	gnuradio-examples/python/apps/hf_radio/radio.py
+REPLACE_PYTHON+=	gnuradio-examples/python/apps/hf_radio/ui.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/audio_copy.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/audio_fft.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/audio_play.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/audio_to_file.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/dial_tone.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/mono_tone.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/multi_tone.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/spectrum_inversion.py
+REPLACE_PYTHON+=	gnuradio-examples/python/audio/test_resampler.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/benchmark_rx.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/benchmark_tx.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/gen_whitener.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/pick_bitrate.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/receive_path.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/rx_voice.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/transmit_path.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/tunnel.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital/tx_voice.py
+REPLACE_PYTHON+=	gnuradio-examples/python/digital_voice/encdec.py
+REPLACE_PYTHON+=	gnuradio-examples/python/multi-antenna/multi_fft.py
+REPLACE_PYTHON+=	gnuradio-examples/python/multi-antenna/multi_file.py
+REPLACE_PYTHON+=	gnuradio-examples/python/multi-antenna/multi_scope.py
+REPLACE_PYTHON+=	gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py
+REPLACE_PYTHON+=	gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py
 
 do-install:
 	set -e;								\
diff --git a/ham/gnuradio-gsm/Makefile b/ham/gnuradio-gsm/Makefile
index 6eb3f675cbf..8426e656572 100644
--- a/ham/gnuradio-gsm/Makefile
+++ b/ham/gnuradio-gsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.19 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-gsm-${VERSION}
 PKGREVISION=	8
@@ -9,8 +9,8 @@ COMMENT=	GNU Radio GSM 06.10 13kbit/sec voice encoder/decoder
 CONFIGURE_ARGS+=--enable-gr-gsm-fr-vocoder
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gr-gsm-fr-vocoder/src/python/encdec.py
-PYTHON_PATCH_SCRIPTS+=	gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
+REPLACE_PYTHON+=	gr-gsm-fr-vocoder/src/python/encdec.py
+REPLACE_PYTHON+=	gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py
 
 post-install:
 	${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/gnuradio/vocoder
diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile
index 18ddda569ff..717ed335ce4 100644
--- a/ham/gnuradio-radio-astronomy/Makefile
+++ b/ham/gnuradio-radio-astronomy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2014/01/20 12:54:53 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-radio-astronomy-${VERSION}
 PKGREVISION=	25
@@ -11,12 +11,12 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 PYTHON_VERSIONED_DEPENDENCIES= ephem
 
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/local_calibrator.py
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/qa_ra.py
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/ra_fftsink.py
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/ra_stripchartsink.py
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/usrp_psr_receiver.py
-PYTHON_PATCH_SCRIPTS+=	gr-radio-astronomy/src/python/usrp_ra_receiver.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/local_calibrator.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/qa_ra.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/ra_fftsink.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/ra_stripchartsink.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/usrp_psr_receiver.py
+REPLACE_PYTHON+=	gr-radio-astronomy/src/python/usrp_ra_receiver.py
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile
index b64eeed2b8e..e3d5181e8b2 100644
--- a/ham/gnuradio-trellis/Makefile
+++ b/ham/gnuradio-trellis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.16 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-trellis-${VERSION}
 PKGREVISION=	10
@@ -10,11 +10,11 @@ CONFIGURE_ARGS+=--enable-gr-trellis
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 CONFIGURE_ENV+=XMLTO=no
 
-PYTHON_PATCH_SCRIPTS+=	gr-trellis/doc/make_numbered_listing.py
-PYTHON_PATCH_SCRIPTS+=	gr-trellis/doc/test_tcm.py
-PYTHON_PATCH_SCRIPTS+=	gr-trellis/doc/test_viterbi_equalization1.py
-PYTHON_PATCH_SCRIPTS+=	gr-trellis/src/python/qa_trellis.py
-PYTHON_PATCH_SCRIPTS+=	gr-trellis/src/examples/*.py
+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
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ham/gnuradio-usrp/Makefile b/ham/gnuradio-usrp/Makefile
index e7f22c79729..729d4549803 100644
--- a/ham/gnuradio-usrp/Makefile
+++ b/ham/gnuradio-usrp/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.21 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-usrp-${VERSION}
 PKGREVISION=	8
 COMMENT=	USRP bindings for GNU Radio
 
-PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/flexrf_debug_gui.py
-PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/qa_usrp.py
-PYTHON_PATCH_SCRIPTS+=	gr-usrp/src/tx_debug_gui.py
+REPLACE_PYTHON+=	gr-usrp/src/flexrf_debug_gui.py
+REPLACE_PYTHON+=	gr-usrp/src/qa_usrp.py
+REPLACE_PYTHON+=	gr-usrp/src/tx_debug_gui.py
 
 .include "../../meta-pkgs/gnuradio/Makefile.common"
 
diff --git a/ham/gnuradio-video-sdl/Makefile b/ham/gnuradio-video-sdl/Makefile
index 9ac7542f98e..736512fca9c 100644
--- a/ham/gnuradio-video-sdl/Makefile
+++ b/ham/gnuradio-video-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/11/20 20:04:38 adam Exp $
+# $NetBSD: Makefile,v 1.14 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-video-sdl-${VERSION}
 PKGREVISION=	9
@@ -9,7 +9,7 @@ COMMENT=	SDL bindings for GNU Radio
 CONFIGURE_ARGS+=--enable-gr-video-sdl
 CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
-PYTHON_PATCH_SCRIPTS+=	gr-video-sdl/src/qa_video_sdl.py
+REPLACE_PYTHON+=	gr-video-sdl/src/qa_video_sdl.py
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index c07f111f2f0..500c0a14c53 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.48 2014/01/25 10:30:10 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
 PKGREVISION=	27
 COMMENT=	GUI framework for GNU Radio based on wxPython
 
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/form.py
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/powermate.py
-PYTHON_PATCH_SCRIPTS+=	gr-wxgui/src/python/slider.py
+REPLACE_PYTHON+=	gr-wxgui/src/python/form.py
+REPLACE_PYTHON+=	gr-wxgui/src/python/powermate.py
+REPLACE_PYTHON+=	gr-wxgui/src/python/slider.py
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-wxWidgets
 
diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile
index f72cc03dc19..2eef1dc3ca2 100644
--- a/ham/usrp/Makefile
+++ b/ham/usrp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2014/01/25 10:45:19 wiz Exp $
 
 PKGNAME=	usrp-${VERSION}
 PKGREVISION=	10
@@ -13,14 +13,14 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel
 
 BUILD_DEPENDS+=	sdcc>=2.4.0<3:../../devel/sdcc
 
-PYTHON_PATCH_SCRIPTS+=	usrp/firmware/include/generate_regs.py
-PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/edit-gpif
-PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/common/build_eeprom.py
-PYTHON_PATCH_SCRIPTS+=	usrp/firmware/src/usrp2/edit-gpif
-PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/check_data.py
-PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/dump_data.py
-PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/gen_usrp_dbid.py
-PYTHON_PATCH_SCRIPTS+=	usrp/host/lib/usrp_dbid.py
+REPLACE_PYTHON+=	usrp/firmware/include/generate_regs.py
+REPLACE_PYTHON+=	usrp/firmware/src/common/edit-gpif
+REPLACE_PYTHON+=	usrp/firmware/src/common/build_eeprom.py
+REPLACE_PYTHON+=	usrp/firmware/src/usrp2/edit-gpif
+REPLACE_PYTHON+=	usrp/host/lib/check_data.py
+REPLACE_PYTHON+=	usrp/host/lib/dump_data.py
+REPLACE_PYTHON+=	usrp/host/lib/gen_usrp_dbid.py
+REPLACE_PYTHON+=	usrp/host/lib/usrp_dbid.py
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"