Wed Dec 30 21:13:15 2009 UTC ()
The vocoder plugin belongs to gnuradio-gsm, so move the rest from gnuradio-core.


(joerg)
diff -r1.19 -r1.20 pkgsrc/ham/gnuradio-core/Makefile
diff -r1.11 -r1.12 pkgsrc/ham/gnuradio-core/PLIST
diff -r1.1 -r1.2 pkgsrc/meta-pkgs/gnuradio/distinfo
diff -r0 -r1.1 pkgsrc/meta-pkgs/gnuradio/patches/patch-ae
cvs diff -r1.19 -r1.20 pkgsrc/ham/gnuradio-core/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/Makefile 2009/09/11 16:23:28 1.19
+++ pkgsrc/ham/gnuradio-core/Makefile 2009/12/30 21:13:15 1.20
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.19 2009/09/11 16:23:28 joerg Exp $ 1# $NetBSD: Makefile,v 1.20 2009/12/30 21:13:15 joerg Exp $
2 2
3PKGNAME= gnuradio-core-${VERSION} 3PKGNAME= gnuradio-core-${VERSION}
 4PKGREVISION= 1
4COMMENT= Runtime system and DSP blocks for GNU Radio 5COMMENT= Runtime system and DSP blocks for GNU Radio
5 6
6PKG_DESTDIR_SUPPORT= user-destdir 7PKG_DESTDIR_SUPPORT= user-destdir
7 8
8.include "../../meta-pkgs/gnuradio/Makefile.common" 9.include "../../meta-pkgs/gnuradio/Makefile.common"
9 10
10CONF_FILES+= ${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf 11CONF_FILES+= ${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf
11CONFIGURE_ARGS+=--enable-gnuradio-core 12CONFIGURE_ARGS+=--enable-gnuradio-core
12CONFIGURE_ARGS+=--enable-omnithread 13CONFIGURE_ARGS+=--enable-omnithread
13CONFIGURE_ARGS+=--enable-gruel 14CONFIGURE_ARGS+=--enable-gruel
14 15
15PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/swig/gen-swig-bug-fix 16PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/swig/gen-swig-bug-fix
16PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/bin/microtune.py 17PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/bin/microtune.py
cvs diff -r1.11 -r1.12 pkgsrc/ham/gnuradio-core/PLIST (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/PLIST 2009/08/12 12:21:39 1.11
+++ pkgsrc/ham/gnuradio-core/PLIST 2009/12/30 21:13:15 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2009/08/12 12:21:39 markd Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/12/30 21:13:15 joerg Exp $
2include/gnuradio/ccomplex_dotprod_generic.h 2include/gnuradio/ccomplex_dotprod_generic.h
3include/gnuradio/ccomplex_dotprod_x86.h 3include/gnuradio/ccomplex_dotprod_x86.h
4include/gnuradio/complex_dotprod_generic.h 4include/gnuradio/complex_dotprod_generic.h
5include/gnuradio/complex_dotprod_x86.h 5include/gnuradio/complex_dotprod_x86.h
6include/gnuradio/fcomplex_dotprod_x86.h 6include/gnuradio/fcomplex_dotprod_x86.h
7include/gnuradio/float_dotprod_generic.h 7include/gnuradio/float_dotprod_generic.h
8include/gnuradio/float_dotprod_x86.h 8include/gnuradio/float_dotprod_x86.h
9include/gnuradio/gnuradio_swig_bug_workaround.h 9include/gnuradio/gnuradio_swig_bug_workaround.h
10include/gnuradio/gr_adaptive_fir_ccf.h 10include/gnuradio/gr_adaptive_fir_ccf.h
11include/gnuradio/gr_add_cc.h 11include/gnuradio/gr_add_cc.h
12include/gnuradio/gr_add_const_cc.h 12include/gnuradio/gr_add_const_cc.h
13include/gnuradio/gr_add_const_ff.h 13include/gnuradio/gr_add_const_ff.h
14include/gnuradio/gr_add_const_ii.h 14include/gnuradio/gr_add_const_ii.h
@@ -964,20 +964,17 @@ ${PYSITELIB}/gnuradio/gruimpl/socket_stu @@ -964,20 +964,17 @@ ${PYSITELIB}/gnuradio/gruimpl/socket_stu
964${PYSITELIB}/gnuradio/gruimpl/socket_stuff.pyo 964${PYSITELIB}/gnuradio/gruimpl/socket_stuff.pyo
965${PYSITELIB}/gnuradio/modulation_utils.py 965${PYSITELIB}/gnuradio/modulation_utils.py
966${PYSITELIB}/gnuradio/modulation_utils.pyc 966${PYSITELIB}/gnuradio/modulation_utils.pyc
967${PYSITELIB}/gnuradio/modulation_utils.pyo 967${PYSITELIB}/gnuradio/modulation_utils.pyo
968${PYSITELIB}/gnuradio/ofdm_packet_utils.py 968${PYSITELIB}/gnuradio/ofdm_packet_utils.py
969${PYSITELIB}/gnuradio/ofdm_packet_utils.pyc 969${PYSITELIB}/gnuradio/ofdm_packet_utils.pyc
970${PYSITELIB}/gnuradio/ofdm_packet_utils.pyo 970${PYSITELIB}/gnuradio/ofdm_packet_utils.pyo
971${PYSITELIB}/gnuradio/optfir.py 971${PYSITELIB}/gnuradio/optfir.py
972${PYSITELIB}/gnuradio/optfir.pyc 972${PYSITELIB}/gnuradio/optfir.pyc
973${PYSITELIB}/gnuradio/optfir.pyo 973${PYSITELIB}/gnuradio/optfir.pyo
974${PYSITELIB}/gnuradio/packet_utils.py 974${PYSITELIB}/gnuradio/packet_utils.py
975${PYSITELIB}/gnuradio/packet_utils.pyc 975${PYSITELIB}/gnuradio/packet_utils.pyc
976${PYSITELIB}/gnuradio/packet_utils.pyo 976${PYSITELIB}/gnuradio/packet_utils.pyo
977${PYSITELIB}/gnuradio/vocoder/__init__.py 
978${PYSITELIB}/gnuradio/vocoder/__init__.pyc 
979${PYSITELIB}/gnuradio/vocoder/__init__.pyo 
980${PYSITELIB}/gnuradio/window.py 977${PYSITELIB}/gnuradio/window.py
981${PYSITELIB}/gnuradio/window.pyc 978${PYSITELIB}/gnuradio/window.pyc
982${PYSITELIB}/gnuradio/window.pyo 979${PYSITELIB}/gnuradio/window.pyo
983share/examples/gnuradio/conf.d/gnuradio-core.conf 980share/examples/gnuradio/conf.d/gnuradio-core.conf
cvs diff -r1.1 -r1.2 pkgsrc/meta-pkgs/gnuradio/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/gnuradio/Attic/distinfo 2009/09/11 16:23:31 1.1
+++ pkgsrc/meta-pkgs/gnuradio/Attic/distinfo 2009/12/30 21:13:15 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.1 2009/09/11 16:23:31 joerg Exp $ 1$NetBSD: distinfo,v 1.2 2009/12/30 21:13:15 joerg Exp $
2 2
3SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba 3SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
4RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8 4RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
5Size (gnuradio-3.2.tar.gz) = 6864952 bytes 5Size (gnuradio-3.2.tar.gz) = 6864952 bytes
6SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1 6SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1
7SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c 7SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c
8SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b 8SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
9SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50 9SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50
 10SHA1 (patch-ae) = 0e5211736ffa70edd704b10fce2d8d3943c552c2
File Added: pkgsrc/meta-pkgs/gnuradio/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.1 2009/12/30 21:13:15 joerg Exp $

--- gnuradio-core/src/python/gnuradio/Makefile.am.orig	2009-12-23 19:51:56.000000000 +0000
+++ gnuradio-core/src/python/gnuradio/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
+SUBDIRS = gr gru gruimpl blks2 blks2impl
 
 grpython_PYTHON = 			\
 	__init__.py			\