Index: head/graphics/sane-backends/Makefile
===================================================================
--- head/graphics/sane-backends/Makefile	(revision 230437)
+++ head/graphics/sane-backends/Makefile	(revision 230438)
@@ -1,77 +1,75 @@
 # New ports collection makefile for:	sane-backends
 # Date created:			Sat Jul 19 16:23:10 MET DST 1997
 # Whom:				gary@hotlava.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sane-backends
 PORTVERSION=	1.0.19
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/2318/ \
 		ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp2.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://ftp3.sane-project.org/pub/sane/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/hci/sane/%SUBDIR%/ \
 		http://gd.tuwien.ac.at/hci/sane/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 OPTIONS=	USB "USB support" on \
 		NLS "NLS support" on \
 		GPHOTO2 "gPhoto2 support" off
 
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-docdir=${DOCSDIR} \
 		--disable-locking
 
 MAKE_ENV=	NOPORTDOCS=${NOPORTDOCS}
 USE_LDCONFIG=	yes
 
 .include "Makefile.man"
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800069
-BROKEN=	does not compile due to changes in USB stack
-.endif
-
 .if defined(WITHOUT_USB)
 CONFIGURE_ARGS+=	--disable-libusb
 .else
+.if ${OSVERSION} < 800069
 LIB_DEPENDS+=		usb-0.1.8:${PORTSDIR}/devel/libusb
+.endif
 .endif
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-translations
 PLIST_SUB+=		NLS="@comment "
 .else
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .endif
 
 .if defined(WITH_GPHOTO2)
 LIB_DEPENDS+=		gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 PLIST_SUB+=		GPHOTO2=""
 .else
 CONFIGURE_ARGS+=	--with-gphoto2=no
 PLIST_SUB+=		GPHOTO2="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|= \.\./libtool|= @LIBTOOL@|g'
 	@${REINPLACE_CMD} -e '/^for ac_header in/s|libc.h||g ; \
 		 s|} -D_REENT|} ${PTHREAD_CFLAGS} -D_REENT|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>

Property changes on: head/graphics/sane-backends/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.81
\ No newline at end of property
+1.82
\ No newline at end of property
Index: head/graphics/sane-backends/files/patch-sanei_sanei_usb.c
===================================================================
--- head/graphics/sane-backends/files/patch-sanei_sanei_usb.c	(nonexistent)
+++ head/graphics/sane-backends/files/patch-sanei_sanei_usb.c	(revision 230438)
@@ -0,0 +1,19 @@
+--- sanei/sanei_usb.c.orig	2009-03-18 17:05:03.000000000 -0700
++++ sanei/sanei_usb.c	2009-03-18 17:05:06.000000000 -0700
+@@ -88,6 +88,7 @@
+ #endif /* HAVE_USBCALLS */
+ 
+ #if defined (__FreeBSD__) 
++#include <sys/param.h>
+ #include <dev/usb/usb.h>
+ #endif /* __FreeBSD__ */
+ #if defined (__DragonFly__)
+@@ -252,7 +253,7 @@
+     *vendorID = vendor;
+     *productID = product;
+   }
+-#elif defined (__FreeBSD__) || defined (__DragonFly__)
++#elif (defined (__FreeBSD__) && __FreeBSD_version < 800064) || defined (__DragonFly__)
+   {
+     int controller;
+     int ctrl_fd;

Property changes on: head/graphics/sane-backends/files/patch-sanei_sanei_usb.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.4
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property