[71114] trunk/dports/science
michaelld at macports.org
michaelld at macports.org
Wed Sep 1 11:54:24 PDT 2010
Revision: 71114
http://trac.macports.org/changeset/71114
Author: michaelld at macports.org
Date: 2010-09-01 11:54:21 -0700 (Wed, 01 Sep 2010)
Log Message:
-----------
Update GNU Radio and USRP to version 3.3.0.
Added new ports for QtGUI, NOAA, MSDD6000.
Renamed 'grc' to 'gnuradio companion', and now the 'grc' port just
prints a NOTE about this change.
Added in support for Python 2.7.
Modified Paths:
--------------
trunk/dports/science/gnuradio/Portfile
trunk/dports/science/gnuradio-audio-jack/Portfile
trunk/dports/science/gnuradio-audio-osx/Portfile
trunk/dports/science/gnuradio-audio-portaudio/Portfile
trunk/dports/science/gnuradio-companion/Portfile
trunk/dports/science/gnuradio-core/Portfile
trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
trunk/dports/science/gnuradio-examples/Portfile
trunk/dports/science/gnuradio-gpio/Portfile
trunk/dports/science/gnuradio-gruel/Portfile
trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
trunk/dports/science/gnuradio-pager/Portfile
trunk/dports/science/gnuradio-radar-mono/Portfile
trunk/dports/science/gnuradio-radio-astronomy/Portfile
trunk/dports/science/gnuradio-sounder/Portfile
trunk/dports/science/gnuradio-trellis/Portfile
trunk/dports/science/gnuradio-usrp/Portfile
trunk/dports/science/gnuradio-utils/Portfile
trunk/dports/science/gnuradio-video-sdl/Portfile
trunk/dports/science/gnuradio-wxgui/Portfile
trunk/dports/science/usrp/Portfile
Added Paths:
-----------
trunk/dports/science/gnuradio-atsc/
trunk/dports/science/gnuradio-atsc/Portfile
trunk/dports/science/gnuradio-companion/
trunk/dports/science/gnuradio-grc/
trunk/dports/science/gnuradio-grc/Portfile
trunk/dports/science/gnuradio-grc/files/
trunk/dports/science/gnuradio-msdd6000/
trunk/dports/science/gnuradio-msdd6000/Portfile
trunk/dports/science/gnuradio-noaa/
trunk/dports/science/gnuradio-noaa/Portfile
trunk/dports/science/gnuradio-qtgui/
trunk/dports/science/gnuradio-qtgui/Portfile
trunk/dports/science/gnuradio-qtgui/files/
trunk/dports/science/gnuradio-qtgui/files/patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff
trunk/dports/science/gnuradio-usrp/files/patch_gr-usrp_src_usrp_swig_files.diff
Removed Paths:
-------------
trunk/dports/science/gnuradio/files/
trunk/dports/science/gnuradio-audio-jack/files/
trunk/dports/science/gnuradio-audio-osx/files/
trunk/dports/science/gnuradio-audio-portaudio/files/
trunk/dports/science/gnuradio-companion/files/
trunk/dports/science/gnuradio-core/files/
trunk/dports/science/gnuradio-cvsd-vocoder/files/
trunk/dports/science/gnuradio-examples/files/
trunk/dports/science/gnuradio-gpio/files/
trunk/dports/science/gnuradio-grc/
trunk/dports/science/gnuradio-gruel/files/
trunk/dports/science/gnuradio-gsm-fr-vocoder/files/
trunk/dports/science/gnuradio-pager/files/
trunk/dports/science/gnuradio-radar-mono/files/
trunk/dports/science/gnuradio-radio-astronomy/files/
trunk/dports/science/gnuradio-sounder/files/
trunk/dports/science/gnuradio-trellis/files/
trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
trunk/dports/science/gnuradio-utils/files/
trunk/dports/science/gnuradio-video-sdl/files/
trunk/dports/science/gnuradio-wxgui/files/
trunk/dports/science/usrp/files/patch-configure.diff
trunk/dports/science/usrp/files/patch-configure.diff.orig
trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_circular_linked_list.h.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_ciurcular_buffer.h.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_darwin.h.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.cc.diff
trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.h.diff
trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -4,8 +4,7 @@
PortSystem 1.0
name gnuradio
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description GNU Radio META-port installer.
long_description GNU Radio META-port installer: \
@@ -13,21 +12,25 @@
This package does not do any compiling or installation itself.
categories science
-homepage http://gnuradio.org/
+homepage http://gnuradio.org/
distfiles
platforms darwin macosx
-depends_lib port:gnuradio-audio-jack \
+depends_lib port:gnuradio-atsc \
+ port:gnuradio-audio-jack \
port:gnuradio-audio-osx \
port:gnuradio-audio-portaudio \
+ port:gnuradio-companion \
port:gnuradio-cvsd-vocoder \
port:gnuradio-examples \
port:gnuradio-gpio \
- port:gnuradio-grc \
port:gnuradio-gsm-fr-vocoder \
+ port:gnuradio-msdd6000 \
+ port:gnuradio-noaa \
port:gnuradio-pager \
+ port:gnuradio-qtgui \
port:gnuradio-radar-mono \
port:gnuradio-radio-astronomy \
port:gnuradio-sounder \
@@ -54,17 +57,27 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Added: trunk/dports/science/gnuradio-atsc/Portfile
===================================================================
--- trunk/dports/science/gnuradio-atsc/Portfile (rev 0)
+++ trunk/dports/science/gnuradio-atsc/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,74 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 63573 2010-02-09 04:11:14Z michaelld at macports.org $
+
+PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
+
+name gnuradio-atsc
+version 3.3.0
+maintainers michaelld
+description ATSC Component of GNU Radio.
+long_description ATSC Component of GNU Radio: \
+Provides ATSC (HDTV) transmitter and receiver blocks.
+
+categories science
+homepage http://gnuradio.org/
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir gnuradio
+master_sites.mirror_subdir gnuradio
+distname gnuradio-${version}
+master_sites gnu
+
+platforms darwin macosx
+
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
+
+depends_lib port:gnuradio-core
+
+archcheck.files lib/libgnuradio-core.dylib
+
+configure.args --disable-all-components \
+ --with-gruel \
+ --with-gnuradio-core \
+ --enable-gr-atsc
+
+use_parallel_build yes
+
+variant docs description "build documentation for ${name}" {
+ configure.args-append --enable-doxygen --enable-docs
+ depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+ configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
+}
+
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
+}
+
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
+ default_variants +python26
+}
Modified: trunk/dports/science/gnuradio-audio-jack/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-jack/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-audio-jack/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-audio-jack
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description JACK component of GNU Radio.
long_description JACK component of GNU Radio: \
Provides JACK audio source and sink blocks.
categories science
-homepage http://gnuradio.org/
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,9 +25,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
port:jack
@@ -36,11 +35,7 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libjack.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-audio-jack
@@ -56,16 +51,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-audio-osx/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-audio-osx/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-audio-osx
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Mac OS X Audio component of GNU Radio.
long_description Mac OS X Audio component of GNU Radio: \
Provides Mac OS X native audio input and output blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,23 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff \
- patch-gr-audio-osx_src_audio_osx.h.diff \
- patch-gr-audio-osx_src_audio_osx_sink.cc.diff \
- patch-gr-audio-osx_src_audio_osx_source.cc.diff \
- patch-gr-audio-osx_src_circular_buffer.h.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-audio-osx
@@ -58,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-audio-portaudio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-portaudio/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-audio-portaudio/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-audio-portaudio
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description PortAudio component of GNU Radio.
long_description PortAudio component of GNU Radio: \
Provides PortAudio audio source and sink blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,9 +25,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
port:portaudio
@@ -36,11 +35,7 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libportaudio.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-audio-portaudio
@@ -56,16 +51,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-companion/Portfile
===================================================================
--- trunk/dports/science/gnuradio-grc/Portfile 2010-08-27 00:40:03 UTC (rev 70938)
+++ trunk/dports/science/gnuradio-companion/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -3,17 +3,16 @@
PortSystem 1.0
-name gnuradio-grc
-version 3.2.2
-revision 1
-maintainers nomaintainer
+name gnuradio-companion
+version 3.3.0
+maintainers michaelld
description GRC component of GNU Radio.
long_description GRC component of GNU Radio: \
GNU Radio Companion (GRC): Graphical interface to editing, \
creating, and running applications which use GNU Radio.
categories science
-homepage http://gnuradio.org/trac
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -25,17 +24,13 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-wxgui
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--with-gr-wxgui \
@@ -52,22 +47,35 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25 \
- port:py25-lxml \
- port:py25-cheetah \
- port:py25-gtk
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25 \
+ port:py25-lxml \
+ port:py25-cheetah \
+ port:py25-gtk
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26 \
- port:py26-lxml \
- port:py26-cheetah \
- port:py26-gtk
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26 \
+ port:py26-lxml \
+ port:py26-cheetah \
+ port:py26-gtk
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27 \
+ port:py27-lxml \
+ port:py27-cheetah \
+ port:py27-gtk
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-core/Portfile
===================================================================
--- trunk/dports/science/gnuradio-core/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-core/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-core
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description GNU Radio Core component of GNU Radio.
long_description GNU Radio Core component of GNU Radio: \
Core functionality for all of GNU Radio.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,21 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-depends_lib port:gnuradio-omnithread \
- port:gnuradio-gruel
+depends_lib port:gnuradio-gruel
-archcheck.files lib/libgruel.dylib \
- lib/libgromnithread.dylib
+archcheck.files lib/libgruel.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--enable-gnuradio-core
@@ -55,18 +48,29 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25 \
- port:py25-numpy
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25 \
+ port:py25-numpy
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26 \
- port:py26-numpy
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26 \
+ port:py26-numpy
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27 \
+ port:py27-numpy
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-cvsd-vocoder/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-cvsd-vocoder/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,8 +6,7 @@
PortGroup archcheck 1.0
name gnuradio-cvsd-vocoder
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description CVSD Vocoder component of GNU Radio.
long_description CVSD Vocoder component of GNU Radio: \
@@ -15,7 +14,7 @@
vocoder source and sink blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -27,19 +26,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-cvsd-vocoder
@@ -55,16 +50,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-examples/Portfile
===================================================================
--- trunk/dports/science/gnuradio-examples/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-examples/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-examples
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Examples component of GNU Radio.
long_description Examples component of GNU Radio: \
Python (GRC and plain scripts) and C++ examples for using GNU Radio.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gnuradio-examples
@@ -54,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-gpio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gpio/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-gpio/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-gpio
-version 3.2.2
-revision 1
+version 3.3.0
maintainers nomaintainer
description GPIO component of GNU Radio.
long_description GPIO component of GNU Radio: \
Provides GPIO block.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,16 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:usrp
archcheck.files lib/libusrp.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
+ --with-gruel \
--with-usrp \
--enable-gr-gpio
@@ -53,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Added: trunk/dports/science/gnuradio-grc/Portfile
===================================================================
--- trunk/dports/science/gnuradio-grc/Portfile (rev 0)
+++ trunk/dports/science/gnuradio-grc/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,27 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 63573 2010-02-09 04:11:14Z michaelld at macports.org $
+
+PortSystem 1.0
+
+name gnuradio-grc
+version 3.2.2
+revision 2
+maintainers michaelld
+description GRC component of GNU Radio.
+long_description GRC component of GNU Radio: \
+GNU Radio Companion (GRC): Graphical interface to editing, \
+creating, and running applications which use GNU Radio.
+
+categories science
+homepage http://gnuradio.org/
+
+distfiles
+
+platforms darwin macosx
+
+use_configure no
+build {}
+destroot {}
+
+notes "This port has been renamed to 'gnuradio-companion'; \n\
+please uninstall this port and install that one."
Modified: trunk/dports/science/gnuradio-gruel/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gruel/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-gruel/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,8 +6,7 @@
PortGroup archcheck 1.0
name gnuradio-gruel
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description GRUEL component of GNU Radio.
long_description GRUEL component of GNU Radio: \
@@ -16,7 +15,7 @@
on the full GNU Radio core or other libraries.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -28,9 +27,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
# gruel gets built by the main configure script, which requires a
# whole slew of ports, included here and then making all other
@@ -54,9 +53,6 @@
lib/libgsl.dylib \
lib/libz.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
--enable-gruel
@@ -71,16 +67,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-gsm-fr-vocoder
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description GSM FR Vocoder Component of GNU Radio.
long_description GSM FR Vocoder Component of GNU Radio: \
Provides GSM FR voice encoder and decoder blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-gsm-fr-vocoder
@@ -54,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Added: trunk/dports/science/gnuradio-msdd6000/Portfile
===================================================================
--- trunk/dports/science/gnuradio-msdd6000/Portfile (rev 0)
+++ trunk/dports/science/gnuradio-msdd6000/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,74 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 63573 2010-02-09 04:11:14Z michaelld at macports.org $
+
+PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
+
+name gnuradio-msdd6000
+version 3.3.0
+maintainers michaelld
+description MSDD6000 Component of GNU Radio.
+long_description MSDD6000 Component of GNU Radio: \
+Provides an interface block between the Softronics MSDD6000 and GNU Radio.
+
+categories science
+homepage http://gnuradio.org/
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir gnuradio
+master_sites.mirror_subdir gnuradio
+distname gnuradio-${version}
+master_sites gnu
+
+platforms darwin macosx
+
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
+
+depends_lib port:gnuradio-core
+
+archcheck.files lib/libgnuradio-core.dylib
+
+configure.args --disable-all-components \
+ --with-gruel \
+ --with-gnuradio-core \
+ --enable-gr-msdd6000
+
+use_parallel_build yes
+
+variant docs description "build documentation for ${name}" {
+ configure.args-append --enable-doxygen --enable-docs
+ depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+ configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
+}
+
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
+}
+
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
+ default_variants +python26
+}
Added: trunk/dports/science/gnuradio-noaa/Portfile
===================================================================
--- trunk/dports/science/gnuradio-noaa/Portfile (rev 0)
+++ trunk/dports/science/gnuradio-noaa/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,78 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 63573 2010-02-09 04:11:14Z michaelld at macports.org $
+
+PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
+
+name gnuradio-noaa
+version 3.3.0
+maintainers michaelld
+description NOAA Component of GNU Radio.
+long_description NOAA Component of GNU Radio: \
+Provides a NOAA POES HRPT receiver / demodulator block.
+
+categories science
+homepage http://gnuradio.org/
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir gnuradio
+master_sites.mirror_subdir gnuradio
+distname gnuradio-${version}
+master_sites gnu
+
+platforms darwin macosx
+
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
+
+depends_lib port:gnuradio-wxgui \
+ port:gnuradio-companion
+
+archcheck.files lib/libgruel.dylib \
+ lib/libgnuradio-core.dylib
+
+configure.args --disable-all-components \
+ --with-gruel \
+ --with-gnuradio-core \
+ --with-gr-wxgui \
+ --with-grc \
+ --enable-gr-noaa
+
+use_parallel_build yes
+
+variant docs description "build documentation for ${name}" {
+ configure.args-append --enable-doxygen --enable-docs
+ depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+ configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
+}
+
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
+}
+
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
+ default_variants +python26
+}
Modified: trunk/dports/science/gnuradio-pager/Portfile
===================================================================
--- trunk/dports/science/gnuradio-pager/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-pager/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-pager
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Pager Component of GNU Radio.
long_description Pager Component of GNU Radio: \
Provides FLEX radio-pager receiver / demodulator block.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-pager
@@ -54,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Added: trunk/dports/science/gnuradio-qtgui/Portfile
===================================================================
--- trunk/dports/science/gnuradio-qtgui/Portfile (rev 0)
+++ trunk/dports/science/gnuradio-qtgui/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,101 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 63573 2010-02-09 04:11:14Z michaelld at macports.org $
+
+PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
+
+name gnuradio-qtgui
+version 3.3.0
+maintainers michaelld
+description Qt GUI component of GNU Radio.
+long_description Qt GUI component of GNU Radio: \
+Qt-based GUI widgets.
+
+categories science
+homepage http://gnuradio.org/
+
+# all GNU Radio components come in a single tarball.
+# Reuse this tarball for each Port
+
+dist_subdir gnuradio
+master_sites.mirror_subdir gnuradio
+distname gnuradio-${version}
+master_sites gnu
+
+platforms darwin macosx
+
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
+
+depends_lib port:gnuradio-core \
+ port:qwtplot3d
+
+archcheck.files lib/libgnuradio-core.dylib \
+ lib/libqwtplot3d.dylib
+
+# fix various 'time' functions that are not on OSX;
+# should be unnecessary in version 3.3.1.
+patchfiles patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff
+
+# for now ... use 'qmake' in the future
+set qt_dir ${prefix}/libexec/qt4-mac
+
+# prepend Qt's PKGCONFIG path to whatever is there now.
+if {${configure.pkg_config_path} == ""} {
+ configure.pkg_config_path ${prefix}/lib/pkgconfig:${qt_dir}/lib/pkgconfig
+} else {
+ configure.pkg_config_path ${prefix}/lib/pkgconfig:${qt_dir}/lib/pkgconfig:${configure.pkg_config_path}
+}
+
+configure.args --disable-all-components \
+ --with-gruel \
+ --with-gnuradio-core \
+ --enable-gr-qtgui \
+ --with-qwt-libdir=${prefix}/lib \
+ --with-qwt-incdir=${prefix}/include/qwt \
+ --with-qwtplot3d-libdir=${prefix}/lib \
+ --with-qwtplot3d-incdir=${prefix}/include/qwtplot3d
+
+# Include the Qt framework directory; GNU Radio 3.3.0's configure
+# script ignores this part of the QtCore PKGCONFIG file.
+configure.ldflags-append -F${qt_dir}/lib
+
+use_parallel_build yes
+
+variant docs description "build documentation for ${name}" {
+ configure.args-append --enable-doxygen --enable-docs
+ depends_lib-append port:doxygen
+}
+
+if { ![variant_isset docs] } {
+ configure.args-append --disable-doxygen --disable-docs
+}
+
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25 \
+ port:py25-pyqt4
+}
+
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26 \
+ port:py26-pyqt4
+}
+
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27 \
+ port:py27-pyqt4
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
+ default_variants +python26
+}
Added: trunk/dports/science/gnuradio-qtgui/files/patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff
===================================================================
--- trunk/dports/science/gnuradio-qtgui/files/patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff (rev 0)
+++ trunk/dports/science/gnuradio-qtgui/files/patch_gr-qtgui_src_lib_highResTimeFunctions.h.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,326 @@
+--- gr-qtgui/src/lib/highResTimeFunctions.h.orig 2010-08-27 15:00:27.000000000 -0400
++++ gr-qtgui/src/lib/highResTimeFunctions.h 2010-08-27 15:01:02.000000000 -0400
+@@ -8,41 +8,74 @@
+
+ static const long NSEC_PER_SEC = 1000000000L;
+
+-static inline bool timespec_greater(const struct timespec* t1, const struct timespec* t0){
+- return ((t1->tv_sec > t0->tv_sec) || ((t1->tv_sec == t0->tv_sec) && (t1->tv_nsec > t0->tv_nsec)));
+-}
+-
+-static inline bool timespec_greater(const struct timespec t1, const struct timespec t0){
+- return ((t1.tv_sec > t0.tv_sec) || ((t1.tv_sec == t0.tv_sec) && (t1.tv_nsec > t0.tv_nsec)));
+-}
+-
+-static inline bool timespec_less(const struct timespec* t1, const struct timespec* t0){
+- return ((t1->tv_sec < t0->tv_sec) || ((t1->tv_sec == t0->tv_sec) && (t1->tv_nsec < t0->tv_nsec)));
+-}
+-
+-static inline bool timespec_less(const struct timespec t1, const struct timespec t0){
+- return ((t1.tv_sec < t0.tv_sec) || ((t1.tv_sec == t0.tv_sec) && (t1.tv_nsec < t0.tv_nsec)));
+-}
+-
+-static inline bool timespec_equal(const struct timespec* t1, const struct timespec* t0){
+- return ((t1->tv_sec == t0->tv_sec) && (t1->tv_nsec == t0->tv_nsec));
+-}
+-
+-static inline bool timespec_equal(const struct timespec t1, const struct timespec t0){
+- return ((t1.tv_sec == t0.tv_sec) && (t1.tv_nsec == t0.tv_nsec));
+-}
+-
+-static inline void timespec_reset(struct timespec* ret){
++static inline bool
++timespec_greater(const struct timespec* t1,
++ const struct timespec* t0)
++{
++ return ((t1->tv_sec > t0->tv_sec) ||
++ ((t1->tv_sec == t0->tv_sec) &&
++ (t1->tv_nsec > t0->tv_nsec)));
++}
++
++static inline bool
++timespec_greater(const struct timespec t1,
++ const struct timespec t0)
++{
++ return ((t1.tv_sec > t0.tv_sec) ||
++ ((t1.tv_sec == t0.tv_sec) &&
++ (t1.tv_nsec > t0.tv_nsec)));
++}
++
++static inline bool
++timespec_less(const struct timespec* t1,
++ const struct timespec* t0)
++{
++ return ((t1->tv_sec < t0->tv_sec) ||
++ ((t1->tv_sec == t0->tv_sec) &&
++ (t1->tv_nsec < t0->tv_nsec)));
++}
++
++static inline bool
++timespec_less(const struct timespec t1,
++ const struct timespec t0)
++{
++ return ((t1.tv_sec < t0.tv_sec) ||
++ ((t1.tv_sec == t0.tv_sec) &&
++ (t1.tv_nsec < t0.tv_nsec)));
++}
++
++static inline bool
++timespec_equal(const struct timespec* t1,
++ const struct timespec* t0)
++{
++ return ((t1->tv_sec == t0->tv_sec) &&
++ (t1->tv_nsec == t0->tv_nsec));
++}
++
++static inline bool
++timespec_equal(const struct timespec t1,
++ const struct timespec t0)
++{
++ return ((t1.tv_sec == t0.tv_sec) &&
++ (t1.tv_nsec == t0.tv_nsec));
++}
++
++static inline void
++timespec_reset(struct timespec* ret)
++{
+ ret->tv_sec = 0;
+ ret->tv_nsec = 0;
+ }
+
+-static inline void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec){
+- while (nsec > NSEC_PER_SEC){
++static inline void
++set_normalized_timespec(struct timespec *ts,
++ time_t sec, long nsec)
++{
++ while (nsec > NSEC_PER_SEC) {
+ nsec -= NSEC_PER_SEC;
+ ++sec;
+ }
+- while(nsec < 0){
++ while(nsec < 0) {
+ nsec += NSEC_PER_SEC;
+ --sec;
+ }
+@@ -50,10 +83,13 @@
+ ts->tv_nsec = nsec;
+ }
+
+-static inline struct timespec convert_to_timespec(const double timeValue){
++static inline struct timespec
++convert_to_timespec(const double timeValue)
++{
+ struct timespec ret;
+ double seconds = 0;
+- long nsec = static_cast<long>(modf(timeValue, &seconds) * static_cast<double>(NSEC_PER_SEC));
++ long nsec = static_cast<long>(modf(timeValue, &seconds) *
++ static_cast<double>(NSEC_PER_SEC));
+ time_t sec = static_cast<time_t>(seconds);
+
+ set_normalized_timespec(&ret, sec, nsec);
+@@ -61,28 +97,46 @@
+ return ret;
+ }
+
+-static inline double convert_from_timespec(const timespec actual){
+- return (static_cast<double>(actual.tv_sec) + (static_cast<double>(actual.tv_nsec) / static_cast<double>(NSEC_PER_SEC)));
++static inline double
++convert_from_timespec(const timespec actual)
++{
++ return (static_cast<double>(actual.tv_sec) +
++ (static_cast<double>(actual.tv_nsec) /
++ static_cast<double>(NSEC_PER_SEC)));
+ }
+
+-static inline void timespec_add(struct timespec *ret, const struct timespec* t1, const struct timespec* t0){
++static inline void
++timespec_add(struct timespec *ret,
++ const struct timespec* t1,
++ const struct timespec* t0)
++{
+ time_t sec = t1->tv_sec + t0->tv_sec;
+ long nsec = t1->tv_nsec + t0->tv_nsec;
+
+ set_normalized_timespec(ret, sec, nsec);
+ }
+
+-static inline void timespec_add(struct timespec *ret, const struct timespec t1, const struct timespec t0){
++static inline void
++timespec_add(struct timespec *ret,
++ const struct timespec t1,
++ const struct timespec t0)
++{
+ return timespec_add(ret, &t1, &t0);
+ }
+
+-static inline struct timespec timespec_add(const struct timespec t1, const struct timespec t0){
++static inline struct timespec
++timespec_add(const struct timespec t1,
++ const struct timespec t0)
++{
+ struct timespec ret;
+ timespec_add(&ret, &t1, &t0);
+ return ret;
+ }
+
+-static inline struct timespec timespec_add(const struct timespec t1, const double time0){
++static inline struct timespec
++timespec_add(const struct timespec t1,
++ const double time0)
++{
+ struct timespec ret;
+ struct timespec t0;
+ t0 = convert_to_timespec(time0);
+@@ -92,24 +146,38 @@
+ return ret;
+ }
+
+-static inline void timespec_subtract(struct timespec *ret, const struct timespec* t1, const struct timespec* t0){
++static inline void
++timespec_subtract(struct timespec *ret,
++ const struct timespec* t1,
++ const struct timespec* t0)
++{
+ time_t sec = t1->tv_sec - t0->tv_sec;
+ long nsec = t1->tv_nsec - t0->tv_nsec;
+
+ set_normalized_timespec(ret, sec, nsec);
+ }
+
+-static inline void timespec_subtract(struct timespec *ret, const struct timespec t1, const struct timespec t0){
++static inline void
++timespec_subtract(struct timespec *ret,
++ const struct timespec t1,
++ const struct timespec t0)
++{
+ return timespec_subtract(ret, &t1, &t0);
+ }
+
+-static inline struct timespec timespec_subtract(const struct timespec t1, const struct timespec t0){
++static inline struct timespec
++timespec_subtract(const struct timespec t1,
++ const struct timespec t0)
++{
+ struct timespec ret;
+ timespec_subtract(&ret, &t1, &t0);
+ return ret;
+ }
+
+-static inline struct timespec timespec_subtract(const struct timespec t1, const double time0){
++static inline struct timespec
++timespec_subtract(const struct timespec t1,
++ const double time0)
++{
+ struct timespec ret;
+ struct timespec t0;
+ t0 = convert_to_timespec(time0);
+@@ -119,7 +187,11 @@
+ return ret;
+ }
+
+-static inline double diff_timespec(struct timespec* ret, const struct timespec *t1, const struct timespec* t0){
++static inline double
++diff_timespec(struct timespec* ret,
++ const struct timespec *t1,
++ const struct timespec* t0)
++{
+ struct timespec actual;
+ time_t sec = 0;
+ long nsec = 0;
+@@ -141,7 +213,8 @@
+ sec = t0->tv_sec - t1->tv_sec;
+ nsec = t0->tv_nsec - t1->tv_nsec;
+
+- // Do nothing with the ret value as the ret value would have to store a negative, which it can't.
++ // Do nothing with the ret value as the ret value
++ // would have to store a negative, which it can't.
+
+ set_normalized_timespec(&actual, sec, nsec);
+
+@@ -149,23 +222,39 @@
+ }
+ }
+
+-static inline double diff_timespec(struct timespec* ret, const struct timespec t1, const struct timespec t0){
++static inline double
++diff_timespec(struct timespec* ret,
++ const struct timespec t1,
++ const struct timespec t0)
++{
+ return diff_timespec(ret, &t1, &t0);
+ }
+
+-static inline double diff_timespec(const struct timespec t1, const struct timespec t0){
++static inline double
++diff_timespec(const struct timespec t1,
++ const struct timespec t0)
++{
+ return diff_timespec(NULL, &t1, &t0);
+ }
+
+
+-static inline double diff_timespec(const struct timespec* t1, const struct timespec* t0){
++static inline double
++diff_timespec(const struct timespec* t1,
++ const struct timespec* t0)
++{
+ return diff_timespec(NULL, t1, t0);
+ }
+
+
+-static inline void get_highres_clock(struct timespec* ret){
++#ifdef CLOCK_REALTIME
++// If we can use clock_gettime, use it;
++// otherwise, use gettimeofday
++static inline void
++get_highres_clock(struct timespec* ret)
++{
+ if(clock_gettime(CLOCK_REALTIME, ret) != 0){
+- // Unable to get high resolution time - fail over to low resolution time
++ // Unable to get high resolution time -
++ // fail over to low resolution time
+ timeval lowResTime;
+ gettimeofday(&lowResTime, NULL);
+ ret->tv_sec = lowResTime.tv_sec;
+@@ -173,17 +262,37 @@
+ }
+ }
+
+-static inline struct timespec get_highres_clock(){
++#else
++
++// Trick timer functions into thinking it has an nsec timer
++// but only use the low resolution (usec) timer.
++static inline void
++get_highres_clock(struct timespec* ret)
++{
++ timeval lowResTime;
++ gettimeofday(&lowResTime, NULL);
++ ret->tv_sec = lowResTime.tv_sec;
++ ret->tv_nsec = lowResTime.tv_usec*1000;
++}
++#endif
++
++static inline struct timespec
++get_highres_clock()
++{
+ struct timespec ret;
+ get_highres_clock(&ret);
+ return ret;
+ }
+
+-static inline bool timespec_empty(const struct timespec* ret){
++static inline bool
++timespec_empty(const struct timespec* ret)
++{
+ return ( (ret->tv_sec == 0 ) && (ret->tv_nsec == 0) );
+ }
+
+-static inline bool timespec_empty(const struct timespec ret){
++static inline bool
++timespec_empty(const struct timespec ret)
++{
+ return timespec_empty(&ret);
+ }
+
Modified: trunk/dports/science/gnuradio-radar-mono/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radar-mono/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-radar-mono/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,8 +6,7 @@
PortGroup archcheck 1.0
name gnuradio-radar-mono
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Radar Mono Component of GNU Radio.
long_description Radar Mono Component of GNU Radio: \
@@ -17,7 +16,7 @@
to a file for offline analysis.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -29,9 +28,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
port:usrp
@@ -39,11 +38,7 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libusrp.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--with-usrp \
@@ -60,16 +55,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-radio-astronomy/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radio-astronomy/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-radio-astronomy/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-radio-astronomy
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Radio Astronomy component of GNU Radio.
long_description Radio Astronomy of GNU Radio: \
Provides Radio Astronomy blocks and scripts.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-radio-astronomy
@@ -54,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-sounder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-sounder/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-sounder/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-sounder
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Sounder component of GNU Radio.
long_description Sounder of GNU Radio: \
Provides blocks and scripts for determining the impulse response of a channel.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,9 +25,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
port:usrp
@@ -36,11 +35,7 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libusrp.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--with-usrp \
@@ -57,16 +52,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-trellis/Portfile
===================================================================
--- trunk/dports/science/gnuradio-trellis/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-trellis/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-trellis
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Trellis component of GNU Radio.
long_description Trellis component of GNU Radio: \
Provides trellis-based encoder and decoding blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,19 +25,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
archcheck.files lib/libgnuradio-core.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-trellis
@@ -54,16 +49,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-usrp/Portfile
===================================================================
--- trunk/dports/science/gnuradio-usrp/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-usrp/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-usrp
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description USRP component of GNU Radio.
long_description USRP component of GNU Radio: \
Provides USRP input and output blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,9 +25,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
port:usrp
@@ -36,11 +35,11 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libusrp.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
+# fix #includes for already installed USRP SWIG and C++ headers;
+# will be fixed in 3.3.1.
+patchfiles patch_gr-usrp_src_usrp_swig_files.diff
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--with-usrp \
@@ -57,16 +56,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Deleted: trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-usrp/files/patch-configure.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-usrp/files/patch-configure.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,437 +0,0 @@
---- configure.orig 2010-02-05 11:31:50.000000000 -0500
-+++ configure 2010-02-05 11:30:39.000000000 -0500
-@@ -28118,8 +28118,233 @@
-
- enable_latex_docs=NO
-
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+ return $1
-+} # as_fn_set_status
-+
-+# ac_fn_c_try_run LINENO
-+# ----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+# that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then :
-+ ac_retval=0
-+else
-+ $as_echo "$as_me: program exited with status $ac_status" >&5
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_retval=$ac_status
-+fi
-+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_run
-+
-+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-+# --------------------------------------------
-+# Tries to find the compile-time value of EXPR in a program that includes
-+# INCLUDES, setting VAR accordingly. Returns whether the value could be
-+# computed
-+ac_fn_c_compute_int ()
-+{
-+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=$ac_mid; break
-+else
-+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_lo=$ac_mid; break
-+else
-+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ ac_lo= ac_hi=
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=$ac_mid
-+else
-+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in #((
-+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-+'') ac_retval=1 ;;
-+esac
-+ else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+static long int longval () { return $2; }
-+static unsigned long int ulongval () { return $2; }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ return 1;
-+ if (($2) < 0)
-+ {
-+ long int i = longval ();
-+ if (i != ($2))
-+ return 1;
-+ fprintf (f, "%ld", i);
-+ }
-+ else
-+ {
-+ unsigned long int i = ulongval ();
-+ if (i != ($2))
-+ return 1;
-+ fprintf (f, "%lu", i);
-+ }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-+else
-+ ac_retval=1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f conftest.val
-+
-+ fi
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_compute_int
-
-
-
-@@ -28127,7 +28352,57 @@
- if test "${with_md_cpu+set}" = set; then
- withval=$with_md_cpu; cf_with_md_cpu="$withval"
- else
-- cf_with_md_cpu="$host_cpu"
-+
-+ if test "$cross_compiling" != no; then
-+ cf_with_md_cpu="$host_cpu"
-+ else
-+ case "$host_os" in
-+ *darwin*10*)
-+ # The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
-+$as_echo_n "checking size of void*... " >&6; }
-+if test "${ac_cv_sizeof_voidp+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then :
-+
-+else
-+ if test "$ac_cv_type_voidp" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void*)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_voidp=0
-+ fi
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
-+$as_echo "$ac_cv_sizeof_voidp" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-+_ACEOF
-+
-+
-+ if test "$ac_cv_sizeof_voidp" = 4; then
-+ cf_with_md_cpu="i386"
-+ else
-+ cf_with_md_cpu="x86_64"
-+ fi
-+ ;;
-+ *)
-+ cf_with_md_cpu="$host_cpu"
-+ ;;
-+ esac
-+ fi
- fi
-
-
-@@ -28235,8 +28510,8 @@
-
- { $as_echo "$as_me:$LINENO: checking for machine dependent speedups" >&5
- $as_echo_n "checking for machine dependent speedups... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $MD_CPU" >&5
--$as_echo "$MD_CPU" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $MD_CPU, $MD_SUBCPU" >&5
-+$as_echo "$MD_CPU, $MD_SUBCPU" >&6; }
-
-
-
-@@ -35909,12 +36184,12 @@
- pkg_cv_USB_CFLAGS="$USB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null`
-+ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35930,12 +36205,12 @@
- pkg_cv_USB_LIBS="$USB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null`
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35957,12 +36232,12 @@
- pkg_cv_USB_LIBS="$USB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null`
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35977,12 +36252,12 @@
- pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb" 2>/dev/null`
-+ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -36002,9 +36277,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb"`
-+ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-legacy"`
- else
-- USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb"`
-+ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-legacy"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$USB_PKG_ERRORS" >&5
-@@ -36162,8 +36437,8 @@
- _ACEOF
-
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&6; }
- fi
-
- done
-@@ -36263,8 +36538,8 @@
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- USB_LIBS="$LIBS"
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
- fi
-
-
-@@ -36429,8 +36704,8 @@
- _ACEOF
-
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&6; }
- fi
-
- done
-@@ -36530,8 +36805,8 @@
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- USB_LIBS="$LIBS"
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
- fi
-
-
-@@ -36567,8 +36842,8 @@
-
- :
- else
-- passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
--$as_echo "Unable to find dependency libusb." >&6; }
-+ passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb-legacy." >&5
-+$as_echo "Unable to find dependency libusb-legacy." >&6; }
- fi
-
-
Added: trunk/dports/science/gnuradio-usrp/files/patch_gr-usrp_src_usrp_swig_files.diff
===================================================================
--- trunk/dports/science/gnuradio-usrp/files/patch_gr-usrp_src_usrp_swig_files.diff (rev 0)
+++ trunk/dports/science/gnuradio-usrp/files/patch_gr-usrp_src_usrp_swig_files.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -0,0 +1,31 @@
+--- gr-usrp/src/usrp_swig.i.orig 2010-08-27 15:18:06.000000000 -0400
++++ gr-usrp/src/usrp_swig.i 2010-08-27 15:18:50.000000000 -0400
+@@ -27,9 +27,9 @@
+ %}
+
+ %include <usrp/usrp_subdev_spec.h>
+-%include <usrp/db_base.i>
+-%include <fpga_regs_common.h>
+-%include <fpga_regs_standard.h>
++%include <db_base.i>
++%include <usrp/fpga_regs_common.h>
++%include <usrp/fpga_regs_standard.h>
+ %include "usrp_standard.i"
+ %include "usrp_base.i"
+ %include "usrp_source_base.i"
+--- gr-usrp/src/usrp_standard.i.orig 2010-08-27 15:22:43.000000000 -0400
++++ gr-usrp/src/usrp_standard.i 2010-08-27 15:20:56.000000000 -0400
+@@ -24,11 +24,11 @@
+
+ %{
+ #include <usrp/usrp_standard.h>
+-#include <usrp_spi_defs.h>
++#include <usrp/usrp_spi_defs.h>
+ #include <usrp/usrp_dbid.h>
+ %}
+
+-%include <usrp_spi_defs.h>
++%include <usrp/usrp_spi_defs.h>
+ %include <usrp/usrp_dbid.h>
+
+ %constant int FPGA_MODE_NORMAL = usrp_standard_rx::FPGA_MODE_NORMAL;
Modified: trunk/dports/science/gnuradio-utils/Portfile
===================================================================
--- trunk/dports/science/gnuradio-utils/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-utils/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -4,15 +4,14 @@
PortSystem 1.0
name gnuradio-utils
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description GR Utils component of GNU Radio.
long_description GR Utils component of GNU Radio: \
Python-based scripts for plotting and USRP functions.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -24,18 +23,14 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-wxgui \
port:usrp
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--with-gr-wxgui \
@@ -53,16 +48,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-video-sdl/Portfile
===================================================================
--- trunk/dports/science/gnuradio-video-sdl/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-video-sdl/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,15 +6,14 @@
PortGroup archcheck 1.0
name gnuradio-video-sdl
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description Video SDL component of GNU Radio.
long_description Video SDL of GNU Radio: \
Provides SDL video source and sink blocks.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -26,9 +25,9 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core \
path:lib/pkgconfig/sdl.pc:libsdl
@@ -36,11 +35,7 @@
archcheck.files lib/libgnuradio-core.dylib \
lib/libSDL.dylib
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-video-sdl
@@ -56,16 +51,26 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/gnuradio-wxgui/Portfile
===================================================================
--- trunk/dports/science/gnuradio-wxgui/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/gnuradio-wxgui/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -4,15 +4,14 @@
PortSystem 1.0
name gnuradio-wxgui
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description WX GUI component of GNU Radio.
long_description WX GUI component of GNU Radio: \
Wx-based GUI widgets, including OpenGL option.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -24,17 +23,13 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
depends_lib port:gnuradio-core
-# version 3.2.2 requires this; next version won't
-patchfiles patch-configure.diff
-
configure.args --disable-all-components \
- --with-omnithread \
--with-gruel \
--with-gnuradio-core \
--enable-gr-wxgui
@@ -50,7 +45,8 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
configure.env PYTHON=${prefix}/bin/python2.5
depends_lib-append port:python25 \
port:py25-wxpython \
@@ -58,7 +54,8 @@
port:py25-opengl
}
-variant python26 conflicts python25 description "Use Python 2.6" {
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
configure.env PYTHON=${prefix}/bin/python2.6
depends_lib-append port:python26 \
port:py26-wxpython \
@@ -66,6 +63,17 @@
port:py26-opengl
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27 \
+ port:py27-wxpython \
+ port:py27-numpy \
+ port:py27-opengl
+}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
default_variants +python26
}
Modified: trunk/dports/science/usrp/Portfile
===================================================================
--- trunk/dports/science/usrp/Portfile 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/Portfile 2010-09-01 18:54:21 UTC (rev 71114)
@@ -6,14 +6,13 @@
PortGroup archcheck 1.0
name usrp
-version 3.2.2
-revision 1
+version 3.3.0
maintainers michaelld
description USRP user-space driver / interface via USB.
long_description USRP user-space driver / interface via USB.
categories science
-homepage http://gnuradio.org
+homepage http://gnuradio.org/
# all GNU Radio components come in a single tarball.
# Reuse this tarball for each Port
@@ -25,31 +24,15 @@
platforms darwin macosx
-checksums md5 3fedcd64c2f51671cc1417b4c1e06834 \
- sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
- rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
+checksums md5 cef9ef65d626e1273c6381966ae9d4bc \
+ sha1 41d5c177b173ce73404f5fe539b013c82600f73f \
+ rmd160 ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
-depends_build port:sdcc
+depends_build port:gnuradio-gruel \
+ port:sdcc
-depends_lib port:gnuradio-omnithread \
- port:libusb-legacy
-
-archcheck.files lib/libgromnithread.dylib \
- lib/libusb-legacy/libusb.dylib
-
-# version 3.2.2 requires these; next version won't
-patchfiles patch-configure.diff \
- patch-usrp_host_lib_legacy_Makefile.in.diff \
- patch-usrp_host_apps_Makefile.in.diff \
- patch-usrp_host_lib_legacy_circular_linked_list.h.diff \
- patch-usrp_host_lib_legacy_ciurcular_buffer.h.diff \
- patch-usrp_host_lib_legacy_darwin.h.diff \
- patch-usrp_host_lib_legacy_fusb_darwin.cc.diff \
- patch-usrp_host_lib_legacy_fusb_darwin.h.diff \
- patch-usrp_usrp.pc.in.diff
-
configure.args --disable-all-components \
- --with-omnithread \
+ --with-gruel \
--enable-usrp
use_parallel_build yes
@@ -63,16 +46,51 @@
configure.args-append --disable-doxygen --disable-docs
}
-variant python25 conflicts python26 description "Use Python 2.5" {
- configure.env PYTHON=${prefix}/bin/python2.5
- depends_lib-append port:python25
+variant python25 conflicts python26 python27 \
+description "Use Python 2.5" {
+ configure.env PYTHON=${prefix}/bin/python2.5
+ depends_lib-append port:python25
}
-variant python26 conflicts python25 description "Use Python 2.6" {
- configure.env PYTHON=${prefix}/bin/python2.6
- depends_lib-append port:python26
+variant python26 conflicts python25 python27 \
+description "Use Python 2.6" {
+ configure.env PYTHON=${prefix}/bin/python2.6
+ depends_lib-append port:python26
}
-if { ![variant_isset python25] && ![variant_isset python26] } {
- default_variants +python26
+variant python27 conflicts python25 python26 \
+description "Use Python 2.7" {
+ configure.env PYTHON=${prefix}/bin/python2.7
+ depends_lib-append port:python27
}
+
+if { ![variant_isset python25] && \
+ ![variant_isset python26] && \
+ ![variant_isset python27] } {
+ default_variants +python26
+}
+
+variant libusb-legacy \
+description "Use LIBUSB legacy version for USB transport" {
+ depends_lib-append port:libusb-legacy
+ archcheck.files-append [exec find ${prefix}/lib/libusb-legacy \
+ -name "libusb*.dylib" -type f | \
+ grep -v pp | \
+ sed -e "s@${prefix}/@@g"]
+
+ # fix LIBUSB search to include 'usb_debug' symbol, so-as
+ # to avoid using the 'compat' library.
+ patchfiles patch-configure-libusb.diff
+}
+
+variant libusb-1 \
+description "Use LIBUSB version 1.0 for USB transport" {
+ depends_lib-append port:libusb
+ archcheck.files-append lib/libusb-1.0.dylib
+ configure.args-append --with-fusb-tech=libusb1
+}
+
+if { ![variant_isset libusb-legacy] && \
+ ![variant_isset libusb-1] } {
+ default_variants +libusb-legacy
+}
Deleted: trunk/dports/science/usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-configure.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-configure.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,437 +0,0 @@
---- configure.orig 2010-02-05 11:31:50.000000000 -0500
-+++ configure 2010-02-05 11:30:39.000000000 -0500
-@@ -28118,8 +28118,233 @@
-
- enable_latex_docs=NO
-
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+ return $1
-+} # as_fn_set_status
-+
-+# ac_fn_c_try_run LINENO
-+# ----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+# that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+ { { case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; }; then :
-+ ac_retval=0
-+else
-+ $as_echo "$as_me: program exited with status $ac_status" >&5
-+ $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_retval=$ac_status
-+fi
-+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_run
-+
-+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-+# --------------------------------------------
-+# Tries to find the compile-time value of EXPR in a program that includes
-+# INCLUDES, setting VAR accordingly. Returns whether the value could be
-+# computed
-+ac_fn_c_compute_int ()
-+{
-+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if test "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_lo=0 ac_mid=0
-+ while :; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=$ac_mid; break
-+else
-+ as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_lo=$ac_mid; break
-+else
-+ as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ done
-+else
-+ ac_lo= ac_hi=
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-+test_array [0] = 0
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+ ac_hi=$ac_mid
-+else
-+ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in #((
-+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-+'') ac_retval=1 ;;
-+esac
-+ else
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+$4
-+static long int longval () { return $2; }
-+static unsigned long int ulongval () { return $2; }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ return 1;
-+ if (($2) < 0)
-+ {
-+ long int i = longval ();
-+ if (i != ($2))
-+ return 1;
-+ fprintf (f, "%ld", i);
-+ }
-+ else
-+ {
-+ unsigned long int i = ulongval ();
-+ if (i != ($2))
-+ return 1;
-+ fprintf (f, "%lu", i);
-+ }
-+ /* Do not output a trailing newline, as this causes \r\n confusion
-+ on some platforms. */
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+ echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-+else
-+ ac_retval=1
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
-+rm -f conftest.val
-+
-+ fi
-+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_compute_int
-
-
-
-@@ -28127,7 +28352,57 @@
- if test "${with_md_cpu+set}" = set; then
- withval=$with_md_cpu; cf_with_md_cpu="$withval"
- else
-- cf_with_md_cpu="$host_cpu"
-+
-+ if test "$cross_compiling" != no; then
-+ cf_with_md_cpu="$host_cpu"
-+ else
-+ case "$host_os" in
-+ *darwin*10*)
-+ # The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void*" >&5
-+$as_echo_n "checking size of void*... " >&6; }
-+if test "${ac_cv_sizeof_voidp+set}" = set; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void*))" "ac_cv_sizeof_voidp" "$ac_includes_default"; then :
-+
-+else
-+ if test "$ac_cv_type_voidp" = yes; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (void*)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+ else
-+ ac_cv_sizeof_voidp=0
-+ fi
-+fi
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
-+$as_echo "$ac_cv_sizeof_voidp" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
-+_ACEOF
-+
-+
-+ if test "$ac_cv_sizeof_voidp" = 4; then
-+ cf_with_md_cpu="i386"
-+ else
-+ cf_with_md_cpu="x86_64"
-+ fi
-+ ;;
-+ *)
-+ cf_with_md_cpu="$host_cpu"
-+ ;;
-+ esac
-+ fi
- fi
-
-
-@@ -28235,8 +28510,8 @@
-
- { $as_echo "$as_me:$LINENO: checking for machine dependent speedups" >&5
- $as_echo_n "checking for machine dependent speedups... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: $MD_CPU" >&5
--$as_echo "$MD_CPU" >&6; }
-+ { $as_echo "$as_me:$LINENO: result: $MD_CPU, $MD_SUBCPU" >&5
-+$as_echo "$MD_CPU, $MD_SUBCPU" >&6; }
-
-
-
-@@ -35909,12 +36184,12 @@
- pkg_cv_USB_CFLAGS="$USB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb" 2>/dev/null`
-+ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35930,12 +36205,12 @@
- pkg_cv_USB_LIBS="$USB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null`
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35957,12 +36232,12 @@
- pkg_cv_USB_LIBS="$USB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb" 2>/dev/null`
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -35977,12 +36252,12 @@
- pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb\"") >&5
-- ($PKG_CONFIG --exists --print-errors "libusb") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb" 2>/dev/null`
-+ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-legacy" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -36002,9 +36277,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb"`
-+ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-legacy"`
- else
-- USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb"`
-+ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-legacy"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$USB_PKG_ERRORS" >&5
-@@ -36162,8 +36437,8 @@
- _ACEOF
-
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&6; }
- fi
-
- done
-@@ -36263,8 +36538,8 @@
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- USB_LIBS="$LIBS"
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
- fi
-
-
-@@ -36429,8 +36704,8 @@
- _ACEOF
-
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb.h not found. See http://libusb.sf.net" >&6; }
- fi
-
- done
-@@ -36530,8 +36805,8 @@
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- USB_LIBS="$LIBS"
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&5
-+$as_echo "USRP requires libusb-legacy. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
- fi
-
-
-@@ -36567,8 +36842,8 @@
-
- :
- else
-- passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
--$as_echo "Unable to find dependency libusb." >&6; }
-+ passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb-legacy." >&5
-+$as_echo "Unable to find dependency libusb-legacy." >&6; }
- fi
-
-
Deleted: trunk/dports/science/usrp/files/patch-configure.diff.orig
===================================================================
--- trunk/dports/science/usrp/files/patch-configure.diff.orig 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-configure.diff.orig 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,829 +0,0 @@
---- configure 2009-07-14 18:56:02.000000000 -0400
-+++ /Users/mlk/Desktop/configure_3.2.2 2009-10-26 15:30:14.000000000 -0400
-@@ -35894,9 +35894,195 @@
- fi
- done
-
-+ req_libusb1=no
-+ libusbok=no
-+ have_libusb1=no
-+ if test x$req_libusb1 = xyes; then
-
-
-- libusbok=yes
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for USB" >&5
-+$as_echo_n "checking for USB... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_CFLAGS"; then
-+ pkg_cv_USB_CFLAGS="$USB_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+if test x$cross_compiling = xyes
-+then
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_LIBS"; then
-+ pkg_cv_USB_LIBS="$USB_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+ _pkg_tmp=
-+ for flag in $pkg_cv_USB_LIBS; do
-+ case $flag in
-+ (-L/lib* | -L/usr/lib* ) ;; # ignore
-+ (*) _pkg_tmp="$_pkg_tmp $flag" ;;
-+ esac
-+ done
-+ pkg_cv_USB_LIBS="$_pkg_tmp"
-+else
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_LIBS"; then
-+ pkg_cv_USB_LIBS="$USB_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+fi
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_INCLUDEDIR"; then
-+ pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-1.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-1.0"`
-+ else
-+ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-1.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$USB_PKG_ERRORS" >&5
-+
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (libusb-1.0) were not met:
-+
-+$USB_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables USB_CFLAGS
-+and USB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&5
-+$as_echo "$as_me: error: Package requirements (libusb-1.0) were not met:
-+
-+$USB_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables USB_CFLAGS
-+and USB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+" >&2;}
-+ { (exit 1); exit 1; }; }
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables USB_CFLAGS
-+and USB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables USB_CFLAGS
-+and USB_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }; }
-+else
-+ USB_CFLAGS=$pkg_cv_USB_CFLAGS
-+ USB_LIBS=$pkg_cv_USB_LIBS
-+ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
-+
-+ USB_CPPFLAGS=""
-+ for flag in $USB_CFLAGS; do
-+ case $flag in
-+ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
-+ esac
-+ done
-+ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
-+
-+
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+ libusbok=yes
-+ have_libusb1=yes
-+ usb_header='libusb-1.0/libusb.h'
-+ usb_lib_func='libusb_bulk_transfer'
-+ usb_lib_name='usb-1.0'
-+
-+fi
-+ else
-+
-
-
-
-@@ -36011,283 +36197,187 @@
-
- { $as_echo "$as_me:$LINENO: result: no" >&5
- $as_echo "no" >&6; }
-+ libusbok=no
-+elif test $pkg_failed = untried; then
-+ libusbok=no
-+else
-+ USB_CFLAGS=$pkg_cv_USB_CFLAGS
-+ USB_LIBS=$pkg_cv_USB_LIBS
-+ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
-
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ USB_CPPFLAGS=""
-+ for flag in $USB_CFLAGS; do
-+ case $flag in
-+ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
-+ esac
-+ done
-+ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
-
-
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ libusbok=yes
-+fi
-+ if test $libusbok = no; then
-
--for ac_header in usb.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:$LINENO: checking for USB" >&5
-+$as_echo_n "checking for USB... " >&6; }
-+
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_CFLAGS"; then
-+ pkg_cv_USB_CFLAGS="$USB_CFLAGS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-legacy" 2>/dev/null`
-+else
-+ pkg_failed=yes
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
-+ fi
- else
-- # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ pkg_failed=untried
-+fi
-+
-+if test x$cross_compiling = xyes
-+then
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_LIBS"; then
-+ pkg_cv_USB_LIBS="$USB_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest.$ac_objext; then
-- ac_header_compiler=yes
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
-+ pkg_failed=yes
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+ fi
-+else
-+ pkg_failed=untried
-+fi
-+ _pkg_tmp=
-+ for flag in $pkg_cv_USB_LIBS; do
-+ case $flag in
-+ (-L/lib* | -L/usr/lib* ) ;; # ignore
-+ (*) _pkg_tmp="$_pkg_tmp $flag" ;;
-+ esac
-+ done
-+ pkg_cv_USB_LIBS="$_pkg_tmp"
-+else
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_LIBS"; then
-+ pkg_cv_USB_LIBS="$USB_LIBS"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null && {
-- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- }; then
-- ac_header_preproc=yes
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_LIBS=`$PKG_CONFIG --libs --static "libusb-legacy" 2>/dev/null`
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
-+ pkg_failed=yes
- fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
-- ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
-+ fi
- else
-- eval "$as_ac_Header=\$ac_header_preproc"
-+ pkg_failed=untried
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--
- fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-
-+if test -n "$PKG_CONFIG"; then
-+ if test -n "$USB_INCLUDEDIR"; then
-+ pkg_cv_USB_INCLUDEDIR="$USB_INCLUDEDIR"
-+ else
-+ if test -n "$PKG_CONFIG" && \
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-legacy\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "libusb-legacy") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "libusb-legacy" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
-+ fi
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ pkg_failed=untried
- fi
-
--done
-
-
-- save_LIBS="$LIBS"
-- case "$host_os" in
-- darwin*)
-- LIBS="$LIBS -lIOKit"
-- ;;
-- *) ;;
-- esac
-
-- { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5
--$as_echo_n "checking for library containing usb_bulk_write... " >&6; }
--if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$LIBS
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-+if test $pkg_failed = yes; then
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char usb_bulk_write ();
--int
--main ()
--{
--return usb_bulk_write ();
-- ;
-- return 0;
--}
--_ACEOF
--for ac_lib in '' usb; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_search_usb_bulk_write=$ac_res
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+ _pkg_short_errors_supported=no
- fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libusb-legacy"`
-+ else
-+ USB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libusb-legacy"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$USB_PKG_ERRORS" >&5
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-- :
--else
-- ac_cv_search_usb_bulk_write=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5
--$as_echo "$ac_cv_search_usb_bulk_write" >&6; }
--ac_res=$ac_cv_search_usb_bulk_write
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- USB_LIBS="$LIBS"
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ libusbok=no
-+elif test $pkg_failed = untried; then
-+ libusbok=no
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
--fi
-+ USB_CFLAGS=$pkg_cv_USB_CFLAGS
-+ USB_LIBS=$pkg_cv_USB_LIBS
-+ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
-
-+ USB_CPPFLAGS=""
-+ for flag in $USB_CFLAGS; do
-+ case $flag in
-+ -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
-+ esac
-+ done
-+ pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
-
-- LIBS="$save_LIBS"
-
-- ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ libusbok=yes
-+fi
-+ fi
-+ usb_header='usb.h'
-+ usb_lib_func='usb_bulk_write'
-+ usb_lib_name='usb'
-+ fi
-+ if test x$req_libusb1 != xyes || test $have_libusb1 = yes; then
-+ libusbok=yes
-
-
--elif test $pkg_failed = untried; then
-
-- ac_ext=c
-+ ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+ save_CPPFLAGS="$CPPFLAGS"
-+ if test x$USB_INCLUDEDIR != x; then
-+ USB_INCLUDES="-I$USB_INCLUDEDIR"
-+ CPPFLAGS="$CPPFLAGS $USB_INCLUDES"
-
-+ fi
-
--for ac_header in usb.h
-+for ac_header in $usb_header
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -36429,27 +36519,49 @@
- _ACEOF
-
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb.h not found. See http://libusb.sf.net" >&6; }
-+ libusbok=no
- fi
-
- done
-
-+ CPPFLAGS="$save_CPPFLAGS"
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-- save_LIBS="$LIBS"
-- case "$host_os" in
-- darwin*)
-- LIBS="$LIBS -lIOKit"
-- ;;
-- *) ;;
-- esac
-
-- { $as_echo "$as_me:$LINENO: checking for library containing usb_bulk_write" >&5
--$as_echo_n "checking for library containing usb_bulk_write... " >&6; }
--if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-+ if test $libusbok = no; then
-+ { $as_echo "$as_me:$LINENO: result: USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&5
-+$as_echo "USRP requires libusb header '$usb_header' which was not found or was not usable. See http://www.libusb.org" >&6; }
-+ else
-+
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ save_LIBS="$LIBS"
-+ LIBS=""
-+ case "$host_os" in
-+ darwin*)
-+ USB_LIBS="$USB_LIBS -lIOKit"
-+ LIBS="$USB_LIBS"
-+ ;;
-+ *) ;;
-+ esac
-+
-+as_ac_Lib=`$as_echo "ac_cv_lib_$usb_lib_name''_$usb_lib_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $usb_lib_func in -l$usb_lib_name" >&5
-+$as_echo_n "checking for $usb_lib_func in -l$usb_lib_name... " >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
- else
-- ac_func_search_save_LIBS=$LIBS
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$usb_lib_name $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -36463,23 +36575,16 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char usb_bulk_write ();
-+char $usb_lib_func ();
- int
- main ()
- {
--return usb_bulk_write ();
-+return $usb_lib_func ();
- ;
- return 0;
- }
- _ACEOF
--for ac_lib in '' usb; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- rm -f conftest.$ac_objext conftest$ac_exeext
-+rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-@@ -36500,78 +36605,64 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_search_usb_bulk_write=$ac_res
-+ eval "$as_ac_Lib=yes"
- else
- $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
-+ eval "$as_ac_Lib=no"
- fi
-
- rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext
-- if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-- break
--fi
--done
--if test "${ac_cv_search_usb_bulk_write+set}" = set; then
-- :
--else
-- ac_cv_search_usb_bulk_write=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_usb_bulk_write" >&5
--$as_echo "$ac_cv_search_usb_bulk_write" >&6; }
--ac_res=$ac_cv_search_usb_bulk_write
--if test "$ac_res" != no; then
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-- USB_LIBS="$LIBS"
-+ac_res=`eval 'as_val=${'$as_ac_Lib'}
-+ $as_echo "$as_val"'`
-+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_Lib'}
-+ $as_echo "$as_val"'`
-+ if test "x$as_val" = x""yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_LIB$usb_lib_name" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ LIBS="-l$usb_lib_name $LIBS"
-+
- else
-- libusbok=no; { $as_echo "$as_me:$LINENO: result: USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&5
--$as_echo "USRP requires libusb. usb_bulk_write not found. See http://libusb.sf.net" >&6; }
--fi
-
-+ libusbok=no
-+ { $as_echo "$as_me:$LINENO: result: USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&5
-+$as_echo "USRP requires library '$usb_lib_name' with function '$usb_lib_func', which was either not found or was not usable. See http://www.libusb.org" >&6; }
-
-- LIBS="$save_LIBS"
-+fi
-
-- ac_ext=c
-+ case "$host_os" in
-+ cygwin* | mingw*)
-+ USB_LIBS="$LIBS"
-+ ;;
-+ *) ;;
-+ esac
-+ LIBS="$save_LIBS"
-+ ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--
--else
-- USB_CFLAGS=$pkg_cv_USB_CFLAGS
-- USB_LIBS=$pkg_cv_USB_LIBS
-- USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
--
-- USB_CPPFLAGS=""
-- for flag in $USB_CFLAGS; do
-- case $flag in
-- -I* | -D* | -U*) USB_CPPFLAGS="$USB_CPPFLAGS $flag" ;;
-- esac
-- done
-- pkg_cv_USB_CPPFLAGS=$USB_CPPFLAGS
--
--
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
-- :
--fi
--
-- if test x$libusbok = xyes; then
--
-- :
-- else
-- passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
--$as_echo "Unable to find dependency libusb." >&6; }
- fi
-+ fi
-+ if test $libusbok = yes; then
-
--
-+ :
-+ else
-+ USB_INCLUDES=
-+ USB_LIBS=
-+ passed=no;{ $as_echo "$as_me:$LINENO: result: Unable to find dependency libusb." >&5
-+$as_echo "Unable to find dependency libusb." >&6; }
-+ fi
-
- sdccok=yes
- # Extract the first word of "sdcc", so it can be a program name with args.
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_apps_Makefile.in.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,11 +0,0 @@
---- usrp/host/apps/Makefile.in_old 2009-10-26 18:49:48.000000000 -0400
-+++ usrp/host/apps/Makefile.in 2009-10-26 18:50:36.000000000 -0400
-@@ -745,7 +745,7 @@
- STAMPS =
- MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT
- AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
-- $(WITH_INCLUDES)
-+ $(WITH_INCLUDES) -I$(USB_INCLUDEDIR)
-
- noinst_HEADERS = \
- time_stuff.h
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_Makefile.in.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,11 +0,0 @@
---- usrp/host/lib/legacy/Makefile.in_old 2009-10-26 16:39:12.000000000 -0400
-+++ usrp/host/lib/legacy/Makefile.in 2009-10-26 16:40:01.000000000 -0400
-@@ -794,7 +794,7 @@
- STAMPS = $(DEPDIR)/stamp-sources-generate*
- MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \
- *.loT stamp-sources-generate
--common_INCLUDES = $(USRP_INCLUDES)
-+common_INCLUDES = $(USRP_INCLUDES) -I$(USB_INCLUDEDIR)
- lib_LTLIBRARIES = libusrp.la
- libusrp_la_common_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 $(BOOST_LDFLAGS)
- libusrp_la_common_LIBADD = \
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_circular_linked_list.h.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_circular_linked_list.h.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_circular_linked_list.h.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,96 +0,0 @@
---- usrp/host/lib/legacy/circular_linked_list.h.orig 2010-02-04 20:33:16.000000000 -0500
-+++ usrp/host/lib/legacy/circular_linked_list.h 2010-02-04 20:37:18.000000000 -0500
-@@ -1,6 +1,6 @@
- /* -*- c++ -*- */
- /*
-- * Copyright 2006 Free Software Foundation, Inc.
-+ * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
-@@ -109,12 +109,12 @@
-
- private:
- s_node_ptr d_current, d_iterate, d_available, d_inUse;
-- UInt32 d_n_nodes, d_n_used;
-+ size_t d_n_nodes, d_n_used;
- mld_mutex_ptr d_internal;
- mld_condition_ptr d_ioBlock;
-
- public:
-- circular_linked_list (UInt32 n_nodes) {
-+ circular_linked_list (size_t n_nodes) {
- if (n_nodes == 0)
- throw std::runtime_error ("circular_linked_list(): n_nodes == 0");
-
-@@ -136,7 +136,7 @@
- l_prev->next (l_next);
- l_prev->prev (l_next);
- if (n_nodes > 2) {
-- UInt32 n = n_nodes - 2;
-+ size_t n = n_nodes - 2;
- while (n-- > 0) {
- d_current = new s_node<T> (l_prev, l_next);
- d_current->set_available ();
-@@ -171,17 +171,17 @@
- d_internal->lock ();
- // find an available node
- s_node_ptr l_node = d_available;
-- DEBUG (fprintf (stderr, "w "););
-+ DEBUG (std::cerr << "w ");
- while (! l_node) {
-- DEBUG (fprintf (stderr, "x\n"););
-+ DEBUG (std::cerr << "x" << std::endl);
- // the ioBlock condition will automatically unlock() d_internal
- d_ioBlock->wait ();
- // and lock() is here
-- DEBUG (fprintf (stderr, "y\n"););
-+ DEBUG (std::cerr << "y" << std::endl);
- l_node = d_available;
- }
-- DEBUG (fprintf (stderr, "::f_n_a_n: #u = %ld, node = %p\n",
-- num_used(), l_node););
-+ DEBUG (std::cerr << "::f_n_a_n: #u = " << num_used()
-+ << ", node = " << l_node << std::endl);
- // remove this one from the current available list
- if (num_available () == 1) {
- // last one, just set available to NULL
-@@ -203,8 +203,8 @@
- void make_node_available (s_node_ptr l_node) {
- if (!l_node) return;
- d_internal->lock ();
-- DEBUG (fprintf (stderr, "::m_n_a: #u = %ld, node = %p\n",
-- num_used(), l_node););
-+ DEBUG (std::cerr << "::m_n_a: #u = " << num_used()
-+ << ", node = " << l_node << std::endl);
- // remove this node from the inUse list
- if (num_used () == 1) {
- // last one, just set inUse to NULL
-@@ -219,10 +219,10 @@
- l_node->insert_before (d_available);
- d_n_used--;
-
-- DEBUG (fprintf (stderr, "s%ld ", d_n_used););
-+ DEBUG (std::cerr << "s" << d_n_used);
- // signal the condition when new data arrives
- d_ioBlock->signal ();
-- DEBUG (fprintf (stderr, "t "););
-+ DEBUG (std::cerr << "t ");
-
- // unlock the mutex for thread safety
- d_internal->unlock ();
-@@ -251,10 +251,10 @@
-
- __INLINE__ T object () { return (d_current->d_object); };
- __INLINE__ void object (T l_object) { d_current->d_object = l_object; };
-- __INLINE__ UInt32 num_nodes () { return (d_n_nodes); };
-- __INLINE__ UInt32 num_used () { return (d_n_used); };
-- __INLINE__ void num_used (UInt32 l_n_used) { d_n_used = l_n_used; };
-- __INLINE__ UInt32 num_available () { return (d_n_nodes - d_n_used); };
-+ __INLINE__ size_t num_nodes () { return (d_n_nodes); };
-+ __INLINE__ size_t num_used () { return (d_n_used); };
-+ __INLINE__ void num_used (size_t l_n_used) { d_n_used = l_n_used; };
-+ __INLINE__ size_t num_available () { return (d_n_nodes - d_n_used); };
- __INLINE__ void num_used_inc (void) {
- if (d_n_used < d_n_nodes) ++d_n_used;
- };
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_ciurcular_buffer.h.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_ciurcular_buffer.h.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_ciurcular_buffer.h.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,209 +0,0 @@
---- usrp/host/lib/legacy/circular_buffer.h.orig 2010-02-04 20:33:10.000000000 -0500
-+++ usrp/host/lib/legacy/circular_buffer.h 2010-02-04 20:37:18.000000000 -0500
-@@ -1,6 +1,6 @@
- /* -*- c++ -*- */
- /*
-- * Copyright 2006 Free Software Foundation, Inc.
-+ * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
-@@ -24,6 +24,7 @@
- #define _CIRCULAR_BUFFER_H_
-
- #include "mld_threads.h"
-+#include <iostream>
- #include <stdexcept>
-
- #ifndef DO_DEBUG
-@@ -43,8 +44,8 @@
- T* d_buffer;
-
- // the following are in Items (type T)
-- UInt32 d_bufLen_I, d_readNdx_I, d_writeNdx_I;
-- UInt32 d_n_avail_write_I, d_n_avail_read_I;
-+ size_t d_bufLen_I, d_readNdx_I, d_writeNdx_I;
-+ size_t d_n_avail_write_I, d_n_avail_read_I;
-
- // stuff to control access to class internals
- mld_mutex_ptr d_internal;
-@@ -69,7 +70,7 @@
- };
-
- public:
-- circular_buffer (UInt32 bufLen_I,
-+ circular_buffer (size_t bufLen_I,
- bool doWriteBlock = true, bool doFullRead = false) {
- if (bufLen_I == 0)
- throw std::runtime_error ("circular_buffer(): "
-@@ -81,10 +82,10 @@
- d_internal = NULL;
- d_readBlock = d_writeBlock = NULL;
- reset ();
-- DEBUG (fprintf (stderr, "c_b(): buf len (items) = %ld, "
-- "doWriteBlock = %s, doFullRead = %s\n", d_bufLen_I,
-- (d_doWriteBlock ? "true" : "false"),
-- (d_doFullRead ? "true" : "false")););
-+ DEBUG (std::cerr << "c_b(): buf len (items) = " << d_bufLen_
-+ << ", doWriteBlock = " << (d_doWriteBlock ? "true" : "false")
-+ << ", doFullRead = " << (d_doFullRead ? "true" : "false")
-+ << std::endl);
- };
-
- ~circular_buffer () {
-@@ -92,21 +93,21 @@
- delete [] d_buffer;
- };
-
-- inline UInt32 n_avail_write_items () {
-+ inline size_t n_avail_write_items () {
- d_internal->lock ();
-- UInt32 retVal = d_n_avail_write_I;
-+ size_t retVal = d_n_avail_write_I;
- d_internal->unlock ();
- return (retVal);
- };
-
-- inline UInt32 n_avail_read_items () {
-+ inline size_t n_avail_read_items () {
- d_internal->lock ();
-- UInt32 retVal = d_n_avail_read_I;
-+ size_t retVal = d_n_avail_read_I;
- d_internal->unlock ();
- return (retVal);
- };
-
-- inline UInt32 buffer_length_items () {return (d_bufLen_I);};
-+ inline size_t buffer_length_items () {return (d_bufLen_I);};
- inline bool do_write_block () {return (d_doWriteBlock);};
- inline bool do_full_read () {return (d_doFullRead);};
-
-@@ -149,14 +150,15 @@
- * buffer length is larger than the instantiated buffer length
- */
-
-- int enqueue (T* buf, UInt32 bufLen_I) {
-- DEBUG (fprintf (stderr, "enqueue: buf = %X, bufLen = %ld, #av_wr = %ld, "
-- "#av_rd = %ld.\n", (unsigned int)buf, bufLen_I,
-- d_n_avail_write_I, d_n_avail_read_I););
-+ int enqueue (T* buf, size_t bufLen_I) {
-+ DEBUG (std::cerr << "enqueue: buf = " << (void*) buf
-+ << ", bufLen = " << bufLen_I
-+ << ", #av_wr = " << d_n_avail_write_I
-+ << ", #av_rd = " << d_n_avail_read_I << std::endl);
- if (bufLen_I > d_bufLen_I) {
-- fprintf (stderr, "cannot add buffer longer (%ld"
-- ") than instantiated length (%ld"
-- ").\n", bufLen_I, d_bufLen_I);
-+ std::cerr << "ERROR: cannot add buffer longer ("
-+ << bufLen_I << ") than instantiated length ("
-+ << d_bufLen_I << ")." << std::endl;
- throw std::runtime_error ("circular_buffer::enqueue()");
- }
-
-@@ -175,25 +177,25 @@
- if (bufLen_I > d_n_avail_write_I) {
- if (d_doWriteBlock) {
- while (bufLen_I > d_n_avail_write_I) {
-- DEBUG (fprintf (stderr, "enqueue: #len > #a, waiting.\n"););
-+ DEBUG (std::cerr << "enqueue: #len > #a, waiting." << std::endl);
- // wait will automatically unlock() the internal mutex
- d_writeBlock->wait ();
- // and lock() it here.
- if (d_doAbort) {
- d_internal->unlock ();
-- DEBUG (fprintf (stderr, "enqueue: #len > #a, aborting.\n"););
-+ DEBUG (std::cerr << "enqueue: #len > #a, aborting." << std::endl);
- return (2);
- }
-- DEBUG (fprintf (stderr, "enqueue: #len > #a, done waiting.\n"););
-+ DEBUG (std::cerr << "enqueue: #len > #a, done waiting." << std::endl);
- }
- } else {
- d_n_avail_read_I = d_bufLen_I - bufLen_I;
- d_n_avail_write_I = bufLen_I;
-- DEBUG (fprintf (stderr, "circular_buffer::enqueue: overflow\n"););
-+ DEBUG (std::cerr << "circular_buffer::enqueue: overflow" << std::endl);
- retval = -1;
- }
- }
-- UInt32 n_now_I = d_bufLen_I - d_writeNdx_I, n_start_I = 0;
-+ size_t n_now_I = d_bufLen_I - d_writeNdx_I, n_start_I = 0;
- if (n_now_I > bufLen_I)
- n_now_I = bufLen_I;
- else if (n_now_I < bufLen_I)
-@@ -232,23 +234,24 @@
- * buffer length is larger than the instantiated buffer length
- */
-
-- int dequeue (T* buf, UInt32* bufLen_I) {
-- DEBUG (fprintf (stderr, "dequeue: buf = %X, *bufLen = %ld, #av_wr = %ld, "
-- "#av_rd = %ld.\n", (unsigned int)buf, *bufLen_I,
-- d_n_avail_write_I, d_n_avail_read_I););
-+ int dequeue (T* buf, size_t* bufLen_I) {
-+ DEBUG (std::cerr << "dequeue: buf = " << ((void*) buf)
-+ << ", *bufLen = " << (*bufLen_I)
-+ << ", #av_wr = " << d_n_avail_write_I
-+ << ", #av_rd = " << d_n_avail_read_I << std::endl);
- if (!bufLen_I)
- throw std::runtime_error ("circular_buffer::dequeue(): "
- "input bufLen pointer is NULL.\n");
- if (!buf)
- throw std::runtime_error ("circular_buffer::dequeue(): "
- "input buffer pointer is NULL.\n");
-- UInt32 l_bufLen_I = *bufLen_I;
-+ size_t l_bufLen_I = *bufLen_I;
- if (l_bufLen_I == 0)
- return (0);
- if (l_bufLen_I > d_bufLen_I) {
-- fprintf (stderr, "cannot remove buffer longer (%ld"
-- ") than instantiated length (%ld"
-- ").\n", l_bufLen_I, d_bufLen_I);
-+ std::cerr << "ERROR: cannot remove buffer longer ("
-+ << l_bufLen_I << ") than instantiated length ("
-+ << d_bufLen_I << ")." << std::endl;
- throw std::runtime_error ("circular_buffer::dequeue()");
- }
-
-@@ -259,34 +262,34 @@
- }
- if (d_doFullRead) {
- while (d_n_avail_read_I < l_bufLen_I) {
-- DEBUG (fprintf (stderr, "dequeue: #a < #len, waiting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a < #len, waiting." << std::endl);
- // wait will automatically unlock() the internal mutex
- d_readBlock->wait ();
- // and lock() it here.
- if (d_doAbort) {
- d_internal->unlock ();
-- DEBUG (fprintf (stderr, "dequeue: #a < #len, aborting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a < #len, aborting." << std::endl);
- return (2);
- }
-- DEBUG (fprintf (stderr, "dequeue: #a < #len, done waiting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a < #len, done waiting." << std::endl);
- }
- } else {
- while (d_n_avail_read_I == 0) {
-- DEBUG (fprintf (stderr, "dequeue: #a == 0, waiting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a == 0, waiting." << std::endl);
- // wait will automatically unlock() the internal mutex
- d_readBlock->wait ();
- // and lock() it here.
- if (d_doAbort) {
- d_internal->unlock ();
-- DEBUG (fprintf (stderr, "dequeue: #a == 0, aborting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a == 0, aborting." << std::endl);
- return (2);
- }
-- DEBUG (fprintf (stderr, "dequeue: #a == 0, done waiting.\n"););
-+ DEBUG (std::cerr << "dequeue: #a == 0, done waiting." << std::endl);
- }
- }
- if (l_bufLen_I > d_n_avail_read_I)
- l_bufLen_I = d_n_avail_read_I;
-- UInt32 n_now_I = d_bufLen_I - d_readNdx_I, n_start_I = 0;
-+ size_t n_now_I = d_bufLen_I - d_readNdx_I, n_start_I = 0;
- if (n_now_I > l_bufLen_I)
- n_now_I = l_bufLen_I;
- else if (n_now_I < l_bufLen_I)
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_darwin.h.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_darwin.h.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_darwin.h.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,228 +0,0 @@
---- usrp/host/lib/legacy/darwin_libusb.h.orig 2010-02-04 20:33:21.000000000 -0500
-+++ usrp/host/lib/legacy/darwin_libusb.h 2010-02-04 20:37:22.000000000 -0500
-@@ -1,6 +1,6 @@
- /* -*- c++ -*- */
- /*
-- * Copyright 2006 Free Software Foundation, Inc.
-+ * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
-@@ -42,28 +42,41 @@
- #include <IOKit/IOKitLib.h>
-
- extern "C" {
--static char *
-+
-+static const char* darwin_error_strings[] = {
-+ "no error",
-+ "device not opened for exclusive access",
-+ "no connection to an IOService",
-+ "no asyc port has been opened for interface",
-+ "another process has device opened for exclusive access",
-+ "pipe is stalled",
-+ "could not establish a connection to Darin kernel",
-+ "invalid argument",
-+ "unknown error"
-+};
-+
-+static const char *
- darwin_error_str (int result)
- {
- switch (result) {
- case kIOReturnSuccess:
-- return "no error";
-+ return (darwin_error_strings[0]);
- case kIOReturnNotOpen:
-- return "device not opened for exclusive access";
-+ return (darwin_error_strings[1]);
- case kIOReturnNoDevice:
-- return "no connection to an IOService";
-+ return (darwin_error_strings[2]);
- case kIOUSBNoAsyncPortErr:
-- return "no asyc port has been opened for interface";
-+ return (darwin_error_strings[3]);
- case kIOReturnExclusiveAccess:
-- return "another process has device opened for exclusive access";
-+ return (darwin_error_strings[4]);
- case kIOUSBPipeStalled:
-- return "pipe is stalled";
-+ return (darwin_error_strings[5]);
- case kIOReturnError:
-- return "could not establish a connection to Darin kernel";
-+ return (darwin_error_strings[6]);
- case kIOReturnBadArgument:
-- return "invalid argument";
-+ return (darwin_error_strings[7]);
- default:
-- return "unknown error";
-+ return (darwin_error_strings[8]);
- }
- }
-
-@@ -103,40 +116,49 @@
- extern int usb_error_errno;
- extern usb_error_type_t usb_error_type;
-
--#define USB_ERROR(r, x) \
-- do { \
-- usb_error_type = USB_ERROR_TYPE_ERRNO; \
-- usb_error_errno = x; \
-- return r; \
-- } while (0)
--
--#define USB_ERROR_STR(r, x, format, args...) \
-- do { \
-- usb_error_type = USB_ERROR_TYPE_STRING; \
-- snprintf(usb_error_str, sizeof(usb_error_str) - 1, format, ## args); \
-- if (usb_debug) \
-- fprintf(stderr, "USB error: %s\n", usb_error_str); \
-- return r; \
-- } while (0)
--
--#define USB_ERROR_STR_ORIG(x, format, args...) \
-- do { \
-- usb_error_type = USB_ERROR_TYPE_STRING; \
-- snprintf(usb_error_str, sizeof(usb_error_str) - 1, format, ## args); \
-- if (usb_debug) \
-- fprintf(stderr, "USB error: %s\n", usb_error_str); \
-- return x; \
-- } while (0)
--
--#define USB_ERROR_STR_NO_RET(x, format, args...) \
-- do { \
-- usb_error_type = USB_ERROR_TYPE_STRING; \
-- snprintf(usb_error_str, sizeof(usb_error_str) - 1, format, ## args); \
-- if (usb_debug) \
-- fprintf(stderr, "USB error: %s\n", usb_error_str); \
-- } while (0)
-+#define USB_ERROR(r, x) \
-+ do { \
-+ usb_error_type = USB_ERROR_TYPE_ERRNO; \
-+ usb_error_errno = x; \
-+ return (r); \
-+ } while (0)
-+
-+#define USB_ERROR_STR(r, x, format, args...) \
-+ do { \
-+ usb_error_type = USB_ERROR_TYPE_STRING; \
-+ snprintf (usb_error_str, sizeof (usb_error_str) - 1, \
-+ format, ## args); \
-+ if (usb_debug) { \
-+ std::cerr << "USB error: " << usb_error_str << std::cerr; \
-+ } \
-+ return (r); \
-+ } while (0)
-+
-+#define USB_ERROR_STR_ORIG(x, format, args...) \
-+ do { \
-+ usb_error_type = USB_ERROR_TYPE_STRING; \
-+ snprintf (usb_error_str, sizeof (usb_error_str) - 1, \
-+ format, ## args); \
-+ if (usb_debug) { \
-+ std::cerr << "USB error: " << usb_error_str << std::endl; \
-+ } \
-+ return (x); \
-+ } while (0)
-+
-+#define USB_ERROR_STR_NO_RET(x, format, args...) \
-+ do { \
-+ usb_error_type = USB_ERROR_TYPE_STRING; \
-+ snprintf (usb_error_str, sizeof (usb_error_str) - 1, \
-+ format, ## args); \
-+ if (usb_debug) { \
-+ std::cerr << "USB error: " << usb_error_str << std::endl; \
-+ } \
-+ } while (0)
-
--/* simple function that figures out what pipeRef is associated with an endpoint */
-+/*
-+ * simple function that figures out what pipeRef
-+ * is associated with an endpoint
-+ */
- static int ep_to_pipeRef (darwin_dev_handle *device, int ep)
- {
- io_return_t ret;
-@@ -145,45 +167,60 @@
- UInt16 dont_care2;
- int i;
-
-- if (usb_debug > 3)
-- fprintf(stderr, "Converting ep address to pipeRef.\n");
-+ if (usb_debug > 3) {
-+ std::cerr << "Converting ep address to pipeRef." << std::endl;
-+ }
-
- /* retrieve the total number of endpoints on this interface */
- ret = (*(device->interface))->GetNumEndpoints(device->interface, &numep);
- if ( ret ) {
-- if ( usb_debug > 3 )
-- fprintf ( stderr, "ep_to_pipeRef: interface is %p\n", device->interface );
-- USB_ERROR_STR_ORIG ( -ret, "ep_to_pipeRef: can't get number of endpoints for interface" );
-+ if ( usb_debug > 3 ) {
-+ std::cerr << "ep_to_pipeRef: interface is "
-+ << device->interface << std::endl;
-+ }
-+ USB_ERROR_STR_ORIG ( -ret, "ep_to_pipeRef: can't get number of "
-+ "endpoints for interface" );
- }
-
- /* iterate through the pipeRefs until we find the correct one */
- for (i = 1 ; i <= numep ; i++) {
-- ret = (*(device->interface))->GetPipeProperties(device->interface, i, &direction, &number,
-- &dont_care1, &dont_care2, &dont_care3);
-+ ret = (*(device->interface))->GetPipeProperties
-+ (device->interface, i, &direction, &number,
-+ &dont_care1, &dont_care2, &dont_care3);
-
- if (ret != kIOReturnSuccess) {
-- fprintf (stderr, "ep_to_pipeRef: an error occurred getting pipe information on pipe %d\n",
-- i );
-- USB_ERROR_STR_ORIG (-darwin_to_errno(ret), "ep_to_pipeRef(GetPipeProperties): %s", darwin_error_str(ret));
-- }
-+ std::cerr << "ep_to_pipeRef: an error occurred getting "
-+ << "pipe information on pipe " << i << std::endl;
-
-- if (usb_debug > 3)
-- fprintf (stderr, "ep_to_pipeRef: Pipe %i: DIR: %i number: %i\n", i, direction, number);
-+ USB_ERROR_STR_ORIG (-darwin_to_errno(ret),
-+ "ep_to_pipeRef(GetPipeProperties): %s",
-+ darwin_error_str(ret));
-+ }
-
-- /* calculate the endpoint of the pipe and check it versus the requested endpoint */
-- if ( ((direction << 7 & USB_ENDPOINT_DIR_MASK) | (number & USB_ENDPOINT_ADDRESS_MASK)) == ep ) {
-- if (usb_debug > 3)
-- fprintf(stderr, "ep_to_pipeRef: pipeRef for ep address 0x%02x found: 0x%02x\n", ep, i);
-+ if (usb_debug > 3) {
-+ std::cerr << "ep_to_pipeRef: Pipe " << i << ": DIR: "
-+ << direction << " number: " << number << std::endl;
-+ }
-
-- return i;
-+ /* calculate the endpoint of the pipe and check it versus
-+ the requested endpoint */
-+ if ( ((direction << 7 & USB_ENDPOINT_DIR_MASK) |
-+ (number & USB_ENDPOINT_ADDRESS_MASK)) == ep ) {
-+ if (usb_debug > 3) {
-+ std::cerr << "ep_to_pipeRef: pipeRef for ep address "
-+ << ep << " found: " << i << std::endl;
-+ }
-+ return (i);
- }
- }
-
-- if (usb_debug > 3)
-- fprintf(stderr, "ep_to_pipeRef: No pipeRef found with endpoint address 0x%02x.\n", ep);
--
-+ if (usb_debug > 3) {
-+ std::cerr << "ep_to_pipeRef: No pipeRef found with endpoint address "
-+ << ep << std::endl;
-+ }
-+
- /* none of the found pipes match the requested endpoint */
-- return -1;
-+ return (-1);
- }
-
- }
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.cc.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.cc.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.cc.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,347 +0,0 @@
---- usrp/host/lib/legacy/fusb_darwin.cc.orig 2010-02-04 20:33:35.000000000 -0500
-+++ usrp/host/lib/legacy/fusb_darwin.cc 2010-02-04 20:37:34.000000000 -0500
-@@ -1,6 +1,6 @@
- /* -*- c++ -*- */
- /*
-- * Copyright 2006 Free Software Foundation, Inc.
-+ * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
-@@ -33,6 +33,7 @@
- #include "fusb.h"
- #include "fusb_darwin.h"
- #include "darwin_libusb.h"
-+#include <iostream>
-
- static const int USB_TIMEOUT = 100; // in milliseconds
- static const UInt8 NUM_QUEUE_ITEMS = 20;
-@@ -153,9 +154,10 @@
- USB_ERROR_STR (false, -ENOENT, "fusb_ephandle_darwin::start: "
- "device not initialized");
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::start: "
-- "dev = %p, device = %p\n", dev, device);
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::start: dev = " <<
-+ (void*) dev << ", device = " << (void*) device << std::endl;
-+ }
-
- d_interfaceRef = device->interface;
- if (! d_interfaceRef)
-@@ -165,10 +167,10 @@
-
- // get read or write pipe info (depends on "d_input_p")
-
-- if (usb_debug > 3)
-- fprintf (stderr, "fusb_ephandle_darwin::start "
-- "d_endpoint = %d, d_input_p = %s\n",
-- d_endpoint, d_input_p ? "TRUE" : "FALSE");
-+ if (usb_debug > 3) {
-+ std::cerr << "fusb_ephandle_darwin::start d_endpoint = " << d_endpoint
-+ << ", d_input_p = " << (d_input_p ? "TRUE" : "FALSE") << std::endl;
-+ }
-
- int l_endpoint = (d_input_p ? USB_ENDPOINT_IN : USB_ENDPOINT_OUT);
- int pipeRef = ep_to_pipeRef (device, d_endpoint | l_endpoint);
-@@ -184,12 +186,14 @@
- &d_transferType,
- &maxPacketSize,
- &interval);
-- if (usb_debug == 3)
-- fprintf (stderr, "fusb_ephandle_darwin::start: %s: ep = 0x%02x, "
-- "pipeRef = %d, d_i = %p, d_iR = %p, if_dir = %d, if_# = %d, "
-- "if_int = %d, if_maxPS = %d\n", d_input_p ? "read" : "write",
-- d_endpoint, d_pipeRef, d_interface, d_interfaceRef, direction,
-- number, interval, maxPacketSize);
-+ if (usb_debug == 3) {
-+ std::cerr << "fusb_ephandle_darwin::start: " << (d_input_p ? "read" : "write")
-+ << ": ep = " << d_endpoint << ", pipeRef = " << d_pipeRef << "interface = "
-+ << d_interface << ", interfaceRef = " << d_interfaceRef
-+ << ", if_direction = " << direction << ", if_# = " << number
-+ << ", if_interval = " << interval << ", if_maxPacketSize = "
-+ << maxPacketSize << std::endl;
-+ }
-
- // set global start boolean
- d_started = true;
-@@ -205,9 +209,10 @@
- // going; this will unlock the mutex before waiting for a signal ()
- d_runBlock->wait ();
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::start: %s started.\n",
-- d_input_p ? "read" : "write");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::start: " << (d_input_p ? "read" : "write")
-+ << " started." << std::endl;
-+ }
-
- return (true);
- }
-@@ -229,10 +234,10 @@
-
- bool l_input_p = This->d_input_p;
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::run_thread: "
-- "starting for %s.\n",
-- l_input_p ? "read" : "write");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::run_thread: starting for "
-+ << (l_input_p ? "read" : "write") << "." << std::endl;
-+ }
-
- usb_interface_t** l_interfaceRef = This->d_interfaceRef;
- usb_interface_t* l_interface = This->d_interface;
-@@ -286,9 +291,10 @@
- CFRunLoopRemoveSource (CFRunLoopGetCurrent (),
- l_cfSource, kCFRunLoopDefaultMode);
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::run_thread: finished for %s.\n",
-- l_input_p ? "read" : "write");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::run_thread: finished for "
-+ << (l_input_p ? "read" : "write") << "." << std::endl;
-+ }
-
- // release the run thread running mutex
- l_runThreadRunning->unlock ();
-@@ -297,8 +303,9 @@
- void
- fusb_ephandle_darwin::read_thread (void* arg)
- {
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::read_thread: starting.\n");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::read_thread: starting." << std::endl;
-+ }
-
- fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(arg);
-
-@@ -331,8 +338,9 @@
- l_node = l_queue->iterate_next ();
- }
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::read_thread: finished.\n");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::read_thread: finished." << std::endl;
-+ }
-
- // release the read running mutex, to let the parent thread knows
- // that this thread is finished
-@@ -343,10 +351,11 @@
- fusb_ephandle_darwin::read_issue (s_both_ptr l_both)
- {
- if ((! l_both) || (! d_started)) {
-- if (usb_debug > 4)
-- fprintf (stderr, "fusb_ephandle_darwin::read_issue: Doing nothing; "
-- "l_both is %X; started is %s\n", (unsigned int) l_both,
-- d_started ? "TRUE" : "FALSE");
-+ if (usb_debug > 4) {
-+ std::cerr << "fusb_ephandle_darwin::read_issue: Doing nothing; "
-+ << "l_both is " << (void*) l_both << "; started is "
-+ << (d_started ? "TRUE" : "FALSE") << std::endl;
-+ }
- return;
- }
-
-@@ -356,7 +365,7 @@
- void* v_buffer = (void*) l_buf->buffer ();
-
- // read up to d_bufLenBytes
-- UInt32 bufLen = d_bufLenBytes;
-+ size_t bufLen = d_bufLenBytes;
- l_buf->n_used (bufLen);
-
- // setup system call result
-@@ -378,9 +387,10 @@
- "(ReadPipeAsync%s): %s",
- d_transferType == kUSBInterrupt ? "" : "TO",
- darwin_error_str (result));
-- else if (usb_debug > 4)
-- fprintf (stderr, "fusb_ephandle_darwin::read_issue: "
-- "Queued %X (%ld Bytes)\n", (unsigned int) l_both, bufLen);
-+ else if (usb_debug > 4) {
-+ std::cerr << "fusb_ephandle_darwin::read_issue: Queued " << (void*) l_both
-+ << " (" << bufLen << " Bytes)" << std::endl;
-+ }
- }
-
- void
-@@ -388,26 +398,27 @@
- io_return_t result,
- void* io_size)
- {
-- UInt32 l_size = (UInt32) io_size;
-+ size_t l_size = (size_t) io_size;
- s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
- fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
- s_node_ptr l_node = l_both->node ();
- circular_buffer<char>* l_buffer = This->d_buffer;
- s_buffer_ptr l_buf = l_node->object ();
-- UInt32 l_i_size = l_buf->n_used ();
-+ size_t l_i_size = l_buf->n_used ();
-
-- if (This->d_started && (l_i_size != l_size))
-- fprintf (stderr, "fusb_ephandle_darwin::read_completed: "
-- "Expected %ld bytes; read %ld.\n",
-- l_i_size, l_size);
-- else if (usb_debug > 4)
-- fprintf (stderr, "fusb_ephandle_darwin::read_completed: "
-- "Read %X (%ld bytes)\n",
-- (unsigned int) l_both, l_size);
-+ if (This->d_started && (l_i_size != l_size)) {
-+ std::cerr << "fusb_ephandle_darwin::read_completed: Expected " << l_i_size
-+ << " bytes; read " << l_size << "." << std::endl;
-+ } else if (usb_debug > 4) {
-+ std::cerr << "fusb_ephandle_darwin::read_completed: Read " << (void*) l_both
-+ << " (" << l_size << " bytes)" << std::endl;
-+ }
-
--// add this read to the transfer buffer
-+// add this read to the transfer buffer, and check for overflow
-+// -> data is being enqueued faster than it can be dequeued
- if (l_buffer->enqueue (l_buf->buffer (), l_size) == -1) {
-- fputs ("iU", stderr);
-+// print out that there's an overflow
-+ fputs ("uO", stderr);
- fflush (stderr);
- }
-
-@@ -421,11 +432,13 @@
- int
- fusb_ephandle_darwin::read (void* buffer, int nbytes)
- {
-- UInt32 l_nbytes = (UInt32) nbytes;
-+ size_t l_nbytes = (size_t) nbytes;
- d_buffer->dequeue ((char*) buffer, &l_nbytes);
-
-- if (usb_debug > 4)
-- fprintf (stderr, "fusb_ephandle_darwin::read: request for %d bytes, %ld bytes retrieved.\n", nbytes, l_nbytes);
-+ if (usb_debug > 4) {
-+ std::cerr << "fusb_ephandle_darwin::read: request for " << nbytes
-+ << " bytes, " << l_nbytes << " bytes retrieved." << std::endl;
-+ }
-
- return ((int) l_nbytes);
- }
-@@ -433,18 +446,18 @@
- int
- fusb_ephandle_darwin::write (const void* buffer, int nbytes)
- {
-- UInt32 l_nbytes = (UInt32) nbytes;
-+ size_t l_nbytes = (size_t) nbytes;
-
- if (! d_started) {
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::write: Not yet started.\n");
--
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::write: Not yet started." << std::endl;
-+ }
- return (0);
- }
-
- while (l_nbytes != 0) {
- // find out how much data to copy; limited to "d_bufLenBytes" per node
-- UInt32 t_nbytes = (l_nbytes > d_bufLenBytes) ? d_bufLenBytes : l_nbytes;
-+ size_t t_nbytes = (l_nbytes > d_bufLenBytes) ? d_bufLenBytes : l_nbytes;
-
- // get next available node to write into;
- // blocks internally if none available
-@@ -476,8 +489,8 @@
- d_transferType == kUSBInterrupt ? "" : "TO",
- darwin_error_str (result));
- else if (usb_debug > 4) {
-- fprintf (stderr, "fusb_ephandle_darwin::write_thread: "
-- "Queued %X (%ld Bytes)\n", (unsigned int) l_both, t_nbytes);
-+ std::cerr << "fusb_ephandle_darwin::write_thread: Queued " << (void*) l_both
-+ << " (" << t_nbytes << " Bytes)" << std::endl;
- }
- l_nbytes -= t_nbytes;
- }
-@@ -492,19 +505,19 @@
- {
- s_both_ptr l_both = static_cast<s_both_ptr>(refCon);
- fusb_ephandle_darwin* This = static_cast<fusb_ephandle_darwin*>(l_both->This ());
-- UInt32 l_size = (UInt32) io_size;
-+ size_t l_size = (size_t) io_size;
- s_node_ptr l_node = l_both->node ();
- s_queue_ptr l_queue = This->d_queue;
- s_buffer_ptr l_buf = l_node->object ();
-- UInt32 l_i_size = l_buf->n_used ();
-+ size_t l_i_size = l_buf->n_used ();
-
-- if (This->d_started && (l_i_size != l_size))
-- fprintf (stderr, "fusb_ephandle_darwin::write_completed: "
-- "Expected %ld bytes written; wrote %ld.\n",
-- l_i_size, l_size);
-- else if (usb_debug > 4)
-- fprintf (stderr, "fusb_ephandle_darwin::write_completed: "
-- "Wrote %X (%ld Bytes)\n", (unsigned int) l_both, l_size);
-+ if (This->d_started && (l_i_size != l_size)) {
-+ std::cerr << "fusb_ephandle_darwin::write_completed: Expected " << l_i_size
-+ << " bytes written; wrote " << l_size << "." << std::endl;
-+ } else if (usb_debug > 4) {
-+ std::cerr << "fusb_ephandle_darwin::write_completed: Wrote " << (void*) l_both
-+ << " (" << l_size << " Bytes)" << std::endl;
-+ }
-
- // set buffer's # data to 0
- l_buf->n_used (0);
-@@ -515,8 +528,9 @@
- void
- fusb_ephandle_darwin::abort ()
- {
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::abort: starting.\n");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::abort: starting." << std::endl;
-+ }
-
- io_return_t result = d_interface->AbortPipe (d_interfaceRef, d_pipeRef);
-
-@@ -524,8 +538,9 @@
- USB_ERROR_STR_NO_RET (- darwin_to_errno (result),
- "fusb_ephandle_darwin::abort "
- "(AbortPipe): %s", darwin_error_str (result));
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::abort: finished.\n");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::abort: finished." << std::endl;
-+ }
- }
-
- bool
-@@ -534,9 +549,10 @@
- if (! d_started)
- return (true);
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::stop: stopping %s.\n",
-- d_input_p ? "read" : "write");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::stop: stopping "
-+ << (d_input_p ? "read" : "write") << "." << std::endl;
-+ }
-
- d_started = false;
-
-@@ -556,9 +572,10 @@
- d_runThreadRunning->lock ();
- d_runThreadRunning->unlock ();
-
-- if (usb_debug)
-- fprintf (stderr, "fusb_ephandle_darwin::stop: %s stopped.\n",
-- d_input_p ? "read" : "write");
-+ if (usb_debug) {
-+ std::cerr << "fusb_ephandle_darwin::stop: " << (d_input_p ? "read" : "write")
-+ << " stopped." << std::endl;
-+ }
-
- return (true);
- }
Deleted: trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.h.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.h.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_host_lib_legacy_fusb_darwin.h.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,56 +0,0 @@
---- usrp/host/lib/legacy/fusb_darwin.h.orig 2010-02-04 20:33:29.000000000 -0500
-+++ usrp/host/lib/legacy/fusb_darwin.h 2010-02-04 20:37:34.000000000 -0500
-@@ -1,6 +1,6 @@
- /* -*- c++ -*- */
- /*
-- * Copyright 2006 Free Software Foundation, Inc.
-+ * Copyright 2006,2009 Free Software Foundation, Inc.
- *
- * This file is part of GNU Radio.
- *
-@@ -75,10 +75,10 @@
- {
- private:
- char* d_buffer;
-- UInt32 d_n_used, d_n_alloc;
-+ size_t d_n_used, d_n_alloc;
-
- public:
-- inline s_buffer (UInt32 n_alloc = 0) {
-+ inline s_buffer (size_t n_alloc = 0) {
- d_n_used = 0;
- d_n_alloc = n_alloc;
- if (n_alloc) {
-@@ -92,17 +92,17 @@
- delete [] d_buffer;
- }
- };
-- inline UInt32 n_used () { return (d_n_used); };
-- inline void n_used (UInt32 bufLen) {
-+ inline size_t n_used () { return (d_n_used); };
-+ inline void n_used (size_t bufLen) {
- d_n_used = (bufLen > d_n_alloc) ? d_n_alloc : bufLen; };
-- inline UInt32 n_alloc () { return (d_n_alloc); };
-- void buffer (char* l_buffer, UInt32 bufLen) {
-+ inline size_t n_alloc () { return (d_n_alloc); };
-+ void buffer (char* l_buffer, size_t bufLen) {
- if (bufLen > d_n_alloc) {
-- fprintf (stderr, "s_buffer::set: Copying only allocated bytes.\n");
-+ std::cerr << "s_buffer::set: Copying only allocated bytes." << std::endl;
- bufLen = d_n_alloc;
- }
- if (!l_buffer) {
-- fprintf (stderr, "s_buffer::set: NULL buffer.\n");
-+ std::cerr << "s_buffer::set: NULL buffer." << std::endl;
- return;
- }
- bcopy (l_buffer, d_buffer, bufLen);
-@@ -173,7 +173,7 @@
- usb_interface_t* d_interface;
- s_queue_ptr d_queue;
- circular_buffer<char>* d_buffer;
-- UInt32 d_bufLenBytes;
-+ size_t d_bufLenBytes;
- mld_mutex_ptr d_readRunning;
- mld_condition_ptr d_runBlock, d_readBlock;
-
Deleted: trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff 2010-09-01 17:59:47 UTC (rev 71113)
+++ trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff 2010-09-01 18:54:21 UTC (rev 71114)
@@ -1,11 +0,0 @@
---- usrp/usrp.pc.in.orig 2010-02-04 20:32:12.000000000 -0500
-+++ usrp/usrp.pc.in 2010-02-04 21:25:44.000000000 -0500
-@@ -5,7 +5,7 @@
-
- Name: usrp
- Description: USRP Client Side C++ interface
--Requires: libusb @usrp_darwin_omnithread_pc_requires@
-+Requires: libusb-legacy @usrp_darwin_omnithread_pc_requires@
- Version: @VERSION@
- Libs: -L${libdir} -lusrp
- Cflags: -I${includedir} @DEFINES@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100901/13f4506c/attachment-0001.html>
More information about the macports-changes
mailing list