Index: head/devel/android-tools-adb-devel/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/Makefile	(revision 401214)
+++ head/devel/android-tools-adb-devel/Makefile	(revision 401215)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-4374
-DISTVERSIONSUFFIX=	-gf83766079e24
-PORTREVISION=	1
+DISTVERSION=	m-preview-5498
+DISTVERSIONSUFFIX=	-g0bb1ce06ea46
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 OPTIONS_DEFINE=	TEST_PYTHON
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development
-TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2091-g6d49ceb:development
+TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2403-g084d084:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 TEST_PYTHON_USES=	python:2.7,build
 
 pre-install-TEST_PYTHON-on:
 # XXX python tests may leave behind running adb server
 # test_adb.py remains in core repository for some reason
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} ${WRKSRC_development}/python-packages/adb/test_device.py
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-adb-devel/distinfo
===================================================================
--- head/devel/android-tools-adb-devel/distinfo	(revision 401214)
+++ head/devel/android-tools-adb-devel/distinfo	(revision 401215)
@@ -1,6 +1,6 @@
-SHA256 (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 099ad3bfb625a52665562291bd822955695046e4c5d68b7f6d5fd39e265a1efd
-SIZE (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 1365538
+SHA256 (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 6495262da5f639cb76625437c82475c6220cab208666cf739508871ce36e79da
+SIZE (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 1407054
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
-SHA256 (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = ea74221301367e0f8788cfca585a015c930aa98a5fded23caaed762bafcd3a2f
-SIZE (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = 126184363
+SHA256 (android-platform_development-android-m-preview-2403-g084d084_GH0.tar.gz) = a7c33bf2708d61ae2e44ff149fac2460f80746e7da936f08b373841be5750102
+SIZE (android-platform_development-android-m-preview-2403-g084d084_GH0.tar.gz) = 183883403
Index: head/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
===================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp	(revision 401214)
+++ head/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp	(nonexistent)
@@ -1,11 +0,0 @@
---- adb/fdevent.cpp.orig	2015-09-17 22:58:36 UTC
-+++ adb/fdevent.cpp
-@@ -53,7 +53,7 @@ int SHELL_EXIT_NOTIFY_FD = -1;
- 
- struct PollNode {
-   fdevent* fde;
--  pollfd pollfd;
-+  ::pollfd pollfd; // -fpermissive
- 
-   PollNode(fdevent* fde) : fde(fde) {
-       memset(&pollfd, 0, sizeof(pollfd));

Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/android-tools-adb-devel/files/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/files/Makefile	(revision 401214)
+++ head/devel/android-tools-adb-devel/files/Makefile	(revision 401215)
@@ -1,121 +1,122 @@
 # $FreeBSD$
 
 PROG_CXX=adb
 NO_MAN=
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
 
 FILES= *.[Tt][Xx][Tt]
 
 SRCS+= adb.cpp
 SRCS+= adb_auth.cpp
 SRCS+= adb_auth_host.cpp
 SRCS+= adb_client.cpp
 SRCS+= adb_io.cpp
 SRCS+= adb_listeners.cpp
 SRCS+= adb_trace.cpp
 SRCS+= adb_utils.cpp
 SRCS+= commandline.cpp
 SRCS+= console.cpp
 SRCS+= fdevent.cpp
 SRCS+= file_sync_client.cpp
+SRCS+= line_printer.cpp
 SRCS+= services.cpp
 SRCS+= shell_service_protocol.cpp
 # XXX SuffFindDeps may fail to restore suffix lost in transformation
 SRCS+= ../adb/sockets.cpp
 SRCS+= transport.cpp
 SRCS+= transport_local.cpp
 SRCS+= transport_usb.cpp
 
 TEST_SRCS+= adb_io_test.cpp
 TEST_SRCS+= adb_utils_test.cpp
 TEST_SRCS+= fdevent_test.cpp
 TEST_SRCS+= shell_service_protocol_test.cpp
 TEST_SRCS+= socket_test.cpp
 TEST_SRCS+= transport_test.cpp
 
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
 
 .PATH: ${EXTRADIR}
 SRCS+= get_my_path_freebsd.cpp
 SRCS+= usb_libusb.cpp
 
 .PATH: ${.CURDIR}/../base
 SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= strings.cpp
 SRCS+= stringprintf.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
 
 .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
 SRCS+= threads.c
 
 # required by base/file.cpp
 .PATH: ${.CURDIR}/../liblog
 SRCS+= fake_log_device.c
 SRCS+= logd_write.c
 CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
 
 REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
 CPPFLAGS+= -DADB_REVISION="\"${REVISION}-android\""
 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${.CURDIR}
 CPPFLAGS+= -I${.CURDIR}/../include
 CPPFLAGS+= -I${.CURDIR}/../base/include
 CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
 CPPFLAGS+= $$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null)
 CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+= -std=gnu++11
 
 .ifndef COMPILE.c
 CFLAGS+= ${CPPFLAGS}
 CXXFLAGS+= ${CPPFLAGS}
 .endif
 
 TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
 CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
 .endfor
 
 LDADD+= $$(${PKG_CONFIG} libcrypto --libs 2>/dev/null || echo -lcrypto)
 LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+= -lz \-lpthread
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
 
 TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
 CLEANFILES+= ${PROG}_test ${TEST_OBJS}
 
 GIT?= git
 GTEST_CONFIG?= gtest-config
 PKG_CONFIG?= pkg-config
 
 beforeinstall:
 	${INSTALL} -d ${DESTDIR}${FILESDIR}
 
 .include <bsd.prog.mk>
 
 test: ${PROG}_test
 	@for f in ${.ALLSRC}; do ./$$f; done
 
 ${PROG}_test: ${OBJS:Nmain.o:Ncommandline.o} ${TEST_OBJS}
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
Index: head/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp
===================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp	(nonexistent)
+++ head/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp	(revision 401215)
@@ -0,0 +1,11 @@
+--- adb/adb_utils_test.cpp.orig	2015-11-07 17:05:12 UTC
++++ adb/adb_utils_test.cpp
+@@ -194,7 +194,7 @@ TEST(adb_utils, parse_host_and_port) {
+ }
+ 
+ void test_mkdirs(const std::string basepath) {
+-  EXPECT_TRUE(mkdirs(basepath));
++  EXPECT_TRUE(mkdirs(adb_dirname(basepath)));
+   EXPECT_NE(-1, adb_creat(basepath.c_str(), 0600));
+   EXPECT_FALSE(mkdirs(basepath + "/subdir/"));
+ }

Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/devel/android-tools-fastboot-devel/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/Makefile	(revision 401214)
+++ head/devel/android-tools-fastboot-devel/Makefile	(revision 401215)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-1212
-DISTVERSIONSUFFIX=	-g94c617ccbba4
-PORTREVISION=	3
+DISTVERSION=	m-preview-5498
+DISTVERSIONSUFFIX=	-g0bb1ce06ea46
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-195-g7434d1f:extras \
-		${DISTVERSIONFULL:C/-[0-9].*//}-19-g249094f:libselinux
+GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-972-g442e952:extras \
+		${DISTVERSIONFULL:C/-[0-9].*//}-90-ga83098b:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-fastboot-devel/distinfo
===================================================================
--- head/devel/android-tools-fastboot-devel/distinfo	(revision 401214)
+++ head/devel/android-tools-fastboot-devel/distinfo	(revision 401215)
@@ -1,10 +1,10 @@
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c
-SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686
-SHA256 (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = b08cf354cc0e920df937356d8fb024dfae660c2a8fee549c833199e033cb163c
-SIZE (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = 76441782
-SHA256 (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 3539bdbe4444e0b84da7f0ef1d0ab9d46cc6af537062c1016a6400bd09397d41
-SIZE (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 58632
+SHA256 (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 6495262da5f639cb76625437c82475c6220cab208666cf739508871ce36e79da
+SIZE (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 1407054
+SHA256 (jbeich-platform_system_extras-android-m-preview-972-g442e952_GH0.tar.gz) = 77082c3fae368dda9fe0a7edb2b54cfb3c47a849f5fe3ab160225304e3598e1e
+SIZE (jbeich-platform_system_extras-android-m-preview-972-g442e952_GH0.tar.gz) = 76529760
+SHA256 (jbeich-platform_external_libselinux-android-m-preview-90-ga83098b_GH0.tar.gz) = 05afbdfad4028c4cdc62d1fa831760cded52883749e686a5c0cea5901d5aa33c
+SIZE (jbeich-platform_external_libselinux-android-m-preview-90-ga83098b_GH0.tar.gz) = 58818
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
Index: head/devel/android-tools-fastboot-devel/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot-devel/files/Makefile	(revision 401214)
+++ head/devel/android-tools-fastboot-devel/files/Makefile	(revision 401215)
@@ -1,111 +1,112 @@
 # $FreeBSD$
 
 PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
 
 FILES=	*.[Tt][Xx][Tt]
 
 SRCS+=	bootimg_utils.cpp
 SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
 SRCS+=	fs.cpp
 SRCS+=	protocol.cpp
 SRCS+=	util.cpp
 
 .PATH: ${EXTRADIR}
 SRCS+=	usb_freebsd.cpp
 SRCS+=	util_freebsd.cpp
 
-# required by libziparchive
+# required by fastboot and libziparchive
 .PATH: ${.CURDIR}/../base
 SRCS+=	file.cpp
+SRCS+=	strings.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../ext4_utils
 SRCS+=	allocate.c
 SRCS+=	contents.c
 SRCS+=	crc16.c
 SRCS+=	ext4_sb.c
 SRCS+=	ext4_utils.c
 SRCS+=	ext4fixup.c
 SRCS+=	extent.c
 SRCS+=	indirect.c
 SRCS+=	make_ext4fs.c
 SRCS+=	sha1.c
 SRCS+=	wipe.c
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
 SRCS+=	fake_log_device.c
 SRCS+=	logd_write.c
 CPPFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
 
 # required by ext4_utils
 .PATH:	${.CURDIR}/../libselinux/src
 SRCS+=	callbacks.c
 SRCS+=	check_context.c
 SRCS+=	freecon.c
 SRCS+=	init.c
 SRCS+=	label.c
 SRCS+=	label_android_property.c
 SRCS+=	label_file.c
 SRCS+=	label_support.c
 CPPFLAGS.label_file.c+=	-D_WITH_GETLINE
 
 # required by fastboot and ext4_utils
 .PATH:	${.CURDIR}/../libsparse
 SRCS+=	backed_block.c
 SRCS+=	output_file.c
 SRCS+=	sparse.c
 SRCS+=	sparse_crc32.c
 SRCS+=	sparse_err.c
 SRCS+=	sparse_read.c
 
 # required by libziparchive
 .PATH: ${.CURDIR}/../libutils
 SRCS+=	FileMap.cpp
 
 # required by fastboot
 .PATH:	${.CURDIR}/../libziparchive
 SRCS+=	zip_archive.cc
 
 REVISION?=	$$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
 CPPFLAGS+=	-DFASTBOOT_REVISION="\"${REVISION}-android\""
 CPPFLAGS+=	-Doff64_t=off_t
 CPPFLAGS+=	-Dftruncate64=ftruncate
 CPPFLAGS+=	-Dlseek64=lseek
 CPPFLAGS+=	-Dmmap64=mmap
 CPPFLAGS+=	-Dpread64=pread
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	-I${.CURDIR}/../include
 CPPFLAGS+=	-I${.CURDIR}/../mkbootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
 CPPFLAGS+=	-I${.CURDIR}/../ext4_utils
 CPPFLAGS+=	-I${.CURDIR}/../f2fs_utils
 CPPFLAGS+=	-I${.CURDIR}/../libselinux/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
 CPPFLAGS+=	${CPPFLAGS.${.IMPSRC:T}}
 CPPFLAGS+=	$$(${PKG_CONFIG} libpcre --cflags 2>/dev/null)
 CPPFLAGS+=	$$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
 CXXFLAGS+=	-D__STDC_LIMIT_MACROS # DragonFly
 CXXFLAGS+=	-std=gnu++11
 
 .ifndef COMPILE.c
 CFLAGS+=	${CPPFLAGS}
 CXXFLAGS+=	${CPPFLAGS}
 .endif
 
 LDADD+=	$$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+=	-lz
 DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
 
 GIT?=		git
 PKG_CONFIG?=	pkg-config
 
 beforeinstall:
 	${INSTALL} -d ${DESTDIR}${FILESDIR}
 
 .include <bsd.prog.mk>