[kde-freebsd] ports/136367: misc/kdeedu3 borken on -current

[Daniel M. Eischen]

The following reply was made to PR ports/136367; it has been noted by GNATS.

From: "Daniel M. Eischen" <eischen at vigrid.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/136367: misc/kdeedu3 borken on -current
Date: Mon, 06 Jul 2009 03:59:40 -0400

 This is a multi-part message in MIME format.
 --------------080905010602030106080803
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 The attached patch fixes the build for me.  I have no idea whether it is
 technically correct, so YMMV.
 
 -- 
 DE
 
 --------------080905010602030106080803
 Content-Type: text/plain;
  name="kdeedu3.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="kdeedu3.patch"
 
 Index: files/patch-kstars-indi-fli_libfli-usb-sys-bsd.c
 ===================================================================
 RCS file: /opt/FreeBSD/cvs/ports/misc/kdeedu3/files/patch-kstars-indi-fli_libfli-usb-sys-bsd.c,v
 retrieving revision 1.1
 diff -u -r1.1 patch-kstars-indi-fli_libfli-usb-sys-bsd.c
 --- files/patch-kstars-indi-fli_libfli-usb-sys-bsd.c	16 Apr 2009 09:01:28 -0000	1.1
 +++ files/patch-kstars-indi-fli_libfli-usb-sys-bsd.c	6 Jul 2009 21:23:13 -0000
 @@ -1,19 +1,18 @@
 -
 ---- kstars/kstars/indi/fli/libfli-usb-sys-bsd.c.orig	2005-09-10 03:17:35.000000000 -0500
 -+++ kstars/kstars/indi/fli/libfli-usb-sys-bsd.c	2009-03-26 09:44:39.470081183 -0500
 -@@ -41,8 +41,13 @@
 +--- kstars/kstars/indi/fli/libfli-usb-sys-bsd.c.orig	2005-09-10 04:17:35.000000000 -0400
 ++++ kstars/kstars/indi/fli/libfli-usb-sys-bsd.c	2009-07-06 17:12:21.000000000 -0400
 +@@ -41,8 +41,15 @@
   
   */
   
  +#include <sys/param.h>
   #include <sys/types.h>
 -+#if __FreeBSD_version > 800061
 -+#include <legacy/dev/usb/usb.h>
 ++#if __FreeBSD_version >= 800069
 ++#include <libusb20.h>
 ++#include <dev/usb/usb_ioctl.h>
 ++#define	USB_SET_TIMEOUT	USB_SET_RX_TIMEOUT
  +#else
   #include <dev/usb/usb.h>
  +#endif
   #include <sys/ioctl.h>
   
   #include <unistd.h>
 -
 -
 
 --------------080905010602030106080803--