Index: head/devel/android-tools-adb/Makefile
===================================================================
--- head/devel/android-tools-adb/Makefile	(revision 390134)
+++ head/devel/android-tools-adb/Makefile	(revision 390135)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	5.0.0_r7
 CATEGORIES=	devel
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Android debug bridge command line tool
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 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
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-adb/files/Makefile
===================================================================
--- head/devel/android-tools-adb/files/Makefile	(revision 390134)
+++ head/devel/android-tools-adb/files/Makefile	(revision 390135)
@@ -1,55 +1,48 @@
 # $FreeBSD$
 
+PROG=	adb
+NO_MAN=
+BINDIR?=/usr/bin
+
 SRCS+= adb.c
 SRCS+= adb_client.c
 SRCS+= adb_auth_host.c
 SRCS+= commandline.c
 SRCS+= console.c
 SRCS+= file_sync_client.c
 SRCS+= fdevent.c
 SRCS+= get_my_path_freebsd.c
 SRCS+= services.c
 SRCS+= sockets.c
 SRCS+= transport.c
 SRCS+= transport_local.c
 SRCS+= transport_usb.c
 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
 SRCS+= socket_loopback_client.c
 SRCS+= socket_loopback_server.c
 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
+LDADD+= -lcrypto -lpthread -lusb -lz
+DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
-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/
-
-clean:
-	rm -rf $(OBJS) adb
+.include <bsd.prog.mk>