Index: devel/android-tools-adb/Makefile
===================================================================
--- devel/android-tools-adb/Makefile
+++ devel/android-tools-adb/Makefile
@@ -2,8 +2,12 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	5.0.0_r7
+DISTVERSION=	5.1.1_r4
 CATEGORIES=	devel
+MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		bash_completion.d/adb?id=2b8cfec:bashcomp
+EXTRACT_ONLY=	${DISTFILES:N*\:bashcomp:C/:.*//}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Android debug bridge command line tool
@@ -14,11 +18,30 @@
 GH_ACCOUNT=	android
 GH_PROJECT=	platform_system_core
 
-USES=		gmake
+USES=		uidfix
 WRKSRC_SUBDIR=	adb
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_JOBS_UNSAFE=	yes
+MAKE_ENV=	BINDIR="${PREFIX}/bin"
 
-PLIST_FILES=	bin/adb
+PLIST_FILES=	bin/adb \
+		%%BASH%%etc/bash_completion.d/adb
+PORTDOCS=	*.txt *.TXT
+
+OPTIONS_DEFINE=	BASH DOCS
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBASH}
+LICENSE+=	MIT # debian/copyright
+LICENSE_COMB=	multi
+.endif
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H}
+	${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \
+		${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//}
+	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
+		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: devel/android-tools-adb/distinfo
===================================================================
--- devel/android-tools-adb/distinfo
+++ devel/android-tools-adb/distinfo
@@ -1,2 +1,4 @@
-SHA256 (android-platform_system_core-android-5.0.0_r7_GH0.tar.gz) = 8f2761c98f59b6860bc084a9f17b78e91543f8606aea179c293256ee05fa7c77
-SIZE (android-platform_system_core-android-5.0.0_r7_GH0.tar.gz) = 1203009
+SHA256 (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 076421a742ef98158d5ea290b8aed007f2115521f1e39832d8be3560e990ea13
+SIZE (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 1210714
+SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
+SIZE (bash_completion.d/adb?id=2b8cfec) = 5198
Index: devel/android-tools-adb/files/Makefile
===================================================================
--- devel/android-tools-adb/files/Makefile
+++ devel/android-tools-adb/files/Makefile
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+PROG=	adb
+NO_MAN=
+BINDIR?=/usr/bin
+
 SRCS+= adb.c
 SRCS+= adb_client.c
 SRCS+= adb_auth_host.c
@@ -16,7 +20,7 @@
 SRCS+= usb_libusb.c
 SRCS+= usb_vendors.c
 
-VPATH+= ../libcutils
+.PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server.c
 SRCS+= socket_local_client.c
 SRCS+= socket_local_server.c
@@ -25,31 +29,20 @@
 SRCS+= socket_network_client.c
 SRCS+= load_file.c
 
-VPATH+= ../libzipfile
+.PATH: ${.CURDIR}/../libzipfile
 SRCS+= centraldir.c
 SRCS+= zipfile.c
 
+CFLAGS+= -DADB_HOST=1
+CFLAGS+= -DHAVE_FORKEXEC=1
+CFLAGS+= -DHAVE_SYMLINKS
+CFLAGS+= -DHAVE_TERMIO_H
+CFLAGS+= -DHAVE_SYS_SOCKET_H
+CFLAGS+= -D_FILE_OFFSET_BITS=64
+CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../include
 
-CPPFLAGS+= -DADB_HOST=1
-CPPFLAGS+= -DHAVE_FORKEXEC=1
-CPPFLAGS+= -DHAVE_SYMLINKS
-CPPFLAGS+= -DHAVE_TERMIO_H
-CPPFLAGS+= -DHAVE_SYS_SOCKET_H
-CPPFLAGS+= -D_FILE_OFFSET_BITS=64
-CPPFLAGS+= -I.
-CPPFLAGS+= -I../include
-
-LIBS+= -lc -pthread -lz -lcrypto -lusb
-
-OBJS= $(SRCS:.c=.o)
-
-all: adb
-
-adb: $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
-
-install: adb
-	${BSD_INSTALL_PROGRAM} adb ${DESTDIR}${PREFIX}/bin/
+LDADD+= -lcrypto -lpthread -lusb -lz
+DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
-clean:
-	rm -rf $(OBJS) adb
+.include <bsd.prog.mk>
Index: devel/android-tools-adb/files/patch-usb_libusb.c
===================================================================
--- devel/android-tools-adb/files/patch-usb_libusb.c
+++ devel/android-tools-adb/files/patch-usb_libusb.c
@@ -9,3 +9,16 @@
  static libusb_context *ctx = NULL;
  
  struct usb_handle
+@@ -347,7 +347,11 @@ register_device(struct usb_handle *uh, c
+ 
+     adb_mutex_unlock(&usb_lock);
+ 
+-    register_usb_transport(usb, serial, NULL, 1); 
++    char devpath[64];
++    snprintf(devpath, sizeof(devpath), "ugen%d.%d",
++             uh->dev_bus, uh->dev_addr);
++
++    register_usb_transport(usb, serial, devpath, 1);
+ 
+     return (1);
+ }