ports/132420: [patch] graphics/libgphoto2 doesnt build on current

[Phillip N.]

>Number:         132420
>Category:       ports
>Synopsis:       [patch] graphics/libgphoto2 doesnt build on current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 08 15:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Phillip N.
>Release:        FreeBSD 8-CURRENT i386
>Organization:
>Environment:


System: FreeBSD ocho.sofsis.cl 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sat Mar  7 17:08:27 UTC 2009     root at ocho.sofsis.cl:/usr/obj/usr/src/sys/GENERIC-nodebug  i386



>Description:


libgphoto2 does not build on 8-CURRENT, on tinderbox.

Thanks!


>How-To-Repeat:





>Fix:


--- libgphoto2.diff begins here ---
diff -ruN libgphoto2.orig/Makefile libgphoto2/Makefile
--- libgphoto2.orig/Makefile	2009-03-07 20:13:38.000000000 +0000
+++ libgphoto2/Makefile	2009-03-08 15:09:26.000000000 +0000
@@ -40,7 +40,7 @@
 .if ${OSVERSION} < 800064
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 .else
-CONFIGURE_ENV+=	LIBUSB_LIBS="-L/usr/lib -lusb20" LIBUSB_CFLAGS="-I/usr/include/dev/usb"
+CONFIGURE_ENV+=	LIBUSB_LIBS="-L/usr/lib -lusb20" LIBUSB_CFLAGS="-I/usr/include/dev/usb -I/usr/include"
 .endif
 
 post-patch:
diff -ruN libgphoto2.orig/files/patch-libusb.c libgphoto2/files/patch-libusb.c
--- libgphoto2.orig/files/patch-libusb.c	1970-01-01 00:00:00.000000000 +0000
+++ libgphoto2/files/patch-libusb.c	2009-03-08 15:09:28.000000000 +0000
@@ -0,0 +1,10 @@
+--- libgphoto2_port/usb/libusb.c.orig	2009-03-08 15:02:44.000000000 +0000
++++ libgphoto2_port/usb/libusb.c	2009-03-08 15:03:53.000000000 +0000
+@@ -33,6 +33,7 @@
+ #include <string.h>
+ 
+ #include <usb.h>
++#include <libusb20_compat01.h>
+ 
+ #include <gphoto2/gphoto2-port.h>
+ #include <gphoto2/gphoto2-port-result.h>
--- libgphoto2.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: