- 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

14 files changed, 71 insertions, 70 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"
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 220a4640f152..bc28bff3b0b4 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.gnokii.org/download/gnocky/
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A graphical (GTK+2) frontend for gnokii
 
-LIB_DEPENDS=	gnokii.4:${PORTSDIR}/comms/gnokii \
-		usb-0.1.8:${PORTSDIR}/devel/libusb
+LIB_DEPENDS=	gnokii.4:${PORTSDIR}/comms/gnokii
 
 USE_GNOME=	gtk20 libglade2
 GNU_CONFIGURE=	yes
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index cde2a72811e3..d90c15ee44c1 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -55,8 +55,10 @@ OPTIONS=	ICAL	"Build with IETF iCal support"		off \
 LIB_DEPENDS+=	ical.42:${PORTSDIR}/devel/libical
 .endif
 
-.if exists(${LOCALBASE}/lib/libusb.so) || defined(WITH_USB)
+.if ${OSVERSION} < 800069
+. if exists(${LOCALBASE}/lib/libusb.so) || defined(WITH_USB)
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
+. endif
 .endif
 
 .if exists(${LOCALBASE}/lib/libpcsclite.so) || defined(WITH_PCSC)
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 8243f8296f80..3eb4e0ff50f0 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -23,7 +23,6 @@ BUILD_DEPENDS=	sdcc:${PORTSDIR}/lang/sdcc \
 		guile:${PORTSDIR}/lang/guile
 LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
-		usb:${PORTSDIR}/devel/libusb \
 		boost_python:${PORTSDIR}/devel/boost-python
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem
@@ -50,6 +49,12 @@ CONFIGURE_ARGS=	--with-boost-include-dir="${LOCALBASE}/include/" \
 		--disable-html-docs \
 		--disable-latex-docs
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.61|2.62|g' ${WRKSRC}/aclocal.m4
 	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
@@ -80,4 +85,4 @@ post-install:
 	@${ECHO} without the .sample suffix and edited as needed before use.
 	@${ECHO}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile
index a1805e1b1ae1..78a40cb6c708 100644
--- a/comms/libticables/Makefile
+++ b/comms/libticables/Makefile
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	tilp
 MAINTAINER=	tijl@ulyssis.org
 COMMENT=	TI calculator link cables library
 
-LIB_DEPENDS=	usb-0.1.8:${PORTSDIR}/devel/libusb
-
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack pkgconfig
@@ -24,4 +22,12 @@ USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
+.else
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/comms/libticables/files/extra-patch-configure b/comms/libticables/files/extra-patch-configure
new file mode 100644
index 000000000000..7b30c348af12
--- /dev/null
+++ b/comms/libticables/files/extra-patch-configure
@@ -0,0 +1,26 @@
+--- configure.orig	2009-03-07 19:05:24.000000000 +0300
++++ configure	2009-03-07 19:06:25.000000000 +0300
+@@ -26925,21 +26925,13 @@
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-if test x$LIBUSB_CONFIG = xyes; then
+-  LIBUSB_CFLAGS=`libusb-config --cflags`
+-  LIBUSB_LIBS=`libusb-config --libs`
++  LIBUSB_CFLAGS=""
++  LIBUSB_LIBS="-lusb"
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBUSB 1
+ _ACEOF
+ 
+-else
+-  LIBUSB_CFLAGS=
+-  LIBUSB_LIBS=
+-fi
+-
+-
+-
+ # Checks for header files.
+ 
+ 
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 790d2a2ef3e6..9bfb750c1f05 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -24,9 +24,13 @@ OPTIONS=	LIBUSB "Enable OBEX over USB" no
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LIBUSB)
+. if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
-CONFIGURE_ARGS+=--enable-usb
 CFLAGS+=	-I${PREFIX}/include
+. else
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
+. endif
+CONFIGURE_ARGS+=--enable-usb
 .else
 CONFIGURE_ARGS+=--disable-usb
 .endif
diff --git a/comms/openobex/files/extra-patch-configure b/comms/openobex/files/extra-patch-configure
new file mode 100644
index 000000000000..01099804dc96
--- /dev/null
+++ b/comms/openobex/files/extra-patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2009-03-07 19:35:55.000000000 +0300
++++ configure	2009-03-07 19:36:21.000000000 +0300
+@@ -10736,6 +10736,11 @@
+ 		USB_LIBS="-lusb"
+ 		usb_lib_found=yes
+ 		;;
++	*-*-freebsd*)
++		USB_CFLAGS=""
++		USB_LIBS="-lusb"
++		usb_lib_found=yes
++		;;
+ 	*)
+ 
+ pkg_failed=no