From owner-freebsd-ports@FreeBSD.ORG  Mon Mar  2 17:25:19 2009
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7916106564A
	for <ports@FreeBSD.org>; Mon,  2 Mar 2009 17:25:19 +0000 (UTC)
	(envelope-from mel@smoochies.rachie.is-a-geek.net)
Received: from mail.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27])
	by mx1.freebsd.org (Postfix) with ESMTP id 97EB28FC14
	for <ports@FreeBSD.org>; Mon,  2 Mar 2009 17:25:19 +0000 (UTC)
	(envelope-from mel@smoochies.rachie.is-a-geek.net)
Received: from smoochies.rachie.is-a-geek.net (smoochies.rachie.is-a-geek.net
	[192.168.1.50])
	by mail.rachie.is-a-geek.net (Postfix) with ESMTP id 7FD3CAFC1FE;
	Mon,  2 Mar 2009 08:08:11 -0900 (AKST)
Received: by smoochies.rachie.is-a-geek.net (Postfix, from userid 1003)
	id 5C85184445; Mon,  2 Mar 2009 08:08:10 -0900 (AKST)
To: FreeBSD-gnats-submit@freebsd.org
From: Mel Flynn <mel@rachie.is-a-geek.net>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <20090302170811.5C85184445@smoochies.rachie.is-a-geek.net>
Date: Mon,  2 Mar 2009 08:08:10 -0900 (AKST)
Cc: MAINTAINER <ports@FreeBSD.org>
Subject: [PATCH] Make graphics/sane-backends work on -CURRENT
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Mar 2009 17:25:20 -0000


>Submitter-Id:	current-users
>Originator:	Mel Flynn
>Confidential:	no 
>Synopsis:	[PATCH] Make graphics/sane-backends work on -CURRENT
>Severity:	serious
>Priority:	medium
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 8.0-CURRENT i386
>Environment:
System: FreeBSD smoochies.wlan.rachie.is-a-geek.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Sat Feb 28 17:05:35 AKST 2009 mel@smoochies.wlan.rachie.is-a-geek.net:/usr/obj/usr/src/sys/SMOOCHIES i386


	
>Description:
Use legacy usb until proper fix is done upstream.
>How-To-Repeat:
on -CURRENT after usb2 import, make -C /usr/ports/graphics/sane-backends build
>Fix:

New file to be added in files/

--- patch-sanei_sanei_usb.c begins here ---
--- sanei/sanei_usb.c.orig	2007-11-15 23:46:32.000000000 -0900
+++ sanei/sanei_usb.c	2009-03-02 07:58:37.000000000 -0900
@@ -88,7 +88,12 @@
 #endif /* HAVE_USBCALLS */
 
 #if defined (__FreeBSD__) 
+#include <sys/param.h>
+#if __FreeBSD_version+0 >= 800064
+#include <legacy/dev/usb/usb.h>
+#else
 #include <dev/usb/usb.h>
+#endif
 #endif /* __FreeBSD__ */
 #if defined (__DragonFly__)
 #include <bus/usb/usb.h>
--- patch-sanei_sanei_usb.c ends here ---