1 files changed, 25 insertions, 6 deletions

diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
index 4f135ae8de4e..496585e6778d 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb.c
@@ -1,6 +1,25 @@
 --- hald/freebsd/hf-usb.c.orig	2008-05-07 19:24:02.000000000 -0400
-+++ hald/freebsd/hf-usb.c	2009-02-17 19:38:21.000000000 -0500
-@@ -41,6 +41,7 @@
++++ hald/freebsd/hf-usb.c	2009-02-24 00:41:03.000000000 -0500
+@@ -25,13 +25,18 @@
+ #  include <config.h>
+ #endif
+ 
++#include <sys/param.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
++#if __FreeBSD_version >= 800064
++#include <legacy/dev/usb/usb.h>
++#else
+ #include <dev/usb/usb.h>
++#endif
+ 
+ #include "../logger.h"
+ #include "../osspec.h"
+@@ -41,6 +46,7 @@
  #include "hf-util.h"
  
  #define HF_USB_DEVICE			"/dev/usb"
@@ -8,7 +27,7 @@
  
  typedef struct
  {
-@@ -231,7 +232,7 @@ hf_usb_get_full_config_descriptor (int f
+@@ -231,7 +237,7 @@ hf_usb_get_full_config_descriptor (int f
   * Adapted from usb_compute_udi() in linux2/physdev.c and
   * usbclass_compute_udi() in linux2/classdev.c.
   */
@@ -17,7 +36,7 @@
  hf_usb_device_compute_udi (HalDevice *device)
  {
    g_return_if_fail(HAL_IS_DEVICE(device));
-@@ -250,12 +251,13 @@ hf_usb_device_compute_udi (HalDevice *de
+@@ -250,12 +256,13 @@ hf_usb_device_compute_udi (HalDevice *de
      hf_device_set_udi(device, "usb_device_%x_%x_%s",
  		      hal_device_property_get_int(device, "usb_device.vendor_id"),
  		      hal_device_property_get_int(device, "usb_device.product_id"),
@@ -33,7 +52,7 @@
  hf_usb_add_webcam_properties (HalDevice *device)
  {
    int unit;
-@@ -575,6 +577,8 @@ hf_usb_probe_device (HalDevice *parent,
+@@ -575,6 +582,8 @@ hf_usb_probe_device (HalDevice *parent,
      {
        if (hal_device_has_capability(device, "hiddev"))
  	hf_runner_run_sync(device, 0, "hald-probe-hiddev", NULL);
@@ -42,7 +61,7 @@
  
        hf_device_add(device);
      }
-@@ -633,9 +637,18 @@ hf_usb_privileged_init (void)
+@@ -633,9 +642,18 @@ hf_usb_privileged_init (void)
  {
    int i;