[63573] trunk/dports/science
michaelld at macports.org
michaelld at macports.org
Mon Feb 8 20:11:17 PST 2010
Revision: 63573
http://trac.macports.org/changeset/63573
Author: michaelld at macports.org
Date: 2010-02-08 20:11:14 -0800 (Mon, 08 Feb 2010)
Log Message:
-----------
initial fix for ticket 21292
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-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-grc/Portfile
trunk/dports/science/gnuradio-gruel/Portfile
trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
trunk/dports/science/gnuradio-mblock/Portfile
trunk/dports/science/gnuradio-omnithread/Portfile
trunk/dports/science/gnuradio-pager/Portfile
trunk/dports/science/gnuradio-pmt/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
trunk/dports/science/usrp/files/patch-configure.diff
trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
Added Paths:
-----------
trunk/dports/science/gnuradio/files/
trunk/dports/science/gnuradio/files/patch-configure.diff
trunk/dports/science/gnuradio-audio-jack/files/
trunk/dports/science/gnuradio-audio-jack/files/patch-configure.diff
trunk/dports/science/gnuradio-audio-osx/files/
trunk/dports/science/gnuradio-audio-osx/files/patch-configure.diff
trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx.h.diff
trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_sink.cc.diff
trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_source.cc.diff
trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_circular_buffer.h.diff
trunk/dports/science/gnuradio-audio-portaudio/files/
trunk/dports/science/gnuradio-audio-portaudio/files/patch-configure.diff
trunk/dports/science/gnuradio-core/files/
trunk/dports/science/gnuradio-core/files/patch-configure.diff
trunk/dports/science/gnuradio-cvsd-vocoder/files/
trunk/dports/science/gnuradio-cvsd-vocoder/files/patch-configure.diff
trunk/dports/science/gnuradio-examples/files/
trunk/dports/science/gnuradio-examples/files/patch-configure.diff
trunk/dports/science/gnuradio-gpio/files/
trunk/dports/science/gnuradio-gpio/files/patch-configure.diff
trunk/dports/science/gnuradio-grc/files/
trunk/dports/science/gnuradio-grc/files/patch-configure.diff
trunk/dports/science/gnuradio-gruel/files/
trunk/dports/science/gnuradio-gruel/files/patch-configure.diff
trunk/dports/science/gnuradio-gsm-fr-vocoder/files/
trunk/dports/science/gnuradio-gsm-fr-vocoder/files/patch-configure.diff
trunk/dports/science/gnuradio-mblock/files/
trunk/dports/science/gnuradio-mblock/files/patch-configure.diff
trunk/dports/science/gnuradio-omnithread/files/
trunk/dports/science/gnuradio-omnithread/files/patch-configure.diff
trunk/dports/science/gnuradio-pager/files/
trunk/dports/science/gnuradio-pager/files/patch-configure.diff
trunk/dports/science/gnuradio-pmt/files/
trunk/dports/science/gnuradio-pmt/files/patch-configure.diff
trunk/dports/science/gnuradio-radar-mono/files/
trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff
trunk/dports/science/gnuradio-radio-astronomy/files/
trunk/dports/science/gnuradio-radio-astronomy/files/patch-configure.diff
trunk/dports/science/gnuradio-sounder/files/
trunk/dports/science/gnuradio-sounder/files/patch-configure.diff
trunk/dports/science/gnuradio-trellis/files/
trunk/dports/science/gnuradio-trellis/files/patch-configure.diff
trunk/dports/science/gnuradio-usrp/files/
trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
trunk/dports/science/gnuradio-utils/files/
trunk/dports/science/gnuradio-utils/files/patch-configure.diff
trunk/dports/science/gnuradio-video-sdl/files/
trunk/dports/science/gnuradio-video-sdl/files/patch-configure.diff
trunk/dports/science/gnuradio-wxgui/files/
trunk/dports/science/gnuradio-wxgui/files/patch-configure.diff
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -5,6 +5,7 @@
name gnuradio
version 3.2.2
+revision 1
maintainers michaelld
description GNU Radio META-port installer.
long_description GNU Radio META-port installer: \
Added: trunk/dports/science/gnuradio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-audio-jack/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-jack/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-audio-jack/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-audio-jack
version 3.2.2
+revision 1
maintainers michaelld
description JACK component of GNU Radio.
long_description JACK component of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-core \
port:jack
+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 \
Added: trunk/dports/science/gnuradio-audio-jack/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-jack/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-jack/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-audio-osx/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-audio-osx/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-audio-osx
version 3.2.2
+revision 1
maintainers michaelld
description Mac OS X Audio component of GNU Radio.
long_description Mac OS X Audio component of GNU Radio: \
@@ -29,6 +32,15 @@
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 \
Added: trunk/dports/science/gnuradio-audio-osx/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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-audio-osx/files/patch-gr-audio-osx_src_audio_osx.h.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx.h.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx.h.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,68 @@
+--- gr-audio-osx/src/audio_osx.h.orig 2009-01-21 11:04:46.000000000 -0500
++++ gr-audio-osx/src/audio_osx.h 2010-02-05 11:33:58.000000000 -0500
+@@ -23,22 +23,33 @@
+ #ifndef INCLUDED_AUDIO_OSX_H
+ #define INCLUDED_AUDIO_OSX_H
+
+-#define CheckErrorAndThrow(err,what,throw_str) \
+-if (err) { \
+- OSStatus error = static_cast<OSStatus>(err); \
+- fprintf (stderr, "%s\n Error# %ld ('%4s')\n %s:%d\n", \
+- what, error, (char*)(&err), __FILE__, __LINE__); \
+- fflush (stdout); \
+- throw std::runtime_error (throw_str); \
+-}
+-
+-#define CheckError(err,what) \
+-if (err) { \
+- OSStatus error = static_cast<OSStatus>(err); \
+- fprintf (stderr, "%s\n Error# %ld ('%4s')\n %s:%d\n", \
+- what, error, (char*)(&err), __FILE__, __LINE__); \
+- fflush (stdout); \
+-}
++#include <iostream>
++#include <string.h>
++
++#define CheckErrorAndThrow(err,what,throw_str) \
++ if (err) { \
++ OSStatus error = static_cast<OSStatus>(err); \
++ char err_str[4]; \
++ strncpy (err_str, (char*)(&err), 4); \
++ std::cerr << what << std::endl; \
++ std::cerr << " Error# " << error << " ('" << err_str \
++ << "')" << std::endl; \
++ std::cerr << " " << __FILE__ << ":" << __LINE__ << std::endl; \
++ fflush (stderr); \
++ throw std::runtime_error (throw_str); \
++ }
++
++#define CheckError(err,what) \
++ if (err) { \
++ OSStatus error = static_cast<OSStatus>(err); \
++ char err_str[4]; \
++ strncpy (err_str, (char*)(&err), 4); \
++ std::cerr << what << std::endl; \
++ std::cerr << " Error# " << error << " ('" << err_str \
++ << "')" << std::endl; \
++ std::cerr << " " << __FILE__ << ":" << __LINE__ << std::endl; \
++ fflush (stderr); \
++ }
+
+ #ifdef WORDS_BIGENDIAN
+ #define GR_PCM_ENDIANNESS kLinearPCMFormatFlagIsBigEndian
+@@ -46,4 +57,15 @@
+ #define GR_PCM_ENDIANNESS 0
+ #endif
+
++// Check the version of MacOSX being used
++#ifdef __APPLE_CC__
++#include <AvailabilityMacros.h>
++#ifndef MAC_OS_X_VERSION_10_6
++#define MAC_OS_X_VERSION_10_6 1060
++#endif
++#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
++#define GR_USE_OLD_AUDIO_UNIT
++#endif
++#endif
++
+ #endif /* INCLUDED_AUDIO_OSX_H */
Added: trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_sink.cc.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_sink.cc.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_sink.cc.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,163 @@
+--- gr-audio-osx/src/audio_osx_sink.cc.orig 2010-02-05 11:34:24.000000000 -0500
++++ gr-audio-osx/src/audio_osx_sink.cc 2010-02-05 11:34:34.000000000 -0500
+@@ -47,19 +47,19 @@
+ d_OutputAU (0)
+ {
+ if (sample_rate <= 0) {
+- fprintf (stderr, "Invalid Sample Rate: %d\n", sample_rate);
++ std::cerr << "Invalid Sample Rate: " << sample_rate << std::endl;
+ throw std::invalid_argument ("audio_osx_sink::audio_osx_sink");
+ } else
+ d_sample_rate = (Float64) sample_rate;
+
+ if (channel_config <= 0 & channel_config != -1) {
+- fprintf (stderr, "Invalid Channel Config: %d\n", channel_config);
++ std::cerr << "Invalid Channel Config: " << channel_config << std::endl;
+ throw std::invalid_argument ("audio_osx_sink::audio_osx_sink");
+ } else if (channel_config == -1) {
+ // no user input; try "device name" instead
+ int l_n_channels = (int) strtol (device_name.data(), (char **)NULL, 10);
+ if (l_n_channels == 0 & errno) {
+- fprintf (stderr, "Error Converting Device Name: %d\n", errno);
++ std::cerr << "Error Converting Device Name: " << errno << std::endl;
+ throw std::invalid_argument ("audio_osx_sink::audio_osx_sink");
+ }
+ if (l_n_channels <= 0)
+@@ -79,7 +79,7 @@
+ if (max_sample_count == -1)
+ max_sample_count = sample_rate;
+ else if (max_sample_count <= 0) {
+- fprintf (stderr, "Invalid Max Sample Count: %d\n", max_sample_count);
++ std::cerr << "Invalid Max Sample Count: " << max_sample_count << std::endl;
+ throw std::invalid_argument ("audio_osx_sink::audio_osx_sink");
+ }
+
+@@ -98,21 +98,39 @@
+ OSStatus err = noErr;
+
+ // Open the default output unit
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ AudioComponentDescription desc;
++#else
+ ComponentDescription desc;
++#endif
++
+ desc.componentType = kAudioUnitType_Output;
+ desc.componentSubType = kAudioUnitSubType_DefaultOutput;
+ desc.componentManufacturer = kAudioUnitManufacturer_Apple;
+ desc.componentFlags = 0;
+ desc.componentFlagsMask = 0;
+
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ AudioComponent comp = AudioComponentFindNext(NULL, &desc);
++ if (comp == NULL) {
++ std::cerr << "AudioComponentFindNext Error" << std::endl;
++ throw std::runtime_error ("audio_osx_sink::audio_osx_sink");
++ }
++#else
+ Component comp = FindNextComponent (NULL, &desc);
+ if (comp == NULL) {
+- fprintf (stderr, "FindNextComponent Error\n");
++ std::cerr << "FindNextComponent Error" << std::endl;
+ throw std::runtime_error ("audio_osx_sink::audio_osx_sink");
+ }
++#endif
+
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ err = AudioComponentInstanceNew (comp, &d_OutputAU);
++ CheckErrorAndThrow (err, "AudioComponentInstanceNew", "audio_osx_sink::audio_osx_sink");
++#else
+ err = OpenAComponent (comp, &d_OutputAU);
+ CheckErrorAndThrow (err, "OpenAComponent", "audio_osx_sink::audio_osx_sink");
++#endif
+
+ // Set up a callback function to generate output to the output unit
+
+@@ -167,11 +185,10 @@
+ "audio_osx_sink::audio_osx_sink");
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "audio_osx_sink Parameters:\n");
+- fprintf (stderr, " Sample Rate is %g\n", d_sample_rate);
+- fprintf (stderr, " Number of Channels is %ld\n", d_n_channels);
+- fprintf (stderr, " Max # samples to store per channel is %ld",
+- d_max_sample_count);
++ std::cerr << "audio_osx_sink Parameters:" << std::endl;
++ std::cerr << " Sample Rate is " << d_sample_rate << std::endl;
++ std::cerr << " Number of Channels is " << d_n_channels << std::endl;
++ std::cerr << " Max # samples to store per channel is " << d_max_sample_count << std::endl;
+ #endif
+ }
+
+@@ -220,7 +237,11 @@
+ // stop and close the AudioUnit
+ stop ();
+ AudioUnitUninitialize (d_OutputAU);
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ AudioComponentInstanceDispose (d_OutputAU);
++#else
+ CloseComponent (d_OutputAU);
++#endif
+
+ // empty and delete the queues
+ for (UInt32 n = 0; n < d_n_channels; n++) {
+@@ -275,8 +296,8 @@
+ #endif
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "work1: qSC = %ld, lMC = %ld, dmSC = %ld, nOI = %d\n",
+- d_queueSampleCount, l_max_count, d_max_sample_count, noutput_items);
++ std::cerr << "work1: qSC = " << d_queueSampleCount << ", lMC = "<< l_max_count
++ << ", dmSC = " << d_max_sample_count << ", nOI = " << noutput_items << std::endl;
+ #endif
+
+ if (d_queueSampleCount > l_max_count) {
+@@ -318,7 +339,7 @@
+ if (res == -1) {
+ // data coming in too fast
+ // drop oldest buffer
+- fputs ("oX", stderr);
++ fputs ("aO", stderr);
+ fflush (stderr);
+ // set the local number of samples available to the max
+ d_queueSampleCount = d_buffers[0]->buffer_length_items ();
+@@ -328,8 +349,8 @@
+ }
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "work2: #OI = %4d, #Cnt = %4ld, mSC = %ld\n",
+- noutput_items, d_queueSampleCount, d_max_sample_count);
++ std::cerr << "work2: #OI = " << noutput_items << ", #Cnt = "
++ << d_queueSampleCount << ", mSC = " << d_max_sample_count << std::endl;
+ #endif
+
+ // release control to allow for other processing parts to run
+@@ -352,8 +373,8 @@
+ This->d_internal->lock ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb_in: SC = %4ld, in#F = %4ld\n",
+- This->d_queueSampleCount, inNumberFrames);
++ std::cerr << "cb_in: SC = " << This->d_queueSampleCount
++ << ", in#F = " << inNumberFrames << std::endl;
+ #endif
+
+ if (This->d_queueSampleCount < inNumberFrames) {
+@@ -364,7 +385,7 @@
+ int l_counter = This->d_n_channels;
+
+ while (--l_counter >= 0) {
+- UInt32 t_n_output_items = inNumberFrames;
++ size_t t_n_output_items = inNumberFrames;
+ float* outBuffer = (float*) ioData->mBuffers[l_counter].mData;
+ This->d_buffers[l_counter]->dequeue (outBuffer, &t_n_output_items);
+ if (t_n_output_items != inNumberFrames) {
+@@ -378,7 +399,7 @@
+ }
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb_out: SC = %4ld\n", This->d_queueSampleCount);
++ std::cerr << "cb_out: SC = " << This->d_queueSampleCount << std::endl;
+ #endif
+
+ // signal that data is available
Added: trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_source.cc.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_source.cc.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_audio_osx_source.cc.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,418 @@
+--- gr-audio-osx/src/audio_osx_source.cc.orig 2010-02-05 11:35:17.000000000 -0500
++++ gr-audio-osx/src/audio_osx_source.cc 2010-02-05 11:35:22.000000000 -0500
+@@ -37,18 +37,20 @@
+ void PrintStreamDesc (AudioStreamBasicDescription *inDesc)
+ {
+ if (inDesc == NULL) {
+- fprintf (stderr, "PrintStreamDesc: Can't print a NULL desc!\n");
++ std::cerr << "PrintStreamDesc: Can't print a NULL desc!" << std::endl;
+ return;
+ }
+
+- fprintf (stderr, " Sample Rate : %g\n", inDesc->mSampleRate);
+- fprintf (stderr, " Format ID : %4s\n", (char*)&inDesc->mFormatID);
+- fprintf (stderr, " Format Flags : %lX\n", inDesc->mFormatFlags);
+- fprintf (stderr, " Bytes per Packet : %ld\n", inDesc->mBytesPerPacket);
+- fprintf (stderr, " Frames per Packet : %ld\n", inDesc->mFramesPerPacket);
+- fprintf (stderr, " Bytes per Frame : %ld\n", inDesc->mBytesPerFrame);
+- fprintf (stderr, " Channels per Frame : %ld\n", inDesc->mChannelsPerFrame);
+- fprintf (stderr, " Bits per Channel : %ld\n", inDesc->mBitsPerChannel);
++ std::cerr << " Sample Rate : " << inDesc->mSampleRate << std::endl;
++ char format_id[4];
++ strncpy (format_id, (char*)(&inDesc->mFormatID), 4);
++ std::cerr << " Format ID : " << format_id << std::endl;
++ std::cerr << " Format Flags : " << inDesc->mFormatFlags << std::endl;
++ std::cerr << " Bytes per Packet : " << inDesc->mBytesPerPacket << std::endl;
++ std::cerr << " Frames per Packet : " << inDesc->mFramesPerPacket << std::endl;
++ std::cerr << " Bytes per Frame : " << inDesc->mBytesPerFrame << std::endl;
++ std::cerr << " Channels per Frame : " << inDesc->mChannelsPerFrame << std::endl;
++ std::cerr << " Bits per Channel : " << inDesc->mBitsPerChannel << std::endl;
+ }
+
+ // FIXME these should query some kind of user preference
+@@ -79,19 +81,19 @@
+ d_AudioConverter (0)
+ {
+ if (sample_rate <= 0) {
+- fprintf (stderr, "Invalid Sample Rate: %d\n", sample_rate);
++ std::cerr << "Invalid Sample Rate: " << sample_rate << std::endl;
+ throw std::invalid_argument ("audio_osx_source::audio_osx_source");
+ } else
+ d_outputSampleRate = (Float64) sample_rate;
+
+ if (channel_config <= 0 & channel_config != -1) {
+- fprintf (stderr, "Invalid Channel Config: %d\n", channel_config);
++ std::cerr << "Invalid Channel Config: " << channel_config << std::endl;
+ throw std::invalid_argument ("audio_osx_source::audio_osx_source");
+ } else if (channel_config == -1) {
+ // no user input; try "device name" instead
+ int l_n_channels = (int) strtol (device_name.data(), (char **)NULL, 10);
+ if (l_n_channels == 0 & errno) {
+- fprintf (stderr, "Error Converting Device Name: %d\n", errno);
++ std::cerr << "Error Converting Device Name: " << errno << std::endl;
+ throw std::invalid_argument ("audio_osx_source::audio_osx_source");
+ }
+ if (l_n_channels <= 0)
+@@ -107,14 +109,14 @@
+ if (max_sample_count == -1)
+ max_sample_count = sample_rate;
+ else if (max_sample_count <= 0) {
+- fprintf (stderr, "Invalid Max Sample Count: %d\n", max_sample_count);
++ std::cerr << "Invalid Max Sample Count: " << max_sample_count << std::endl;
+ throw std::invalid_argument ("audio_osx_source::audio_osx_source");
+ }
+
+ d_max_sample_count = max_sample_count;
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "source(): max # samples = %ld\n", d_max_sample_count);
++ std::cerr << "source(): max # samples = " << d_max_sample_count << std::endl;
+ #endif
+
+ OSStatus err = noErr;
+@@ -122,7 +124,12 @@
+ // create the default AudioUnit for input
+
+ // Open the default input unit
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ AudioComponentDescription InputDesc;
++#else
+ ComponentDescription InputDesc;
++#endif
++
+
+ InputDesc.componentType = kAudioUnitType_Output;
+ InputDesc.componentSubType = kAudioUnitSubType_HALOutput;
+@@ -130,15 +137,31 @@
+ InputDesc.componentFlags = 0;
+ InputDesc.componentFlagsMask = 0;
+
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ AudioComponent comp = AudioComponentFindNext (NULL, &InputDesc);
++#else
+ Component comp = FindNextComponent (NULL, &InputDesc);
++#endif
++
+ if (comp == NULL) {
+- fprintf (stderr, "FindNextComponent Error\n");
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ std::cerr << "AudioComponentFindNext Error" << std::endl;
++#else
++ std::cerr << "FindNextComponent Error" << std::endl;
++#endif
+ throw std::runtime_error ("audio_osx_source::audio_osx_source");
+ }
+
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ err = AudioComponentInstanceNew (comp, &d_InputAU);
++ CheckErrorAndThrow (err, "AudioComponentInstanceNew",
++ "audio_osx_source::audio_osx_source");
++#else
+ err = OpenAComponent (comp, &d_InputAU);
+ CheckErrorAndThrow (err, "OpenAComponent",
+ "audio_osx_source::audio_osx_source");
++#endif
++
+
+ UInt32 enableIO;
+
+@@ -208,7 +231,7 @@
+ CheckErrorAndThrow (err, "AudioUnitGetProperty HasIO",
+ "audio_osx_source::audio_osx_source");
+ if (hasInput == 0) {
+- fprintf (stderr, "Selected Audio Device does not support Input.\n");
++ std::cerr << "Selected Audio Device does not support Input." << std::endl;
+ throw std::runtime_error ("audio_osx_source::audio_osx_source");
+ }
+
+@@ -248,7 +271,7 @@
+ "audio_osx_source::audio_osx_source");
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "\n---- Device Stream Format ----\n" );
++ std::cerr << std::endl << "---- Device Stream Format ----" << std::endl;
+ PrintStreamDesc (&asbd_device);
+ #endif
+
+@@ -264,7 +287,7 @@
+ "audio_osx_source::audio_osx_source");
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "\n---- Client Stream Format ----\n");
++ std::cerr << std::endl << "---- Client Stream Format ----" << std::endl;
+ PrintStreamDesc (&asbd_client);
+ #endif
+
+@@ -436,22 +459,17 @@
+ "audio_osx_source::audio_osx_source");
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "audio_osx_source Parameters:\n");
+- fprintf (stderr, " Device Sample Rate is %g\n", d_deviceSampleRate);
+- fprintf (stderr, " User Sample Rate is %g\n", d_outputSampleRate);
+- fprintf (stderr, " Max Sample Count is %ld\n", d_max_sample_count);
+- fprintf (stderr, " # Device Channels is %ld\n", d_n_deviceChannels);
+- fprintf (stderr, " # Max Channels is %ld\n", d_n_max_channels);
+- fprintf (stderr, " Device Buffer Size is Frames = %ld\n",
+- d_deviceBufferSizeFrames);
+- fprintf (stderr, " Lead Size is Frames = %ld\n",
+- d_leadSizeFrames);
+- fprintf (stderr, " Trail Size is Frames = %ld\n",
+- d_trailSizeFrames);
+- fprintf (stderr, " Input Buffer Size is Frames = %ld\n",
+- d_inputBufferSizeFrames);
+- fprintf (stderr, " Output Buffer Size is Frames = %ld\n",
+- d_outputBufferSizeFrames);
++ std::cerr << "audio_osx_source Parameters:" << std::endl;
++ std::cerr << " Device Sample Rate is " << d_deviceSampleRate << std::endl;
++ std::cerr << " User Sample Rate is " << d_outputSampleRate << std::endl;
++ std::cerr << " Max Sample Count is " << d_max_sample_count << std::endl;
++ std::cerr << " # Device Channels is " << d_n_deviceChannels << std::endl;
++ std::cerr << " # Max Channels is " << d_n_max_channels << std::endl;
++ std::cerr << " Device Buffer Size is Frames = " << d_deviceBufferSizeFrames << std::endl;
++ std::cerr << " Lead Size is Frames = " << d_leadSizeFrames << std::endl;
++ std::cerr << " Trail Size is Frames = " << d_trailSizeFrames << std::endl;
++ std::cerr << " Input Buffer Size is Frames = " << d_inputBufferSizeFrames << std::endl;
++ std::cerr << " Output Buffer Size is Frames = " << d_outputBufferSizeFrames << std::endl;
+ #endif
+ }
+
+@@ -564,8 +582,13 @@
+ err = AudioUnitUninitialize (d_InputAU);
+ CheckError (err, "~audio_osx_source: AudioUnitUninitialize");
+
++#ifndef GR_USE_OLD_AUDIO_UNIT
++ err = AudioComponentInstanceDispose (d_InputAU);
++ CheckError (err, "~audio_osx_source: AudioComponentInstanceDispose");
++#else
+ err = CloseComponent (d_InputAU);
+ CheckError (err, "~audio_osx_source: CloseComponent");
++#endif
+
+ // empty and delete the queues
+ for (UInt32 n = 0; n < d_n_max_channels; n++) {
+@@ -598,18 +621,18 @@
+ {
+ // check # inputs to make sure it's valid
+ if (ninputs != 0) {
+- fprintf (stderr, "audio_osx_source::check_topology(): "
+- "number of input streams provided (%d) should be 0.\n",
+- ninputs);
++ std::cerr << "audio_osx_source::check_topology(): number of input "
++ << "streams provided (" << ninputs
++ << ") should be 0." << std::endl;
+ throw std::runtime_error ("audio_osx_source::check_topology()");
+ }
+
+ // check # outputs to make sure it's valid
+ if ((noutputs < 1) | (noutputs > (int) d_n_max_channels)) {
+- fprintf (stderr, "audio_osx_source::check_topology(): "
+- "number of output streams provided (%d) should be in "
+- "[1,%ld] for the selected audio device.\n",
+- noutputs, d_n_max_channels);
++ std::cerr << "audio_osx_source::check_topology(): number of output "
++ << "streams provided (" << noutputs << ") should be in [1,"
++ << d_n_max_channels << "] for the selected audio device."
++ << std::endl;
+ throw std::runtime_error ("audio_osx_source::check_topology()");
+ }
+
+@@ -617,8 +640,8 @@
+ d_n_user_channels = noutputs;
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "chk_topo: Actual # user output channels = %d\n",
+- noutputs);
++ std::cerr << "chk_topo: Actual # user output channels = "
++ << noutputs << std::endl;
+ #endif
+
+ return (true);
+@@ -634,8 +657,9 @@
+ d_internal->lock ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "work1: SC = %4ld, #OI = %4d, #Chan = %ld\n",
+- d_queueSampleCount, noutput_items, output_items.size());
++ std::cerr << "work1: SC = " << d_queueSampleCount
++ << ", #OI = " << noutput_items
++ << ", #Chan = " << output_items.size() << std::endl;
+ #endif
+
+ // set the actual # of output items to the 'desired' amount then
+@@ -675,14 +699,14 @@
+ // verify that the number copied out is as expected.
+
+ while (--l_counter >= 0) {
+- UInt32 t_n_output_items = actual_noutput_items;
++ size_t t_n_output_items = actual_noutput_items;
+ d_buffers[l_counter]->dequeue ((float*) output_items[l_counter],
+ &t_n_output_items);
+ if (t_n_output_items != actual_noutput_items) {
+- fprintf (stderr, "audio_osx_source::work(): "
+- "number of available items changing "
+- "unexpectedly; expecting %ld, got %ld.\n",
+- actual_noutput_items, t_n_output_items);
++ std::cerr << "audio_osx_source::work(): ERROR: number of "
++ << "available items changing unexpectedly; expecting "
++ << actual_noutput_items << ", got "
++ << t_n_output_items << "." << std::endl;
+ throw std::runtime_error ("audio_osx_source::work()");
+ }
+ }
+@@ -693,8 +717,8 @@
+ d_queueSampleCount -= actual_noutput_items;
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "work2: SC = %4ld, act#OI = %4ld\n",
+- d_queueSampleCount, actual_noutput_items);
++ std::cerr << "work2: SC = " << d_queueSampleCount
++ << ", act#OI = " << actual_noutput_items << std::endl;
+ #endif
+
+ // release control to allow for other processing parts to run
+@@ -702,7 +726,7 @@
+ d_internal->unlock ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "work3: Returning.\n");
++ std::cerr << "work3: Returning." << std::endl;
+ #endif
+
+ return (actual_noutput_items);
+@@ -728,8 +752,9 @@
+ This->d_n_ActualInputFrames = (*ioNumberDataPackets);
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cc1: io#DP = %ld, TIBSB = %ld, #C = %d\n",
+- *ioNumberDataPackets, totalInputBufferSizeBytes, counter);
++ std::cerr << "cc1: io#DP = " << (*ioNumberDataPackets)
++ << ", TIBSB = " << totalInputBufferSizeBytes
++ << ", #C = " << counter << std::endl;
+ #endif
+
+ while (--counter >= 0) {
+@@ -740,7 +765,7 @@
+ }
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cc2: Returning.\n");
++ std::cerr << "cc2: Returning." << std::endl;
+ #endif
+
+ return (noErr);
+@@ -760,8 +785,9 @@
+ This->d_internal->lock ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb0: in#F = %4ld, inBN = %ld, SC = %4ld\n",
+- inNumberFrames, inBusNumber, This->d_queueSampleCount);
++ std::cerr << "cb0: in#F = " << inNumberFrames
++ << ", inBN = " << inBusNumber
++ << ", SC = " << This->d_queueSampleCount << std::endl;
+ #endif
+
+ // Get the new audio data from the input device
+@@ -821,8 +847,8 @@
+ #endif
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb1: avail: #IF = %ld, #OF = %ld\n",
+- AvailableInputFrames, AvailableOutputFrames);
++ std::cerr << "cb1: avail: #IF = " << AvailableInputFrames
++ << ", #OF = " << AvailableOutputFrames << std::endl;
+ #endif
+ ActualOutputFrames = AvailableOutputFrames;
+
+@@ -841,11 +867,11 @@
+ // on output, ActualOutputFrames is the actual number of output frames
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb2: actual: #IF = %ld, #OF = %ld\n",
+- This->d_n_ActualInputFrames, AvailableOutputFrames);
++ std::cerr << "cb2: actual: #IF = " << This->d_n_ActualInputFrames
++ << ", #OF = " << AvailableOutputFrames << std::endl;
+ if (This->d_n_ActualInputFrames != AvailableInputFrames)
+- fprintf (stderr, "cb2.1: avail#IF = %ld, actual#IF = %ld\n",
+- AvailableInputFrames, This->d_n_ActualInputFrames);
++ std::cerr << "cb2.1: avail#IF = " << AvailableInputFrames
++ << ", actual#IF = " << This->d_n_ActualInputFrames << std::endl;
+ #endif
+ }
+
+@@ -858,7 +884,7 @@
+ float* inBuffer = (float*) This->d_OutputBuffer->mBuffers[l_counter].mData;
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb3: enqueuing audio data.\n");
++ std::cerr << "cb3: enqueuing audio data." << std::endl;
+ #endif
+
+ int l_res = This->d_buffers[l_counter]->enqueue (inBuffer, ActualOutputFrames);
+@@ -879,23 +905,23 @@
+ }
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb4: #OI = %4ld, #Cnt = %4ld, mSC = %ld, \n",
+- ActualOutputFrames, This->d_queueSampleCount,
+- This->d_max_sample_count);
++ std::cerr << "cb4: #OI = " << ActualOutputFrames
++ << ", #Cnt = " << This->d_queueSampleCount
++ << ", mSC = " << This->d_max_sample_count << std::endl;
+ #endif
+
+ // signal that data is available, if appropraite
+ This->d_cond_data->signal ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb5: releasing internal mutex.\n");
++ std::cerr << "cb5: releasing internal mutex." << std::endl;
+ #endif
+
+ // release control to allow for other processing parts to run
+ This->d_internal->unlock ();
+
+ #if _OSX_AU_DEBUG_
+- fprintf (stderr, "cb6: returning.\n");
++ std::cerr << "cb6: returning." << std::endl;
+ #endif
+
+ return (err);
+@@ -930,7 +956,7 @@
+ OSStatus err = noErr;
+ audio_osx_source* This = static_cast<audio_osx_source*>(inClientData);
+
+- fprintf (stderr, "a_o_s::HardwareListener\n");
++ std::cerr << "a_o_s::HardwareListener" << std::endl;
+
+ // set the new default hardware input device for use by our AU
+
+@@ -957,7 +983,7 @@
+ audio_osx_source* This = static_cast<audio_osx_source*>(inRefCon);
+ AudioStreamBasicDescription asbd;
+
+- fprintf (stderr, "a_o_s::UnitListener\n");
++ std::cerr << "a_o_s::UnitListener" << std::endl;
+
+ // get the converter's input ASBD (for printing)
+
+@@ -970,8 +996,8 @@
+ "CurrentInputStreamDescription",
+ "audio_osx_source::UnitListener");
+
+- fprintf (stderr, "UnitListener: Input Source changed.\n"
+- "Old Source Output Info:\n");
++ std::cerr << "UnitListener: Input Source changed." << std::endl
++ << "Old Source Output Info:" << std::endl;
+ PrintStreamDesc (&asbd);
+
+ // get the new input unit's output ASBD
+@@ -984,7 +1010,7 @@
+ CheckErrorAndThrow (err, "AudioUnitGetProperty StreamFormat",
+ "audio_osx_source::UnitListener");
+
+- fprintf (stderr, "New Source Output Info:\n");
++ std::cerr << "New Source Output Info:" << std::endl;
+ PrintStreamDesc (&asbd);
+
+ // set the converter's input ASBD to this
Added: trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_circular_buffer.h.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_circular_buffer.h.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-osx/files/patch-gr-audio-osx_src_circular_buffer.h.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,214 @@
+--- gr-audio-osx/src/circular_buffer.h.orig 2010-02-04 20:31:22.000000000 -0500
++++ gr-audio-osx/src/circular_buffer.h 2010-02-04 20:34:54.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,9 +24,12 @@
+ #define _CIRCULAR_BUFFER_H_
+
+ #include "mld_threads.h"
++#include <iostream>
+ #include <stdexcept>
+
++#ifndef DO_DEBUG
+ #define DO_DEBUG 0
++#endif
+
+ #if DO_DEBUG
+ #define DEBUG(X) do{X} while(0);
+@@ -41,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;
+@@ -67,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(): "
+@@ -79,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 () {
+@@ -90,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);};
+
+@@ -147,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()");
+ }
+
+@@ -173,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)
+@@ -230,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()");
+ }
+
+@@ -257,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)
Modified: trunk/dports/science/gnuradio-audio-portaudio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-audio-portaudio/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-audio-portaudio/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-audio-portaudio
version 3.2.2
+revision 1
maintainers michaelld
description PortAudio component of GNU Radio.
long_description PortAudio component of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-core \
port:portaudio
+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 \
Added: trunk/dports/science/gnuradio-audio-portaudio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-audio-portaudio/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-audio-portaudio/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-core/Portfile
===================================================================
--- trunk/dports/science/gnuradio-core/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-core/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-core
version 3.2.2
+revision 1
maintainers michaelld
description GNU Radio Core component of GNU Radio.
long_description GNU Radio Core component of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-omnithread \
port:gnuradio-gruel
+archcheck.files lib/libgruel.dylib \
+ lib/libgromnithread.dylib
+
+# version 3.2.2 requires this; next version won't
+patchfiles patch-configure.diff
+
configure.args --disable-all-components \
--with-omnithread \
--with-gruel \
Added: trunk/dports/science/gnuradio-core/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-core/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-core/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-cvsd-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-cvsd-vocoder/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-cvsd-vocoder/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-cvsd-vocoder
version 3.2.2
+revision 1
maintainers michaelld
description CVSD Vocoder component of GNU Radio.
long_description CVSD Vocoder component of GNU Radio: \
@@ -30,6 +33,11 @@
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 \
Added: trunk/dports/science/gnuradio-cvsd-vocoder/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-cvsd-vocoder/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-cvsd-vocoder/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-examples/Portfile
===================================================================
--- trunk/dports/science/gnuradio-examples/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-examples/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-examples
version 3.2.2
+revision 1
maintainers michaelld
description Examples component of GNU Radio.
long_description Examples component of GNU Radio: \
@@ -29,6 +32,11 @@
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 \
Added: trunk/dports/science/gnuradio-examples/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-examples/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-examples/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-gpio/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gpio/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-gpio/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-gpio
version 3.2.2
+revision 1
maintainers nomaintainer
description GPIO component of GNU Radio.
long_description GPIO component of GNU Radio: \
@@ -29,6 +32,11 @@
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-usrp \
Added: trunk/dports/science/gnuradio-gpio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-gpio/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-gpio/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-grc/Portfile
===================================================================
--- trunk/dports/science/gnuradio-grc/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-grc/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -5,6 +5,7 @@
name gnuradio-grc
version 3.2.2
+revision 1
maintainers nomaintainer
description GRC component of GNU Radio.
long_description GRC component of GNU Radio: \
@@ -30,6 +31,9 @@
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 \
Added: trunk/dports/science/gnuradio-grc/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-grc/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-grc/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-gruel/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gruel/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-gruel/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-gruel
version 3.2.2
+revision 1
maintainers michaelld
description GRUEL component of GNU Radio.
long_description GRUEL component of GNU Radio: \
@@ -33,17 +36,27 @@
# whole slew of ports, included here and then making all other
# gnuradio ports dependent on this one.
-depends_build port:pkgconfig
-depends_lib port:gawk \
+depends_build port:gawk \
+ port:guile \
port:libtool \
- port:zlib \
- port:boost \
+ port:pkgconfig \
+ port:swig-python
+
+depends_lib port:boost \
port:cppunit \
port:fftw-3-single \
- port:guile \
- port:swig-python \
- port:gsl
+ port:gsl \
+ port:zlib
+archcheck.files lib/libboost_thread-mt.dylib \
+ lib/libcppunit.dylib \
+ lib/libfftw3f.dylib \
+ 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
Added: trunk/dports/science/gnuradio-gruel/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-gruel/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-gruel/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-gsm-fr-vocoder/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-gsm-fr-vocoder
version 3.2.2
+revision 1
maintainers michaelld
description GSM FR Vocoder Component of GNU Radio.
long_description GSM FR Vocoder Component of GNU Radio: \
@@ -29,6 +32,11 @@
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 \
Added: trunk/dports/science/gnuradio-gsm-fr-vocoder/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-gsm-fr-vocoder/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-gsm-fr-vocoder/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-mblock/Portfile
===================================================================
--- trunk/dports/science/gnuradio-mblock/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-mblock/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-mblock
version 3.2.2
+revision 1
maintainers michaelld
description Message block GNU Radio component.
long_description Message block GNU Radio component: \
@@ -31,6 +34,11 @@
depends_lib port:gnuradio-pmt
+archcheck.files lib/libpmt.dylib
+
+# version 3.2.2 requires this; next version won't
+patchfiles patch-configure.diff
+
configure.args --disable-all-components \
--with-omnithread \
--with-pmt \
Added: trunk/dports/science/gnuradio-mblock/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-mblock/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-mblock/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-omnithread/Portfile
===================================================================
--- trunk/dports/science/gnuradio-omnithread/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-omnithread/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-omnithread
version 3.2.2
+revision 1
maintainers michaelld
description Omnithread component of GNU Radio.
long_description Omnithread component of GNU Radio: \
@@ -33,6 +36,11 @@
depends_lib port:gnuradio-gruel
+archcheck.files lib/libgruel.dylib
+
+# version 3.2.2 requires this; next version won't
+patchfiles patch-configure.diff
+
configure.args --disable-all-components \
--enable-omnithread
Added: trunk/dports/science/gnuradio-omnithread/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-omnithread/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-omnithread/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-pager/Portfile
===================================================================
--- trunk/dports/science/gnuradio-pager/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-pager/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-pager
version 3.2.2
+revision 1
maintainers michaelld
description Pager Component of GNU Radio.
long_description Pager Component of GNU Radio: \
@@ -29,6 +32,11 @@
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 \
Added: trunk/dports/science/gnuradio-pager/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-pager/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-pager/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-pmt/Portfile
===================================================================
--- trunk/dports/science/gnuradio-pmt/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-pmt/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-pmt
version 3.2.2
+revision 1
maintainers michaelld
description PMT component of GNU Radio.
long_description PMT component of GNU Radio: \
@@ -29,6 +32,11 @@
depends_lib port:gnuradio-omnithread
+archcheck.files lib/libgromnithread.dylib
+
+# version 3.2.2 requires this; next version won't
+patchfiles patch-configure.diff
+
configure.args --disable-all-components \
--with-omnithread \
--enable-pmt
Added: trunk/dports/science/gnuradio-pmt/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-pmt/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-pmt/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-radar-mono/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radar-mono/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-radar-mono/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-radar-mono
version 3.2.2
+revision 1
maintainers michaelld
description Radar Mono Component of GNU Radio.
long_description Radar Mono Component of GNU Radio: \
@@ -33,6 +36,12 @@
depends_lib port:gnuradio-core \
port:usrp
+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 \
Added: trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-radar-mono/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-radio-astronomy/Portfile
===================================================================
--- trunk/dports/science/gnuradio-radio-astronomy/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-radio-astronomy/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-radio-astronomy
version 3.2.2
+revision 1
maintainers michaelld
description Radio Astronomy component of GNU Radio.
long_description Radio Astronomy of GNU Radio: \
@@ -29,6 +32,11 @@
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 \
Added: trunk/dports/science/gnuradio-radio-astronomy/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-radio-astronomy/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-radio-astronomy/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-sounder/Portfile
===================================================================
--- trunk/dports/science/gnuradio-sounder/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-sounder/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-sounder
version 3.2.2
+revision 1
maintainers michaelld
description Sounder component of GNU Radio.
long_description Sounder of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-core \
port:usrp
+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 \
Added: trunk/dports/science/gnuradio-sounder/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-sounder/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-sounder/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-trellis/Portfile
===================================================================
--- trunk/dports/science/gnuradio-trellis/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-trellis/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-trellis
version 3.2.2
+revision 1
maintainers michaelld
description Trellis component of GNU Radio.
long_description Trellis component of GNU Radio: \
@@ -29,6 +32,11 @@
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 \
Added: trunk/dports/science/gnuradio-trellis/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-trellis/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-trellis/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-usrp/Portfile
===================================================================
--- trunk/dports/science/gnuradio-usrp/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-usrp/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-usrp
version 3.2.2
+revision 1
maintainers michaelld
description USRP component of GNU Radio.
long_description USRP component of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-core \
port:usrp
+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 \
Added: trunk/dports/science/gnuradio-usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-usrp/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-usrp/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-utils/Portfile
===================================================================
--- trunk/dports/science/gnuradio-utils/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-utils/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -5,6 +5,7 @@
name gnuradio-utils
version 3.2.2
+revision 1
maintainers michaelld
description GR Utils component of GNU Radio.
long_description GR Utils component of GNU Radio: \
@@ -30,6 +31,9 @@
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 \
Added: trunk/dports/science/gnuradio-utils/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-utils/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-utils/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-video-sdl/Portfile
===================================================================
--- trunk/dports/science/gnuradio-video-sdl/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-video-sdl/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name gnuradio-video-sdl
version 3.2.2
+revision 1
maintainers michaelld
description Video SDL component of GNU Radio.
long_description Video SDL of GNU Radio: \
@@ -30,6 +33,12 @@
depends_lib port:gnuradio-core \
path:lib/pkgconfig/sdl.pc:libsdl
+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 \
Added: trunk/dports/science/gnuradio-video-sdl/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-video-sdl/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-video-sdl/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/gnuradio-wxgui/Portfile
===================================================================
--- trunk/dports/science/gnuradio-wxgui/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/gnuradio-wxgui/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -5,6 +5,7 @@
name gnuradio-wxgui
version 3.2.2
+revision 1
maintainers michaelld
description WX GUI component of GNU Radio.
long_description WX GUI component of GNU Radio: \
@@ -29,6 +30,9 @@
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 \
Added: trunk/dports/science/gnuradio-wxgui/files/patch-configure.diff
===================================================================
--- trunk/dports/science/gnuradio-wxgui/files/patch-configure.diff (rev 0)
+++ trunk/dports/science/gnuradio-wxgui/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -0,0 +1,437 @@
+--- 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
+
+
Modified: trunk/dports/science/usrp/Portfile
===================================================================
--- trunk/dports/science/usrp/Portfile 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/usrp/Portfile 2010-02-09 04:11:14 UTC (rev 63573)
@@ -2,9 +2,12 @@
# $Id$
PortSystem 1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
name usrp
version 3.2.2
+revision 1
maintainers michaelld
description USRP user-space driver / interface via USB.
long_description USRP user-space driver / interface via USB.
@@ -26,13 +29,23 @@
sha1 6177d13e42937383e622edadc0b9f06391d0e5fc \
rmd160 42d1a496400ebc77e054f59d9f33cc8ba24a4234
-depends_lib port:libusb-legacy \
- port:sdcc
+depends_build 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 \
Modified: trunk/dports/science/usrp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-configure.diff 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/usrp/files/patch-configure.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -1,829 +1,437 @@
---- 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
+--- configure.orig 2010-02-05 11:31:50.000000000 -0500
++++ configure 2010-02-05 11:30:39.000000000 -0500
+@@ -28118,8 +28118,233 @@
-+ req_libusb1=no
-+ libusbok=no
-+ have_libusb1=no
-+ if test x$req_libusb1 = xyes; then
+ enable_latex_docs=NO
-
-- libusbok=yes
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++ return $1
++} # as_fn_set_status
+
-+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_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:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
++ $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
-+ pkg_failed=yes
++ $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
-+ fi
-+else
-+ pkg_failed=untried
-+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
+
-+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`
++} # 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
-+ pkg_failed=yes
++ 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
-+ 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
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 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`
++ 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
-+ pkg_failed=yes
++ 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
-+ fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ done
+else
-+ pkg_failed=untried
++ ac_lo= ac_hi=
+fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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`
++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
-+ pkg_failed=yes
++ as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
-+ 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
-+ pkg_failed=untried
++ 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 :
+
-+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
++ 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
-+ 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:
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_voidp" >&5
++$as_echo "$ac_cv_sizeof_voidp" >&6; }
+
-+$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:
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_VOIDP $ac_cv_sizeof_voidp
++_ACEOF
+
-+$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
-+
++ 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 @@
-@@ -36011,283 +36197,187 @@
+ { $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; }
- { $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" && \
+@@ -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
+ 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
--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" && \
+ 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=$?
-- 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
+ (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
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_compiler=no
-+ pkg_failed=yes
+ 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" && \
+@@ -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=$?
-- 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
+ (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
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
-+ pkg_failed=yes
+ 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" && \
+@@ -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
+ 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
-+ 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
+ pkg_failed=yes
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
+@@ -36002,9 +36277,9 @@
+ _pkg_short_errors_supported=no
fi
-+ if test $_pkg_short_errors_supported = yes; then
+ 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
+ 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
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$USB_PKG_ERRORS" >&5
+@@ -36162,8 +36437,8 @@
+ _ACEOF
--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.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; }
--fi
-+ USB_CFLAGS=$pkg_cv_USB_CFLAGS
-+ USB_LIBS=$pkg_cv_USB_LIBS
-+ USB_INCLUDEDIR=$pkg_cv_USB_INCLUDEDIR
++ 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
-+ 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 @@
+@@ -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
++ 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
-
-+ 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
+@@ -36530,8 +36805,8 @@
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ USB_LIBS="$LIBS"
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 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
-+ 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
+@@ -36567,8 +36842,8 @@
-- 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
+ :
+ 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
-+ 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.
Modified: trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff
===================================================================
--- trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff 2010-02-09 03:59:00 UTC (rev 63572)
+++ trunk/dports/science/usrp/files/patch-usrp_usrp.pc.in.diff 2010-02-09 04:11:14 UTC (rev 63573)
@@ -1,5 +1,5 @@
---- usrp/usrp.pc.in_old 2009-10-26 19:08:28.000000000 -0400
-+++ usrp/usrp.pc.in 2009-10-26 19:08:44.000000000 -0400
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100208/0e07bd85/attachment-0001.html>
More information about the macports-changes
mailing list