Fix building on Mac OS X

3 files changed, 29 insertions, 10 deletions

diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 186111b0c07..c3e293da81e 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/06/14 20:00:15 heinz Exp $
+# $NetBSD: Makefile,v 1.30 2010/12/04 08:12:33 adam Exp $
 
 DISTNAME=	libusb-0.1.12
 PKGREVISION=	2
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://libusb.sourceforge.net/
 COMMENT=	USB access library
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 3fa8cb8b859..900e55961aa 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2010/02/20 22:42:02 schwarz Exp $
+$NetBSD: distinfo,v 1.21 2010/12/04 08:12:33 adam Exp $
 
 SHA1 (libusb-0.1.12.tar.gz) = 599a5168590f66bc6f1f9a299579fd8500614807
 RMD160 (libusb-0.1.12.tar.gz) = 63848df717e00fff67ab30ba86a85466370d4e8e
@@ -8,4 +8,4 @@ SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839
 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055
 SHA1 (patch-ad) = f81135a5f92bf0c2e1ca921368bd39482bd3b580
 SHA1 (patch-ae) = 49a01ebe66de4965f3611cf42db09703aa68c415
-SHA1 (patch-af) = e6771da24e1a695a8c7029f97a9c0d42aa23f5e5
+SHA1 (patch-af) = e46e576a589fb65488011a41df95f744230c0c6c
diff --git a/devel/libusb/patches/patch-af b/devel/libusb/patches/patch-af
index 41b198ac81b..9ec8f067d69 100644
--- a/devel/libusb/patches/patch-af
+++ b/devel/libusb/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
+$NetBSD: patch-af,v 1.2 2010/12/04 08:12:34 adam Exp $
 
---- darwin.c.orig	2010-02-20 23:22:35.000000000 +0100
-+++ darwin.c	2010-02-20 23:36:10.000000000 +0100
-@@ -254,7 +254,7 @@
+--- darwin.c.orig	2006-03-04 02:52:46.000000000 +0000
++++ darwin.c
+@@ -254,7 +254,7 @@ static usb_device_t **usb_get_next_devic
    
    result = IOCreatePlugInInterfaceForService(usbDevice, kIOUSBDeviceUserClientTypeID,
  					     kIOCFPlugInInterfaceID, &plugInInterface,
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
    
    result = IOObjectRelease(usbDevice);
    if (result || !plugInInterface)
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ static int claim_interface (usb_dev_hand
    result = IOCreatePlugInInterfaceForService(usbInterface,
  					     kIOUSBInterfaceUserClientTypeID,
  					     kIOCFPlugInInterfaceID,
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
    /* No longer need the usbInterface object after getting the plug-in */
    result = IOObjectRelease(usbInterface);
    if (result || !plugInInterface)
-@@ -758,7 +758,7 @@
+@@ -758,7 +758,7 @@ static int ep_to_pipeRef (struct darwin_
  
  /* argument to handle multiple parameters to rw_completed */
  struct rw_complete_arg {
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
    IOReturn      result;
    CFRunLoopRef  cf_loop;
  };
-@@ -769,9 +769,9 @@
+@@ -769,9 +769,9 @@ static void rw_completed(void *refcon, i
  
    if (usb_debug > 2)
      fprintf(stderr, "io async operation completed: %s, size=%lu, result=0x%08x\n", darwin_error_str(result),
@@ -41,3 +41,21 @@ $NetBSD: patch-af,v 1.1 2010/02/20 22:42:02 schwarz Exp $
    rw_arg->result  = result;
  
    CFRunLoopStop(rw_arg->cf_loop);
+@@ -1064,7 +1064,7 @@ int usb_os_find_devices(struct usb_bus *
+     result = (*(device))->GetDeviceAddress(device, (USBDeviceAddress *)&address);
+ 
+     if (usb_debug >= 2)
+-      fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08lx\n", location);
++      fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08x\n", location);
+ 
+     /* first byte of location appears to be associated with the device's bus */
+     if (location >> 24 == bus_loc >> 24) {
+@@ -1091,7 +1091,7 @@ int usb_os_find_devices(struct usb_bus *
+       LIST_ADD(fdev, dev);
+ 
+       if (usb_debug >= 2)
+-	fprintf(stderr, "usb_os_find_devices: Found %s on %s at location 0x%08lx\n",
++	fprintf(stderr, "usb_os_find_devices: Found %s on %s at location 0x%08x\n",
+ 		dev->filename, bus->dirname, location);
+     }
+