diff options
| author | Diane Bruce <db@FreeBSD.org> | 2008-01-22 18:43:15 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2008-01-22 18:43:15 +0000 |
| commit | 2394288545dad546bffead3bf29228181e30bc39 (patch) | |
| tree | 195c88632c40b3a5f854f416f7326d2495afb1e0 /comms/gnuradio | |
| parent | 36a8c76ffefd74b1c67e9202d59eda9401827df0 (diff) | |
| download | ports-2394288545dad546bffead3bf29228181e30bc39.tar.gz ports-2394288545dad546bffead3bf29228181e30bc39.zip | |
- Remove redundant version select
- Allow use of wx 2.8
- Correct build of usrpm
Notes
Notes:
svn path=/head/; revision=206035
Diffstat (limited to 'comms/gnuradio')
| -rw-r--r-- | comms/gnuradio/Makefile | 3 | ||||
| -rw-r--r-- | comms/gnuradio/files/patch-gr-wxgui_src_python_stdgui.py | 11 | ||||
| -rw-r--r-- | comms/gnuradio/files/patch-usrp_host_swig_Makefile.in | 10 | ||||
| -rw-r--r-- | comms/gnuradio/files/wxgui_src_python_init.py | 2 | ||||
| -rw-r--r-- | comms/gnuradio/pkg-plist | 3 |
5 files changed, 6 insertions, 23 deletions
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 88b7ebc1c345..f1d5c060ebad 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnuradio PORTVERSION= 3.1.1 +PORTREVISION= 1 CATEGORIES= comms astro hamradio MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= gnuradio @@ -27,7 +28,7 @@ RUN_DEPENDS= ${PYNUMERIC} \ ${PYTHON_SITELIBDIR}/ephem.so:${PORTSDIR}/astro/pyephem USE_PYTHON= 2.4+ -USE_WX= 2.6 +USE_WX= 2.6+ WX_COMPS= wx wx:build wx:run python:build python:run USE_PERL5= yes USE_AUTOTOOLS= autoconf:261 libtool:15 diff --git a/comms/gnuradio/files/patch-gr-wxgui_src_python_stdgui.py b/comms/gnuradio/files/patch-gr-wxgui_src_python_stdgui.py deleted file mode 100644 index c90acff82bdd..000000000000 --- a/comms/gnuradio/files/patch-gr-wxgui_src_python_stdgui.py +++ /dev/null @@ -1,11 +0,0 @@ ---- gr-wxgui/src/python/stdgui.py.orig 2007-11-05 19:54:57.000000000 -0500 -+++ gr-wxgui/src/python/stdgui.py 2008-01-03 13:20:37.000000000 -0500 -@@ -21,6 +21,8 @@ - - '''A simple wx gui for GNU Radio applications''' - -+import wxversion -+wxversion.select('2.6') - import wx - import sys - from gnuradio import gr diff --git a/comms/gnuradio/files/patch-usrp_host_swig_Makefile.in b/comms/gnuradio/files/patch-usrp_host_swig_Makefile.in deleted file mode 100644 index c7de91ddfc53..000000000000 --- a/comms/gnuradio/files/patch-usrp_host_swig_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- usrp/host/swig/Makefile.in.orig 2007-11-05 20:04:16.000000000 -0500 -+++ usrp/host/swig/Makefile.in 2008-01-03 13:19:58.000000000 -0500 -@@ -455,7 +455,6 @@ - usrp_prims.py - - ourpython_PYTHON = \ -- __init__.py \ - usrp_fpga_regs.py \ - usrp_prims.py - diff --git a/comms/gnuradio/files/wxgui_src_python_init.py b/comms/gnuradio/files/wxgui_src_python_init.py index e754a06edafe..229a9efdb665 100644 --- a/comms/gnuradio/files/wxgui_src_python_init.py +++ b/comms/gnuradio/files/wxgui_src_python_init.py @@ -1,2 +1,2 @@ import wxversion -wxversion.select('2.6') +wxversion.ensureMinimal('2.6') diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index 4152fe8ab263..6e6e753e5796 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -1308,6 +1308,9 @@ share/usrp/rev4/usrp_sounder.rbf %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/waterfallsink2.py %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/waterfallsink2.pyc %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/waterfallsink2.pyo +%%PYTHON_SITELIBDIR%%/usrpm/__init__.py +%%PYTHON_SITELIBDIR%%/usrpm/__init__.pyc +%%PYTHON_SITELIBDIR%%/usrpm/__init__.pyo %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.py %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.pyc %%PYTHON_SITELIBDIR%%/usrpm/usrp_dbid.pyo |