diff options
author | reed <reed@pkgsrc.org> | 2005-08-22 17:15:23 +0000 |
---|---|---|
committer | reed <reed@pkgsrc.org> | 2005-08-22 17:15:23 +0000 |
commit | b786344c235a857e5994130a95833147b8cfba93 (patch) | |
tree | ca437fe1399e8926744ce7d945062f2760c97dad /devel/libusb | |
parent | 17c4d72e54ec0a48ecae2e504d7d155afd772c35 (diff) | |
download | pkgsrc-b786344c235a857e5994130a95833147b8cfba93.tar.gz |
Add DragonFly support. (Okayed by drochner@.)
This needs testing under DragonFly.
Diffstat (limited to 'devel/libusb')
-rw-r--r-- | devel/libusb/Makefile | 4 | ||||
-rw-r--r-- | devel/libusb/distinfo | 6 | ||||
-rw-r--r-- | devel/libusb/patches/patch-aa | 19 | ||||
-rw-r--r-- | devel/libusb/patches/patch-ad | 32 |
4 files changed, 45 insertions, 16 deletions
diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile index b958272d6a6..f7dcc0f92d2 100644 --- a/devel/libusb/Makefile +++ b/devel/libusb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:28 tv Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/22 17:15:23 reed Exp $ DISTNAME= libusb-0.1.10a CATEGORIES= devel @@ -15,6 +15,6 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-build-docs ONLY_FOR_PLATFORM= Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* -ONLY_FOR_PLATFORM+= OpenBSD-*-* +ONLY_FOR_PLATFORM+= OpenBSD-*-* DragonFly-*-* .include "../../mk/bsd.pkg.mk" diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo index d2d52b7e5dd..2c258d970b9 100644 --- a/devel/libusb/distinfo +++ b/devel/libusb/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.15 2005/02/25 14:19:33 adam Exp $ +$NetBSD: distinfo,v 1.16 2005/08/22 17:15:23 reed Exp $ SHA1 (libusb-0.1.10a.tar.gz) = 7e03a71f2cec39d96f58e22ea9289088eee617ef RMD160 (libusb-0.1.10a.tar.gz) = 18d50ac645440925bfa9f58d7a311d857e640882 Size (libusb-0.1.10a.tar.gz) = 375144 bytes -SHA1 (patch-aa) = f9a4a5d48b11ccddcaba77b23d1b7f8c91778c7d +SHA1 (patch-aa) = 3c3832a07f197da37c619a1c27f27be6198d5d26 SHA1 (patch-ab) = bc4756536ce7b2cc49d0c7c48c249f146f185839 SHA1 (patch-ac) = cc92318e0979779f6ef03ee653bc94ee2b96a055 -SHA1 (patch-ad) = a04dcc518d1e0c31e9f2431a88896b25ea4f4824 +SHA1 (patch-ad) = 6a5ef6d90dd67769e384ddec0743aeee4b9a4ddd SHA1 (patch-ae) = ba0d7d7602a27d3a27539305b5b3308d1ac385fc diff --git a/devel/libusb/patches/patch-aa b/devel/libusb/patches/patch-aa index bcdaaa039de..ff5fffe32e3 100644 --- a/devel/libusb/patches/patch-aa +++ b/devel/libusb/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.5 2005/02/14 09:50:18 adam Exp $ +$NetBSD: patch-aa,v 1.6 2005/08/22 17:15:23 reed Exp $ ---- configure.orig 2005-02-11 01:51:06.000000000 +0000 -+++ configure -@@ -19226,8 +19226,8 @@ _ACEOF +--- configure.orig 2005-02-14 12:23:23.000000000 -0800 ++++ configure 2005-08-20 09:00:04.000000000 -0700 +@@ -19211,7 +19211,7 @@ + echo "${ECHO_T}Linux" >&6 + OSLIBS="" + ;; +- *-freebsd*|*-openbsd*|*-netbsd*) ++ *-freebsd*|*-openbsd*|*-netbsd*|*-dragonfly*) + cat >>confdefs.h <<\_ACEOF + #define BSD_API 1 + _ACEOF +@@ -19226,8 +19226,8 @@ BSD_API=1 os_support=bsd @@ -13,7 +22,7 @@ $NetBSD: patch-aa,v 1.5 2005/02/14 09:50:18 adam Exp $ OSLIBS="" ;; *-darwin*) -@@ -21635,17 +21635,11 @@ cat confdefs.h >>conftest.$ac_ext +@@ -21635,17 +21635,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <dev/usb/usb.h> diff --git a/devel/libusb/patches/patch-ad b/devel/libusb/patches/patch-ad index 1d4240882ee..508e22660ce 100644 --- a/devel/libusb/patches/patch-ad +++ b/devel/libusb/patches/patch-ad @@ -1,8 +1,28 @@ -$NetBSD: patch-ad,v 1.5 2005/02/14 09:50:18 adam Exp $ +$NetBSD: patch-ad,v 1.6 2005/08/22 17:15:23 reed Exp $ ---- bsd.c.orig 2004-02-18 06:34:52.000000000 +0000 -+++ bsd.c -@@ -399,7 +399,7 @@ int usb_interrupt_write(usb_dev_handle * +--- bsd.c.orig 2004-02-17 22:34:52.000000000 -0800 ++++ bsd.c 2005-08-20 09:08:12.000000000 -0700 +@@ -35,14 +35,18 @@ + #include <sys/time.h> + #include <sys/ioctl.h> + ++#if (__DragonFly__) ++#include <bus/usb/usb.h> ++#else + #include <dev/usb/usb.h> ++#endif + + #include "usbi.h" + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + +-#ifdef HAVE_OLD_DEV_USB_USB_H ++#if defined(HAVE_OLD_DEV_USB_USB_H) && !defined(__DragonFly__) + /* + * It appears some of the BSD's (OpenBSD atleast) have switched over to a + * new naming convention, so we setup some macro's for backward +@@ -399,7 +403,7 @@ int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size, int timeout) { @@ -11,7 +31,7 @@ $NetBSD: patch-ad,v 1.5 2005/02/14 09:50:18 adam Exp $ /* Ensure the endpoint address is correct */ ep |= USB_ENDPOINT_IN; -@@ -425,7 +425,8 @@ int usb_interrupt_read(usb_dev_handle *d +@@ -425,7 +429,8 @@ USB_ERROR_STR(-errno, "error setting short xfer: %s", strerror(errno)); do { @@ -21,7 +41,7 @@ $NetBSD: patch-ad,v 1.5 2005/02/14 09:50:18 adam Exp $ if (ret < 0) #if __FreeBSD__ USB_ERROR_STR(-errno, "error reading from interrupt endpoint %s.%d: %s", -@@ -435,7 +436,7 @@ int usb_interrupt_read(usb_dev_handle *d +@@ -435,7 +440,7 @@ dev->device->filename, UE_GET_ADDR(ep), strerror(errno)); #endif retrieved += ret; |