Modified: trunk/dports/science/usrp/Portfile (75731 => 75732)

--- trunk/dports/science/usrp/Portfile	2011-02-06 01:14:37 UTC (rev 75731)
+++ trunk/dports/science/usrp/Portfile	2011-02-06 01:15:49 UTC (rev 75732)
@@ -7,6 +7,7 @@
 
 name			usrp
 version         3.3.0
+revision        1
 maintainers		michaelld
 description		USRP user-space driver / interface via USB.
 long_description USRP user-space driver / interface via USB.
@@ -28,12 +29,18 @@
                 sha1    41d5c177b173ce73404f5fe539b013c82600f73f \
                 rmd160  ae83bd8a93deaf73d730e2af0d05c9ffc4c98520
 
+# USRP does not work with SDCC3
 depends_build	port:gnuradio-gruel \
-                port:sdcc
+                port:sdcc29
 
+# do not archcheck sdcc, just use it
+depends_skip_archcheck sdcc29
+
 configure.args	--disable-all-components \
 				--with-gruel \
 				--enable-usrp
+configure.env-append PATH=${prefix}/libexec/sdcc29/bin:$env(PATH)
+build.env-append PATH=${prefix}/libexec/sdcc29/bin:$env(PATH)
 
 use_parallel_build	yes
 
@@ -48,19 +55,19 @@
 
 variant python25 conflicts python26 python27 \
 description "Use Python 2.5" {
-    configure.env      PYTHON=${prefix}/bin/python2.5
+    configure.env-append PYTHON=${prefix}/bin/python2.5
     depends_lib-append port:python25
 }
 
 variant python26 conflicts python25 python27 \
 description "Use Python 2.6" {
-    configure.env      PYTHON=${prefix}/bin/python2.6
+    configure.env-append PYTHON=${prefix}/bin/python2.6
     depends_lib-append port:python26
 }
 
 variant python27 conflicts python25 python26 \
 description "Use Python 2.7" {
-    configure.env      PYTHON=${prefix}/bin/python2.7
+    configure.env-append PYTHON=${prefix}/bin/python2.7
     depends_lib-append port:python27
 }
 
@@ -70,6 +77,15 @@
     default_variants +python26
 }
 
+# make sure -python26 is not alone
+if { ![variant_isset python25] && \
+     ![variant_isset python26] && \
+     ![variant_isset python27] } {
+    return -code error \
+        "\n\nThe variant -python26 will not work alone.
+Please select one of +python25, +python26, or +python27 as a variant."
+}
+
 variant libusb_legacy \
 description "Use LIBUSB legacy version for USB transport" {
     depends_lib-append     port:libusb-legacy
@@ -90,3 +106,11 @@
      ![variant_isset libusb_1] } {
     default_variants +libusb_legacy
 }
+
+# make sure -libusb_legacy is not alone
+if { ![variant_isset libusb_legacy] && \
+     ![variant_isset libusb_1] } {
+    return -code error \
+"\n\nThe variant -libusb_legacy will not work alone.
+Please select one of +libusb_legacy or +libusb_1 as a variant.\n"
+}