7 files changed, 8 insertions, 65 deletions
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 801ee840380e..a82dfdbf23f8 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libusb
-PORTVERSION=	0.1.10a
-PORTREVISION=	2
+PORTVERSION=	0.1.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,4 +18,7 @@ CONFIGURE_ARGS=	--disable-build-docs
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 98c21c742e9a..72bfcf50a0c6 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,3 +1,3 @@
-MD5 (libusb-0.1.10a.tar.gz) = c6062b29acd2cef414bcc34e0decbdd1
-SHA256 (libusb-0.1.10a.tar.gz) = 2f0ed0261074beaa6e060f9539c54017a3f3b4d2b272311e6cf60ba09c4aeadc
-SIZE (libusb-0.1.10a.tar.gz) = 375144
+MD5 (libusb-0.1.12.tar.gz) = caf182cbc7565dac0fd72155919672e6
+SHA256 (libusb-0.1.12.tar.gz) = 37f6f7d9de74196eb5fc0bbe0aea9b5c939de7f500acba3af6fd643f3b538b44
+SIZE (libusb-0.1.12.tar.gz) = 389343
diff --git a/devel/libusb/files/patch-bsd.c b/devel/libusb/files/patch-bsd.c
deleted file mode 100644
index f4b3c5373744..000000000000
--- a/devel/libusb/files/patch-bsd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bsd.c.orig	Wed Feb 18 07:34:52 2004
-+++ bsd.c	Thu Jun 16 22:08:00 2005
-@@ -457,7 +457,7 @@
-   USETW(req.ucr_request.wLength, size);
- 
-   req.ucr_data = bytes;
--  req.ucr_flags = 0;
-+  req.ucr_flags = USBD_SHORT_XFER_OK;
- 
-   ret = ioctl(dev->fd, USB_SET_TIMEOUT, &timeout);
- #if (__NetBSD__ || __OpenBSD__)
diff --git a/devel/libusb/files/patch-configure b/devel/libusb/files/patch-configure
deleted file mode 100644
index 86fff3308225..000000000000
--- a/devel/libusb/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Fri Feb 25 23:04:35 2005
-+++ configure	Fri Feb 25 23:05:03 2005
-@@ -21635,16 +21635,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <dev/usb/usb.h>
--int
--main ()
--{
- int main(void)
-      {
-        int a = ((struct usb_ctl_request *)0L)->ucr_addr;
-        return 0;
-      }
--  ;
--  return 0;
--}
- _ACEOF
- rm -f conftest.$ac_objext
diff --git a/devel/libusb/files/patch-tests_descriptor__test.cpp b/devel/libusb/files/patch-tests_descriptor__test.cpp
deleted file mode 100644
index 439401a89e26..000000000000
--- a/devel/libusb/files/patch-tests_descriptor__test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- tests/descriptor_test.cpp.orig
-+++ tests/descriptor_test.cpp
-@@ -34,9 +34,9 @@
- 
- 			cout << bus->directoryName() << "/" 
- 				 << device->fileName() << "     "
--				 << uppercase << hex << setw(4) << setfill('0')
-+				 << hex << setw(4) << setfill('0')
- 				 << device->idVendor() << "/"
--				 << uppercase << hex << setw(4) << setfill('0')
-+				 << hex << setw(4) << setfill('0')
- 				 << device->idProduct() << endl;
- 			if (device->Vendor() != "") {
- 				cout << "- Manufacturer : " << device->Vendor() << endl;
diff --git a/devel/libusb/files/patch-usbpp.cpp b/devel/libusb/files/patch-usbpp.cpp
deleted file mode 100644
index 8c53cfd0f883..000000000000
--- a/devel/libusb/files/patch-usbpp.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- usbpp.cpp.orig
-+++ usbpp.cpp
-@@ -9,6 +9,7 @@
- 
- #include <errno.h>
- #include <cstdlib>
-+#include <cstdio>
- 
- //remove after debugging
- #include <iostream>
diff --git a/devel/libusb/pkg-plist b/devel/libusb/pkg-plist
index e8dd56b5c2fe..ce06d28fc8d9 100644
--- a/devel/libusb/pkg-plist
+++ b/devel/libusb/pkg-plist
@@ -11,3 +11,4 @@ lib/libusbpp-0.1.so.8
 lib/libusbpp.a
 lib/libusbpp.la
 lib/libusbpp.so
+libdata/pkgconfig/libusb.pc