Mon Oct 8 16:54:07 2012 UTC ()
Build patches for DragonFly, from Neil Booth in PR 47042.


(dholland)
diff -r1.4 -r1.5 pkgsrc/devel/libusb1/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/libusb1/distinfo
diff -r0 -r1.1 pkgsrc/devel/libusb1/patches/patch-configure
diff -r0 -r1.1 pkgsrc/devel/libusb1/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/devel/libusb1/patches/patch-libusb_os_openbsd__usb.c
cvs diff -r1.4 -r1.5 pkgsrc/devel/libusb1/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/Makefile 2012/09/26 08:19:32 1.4
+++ pkgsrc/devel/libusb1/Makefile 2012/10/08 16:54:07 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.4 2012/09/26 08:19:32 jperkin Exp $ 1# $NetBSD: Makefile,v 1.5 2012/10/08 16:54:07 dholland Exp $
2# 2#
3 3
4DISTNAME= libusb-1.0.9 4DISTNAME= libusb-1.0.9
5PKGNAME= ${DISTNAME:S/libusb/libusb1/} 5PKGNAME= ${DISTNAME:S/libusb/libusb1/}
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libusb/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.libusb.org/wiki/libusb-1.0 11HOMEPAGE= http://www.libusb.org/wiki/libusb-1.0
12COMMENT= USB Access Library (version 1) 12COMMENT= USB Access Library (version 1)
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17NOT_FOR_PLATFORM= DragonFly-*-* SunOS-*-* 17NOT_FOR_PLATFORM= SunOS-*-*
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22 22
23PKGCONFIG_OVERRIDE+= libusb-1.0.pc.in 23PKGCONFIG_OVERRIDE+= libusb-1.0.pc.in
24 24
25CONFLICTS= libusbx-[0-9]* 25CONFLICTS= libusbx-[0-9]*
26 26
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/libusb1/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/distinfo 2012/05/30 14:10:23 1.1.1.1
+++ pkgsrc/devel/libusb1/distinfo 2012/10/08 16:54:07 1.2
@@ -1,5 +1,8 @@ @@ -1,5 +1,8 @@
1$NetBSD: distinfo,v 1.1.1.1 2012/05/30 14:10:23 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2012/10/08 16:54:07 dholland Exp $
2 2
3SHA1 (libusb-1.0.9.tar.bz2) = 025582ff2f6216e2dbc2610ae16b2e073e1b3346 3SHA1 (libusb-1.0.9.tar.bz2) = 025582ff2f6216e2dbc2610ae16b2e073e1b3346
4RMD160 (libusb-1.0.9.tar.bz2) = 5410570f8ce31783044eb04aebaae7ade3b21a61 4RMD160 (libusb-1.0.9.tar.bz2) = 5410570f8ce31783044eb04aebaae7ade3b21a61
5Size (libusb-1.0.9.tar.bz2) = 421971 bytes 5Size (libusb-1.0.9.tar.bz2) = 421971 bytes
 6SHA1 (patch-configure) = affe76f2b0644e3b4090822750058472dad2b412
 7SHA1 (patch-configure.ac) = f14ba91c76300b221db1b4761dc3b2adde8b36f7
 8SHA1 (patch-libusb_os_openbsd__usb.c) = d0956db2544f4340a97acec9f72b6b852e8c3de8
File Added: pkgsrc/devel/libusb1/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2012/10/08 16:54:07 dholland Exp $

--- configure.orig    2012-10-06 07:29:32.285323000 +0000
+++ configure
@@ -11108,6 +11108,11 @@ $as_echo "Darwin/Mac OS X" >&6; }
 $as_echo "OpenBSD" >&6; }
 	backend="openbsd"
 	;;
+*-dragonfly*)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: DragonflyBSD (using OpenBSD backend)" >&5
+$as_echo "DragonflyBSD (using OpenBSD backend)" >&6; }
+	backend="openbsd"
+	;;
 *-netbsd*)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: NetBSD (using OpenBSD backend)" >&5
 $as_echo "NetBSD (using OpenBSD backend)" >&6; }
File Added: pkgsrc/devel/libusb1/patches/Attic/patch-configure.ac
$NetBSD: patch-configure.ac,v 1.1 2012/10/08 16:54:07 dholland Exp $

--- configure.ac.orig    2012-04-20 06:44:27.000000000 +0000
+++ configure.ac
@@ -58,6 +58,10 @@ case $host in
 	AC_MSG_RESULT([OpenBSD])
 	backend="openbsd"
 	;;
+*-dragonfly*)
+	AC_MSG_RESULT([DragonflyBSD (using OpenBSD backend)])
+	backend="openbsd"
+	;;
 *-netbsd*)
 	AC_MSG_RESULT([NetBSD (using OpenBSD backend)])
 	backend="openbsd"
File Added: pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_openbsd__usb.c
$NetBSD: patch-libusb_os_openbsd__usb.c,v 1.1 2012/10/08 16:54:07 dholland Exp $

--- libusb/os/openbsd_usb.c.orig    2012-04-20 06:44:27.000000000 +0000
+++ libusb/os/openbsd_usb.c
@@ -26,7 +26,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __DragonFly__
+#include <bus/usb/usb.h>
+#else
 #include <dev/usb/usb.h>
+#endif
 
 #include "libusb.h"
 #include "libusbi.h"