pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnuradio-*: must enable GRC in subpackage now to get blocks installed



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Aug 2 10:20:08 2020 +0200
Changeset:	4974a24dcb6c26e7582b5b2cdab6cf02f2e11327

Modified Files:
	gnuradio-ctrlport/PLIST
	gnuradio-digital/Makefile
	gnuradio-digital/PLIST
	gnuradio-dtv/PLIST
	gnuradio-fec/Makefile
	gnuradio-fec/PLIST
	gnuradio-utils/PLIST
	gnuradio-vocoder/Makefile
	gnuradio-vocoder/PLIST
	gnuradio-wavelet/PLIST
	gnuradio-zeromq/Makefile
	gnuradio-zeromq/PLIST

Log Message:
gnuradio-*: must enable GRC in subpackage now to get blocks installed

Also delete bogus @pkgdir entries created by make print-PLIST.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4974a24dcb6c26e7582b5b2cdab6cf02f2e11327

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-ctrlport/PLIST   | 27 -------------
 gnuradio-digital/Makefile |  3 ++
 gnuradio-digital/PLIST    | 97 ++++++++++++++++++++++++++++++++++-------------
 gnuradio-dtv/PLIST        | 86 ++++++++++++++++++++++++++---------------
 gnuradio-fec/Makefile     |  3 ++
 gnuradio-fec/PLIST        | 65 +++++++++++++++++++------------
 gnuradio-utils/PLIST      | 29 --------------
 gnuradio-vocoder/Makefile |  3 ++
 gnuradio-vocoder/PLIST    | 42 ++++++++------------
 gnuradio-wavelet/PLIST    | 27 -------------
 gnuradio-zeromq/Makefile  |  3 ++
 gnuradio-zeromq/PLIST     | 39 ++++++-------------
 12 files changed, 206 insertions(+), 218 deletions(-)

diffs:
diff --git a/gnuradio-ctrlport/PLIST b/gnuradio-ctrlport/PLIST
index 78a52c5c9f..49126b573b 100644
--- a/gnuradio-ctrlport/PLIST
+++ b/gnuradio-ctrlport/PLIST
@@ -30,30 +30,3 @@ share/gnuradio/examples/ctrlport/simple_copy.grc
 share/gnuradio/examples/ctrlport/simple_copy_controller.py
 share/gnuradio/examples/ctrlport/usrp_source_control.grc
 share/gnuradio/examples/ctrlport/usrp_source_controller.py
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir share/doc/gnuradio-${PKGVERSION}
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir lib/pkgconfig
-@pkgdir lib/cmake/gnuradio
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/swig
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
diff --git a/gnuradio-digital/Makefile b/gnuradio-digital/Makefile
index af112f75b1..441a57e5fe 100644
--- a/gnuradio-digital/Makefile
+++ b/gnuradio-digital/Makefile
@@ -10,5 +10,8 @@ COMMENT=	Digital related algorithms for GNU Radio
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_DIGITAL=True
+CMAKE_ARGS+=    -DENABLE_GRC=True
+
+PLIST_MINUS+=	companion
 
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-digital/PLIST b/gnuradio-digital/PLIST
index 73fda2ed5c..80f6e11239 100644
--- a/gnuradio-digital/PLIST
+++ b/gnuradio-digital/PLIST
@@ -250,29 +250,74 @@ share/gnuradio/examples/digital/packet/uhd_packet_tx.grc
 share/gnuradio/examples/digital/packet/uhd_packet_tx_tun.grc
 share/gnuradio/examples/digital/run_length.py
 share/gnuradio/examples/digital/snr_estimators.py
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
-@pkgdir bin
+share/gnuradio/grc/blocks/digital.tree.yml
+share/gnuradio/grc/blocks/digital_additive_scrambler_bb.block.yml
+share/gnuradio/grc/blocks/digital_binary_slicer_fb.block.yml
+share/gnuradio/grc/blocks/digital_burst_shaper.block.yml
+share/gnuradio/grc/blocks/digital_chunks_to_symbols.block.yml
+share/gnuradio/grc/blocks/digital_clock_recovery_mm_xx.block.yml
+share/gnuradio/grc/blocks/digital_cma_equalizer_cc.block.yml
+share/gnuradio/grc/blocks/digital_constellation.block.yml
+share/gnuradio/grc/blocks/digital_constellation_decoder_cb.block.yml
+share/gnuradio/grc/blocks/digital_constellation_modulator.block.yml
+share/gnuradio/grc/blocks/digital_constellation_receiver_cb.block.yml
+share/gnuradio/grc/blocks/digital_constellation_rect.block.yml
+share/gnuradio/grc/blocks/digital_constellation_soft_decoder_cf.block.yml
+share/gnuradio/grc/blocks/digital_corr_est_cc.block.yml
+share/gnuradio/grc/blocks/digital_correlate_access_code_bb.block.yml
+share/gnuradio/grc/blocks/digital_correlate_access_code_tag_xx.block.yml
+share/gnuradio/grc/blocks/digital_correlate_access_code_xx_ts.block.yml
+share/gnuradio/grc/blocks/digital_costas_loop_cc.block.yml
+share/gnuradio/grc/blocks/digital_cpmmod_bc.block.yml
+share/gnuradio/grc/blocks/digital_crc32_async_bb.block.yml
+share/gnuradio/grc/blocks/digital_crc32_bb.block.yml
+share/gnuradio/grc/blocks/digital_descrambler_bb.block.yml
+share/gnuradio/grc/blocks/digital_diff_decoder_bb.block.yml
+share/gnuradio/grc/blocks/digital_diff_encoder_bb.block.yml
+share/gnuradio/grc/blocks/digital_diff_phasor_cc.block.yml
+share/gnuradio/grc/blocks/digital_fll_band_edge_cc.block.yml
+share/gnuradio/grc/blocks/digital_framer_sink_1.block.yml
+share/gnuradio/grc/blocks/digital_gfsk_demod.block.yml
+share/gnuradio/grc/blocks/digital_gfsk_mod.block.yml
+share/gnuradio/grc/blocks/digital_glfsr_source_x.block.yml
+share/gnuradio/grc/blocks/digital_gmsk_demod.block.yml
+share/gnuradio/grc/blocks/digital_gmsk_mod.block.yml
+share/gnuradio/grc/blocks/digital_gmskmod_bc.block.yml
+share/gnuradio/grc/blocks/digital_hdlc_deframer_bp.block.yml
+share/gnuradio/grc/blocks/digital_hdlc_framer_pb.block.yml
+share/gnuradio/grc/blocks/digital_header_payload_demux.block.yml
+share/gnuradio/grc/blocks/digital_kurtotic_equalizer_cc.block.yml
+share/gnuradio/grc/blocks/digital_lms_dd_equalizer_cc.block.yml
+share/gnuradio/grc/blocks/digital_map_bb.block.yml
+share/gnuradio/grc/blocks/digital_modulate_vector.block.yml
+share/gnuradio/grc/blocks/digital_mpsk_snr_est_cc.block.yml
+share/gnuradio/grc/blocks/digital_msk_timing_recovery_cc.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_carrier_allocator_cvc.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_chanest_vcvc.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_cyclic_prefixer.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_frame_equalizer_vcvc.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_rx.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_serializer_vcc.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_sync_sc_cfb.block.yml
+share/gnuradio/grc/blocks/digital_ofdm_tx.block.yml
+share/gnuradio/grc/blocks/digital_packet_headergenerator_bb.block.yml
+share/gnuradio/grc/blocks/digital_packet_headergenerator_bb_default.block.yml
+share/gnuradio/grc/blocks/digital_packet_headerparser_b.block.yml
+share/gnuradio/grc/blocks/digital_packet_headerparser_b_default.block.yml
+share/gnuradio/grc/blocks/digital_packet_sink.block.yml
+share/gnuradio/grc/blocks/digital_pfb_clock_sync.block.yml
+share/gnuradio/grc/blocks/digital_pn_correlator_cc.block.yml
+share/gnuradio/grc/blocks/digital_probe_density_b.block.yml
+share/gnuradio/grc/blocks/digital_probe_mpsk_snr_est_c.block.yml
+share/gnuradio/grc/blocks/digital_protocol_formatter_async.block.yml
+share/gnuradio/grc/blocks/digital_protocol_formatter_bb.block.yml
+share/gnuradio/grc/blocks/digital_protocol_parser_b.block.yml
+share/gnuradio/grc/blocks/digital_psk_demod.block.yml
+share/gnuradio/grc/blocks/digital_psk_mod.block.yml
+share/gnuradio/grc/blocks/digital_qam_demod.block.yml
+share/gnuradio/grc/blocks/digital_qam_mod.block.yml
+share/gnuradio/grc/blocks/digital_scrambler_bb.block.yml
+share/gnuradio/grc/blocks/digital_simple_correlator.block.yml
+share/gnuradio/grc/blocks/digital_simple_framer.block.yml
+share/gnuradio/grc/blocks/digital_symbol_sync_xx.block.yml
+share/gnuradio/grc/blocks/variable_header_format_default.block.yml
diff --git a/gnuradio-dtv/PLIST b/gnuradio-dtv/PLIST
index 84e89be73c..991c01d200 100644
--- a/gnuradio-dtv/PLIST
+++ b/gnuradio-dtv/PLIST
@@ -129,34 +129,58 @@ share/gnuradio/examples/dtv/vv019-norot.grc
 share/gnuradio/examples/dtv/vv034-dtg016.grc
 share/gnuradio/examples/dtv/vv035-dtg052.grc
 share/gnuradio/examples/dtv/vv036-dtg091.grc
-@pkgdir share/gnuradio/fec/ldpc
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/fec
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fec/polar
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fec/LDPC
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/fec
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
-@pkgdir bin
+share/gnuradio/grc/blocks/dtv.tree.yml
+share/gnuradio/grc/blocks/dtv_atsc_deinterleaver.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_depad.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_derandomizer.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_equalizer.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_field_sync_mux.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_fpll.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_fs_checker.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_interleaver.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_pad.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_randomizer.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_rs_decoder.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_rs_encoder.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_rx.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_rx_filter.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_sync.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_trellis_encoder.block.yml
+share/gnuradio/grc/blocks/dtv_atsc_viterbi_decoder.block.yml
+share/gnuradio/grc/blocks/dtv_catv_frame_sync_enc_bb.block.yml
+share/gnuradio/grc/blocks/dtv_catv_randomizer_bb.block.yml
+share/gnuradio/grc/blocks/dtv_catv_reed_solomon_enc_bb.block.yml
+share/gnuradio/grc/blocks/dtv_catv_transport_framing_enc_bb.block.yml
+share/gnuradio/grc/blocks/dtv_catv_trellis_enc_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvb_bbheader_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvb_bbscrambler_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvb_bch_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvb_ldpc_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvbs2_interleaver_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvbs2_modulator_bc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbs2_physical_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_cellinterleaver_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_framemapper_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_freqinterleaver_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_interleaver_bb.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_miso_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_modulator_bc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_p1insertion_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_paprtr_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt2_pilotgenerator_cc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_bit_inner_deinterleaver.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_bit_inner_interleaver.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_convolutional_deinterleaver.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_convolutional_interleaver.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_demap.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_demod_reference_signals.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_energy_descramble.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_energy_dispersal.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_inner_coder.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_map.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_ofdm_sym_acquisition.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_reed_solomon_dec.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_reed_solomon_enc.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_reference_signals.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_symbol_inner_interleaver.block.yml
+share/gnuradio/grc/blocks/dtv_dvbt_viterbi_decoder.block.yml
diff --git a/gnuradio-fec/Makefile b/gnuradio-fec/Makefile
index 92ad484313..0c19ef50f1 100644
--- a/gnuradio-fec/Makefile
+++ b/gnuradio-fec/Makefile
@@ -8,6 +8,9 @@ COMMENT=	Forward Error Correction blocks, utilities, & examples of GNU Radio
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=OFF
 CMAKE_ARGS+=	-DENABLE_GR_FEC=ON
+CMAKE_ARGS+=    -DENABLE_GRC=True
+
+PLIST_MINUS+=	companion
 
 .include	"../../math/gsl/buildlink3.mk"
 .include	"../../mk/bsd.pkg.mk"
diff --git a/gnuradio-fec/PLIST b/gnuradio-fec/PLIST
index fcf896c114..6e3afef90c 100644
--- a/gnuradio-fec/PLIST
+++ b/gnuradio-fec/PLIST
@@ -171,28 +171,43 @@ share/gnuradio/fec/ldpc/n_1100_k_0442_gap_24.alist
 share/gnuradio/fec/ldpc/n_1300_k_0522_gap_30.alist
 share/gnuradio/fec/ldpc/n_1800_k_0902_gap_28.alist
 share/gnuradio/fec/ldpc/simple_g_matrix.alist
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
+share/gnuradio/grc/blocks/fec.tree.yml
+share/gnuradio/grc/blocks/fec_async_decoder.block.yml
+share/gnuradio/grc/blocks/fec_async_encoder.block.yml
+share/gnuradio/grc/blocks/fec_ber_bf.block.yml
+share/gnuradio/grc/blocks/fec_bercurve_generator.block.yml
+share/gnuradio/grc/blocks/fec_decode_ccsds_27_bb.block.yml
+share/gnuradio/grc/blocks/fec_decode_ccsds_27_fb.block.yml
+share/gnuradio/grc/blocks/fec_decoder.block.yml
+share/gnuradio/grc/blocks/fec_depuncture_bb.block.yml
+share/gnuradio/grc/blocks/fec_encoder.block.yml
+share/gnuradio/grc/blocks/fec_extended_async_encoder.block.yml
+share/gnuradio/grc/blocks/fec_extended_decoder.block.yml
+share/gnuradio/grc/blocks/fec_extended_encoder.block.yml
+share/gnuradio/grc/blocks/fec_extended_tagged_decoder.block.yml
+share/gnuradio/grc/blocks/fec_extended_tagged_encoder.block.yml
+share/gnuradio/grc/blocks/fec_puncture_xx.block.yml
+share/gnuradio/grc/blocks/fec_tagged_decoder.block.yml
+share/gnuradio/grc/blocks/fec_tagged_encoder.block.yml
+share/gnuradio/grc/blocks/ldpc_decoder_def_list.block.yml
+share/gnuradio/grc/blocks/ldpc_encoder_def_list.block.yml
+share/gnuradio/grc/blocks/tpc_decoder_def_list.block.yml
+share/gnuradio/grc/blocks/tpc_encoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_cc_decoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_cc_encoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_ccsds_encoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_dummy_decoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_dummy_encoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_ldpc_G_matrix_object.block.yml
+share/gnuradio/grc/blocks/variable_ldpc_H_matrix_object.block.yml
+share/gnuradio/grc/blocks/variable_ldpc_bit_flip_decoder.block.yml
+share/gnuradio/grc/blocks/variable_ldpc_encoder_G.block.yml
+share/gnuradio/grc/blocks/variable_ldpc_encoder_H.block.yml
+share/gnuradio/grc/blocks/variable_polar_code_configurator.block.yml
+share/gnuradio/grc/blocks/variable_polar_decoder_sc.block.yml
+share/gnuradio/grc/blocks/variable_polar_decoder_sc_list.block.yml
+share/gnuradio/grc/blocks/variable_polar_decoder_sc_systematic.block.yml
+share/gnuradio/grc/blocks/variable_polar_encoder.block.yml
+share/gnuradio/grc/blocks/variable_polar_encoder_systematic.block.yml
+share/gnuradio/grc/blocks/variable_repetition_decoder_def_list.block.yml
+share/gnuradio/grc/blocks/variable_repetition_encoder_def_list.block.yml
diff --git a/gnuradio-utils/PLIST b/gnuradio-utils/PLIST
index b101dca04b..a955fb02fc 100644
--- a/gnuradio-utils/PLIST
+++ b/gnuradio-utils/PLIST
@@ -22,32 +22,3 @@ ${PYSITELIB}/gnuradio/pyqt_filter.pyo
 ${PYSITELIB}/gnuradio/pyqt_plot.py
 ${PYSITELIB}/gnuradio/pyqt_plot.pyc
 ${PYSITELIB}/gnuradio/pyqt_plot.pyo
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir share/doc/gnuradio-${PKGVERSION}
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir lib/pkgconfig
-@pkgdir lib/cmake/gnuradio
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/swig
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
diff --git a/gnuradio-vocoder/Makefile b/gnuradio-vocoder/Makefile
index 654dee3901..c063f7fc28 100644
--- a/gnuradio-vocoder/Makefile
+++ b/gnuradio-vocoder/Makefile
@@ -8,6 +8,9 @@ COMMENT=	All available vocoders in GNU Radio
 
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_VOCODER=True
+CMAKE_ARGS+=	-DENABLE_GRC=True
+
+PLIST_MINUS+=	companion
 
 .include	"../../devel/libusb1/buildlink3.mk"
 
diff --git a/gnuradio-vocoder/PLIST b/gnuradio-vocoder/PLIST
index 659eb4be0a..c7d308430b 100644
--- a/gnuradio-vocoder/PLIST
+++ b/gnuradio-vocoder/PLIST
@@ -41,29 +41,19 @@ share/gnuradio/examples/vocoder/g723_24_audio_loopback.py
 share/gnuradio/examples/vocoder/g723_40_audio_loopback.py
 share/gnuradio/examples/vocoder/gsm_audio_loopback.py
 share/gnuradio/examples/vocoder/ulaw_audio_loopback.py
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
-@pkgdir bin
+share/gnuradio/grc/blocks/vocoder_alaw_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_alaw_encode_sb.block.yml
+share/gnuradio/grc/blocks/vocoder_cvsd_decode.block.yml
+share/gnuradio/grc/blocks/vocoder_cvsd_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_cvsd_encode.block.yml
+share/gnuradio/grc/blocks/vocoder_cvsd_encode_sb.block.yml
+share/gnuradio/grc/blocks/vocoder_g721_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_g721_encode_sb.block.yml
+share/gnuradio/grc/blocks/vocoder_g723_24_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_g723_24_encode_sb.block.yml
+share/gnuradio/grc/blocks/vocoder_g723_40_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_g723_40_encode_sb.block.yml
+share/gnuradio/grc/blocks/vocoder_gsm_fr_decode_ps.block.yml
+share/gnuradio/grc/blocks/vocoder_gsm_fr_encode_sp.block.yml
+share/gnuradio/grc/blocks/vocoder_ulaw_decode_bs.block.yml
+share/gnuradio/grc/blocks/vocoder_ulaw_encode_sb.block.yml
diff --git a/gnuradio-wavelet/PLIST b/gnuradio-wavelet/PLIST
index 3fab3c2a87..31392e7a40 100644
--- a/gnuradio-wavelet/PLIST
+++ b/gnuradio-wavelet/PLIST
@@ -19,30 +19,3 @@ ${PYSITELIB}/gnuradio/wavelet/_wavelet_swig.so
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.py
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.pyc
 ${PYSITELIB}/gnuradio/wavelet/wavelet_swig.pyo
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir share/doc/gnuradio-${PKGVERSION}
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
-@pkgdir bin
diff --git a/gnuradio-zeromq/Makefile b/gnuradio-zeromq/Makefile
index e793aca17e..e05ad0dedd 100644
--- a/gnuradio-zeromq/Makefile
+++ b/gnuradio-zeromq/Makefile
@@ -17,6 +17,9 @@ COMMENT=	All of the zeromq blocks, utilities, and examples
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_GR_ZEROMQ=True
 CMAKE_ARGS+=	-DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
+CMAKE_ARGS+=	-DENABLE_GRC=True
+
+PLIST_MINUS+=	companion
 
 post-patch:
 	${CP}	${PKGDIR}/files/zmq.hpp ${WRKSRC}/gr-zeromq/include/
diff --git a/gnuradio-zeromq/PLIST b/gnuradio-zeromq/PLIST
index d03665d50e..7ca3fad13a 100644
--- a/gnuradio-zeromq/PLIST
+++ b/gnuradio-zeromq/PLIST
@@ -39,30 +39,15 @@ share/gnuradio/examples/zeromq/zeromq_pushpull.grc
 share/gnuradio/examples/zeromq/zeromq_reqrep.grc
 share/gnuradio/examples/zeromq/zmq_msg.grc
 share/gnuradio/examples/zeromq/zmq_stream.grc
-@pkgdir share/gnuradio/examples/volk_benchmark
-@pkgdir share/gnuradio/examples/tags
-@pkgdir share/gnuradio/examples/network
-@pkgdir share/gnuradio/examples/mp-sched
-@pkgdir share/gnuradio/examples/metadata
-@pkgdir share/gnuradio/examples/filter
-@pkgdir share/gnuradio/examples/blocks
-@pkgdir share/gnuradio/examples/audio
-@pkgdir share/gnuradio/examples/analog
-@pkgdir share/doc/gnuradio-${PKGVERSION}
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/pmt
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gru
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/gr
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/filter
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/fft
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/blocks
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/audio
-@pkgdir lib/python${PYVERSSUFFIX}/site-packages/gnuradio/analog
-@pkgdir include/pmt
-@pkgdir include/gnuradio/thread
-@pkgdir include/gnuradio/messages
-@pkgdir include/gnuradio/filter
-@pkgdir include/gnuradio/fft
-@pkgdir include/gnuradio/blocks
-@pkgdir include/gnuradio/audio
-@pkgdir include/gnuradio/analog
-@pkgdir bin
+share/gnuradio/grc/blocks/zeromq_pub_msg_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_pub_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_pull_msg_source.block.yml
+share/gnuradio/grc/blocks/zeromq_pull_source.block.yml
+share/gnuradio/grc/blocks/zeromq_push_msg_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_push_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_rep_msg_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_rep_sink.block.yml
+share/gnuradio/grc/blocks/zeromq_req_msg_source.block.yml
+share/gnuradio/grc/blocks/zeromq_req_source.block.yml
+share/gnuradio/grc/blocks/zeromq_sub_msg_source.block.yml
+share/gnuradio/grc/blocks/zeromq_sub_source.block.yml


Home | Main Index | Thread Index | Old Index