Updated to 0.1.4. List of changes is unknown (ChangeLog was not updated).

6 files changed, 10 insertions, 95 deletions

diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile
index 038a7ca7d83..6975ebc23a0 100644
--- a/devel/libusb/Makefile
+++ b/devel/libusb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/07/24 11:17:46 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/03 10:42:49 martti Exp $
 #
 
-DISTNAME=	libusb-0.1.3b
+DISTNAME=	libusb-0.1.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libusb/}
 
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 0b36b664846..3ea1234e6f2 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:50 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/03 10:42:49 martti Exp $
 bin/libusb-config
 include/usb.h
-lib/libusb-0.1.so.3.0
-lib/libusb-0.1.so.3
+lib/libusb-0.1.so.4.0
+lib/libusb-0.1.so.4
 lib/libusb-0.1.so
 lib/libusb.so
 lib/libusb.la
diff --git a/devel/libusb/buildlink.mk b/devel/libusb/buildlink.mk
index bceb5474e28..a4197a2b784 100644
--- a/devel/libusb/buildlink.mk
+++ b/devel/libusb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/10/03 20:56:45 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/01/03 10:42:49 martti Exp $
 #
 # This Makefile fragment is included by packages that use libusb.
 #
@@ -17,7 +17,7 @@ LIBUSB_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libusb?=	libusb-*
+BUILDLINK_DEPENDS.libusb?=	libusb>=0.1.4
 DEPENDS+=	${BUILDLINK_DEPENDS.libusb}:../../devel/libusb
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libusb=libusb
diff --git a/devel/libusb/distinfo b/devel/libusb/distinfo
index 218298332a1..476888f4f42 100644
--- a/devel/libusb/distinfo
+++ b/devel/libusb/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/06/15 16:36:51 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/01/03 10:42:49 martti Exp $
 
-SHA1 (libusb-0.1.3b.tar.gz) = ff64bf2c093f37c3f3b4ebbb40601f49e1d5fb64
-Size (libusb-0.1.3b.tar.gz) = 121141 bytes
-SHA1 (patch-aa) = 38de6f762249a6a2fa5d36bebcca3ce2b17bdb15
-SHA1 (patch-ab) = 0e602386aa7892f07a22ce7ed3ce8d844a8c57a5
+SHA1 (libusb-0.1.4.tar.gz) = 16d4ec5b7efccbc1997177799b20bd3e38be4a4d
+Size (libusb-0.1.4.tar.gz) = 128415 bytes
 SHA1 (patch-ac) = 4e68ca416a75d54845bb0c19e17bd1c3d42ed252
diff --git a/devel/libusb/patches/patch-aa b/devel/libusb/patches/patch-aa
deleted file mode 100644
index 61147f7dd82..00000000000
--- a/devel/libusb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/28 10:11:41 drochner Exp $
-
---- configure.orig	Fri Feb 16 17:58:02 2001
-+++ configure	Fri Feb 16 17:58:29 2001
-@@ -1605,7 +1605,7 @@
-     os_support=linux
-     echo "$ac_t""Linux" 1>&6
-     ;;
--  *-freebsd*)
-+  *-freebsd*|*-netbsd*)
-     cat >> confdefs.h <<\EOF
- #define FREEBSD 1
- EOF
diff --git a/devel/libusb/patches/patch-ab b/devel/libusb/patches/patch-ab
deleted file mode 100644
index 7cb2c9b5c22..00000000000
--- a/devel/libusb/patches/patch-ab
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/06/15 16:36:51 drochner Exp $
-
---- freebsd.c.orig	Tue Oct 10 00:08:22 2000
-+++ freebsd.c	Fri Jun 15 18:07:19 2001
-@@ -41,16 +41,18 @@
- {
-     int i;
-     struct freebsd_usb_dev_handle_info *info;
-+    char ctlpath[PATH_MAX];
- 
-     info = malloc(sizeof(*info));
-     if (!info)
- 	USB_ERROR(-ENOMEM);
-     dev->impl_info = info;
- 
--    dev->fd = open(dev->device->filename, O_RDWR);
-+    snprintf(ctlpath, PATH_MAX, "%s.00", dev->device->filename);
-+    dev->fd = open(ctlpath, O_RDWR);
-     if (dev->fd < 0) 
-     {
--	dev->fd = open(dev->device->filename, O_RDONLY);
-+	dev->fd = open(ctlpath, O_RDONLY);
- 	if (dev->fd < 0)
- 	{
- 	    free(info);
-@@ -152,10 +154,10 @@
- 
-     if(info->ep_fd[ep] < 0)
-     {
--	sprintf(buf, "%s.%d", dev->device->filename, ep);
--	fd = open(buf, O_RDONLY);
-+	sprintf(buf, "%s.%02d", dev->device->filename, ep);
-+	fd = open(buf, mode);
- 	if(fd < 0)
--	    USB_ERROR_STR(fd, "can't open %s for bulk read: %s\n",
-+	    USB_ERROR_STR(fd, "can't open %s for bulk operations: %s\n",
- 			  buf, strerror(errno));
- 	info->ep_fd[ep] = fd;
-     }
-@@ -234,10 +236,12 @@
-     req.data = bytes;
-     req.flags = 0;
- 
-+#if 0
-     ret = ioctl(dev->fd, USB_SET_TIMEOUT, &timeout);
-     if (ret < 0)
- 	USB_ERROR_STR(ret, "error setting timeout: %s",
- 		      strerror(errno));
-+#endif
- 
-     ret = ioctl(dev->fd, USB_DO_REQUEST, &req);
-     if (ret < 0)
-@@ -285,7 +289,7 @@
- 
- 	/* Open its control endpoint */
- 
--	sprintf(buf, "/dev/%s", di.devnames[0]);
-+	sprintf(buf, "/dev/%s.00", di.devnames[0]);
- 	dfd = open(buf, O_RDONLY);
- 	if(dfd < 0)
- 	{
-@@ -302,7 +306,7 @@
- 
- 	dev->bus = bus;
- 
--	strcpy(dev->filename, buf);
-+	sprintf(dev->filename, "/dev/%s", di.devnames[0]);
- 
- 	if(ioctl(dfd, USB_GET_DEVICE_DESC, &dev->descriptor) < 0)
- 	    USB_ERROR_STR(-errno, "couldn't get device descriptor for %s: %s",