Bah, not my day. Add the DragonFly patches as rest of the last commit.

4 files changed, 70 insertions, 0 deletions

diff --git a/sysutils/apcupsd/patches/patch-al b/sysutils/apcupsd/patches/patch-al
new file mode 100644
index 00000000000..5ee712fdacc
--- /dev/null
+++ b/sysutils/apcupsd/patches/patch-al
@@ -0,0 +1,18 @@
+$NetBSD: patch-al,v 1.3 2007/03/07 20:48:04 joerg Exp $
+
+--- src/drivers/usb/bsd/bsd-usb.c.orig	2007-03-07 19:31:11.000000000 +0000
++++ src/drivers/usb/bsd/bsd-usb.c
+@@ -27,8 +27,13 @@
+ #include "apc.h"
+ #include "hidutils.h"
+ #include "../usb_common.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
+ 
+ /* Compatibility cruft for FreeBSD <= 4.7 */
+ #ifndef USB_MAX_DEVNAMES
diff --git a/sysutils/apcupsd/patches/patch-am b/sysutils/apcupsd/patches/patch-am
new file mode 100644
index 00000000000..031835a1aeb
--- /dev/null
+++ b/sysutils/apcupsd/patches/patch-am
@@ -0,0 +1,18 @@
+$NetBSD: patch-am,v 1.3 2007/03/07 20:48:04 joerg Exp $
+
+--- src/drivers/usb/bsd/hidutils.c.orig	2007-03-07 19:31:41.000000000 +0000
++++ src/drivers/usb/bsd/hidutils.c
+@@ -26,8 +26,13 @@
+ #include "apc.h"
+ 
+ #include "hidutils.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
+ 
+ #define MAX_SANE_DESCRIPTOR_LEN 4096
+ 
diff --git a/sysutils/apcupsd/patches/patch-an b/sysutils/apcupsd/patches/patch-an
new file mode 100644
index 00000000000..ab3abd56065
--- /dev/null
+++ b/sysutils/apcupsd/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.3 2007/03/07 20:48:04 joerg Exp $
+
+--- src/libusbhid/descr.c.orig	2007-03-07 19:32:12.000000000 +0000
++++ src/libusbhid/descr.c
+@@ -38,7 +38,11 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ 
++#ifdef __DragonFly__
++#include <bus/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "usbhid.h"
+ #include "usbvar.h"
diff --git a/sysutils/apcupsd/patches/patch-ao b/sysutils/apcupsd/patches/patch-ao
new file mode 100644
index 00000000000..5d0f188f6a5
--- /dev/null
+++ b/sysutils/apcupsd/patches/patch-ao
@@ -0,0 +1,18 @@
+$NetBSD: patch-ao,v 1.3 2007/03/07 20:48:04 joerg Exp $
+
+--- src/libusbhid/parse.c.orig	2007-03-07 19:32:34.000000000 +0000
++++ src/libusbhid/parse.c
+@@ -33,8 +33,13 @@
+ #include <string.h>
+ #include <sys/time.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
+ 
+ #include "usbhid.h"
+ #include "usbvar.h"