Fix path names to USB devices on DragonFly. Bump revision.

Based on patch from Joe Talbott.

3 files changed, 121 insertions, 7 deletions

diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 562efe3782a..4ccc9841dbc 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/03/11 08:34:12 adam Exp $
+# $NetBSD: Makefile,v 1.27 2006/05/26 10:06:13 joerg Exp $
 
 DISTNAME=	libusb-0.1.12
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 93af2c8045c..477817f9235 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/03/11 08:34:13 adam Exp $
+$NetBSD: distinfo,v 1.18 2006/05/26 10:06:13 joerg Exp $
 
 SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
 RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
@@ -6,5 +6,5 @@ Size (libusb-0.1.12.tar.gz) = 389343 bytes
 SHA1 (patch-aa) = 1da6c46e8b41d7846032922bbef8a0b5eb1ae68b
 SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
-SHA1 (patch-ad) = 8c5ef2da6646563add86312c081ed8ce47fdf7e7
+SHA1 (patch-ad) = 56a4beb9047f4e1e3e098d2b9aa2c7d0ece34045
 SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
diff --git a/devel/libusb/patches/patch-ad b/devel/libusb/patches/patch-ad
index b8681a8fd4c..477db22e47f 100644
--- a/devel/libusb/patches/patch-ad
+++ b/devel/libusb/patches/patch-ad
@@ -1,7 +1,18 @@
-$NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
+$NetBSD: patch-ad,v 1.8 2006/05/26 10:06:13 joerg Exp $
 
---- bsd.c.orig	2006-03-04 03:52:46.000000000 +0100
+--- bsd.c.orig	2006-03-04 02:52:46.000000000 +0000
 +++ bsd.c
+@@ -25,8 +25,8 @@
+  * 	for both read and write.
+  */
+ 
+-#if defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+-#define __FreeBSD_kernel__ __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#define FreeBSD_like_device_names 1
+ #endif
+ 
+ #include <stdlib.h>
 @@ -39,14 +39,18 @@
  #include <sys/time.h>
  #include <sys/ioctl.h>
@@ -22,6 +33,78 @@ $NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
  /*
   * It appears some of the BSD's (OpenBSD atleast) have switched over to a
   * new naming convention, so we setup some macro's for backward
+@@ -146,7 +150,7 @@ int usb_os_open(usb_dev_handle *dev)
+     USB_ERROR(-ENOMEM);
+   dev->impl_info = info;
+ 
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+   snprintf(ctlpath, PATH_MAX, "%s", dev->device->filename);
+ #else
+   snprintf(ctlpath, PATH_MAX, "%s.00", dev->device->filename);
+@@ -259,7 +263,7 @@ static int ensure_ep_open(usb_dev_handle
+   ep = UE_GET_ADDR(ep);
+ 
+   if (info->ep_fd[ep] < 0) {
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+     snprintf(buf, sizeof(buf) - 1, "%s.%d", dev->device->filename, ep);
+ #else
+     snprintf(buf, sizeof(buf) - 1, "%s.%02d", dev->device->filename, ep);
+@@ -290,7 +294,7 @@ int usb_bulk_write(usb_dev_handle *dev, 
+   fd = ensure_ep_open(dev, ep, O_WRONLY);
+   if (fd < 0) {
+     if (usb_debug >= 2) {
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+       fprintf (stderr, "usb_bulk_write: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep));
+ #else
+       fprintf (stderr, "usb_bulk_write: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep));
+@@ -306,7 +310,7 @@ int usb_bulk_write(usb_dev_handle *dev, 
+ 
+   ret = write(fd, bytes, size);
+   if (ret < 0)
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+     USB_ERROR_STR(-errno, "error writing to bulk endpoint %s.%d: %s",
+                   dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
+ #else
+@@ -328,7 +332,7 @@ int usb_bulk_read(usb_dev_handle *dev, i
+   fd = ensure_ep_open(dev, ep, O_RDONLY);
+   if (fd < 0) {
+     if (usb_debug >= 2) {
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+       fprintf (stderr, "usb_bulk_read: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep));
+ #else
+       fprintf (stderr, "usb_bulk_read: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep));
+@@ -347,7 +351,7 @@ int usb_bulk_read(usb_dev_handle *dev, i
+ 
+   ret = read(fd, bytes, size);
+   if (ret < 0)
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+     USB_ERROR_STR(-errno, "error reading from bulk endpoint %s.%d: %s",
+                   dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
+ #else
+@@ -369,7 +373,7 @@ int usb_interrupt_write(usb_dev_handle *
+   fd = ensure_ep_open(dev, ep, O_WRONLY);
+   if (fd < 0) {
+     if (usb_debug >= 2) {
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+       fprintf (stderr, "usb_interrupt_write: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep));
+ #else
+       fprintf (stderr, "usb_interrupt_write: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep));
+@@ -386,7 +390,7 @@ int usb_interrupt_write(usb_dev_handle *
+   do {
+     ret = write(fd, bytes+sent, size-sent);
+     if (ret < 0)
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+       USB_ERROR_STR(-errno, "error writing to interrupt endpoint %s.%d: %s",
+                     dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
+ #else
 @@ -403,7 +407,7 @@ int usb_interrupt_write(usb_dev_handle *
  int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size,
                         int timeout)
@@ -31,7 +114,16 @@ $NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
  
    /* Ensure the endpoint address is correct */
    ep |= USB_ENDPOINT_IN;
-@@ -429,7 +433,8 @@ int usb_interrupt_read(usb_dev_handle *d
+@@ -411,7 +415,7 @@ int usb_interrupt_read(usb_dev_handle *d
+   fd = ensure_ep_open(dev, ep, O_RDONLY);
+   if (fd < 0) {
+     if (usb_debug >= 2) {
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+       fprintf (stderr, "usb_interrupt_read: got negative open file descriptor for endpoint %d\n", UE_GET_ADDR(ep));
+ #else
+       fprintf (stderr, "usb_interrupt_read: got negative open file descriptor for endpoint %02d\n", UE_GET_ADDR(ep));
+@@ -429,9 +433,10 @@ int usb_interrupt_read(usb_dev_handle *d
      USB_ERROR_STR(-errno, "error setting short xfer: %s", strerror(errno));
  
    do {
@@ -39,8 +131,11 @@ $NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
 +    requested = size - retrieved;
 +    ret = read(fd, bytes+retrieved, requested);
      if (ret < 0)
- #ifdef __FreeBSD_kernel__
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
        USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s",
+                     dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
+ #else
 @@ -439,7 +444,7 @@ int usb_interrupt_read(usb_dev_handle *d
                    dev->device->filename, UE_GET_ADDR(ep), strerror(errno));
  #endif
@@ -50,3 +145,21 @@ $NetBSD: patch-ad,v 1.7 2006/03/11 08:34:13 adam Exp $
  
    return retrieved;
  }
+@@ -548,7 +553,7 @@ int usb_os_find_devices(struct usb_bus *
+       /* best not to play with things we don't understand */
+       continue;
+ 
+-#ifdef __FreeBSD_kernel__
++#ifdef FreeBSD_like_device_names
+     snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.udi_devnames[0]);
+ #else
+     snprintf(buf, sizeof(buf) - 1, "/dev/%s.00", di.udi_devnames[0]);
+@@ -574,7 +579,7 @@ int usb_os_find_devices(struct usb_bus *
+     /* we need to report the device name as /dev/ugenx NOT /dev/ugenx.00
+      * This seemed easier than having 2 variables...
+      */
+-#if (__NetBSD__ || __OpenBSD__)
++#if !defined(FreeBSD_like_device_names)
+     snprintf(buf, sizeof(buf) - 1, "/dev/%s", di.udi_devnames[0]);
+ #endif
+