Here's an update to the last usbutils package, ok?
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/usbutils/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 21 Mar 2013 08:48:54 -0000 1.6
+++ Makefile 11 Mar 2014 15:43:13 -0000
@@ -2,12 +2,10 @@
COMMENT = utility used to display information about USB devices
-VERSION = 005
+VERSION = 007
DISTNAME = usbutils_${VERSION}.orig
PKGNAME = usbutils-${VERSION}
-REVISION = 1
-
CATEGORIES = sysutils
HOMEPAGE = http://www.linux-usb.org
@@ -17,12 +15,13 @@ MAINTAINER = Martin Pieuchot <mpi@openb
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/u/usbutils/
+EXTRACT_SUFX = .tar.xz
WANTLIB = c usb-1.0 z
LIB_DEPENDS = devel/libusb1
AUTOMAKE_VERSION = 1.11
-AUTOCONF_VERSION = 2.68
+AUTOCONF_VERSION = 2.69
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/usbutils/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 15 May 2012 13:44:52 -0000 1.1.1.1
+++ distinfo 11 Mar 2014 15:43:13 -0000
@@ -1,5 +1,2 @@
-MD5 (usbutils_005.orig.tar.gz) = LpkCZdRy4vbwZiNW1lRoOw==
-RMD160 (usbutils_005.orig.tar.gz) = UP7nRFbOxj1u4l5pQxATWm5k1nQ=
-SHA1 (usbutils_005.orig.tar.gz) = 5nri5uCxT7d4srV2yPswK/pD0K8=
-SHA256 (usbutils_005.orig.tar.gz) =
KlM+WNWaojWGEOQPgHQowxiYSEWGT5QnukjSs06dXRc=
-SIZE (usbutils_005.orig.tar.gz) = 234751
+SHA256 (usbutils_007.orig.tar.xz) =
dZOgFyS7wP2f5I5ivHIc62HHZlTx17Ixs8Zfbfu676Q=
+SIZE (usbutils_007.orig.tar.xz) = 418264
Index: patches/patch-Makefile_am
===================================================================
RCS file: /home/ncvs/ports/sysutils/usbutils/patches/patch-Makefile_am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_am
--- patches/patch-Makefile_am 15 May 2012 13:44:52 -0000 1.1.1.1
+++ patches/patch-Makefile_am 11 Mar 2014 15:43:13 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-Makefile_am,v 1.1.1.1 20
No usbhid-dump(1) nor 'lsusb -t' option under OpenBSD
---- Makefile.am.orig Sun Oct 30 20:35:50 2011
-+++ Makefile.am Tue May 15 14:28:34 2012
+--- Makefile.am.orig Wed Dec 12 00:01:00 2012
++++ Makefile.am Tue Mar 11 16:28:10 2014
@@ -1,6 +1,3 @@
-SUBDIRS = \
- usbhid-dump
@@ -11,11 +11,11 @@ No usbhid-dump(1) nor 'lsusb -t' option
AM_LDFLAGS = \
-Wl,--as-needed
-@@ -19,7 +16,6 @@ bin_SCRIPTS = \
+@@ -17,7 +14,6 @@ bin_SCRIPTS = \
lsusb_SOURCES = \
lsusb.c lsusb.h \
- lsusb-t.c \
list.h \
names.c names.h \
- devtree.c devtree.h \
+ usbmisc.c usbmisc.h
Index: patches/patch-lsusb_c
===================================================================
RCS file: /home/ncvs/ports/sysutils/usbutils/patches/patch-lsusb_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lsusb_c
--- patches/patch-lsusb_c 16 Jul 2012 20:17:03 -0000 1.2
+++ patches/patch-lsusb_c 11 Mar 2014 15:43:13 -0000
@@ -2,48 +2,46 @@ $OpenBSD: patch-lsusb_c,v 1.2 2012/07/16
Disable unsupported options.
---- lsusb.c.orig Sun Oct 30 20:35:50 2011
-+++ lsusb.c Mon Jul 16 18:05:14 2012
-@@ -3902,6 +3902,7 @@ void devtree_devdisconnect(struct usbdevnode *dev)
- dev = dev; /* reduce compiler warnings */
- }
+--- lsusb.c.orig Fri Jun 7 01:13:43 2013
++++ lsusb.c Tue Mar 11 16:42:07 2014
+@@ -3856,6 +3856,7 @@ static void dumpdev(libusb_device *dev)
+
+ /* ---------------------------------------------------------------------- */
+#ifndef __OpenBSD__
- static int treedump(void)
+ static int dump_one_device(libusb_context *ctx, const char *path)
{
- int fd;
-@@ -3919,6 +3920,7 @@ static int treedump(void)
- devtree_dump(verblevel);
+ libusb_device *dev;
+@@ -3877,6 +3878,7 @@ static int dump_one_device(libusb_context *ctx, const
+ dumpdev(dev);
return 0;
}
+#endif
- /* ---------------------------------------------------------------------- */
+ static int list_devices(libusb_context *ctx, int busnum, int devnum, int
vendorid, int productid)
+ {
+@@ -3947,7 +3949,7 @@ int main(int argc, char *argv[])
-@@ -3937,7 +3939,7 @@ int main(int argc, char *argv[])
- char *cp;
- int status;
+ setlocale(LC_CTYPE, "");
-- while ((c = getopt_long(argc, argv, "D:vxtP:p:s:d:V",
-+ while ((c = getopt_long(argc, argv, "D:vxP:p:s:d:V",
+- while ((c = getopt_long(argc, argv, "D:vtP:p:s:d:Vh",
++ while ((c = getopt_long(argc, argv, "vP:p:s:d:Vh",
long_options, NULL)) != EOF) {
switch (c) {
case 'V':
-@@ -3951,11 +3953,11 @@ int main(int argc, char *argv[])
- case 'x':
- allowctrlmsg = 1;
+@@ -3961,9 +3963,11 @@ int main(int argc, char *argv[])
+ help=1;
break;
--
+
+#ifndef __OpenBSD__
case 't':
treemode = 1;
break;
--
+#endif
+
case 's':
cp = strchr(optarg, ':');
- if (cp) {
-@@ -3983,9 +3985,11 @@ int main(int argc, char *argv[])
+@@ -3992,9 +3996,11 @@ int main(int argc, char *argv[])
product = strtoul(cp, NULL, 16);
break;
@@ -55,31 +53,41 @@ Disable unsupported options.
case '?':
default:
-@@ -4004,10 +4008,12 @@ int main(int argc, char *argv[])
+@@ -4013,10 +4019,12 @@ int main(int argc, char *argv[])
" -d vendor:[product]\n"
" Show only devices with the specified vendor
and\n"
" product ID numbers (in hexadecimal)\n"
+#ifndef __OpenBSD__
" -D device\n"
" Selects which device lsusb will examine\n"
- " -t\n"
+ " -t, --tree\n"
" Dump the physical USB device hierarchy as a
tree\n"
+#endif
" -V, --version\n"
" Show version of program\n"
- );
-@@ -4033,13 +4039,16 @@ int main(int argc, char *argv[])
- return EXIT_FAILURE;
- }
+ " -h, --help\n"
+@@ -4039,6 +4047,7 @@ int main(int argc, char *argv[])
+ strerror(err));
+ status = 0;
+#ifndef __OpenBSD__
if (treemode) {
/* treemode requires at least verblevel 1 */
verblevel += 1 - VERBLEVEL_DEFAULT;
- status = treedump();
-- } else if (devdump)
-+ } else
-+ if (devdump)
+@@ -4046,6 +4055,7 @@ int main(int argc, char *argv[])
+ names_exit();
+ return status;
+ }
++#endif
+
+ err = libusb_init(&ctx);
+ if (err) {
+@@ -4053,9 +4063,11 @@ int main(int argc, char *argv[])
+ return EXIT_FAILURE;
+ }
+
++#ifndef __OpenBSD__
+ if (devdump)
status = dump_one_device(ctx, devdump);
else
+#endif
