- Chase libusb20 rename in r189585.

- Mark sane-backends broken on current due to changes
  in USB stack.

Reviewed by:	thompsa (old version), miwi
Tested by:	miwi

7 files changed, 6 insertions, 61 deletions

diff --git a/comms/dfu-util/Makefile b/comms/dfu-util/Makefile
index 6f8748f77847..00f953e601e7 100644
--- a/comms/dfu-util/Makefile
+++ b/comms/dfu-util/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 800063
+.if ${OSVERSION} < 800069
 IGNORE=		requires new USB stack in FreeBSD 8
 .endif
 
diff --git a/comms/dfu-util/files/patch-configure.ac b/comms/dfu-util/files/patch-configure.ac
index b8e800739dd7..956d8181827e 100644
--- a/comms/dfu-util/files/patch-configure.ac
+++ b/comms/dfu-util/files/patch-configure.ac
@@ -1,13 +1,13 @@
---- configure.ac.orig	2008-10-07 14:14:07.000000000 +0100
-+++ configure.ac	2009-02-04 22:04:02.000000000 +0000
-@@ -15,9 +15,7 @@
+--- configure.ac.orig	2008-10-07 17:14:07.000000000 +0400
++++ configure.ac	2009-03-08 11:54:32.000000000 +0300
+@@ -15,9 +15,8 @@
  
  # Checks for libraries.
  
 -PKG_CHECK_MODULES(USB, libusb >= 0.1.4,,
 -                 AC_MSG_ERROR([*** Required libusb >= 0.1.4 not installed ***]))
--AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
-+USB_LIBS=-lusb20
+ AC_CHECK_LIB([usbpath],[usb_path2devnum],,,-lusb)
++USB_LIBS=-lusb
  
  LIBS="$LIBS $USB_LIBS"
  CFLAGS="$CFLAGS $USB_CFLAGS"
diff --git a/comms/dfu-util/files/patch-src-commands.h b/comms/dfu-util/files/patch-src-commands.h
deleted file mode 100644
index 2cfa3d43aef5..000000000000
--- a/comms/dfu-util/files/patch-src-commands.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/commands.h.orig	2007-02-22 21:33:15.000000000 +0000
-+++ src/commands.h	2009-02-04 22:04:41.000000000 +0000
-@@ -21,7 +21,7 @@
- #ifndef __COMMANDS_H__
- #define __COMMANDS_H__
- 
--#include <usb.h>
-+#include <libusb20_compat01.h>
- #include "arguments.h"
- 
- int execute_command( struct usb_dev_handle *device,
diff --git a/comms/dfu-util/files/patch-src-dfu.c b/comms/dfu-util/files/patch-src-dfu.c
deleted file mode 100644
index 03fd922339e7..000000000000
--- a/comms/dfu-util/files/patch-src-dfu.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dfu.c.orig	2007-02-25 15:43:05.000000000 +0000
-+++ src/dfu.c	2009-02-04 22:05:08.000000000 +0000
-@@ -19,7 +19,7 @@
-  */
- 
- #include <stdio.h>
--#include <usb.h>
-+#include <libusb20_compat01.h>
- #include "dfu.h"
- 
- /* DFU commands */
diff --git a/comms/dfu-util/files/patch-src-dfu.h b/comms/dfu-util/files/patch-src-dfu.h
deleted file mode 100644
index d7e08a0b911c..000000000000
--- a/comms/dfu-util/files/patch-src-dfu.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dfu.h.orig	2007-02-25 15:43:05.000000000 +0000
-+++ src/dfu.h	2009-02-04 22:05:15.000000000 +0000
-@@ -21,7 +21,7 @@
- #ifndef __DFU_H__
- #define __DFU_H__
- 
--#include <usb.h>
-+#include <libusb20_compat01.h>
- #include "usb_dfu.h"
- 
- /* DFU states */
diff --git a/comms/dfu-util/files/patch-src-main.c b/comms/dfu-util/files/patch-src-main.c
deleted file mode 100644
index 5a09bb0f48b0..000000000000
--- a/comms/dfu-util/files/patch-src-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c	2009-02-09 01:50:55.118776000 +0000
-+++ src/main.c	2009-02-12 21:15:13.000000000 +0000
-@@ -26,7 +26,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <getopt.h>
--#include <usb.h>
-+#include <libusb20_compat01.h>
- #include <errno.h>
- 
- #include "dfu.h"
diff --git a/comms/dfu-util/files/patch-src-sam7dfu.c b/comms/dfu-util/files/patch-src-sam7dfu.c
deleted file mode 100644
index 85227047092f..000000000000
--- a/comms/dfu-util/files/patch-src-sam7dfu.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sam7dfu.c	2009-02-09 01:50:55.118776000 +0000
-+++ src/sam7dfu.c	2009-02-12 21:15:27.000000000 +0000
-@@ -12,7 +12,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
--#include <usb.h>
-+#include <libusb20_compat01.h>
- 
- #include "config.h"
- #include "dfu.h"