- 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

3 files changed, 28 insertions, 5 deletions

diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index 058c66f7dc59..fba3ab1d1e5d 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -19,8 +19,7 @@ COMMENT=	Open source color profiler
 LIB_DEPENDS=	lcms.1:${PORTSDIR}/graphics/lcms \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		vigraimpex.2:${PORTSDIR}/graphics/vigra \
-		usb-0.1.8:${PORTSDIR}/devel/libusb
+		vigraimpex.2:${PORTSDIR}/graphics/vigra
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xext sm ice xxf86vm
@@ -33,6 +32,12 @@ CMAKE_USE_PTHREAD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/asm\/types.h/ d' ${WRKSRC}/src/argyll/spectro/hidio.c
 	@${REINPLACE_CMD} -e '/DESTINATION/ s|data/|share/${PORTNAME}/data/|' \
@@ -41,4 +46,4 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/icons/lprof.png ${PREFIX}/share/pixmaps
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c b/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c
index e3b36a617da4..0561d219f1ea 100644
--- a/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c
+++ b/graphics/lprof-devel/files/patch-src-argyll-spectro-unixio.c
@@ -1,6 +1,14 @@
 --- src/argyll/spectro/unixio.c.orig	2008-02-20 00:02:24.000000000 +0300
-+++ src/argyll/spectro/unixio.c	2008-08-03 21:47:17.000000000 +0400
-@@ -585,9 +585,8 @@
++++ src/argyll/spectro/unixio.c	2009-03-07 21:19:48.000000000 +0300
+@@ -35,6 +35,7 @@
+ #include "insttypes.h"
+ #include "icoms.h"
+ #include "usbio.h"
++#include <dirent.h>
+ 
+ #undef DEBUG
+ 
+@@ -585,9 +586,8 @@
  				break;
  
  			if (!(
diff --git a/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c b/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c
new file mode 100644
index 000000000000..9ee392c2e375
--- /dev/null
+++ b/graphics/lprof-devel/files/patch-src_argyll_spectro_usbio.c
@@ -0,0 +1,10 @@
+--- src/argyll/spectro/usbio.c.orig	2009-03-07 21:18:13.000000000 +0300
++++ src/argyll/spectro/usbio.c	2009-03-07 21:18:41.000000000 +0300
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <time.h>
+ #include <signal.h>
+ #if defined(UNIX)