From owner-svn-ports-all@freebsd.org  Tue Aug 22 13:24:01 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FC48DEB015;
 Tue, 22 Aug 2017 13:24:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6D1FF1DE6;
 Tue, 22 Aug 2017 13:24:01 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7MDO0og010133;
 Tue, 22 Aug 2017 13:24:00 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7MDO0T3010131;
 Tue, 22 Aug 2017 13:24:00 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201708221324.v7MDO0T3010131@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 22 Aug 2017 13:24:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r448529 - in head/devel: android-tools-fastboot-devel
 android-tools-fastboot-devel/files android-tools-fastboot/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: in head/devel: android-tools-fastboot-devel
 android-tools-fastboot-devel/files android-tools-fastboot/files
X-SVN-Commit-Revision: 448529
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Aug 2017 13:24:01 -0000

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) {