Include correct headers on DragonFly. Don't depend on sys/ioctl.h being

included by dev/usb/usb.h, which is not the case on DragonFly and FreeBSD.

5 files changed, 90 insertions, 6 deletions

diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo
index 98f2f9a1360..72018108810 100644
--- a/sysutils/usbutil/distinfo
+++ b/sysutils/usbutil/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:40:58 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/18 17:31:22 joerg Exp $
 
 SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599
 RMD160 (usbutil-0.5.tar.gz) = 48c6bedeed8daf50a760feedef3575db021066f8
 Size (usbutil-0.5.tar.gz) = 11508 bytes
-SHA1 (patch-aa) = b41e7d55d1951ceb62b21cac84c89ff68bd5b79f
+SHA1 (patch-aa) = 8db548f99befd76839b8b31caa2de0861c6d708b
+SHA1 (patch-ab) = f3bf1820290e966065b185b3b55ce7ec4f127d59
+SHA1 (patch-ac) = 0c1c7e67c84c1a6db1ad0144803977bee7c61ceb
+SHA1 (patch-ad) = bf7ba74ab56b2ae8560c3da73cbd53134a2bf2b8
diff --git a/sysutils/usbutil/patches/patch-aa b/sysutils/usbutil/patches/patch-aa
index c15bce7c33e..3a1f488eabc 100644
--- a/sysutils/usbutil/patches/patch-aa
+++ b/sysutils/usbutil/patches/patch-aa
@@ -1,8 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2002/03/07 07:49:49 jmc Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/18 17:31:22 joerg Exp $
 
---- usbgen.c.orig	Thu Mar  7 07:46:26 2002
-+++ usbgen.c	Thu Mar  7 07:48:00 2002
-@@ -54,6 +54,7 @@
+--- usbgen.c.orig	2002-02-25 00:55:12.000000000 +0000
++++ usbgen.c
+@@ -27,11 +27,16 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <err.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ /* Backwards compatibility */
+ #ifndef UE_GET_DIR
+@@ -54,6 +59,7 @@
  #define ucd_desc desc
  #define uai_config_index config_index
  #define uai_interface_index interface_index
diff --git a/sysutils/usbutil/patches/patch-ab b/sysutils/usbutil/patches/patch-ab
new file mode 100644
index 00000000000..95937c5ebea
--- /dev/null
+++ b/sysutils/usbutil/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2005/12/18 17:31:22 joerg Exp $
+
+--- usbctl.c.orig	2002-02-25 00:50:55.000000000 +0000
++++ usbctl.c
+@@ -27,12 +27,18 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <err.h>
+ #include <errno.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#include <bus/usb/usbhid.h>
++#else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
++#endif
+ 
+ #ifndef USB_STACK_VERSION
+ #define ucr_addr addr
diff --git a/sysutils/usbutil/patches/patch-ac b/sysutils/usbutil/patches/patch-ac
new file mode 100644
index 00000000000..614dbcb02ea
--- /dev/null
+++ b/sysutils/usbutil/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2005/12/18 17:31:22 joerg Exp $
+
+--- usbdebug.c.orig	1999-05-18 23:47:45.000000000 +0000
++++ usbdebug.c
+@@ -26,11 +26,16 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <err.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #define USBDEV "/dev/usb0"
+ 
diff --git a/sysutils/usbutil/patches/patch-ad b/sysutils/usbutil/patches/patch-ad
new file mode 100644
index 00000000000..d708463c406
--- /dev/null
+++ b/sysutils/usbutil/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2005/12/18 17:31:22 joerg Exp $
+
+--- usbstats.c.orig	2005-12-18 17:23:45.000000000 +0000
++++ usbstats.c
+@@ -26,10 +26,15 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/ioctl.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <err.h>
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #ifndef USB_STACK_VERSION
+ #define uds_requests requests