svn commit: r448529 - in head/devel: android-tools-fastboot-devel android-tools-fastboot-devel/files android-tools-fastboot/files

[Jan Beich]

Author: jbeich
Date: Tue Aug 22 13:24:00 2017
New Revision: 448529
URL: https://svnweb.freebsd.org/changeset/ports/448529

Log:
  devel/android-tools-fastboot: sync usb_freebsd.cpp with -devel

Deleted:
  head/devel/android-tools-fastboot-devel/files/pkg-message.in
  head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp
Modified:
  head/devel/android-tools-fastboot-devel/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/files/usb_freebsd.cpp

Modified: head/devel/android-tools-fastboot-devel/Makefile
==============================================================================
--- head/devel/android-tools-fastboot-devel/Makefile	Tue Aug 22 13:19:49 2017	(r448528)
+++ head/devel/android-tools-fastboot-devel/Makefile	Tue Aug 22 13:24:00 2017	(r448529)
@@ -14,7 +14,6 @@ CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
 DISTINFO_FILE=	${.CURDIR}/distinfo
-FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/android-tools-fastboot/files/usb_freebsd.cpp
==============================================================================
--- head/devel/android-tools-fastboot/files/usb_freebsd.cpp	Tue Aug 22 13:19:49 2017	(r448528)
+++ head/devel/android-tools-fastboot/files/usb_freebsd.cpp	Tue Aug 22 13:24:00 2017	(r448529)
@@ -82,7 +82,7 @@ probe(std::unique_ptr<usb_handle> &h, ifc_match_func c
 	info.dev_protocol = ddesc.bDeviceProtocol;
 	info.writable = 1;
 
-	snprintf(info.device_path, sizeof(info.device_path), "ugen%d.%d",
+	snprintf(info.device_path, sizeof(info.device_path), "usb:%d:%d",
 		 libusb_get_bus_number(h->dev), libusb_get_device_address(h->dev));
 
 	if (ddesc.iSerialNumber != 0) {