Mon Oct 8 16:59:27 2012 UTC ()
oops, add patch comments (meant to do that before committing)


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

--- pkgsrc/devel/libusb1/distinfo 2012/10/08 16:54:07 1.2
+++ pkgsrc/devel/libusb1/distinfo 2012/10/08 16:59:26 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2012/10/08 16:54:07 dholland Exp $ 1$NetBSD: distinfo,v 1.3 2012/10/08 16:59:26 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 6SHA1 (patch-configure) = 16945e970e356009d1022d9832ef3ee532435422
7SHA1 (patch-configure.ac) = f14ba91c76300b221db1b4761dc3b2adde8b36f7 7SHA1 (patch-configure.ac) = 3d8234d368409a23da0f346822bea276c6081e8b
8SHA1 (patch-libusb_os_openbsd__usb.c) = d0956db2544f4340a97acec9f72b6b852e8c3de8 8SHA1 (patch-libusb_os_openbsd__usb.c) = 2c8c5b9efe7c809120d752b49c6484edbc2cac71
cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/patches/Attic/patch-configure 2012/10/08 16:54:07 1.1
+++ pkgsrc/devel/libusb1/patches/Attic/patch-configure 2012/10/08 16:59:26 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-configure,v 1.1 2012/10/08 16:54:07 dholland Exp $ 1$NetBSD: patch-configure,v 1.2 2012/10/08 16:59:26 dholland Exp $
 2
 3Recognize Dragonfly.
2 4
3--- configure.orig 2012-10-06 07:29:32.285323000 +0000 5--- configure.orig 2012-10-06 07:29:32.285323000 +0000
4+++ configure 6+++ configure
5@@ -11108,6 +11108,11 @@ $as_echo "Darwin/Mac OS X" >&6; } 7@@ -11108,6 +11108,11 @@ $as_echo "Darwin/Mac OS X" >&6; }
6 $as_echo "OpenBSD" >&6; } 8 $as_echo "OpenBSD" >&6; }
7 backend="openbsd" 9 backend="openbsd"
8 ;; 10 ;;
9+*-dragonfly*) 11+*-dragonfly*)
10+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: DragonflyBSD (using OpenBSD backend)" >&5 12+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: DragonflyBSD (using OpenBSD backend)" >&5
11+$as_echo "DragonflyBSD (using OpenBSD backend)" >&6; } 13+$as_echo "DragonflyBSD (using OpenBSD backend)" >&6; }
12+ backend="openbsd" 14+ backend="openbsd"
13+ ;; 15+ ;;
14 *-netbsd*) 16 *-netbsd*)
cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/patches/Attic/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/patches/Attic/patch-configure.ac 2012/10/08 16:54:07 1.1
+++ pkgsrc/devel/libusb1/patches/Attic/patch-configure.ac 2012/10/08 16:59:26 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-configure.ac,v 1.1 2012/10/08 16:54:07 dholland Exp $ 1$NetBSD: patch-configure.ac,v 1.2 2012/10/08 16:59:26 dholland Exp $
 2
 3Recognize Dragonfly.
2 4
3--- configure.ac.orig 2012-04-20 06:44:27.000000000 +0000 5--- configure.ac.orig 2012-04-20 06:44:27.000000000 +0000
4+++ configure.ac 6+++ configure.ac
5@@ -58,6 +58,10 @@ case $host in 7@@ -58,6 +58,10 @@ case $host in
6 AC_MSG_RESULT([OpenBSD]) 8 AC_MSG_RESULT([OpenBSD])
7 backend="openbsd" 9 backend="openbsd"
8 ;; 10 ;;
9+*-dragonfly*) 11+*-dragonfly*)
10+ AC_MSG_RESULT([DragonflyBSD (using OpenBSD backend)]) 12+ AC_MSG_RESULT([DragonflyBSD (using OpenBSD backend)])
11+ backend="openbsd" 13+ backend="openbsd"
12+ ;; 14+ ;;
13 *-netbsd*) 15 *-netbsd*)
14 AC_MSG_RESULT([NetBSD (using OpenBSD backend)]) 16 AC_MSG_RESULT([NetBSD (using OpenBSD backend)])
cvs diff -r1.1 -r1.2 pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_openbsd__usb.c (expand / switch to unified diff)

--- pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_openbsd__usb.c 2012/10/08 16:54:07 1.1
+++ pkgsrc/devel/libusb1/patches/Attic/patch-libusb_os_openbsd__usb.c 2012/10/08 16:59:26 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-libusb_os_openbsd__usb.c,v 1.1 2012/10/08 16:54:07 dholland Exp $ 1$NetBSD: patch-libusb_os_openbsd__usb.c,v 1.2 2012/10/08 16:59:26 dholland Exp $
 2
 3Fix build on Dragonfly.
2 4
3--- libusb/os/openbsd_usb.c.orig 2012-04-20 06:44:27.000000000 +0000 5--- libusb/os/openbsd_usb.c.orig 2012-04-20 06:44:27.000000000 +0000
4+++ libusb/os/openbsd_usb.c 6+++ libusb/os/openbsd_usb.c
5@@ -26,7 +26,11 @@ 7@@ -26,7 +26,11 @@
6 #include <string.h> 8 #include <string.h>
7 #include <unistd.h> 9 #include <unistd.h>
8  10
9+#ifdef __DragonFly__ 11+#ifdef __DragonFly__
10+#include <bus/usb/usb.h> 12+#include <bus/usb/usb.h>
11+#else 13+#else
12 #include <dev/usb/usb.h> 14 #include <dev/usb/usb.h>
13+#endif 15+#endif
14  16