pkg/44320: [PATCH] sysutils/smartmontools: usb headers on DragonFly BSD are in bus/usb/

[rumcic%gmail.com@localhost]

>Number:         44320
>Category:       pkg
>Synopsis:       [PATCH] sysutils/smartmontools: usb headers on DragonFly BSD 
>are in bus/usb/
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 03 00:15:00 +0000 2011
>Originator:     Rumko
>Release:        /
>Organization:
/
>Environment:
DragonFly rumko.rumko.net 2.9-DEVELOPMENT DragonFly 
v2.9.1.351.ga55d7-DEVELOPMENT #2: Thu Dec 30 09:30:14 CET 2010     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
Due to wrong includes in os_freebsd.cpp, the package will not compile 
succesfully on DragonFly BSD. A ticket has been opened upstream ( 
https://sourceforge.net/apps/trac/smartmontools/ticket/141 ).
>How-To-Repeat:

>Fix:
Patch available at 
http://www.rumko.net/pkgsrc/0001-sysutils-smartmontools-include-proper-usb-headers-on.patch
 and inlined here:
From efd84d3a63cb874e55c43f6c9e6631460affd16b Mon Sep 17 00:00:00 2001
From: Rumko <rumcic%gmail.com@localhost>
Date: Sat, 11 Dec 2010 21:41:03 +0100
Subject: [PATCH] sysutils/smartmontools: include proper usb headers on dfly

On DragonFly BSD, USB-related headers are located in bus/usb/ and
not in dev/usb/ like on FreeBSD.
---
 sysutils/smartmontools/distinfo         |    1 +
 sysutils/smartmontools/patches/patch-ab |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 sysutils/smartmontools/patches/patch-ab

diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo
index f266070..b17b6ed 100644
--- a/sysutils/smartmontools/distinfo
+++ b/sysutils/smartmontools/distinfo
@@ -4,4 +4,5 @@ SHA1 (smartmontools-5.40.tar.gz) = 
08a86a939a2e2cd85d2c88c09188d494f06ce050
 RMD160 (smartmontools-5.40.tar.gz) = ff2ebfd130182ba721248ebfebd9d4d5cc325ff4
 Size (smartmontools-5.40.tar.gz) = 705592 bytes
 SHA1 (patch-aa) = b6f8b3bf263a46e4c88bcafa51582bb4c802165a
+SHA1 (patch-ab) = ae47a3dd074729467b581ec66aae14be74b34e94
 SHA1 (patch-ag) = a4efc16ceb1f213979e63d7f8f50cce942c20ccf
diff --git a/sysutils/smartmontools/patches/patch-ab 
b/sysutils/smartmontools/patches/patch-ab
new file mode 100644
index 0000000..523340e
--- /dev/null
+++ b/sysutils/smartmontools/patches/patch-ab
@@ -0,0 +1,12 @@
+--- os_freebsd.cpp.orig        2010-10-14 20:46:33 +0200
++++ os_freebsd.cpp     2010-12-11 21:00:01 +0100
+@@ -59,6 +59,9 @@
+ #if (FREEBSDVER >= 800000)
+ #include <libusb20_desc.h>
+ #include <libusb20.h>
++#elif defined(__DragonFly__)
++#include <bus/usb/usb.h>
++#include <bus/usb/usbhid.h>
+ #else
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
-- 
1.7.3.2