ports/133092: misc/kdeedu3: Fails to build on -Current - 'USB_SET_TIMEOUT' undeclared

[Scot Hetzel]

>Number:         133092
>Category:       ports
>Synopsis:       misc/kdeedu3: Fails to build on -Current - 'USB_SET_TIMEOUT' undeclared
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 26 15:30:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Scot Hetzel
>Release:        8.0-CURRENT
>Organization:
>Environment:
FreeBSD hp010.hetzel.org 8.0-CURRENT FreeBSD 8.0-CURRENT #6: Tue Mar 24 05:47:19 CDT 2009     root at hp010.hetzel.org:/usr/obj/usr/src/sys/DV8135NR  amd64
>Description:
Since the switch to the new usb stack misc/kdeedu3 fails to build due to undefined USB_SET_TIMEOUT.
>How-To-Repeat:
cd /usr/ports/misc/kdeedu3
make build

/bin/sh /usr/local/bin/libtool --silent --tag=CC   --mode=compile cc -DHAVE_CONFIG_H -I. -I../../../.. -I/usr/local/include  -I/usr/local/include  -D_THREAD_SAFE -pthread -DQT_THREAD_SUPPORT   -I/usr/local/include -I/usr/local/include  -I/usr/local/include -D_GETOPT_H -D_THREAD_SAFE  -I/usr/local/include  -DNDEBUG -O2  -O2 -pipe -fno-strict-aliasing -MT libfli-usb-sys-bsd.lo -MD -MP -MF .deps/libfli-usb-sys-bsd.Tpo -c -o libfli-usb-sys-bsd.lo libfli-usb-sys-bsd.c
libfli-usb-sys-bsd.c: In function 'unix_usbverifydescriptor':
libfli-usb-sys-bsd.c:69: warning: comparison between pointer and integer
libfli-usb-sys-bsd.c:78: warning: comparison between pointer and integer
libfli-usb-sys-bsd.c:89: warning: assignment makes integer from pointer without a cast
libfli-usb-sys-bsd.c: In function 'bsd_bulkwrite':
libfli-usb-sys-bsd.c:104: error: 'USB_SET_TIMEOUT' undeclared (first use in this function)
libfli-usb-sys-bsd.c:104: error: (Each undeclared identifier is reported only once
libfli-usb-sys-bsd.c:104: error: for each function it appears in.)
libfli-usb-sys-bsd.c: In function 'bsd_bulkread':
libfli-usb-sys-bsd.c:124: error: 'USB_SET_TIMEOUT' undeclared (first use in this function)
gmake[5]: *** [libfli-usb-sys-bsd.lo] Error 1
gmake[5]: Leaving directory `/usr/ports/misc/kdeedu3/work/kdeedu-3.5.10/kstars/kstars/indi/fli'
gmake[4]: *** [all-recursive] Error 1
gmake[4]: Leaving directory `/usr/ports/misc/kdeedu3/work/kdeedu-3.5.10/kstars/kstars/indi'
gmake[3]: *** [all-recursive] Error 1
gmake[3]: Leaving directory `/usr/ports/misc/kdeedu3/work/kdeedu-3.5.10/kstars/kstars'
gmake[2]: *** [all-recursive] Error 1
gmake[2]: Leaving directory `/usr/ports/misc/kdeedu3/work/kdeedu-3.5.10/kstars'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/ports/misc/kdeedu3/work/kdeedu-3.5.10'
gmake: *** [all] Error 2
*** Error code 2
>Fix:
The attached patch adds an include for legacy/dev/usb/usb.h to kstars/kstars/indi/fli/libfli-usb-sys-bsd.c.

Patch attached with submission follows:

--- kstars/kstars/indi/fli/libfli-usb-sys-bsd.c.orig	2005-09-10 03:17:35.000000000 -0500
+++ kstars/kstars/indi/fli/libfli-usb-sys-bsd.c	2009-03-26 09:44:39.470081183 -0500
@@ -41,8 +41,13 @@
 
 */
 
+#include <sys/param.h>
 #include <sys/types.h>
+#if __FreeBSD_version > 800068
+#include <legacy/dev/usb/usb.h>
+#else
 #include <dev/usb/usb.h>
+#endif
 #include <sys/ioctl.h>
 
 #include <unistd.h>


>Release-Note:
>Audit-Trail:
>Unformatted: