Index: head/devel/android-tools-adb-devel/Makefile
===================================================================
--- head/devel/android-tools-adb-devel/Makefile	(revision 397253)
+++ head/devel/android-tools-adb-devel/Makefile	(revision 397254)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 DISTVERSION=	m-preview-1112
-DISTVERSIONSUFFIX=	-ge4c1bb5
-PORTREVISION=	0
+DISTVERSIONSUFFIX=	-ge4c1bb53068d
+PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-adb
 DISTINFO_FILE=	${.CURDIR}/distinfo
 MAKEFILE=	${.CURDIR}/files/Makefile
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 
 USES=		compiler:c++11-lib
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKE_ENV=	FILESDIR="${FILESDIR}"
-CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONFULL}\"'
+CFLAGS+=	-DADB_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
 ALL_TARGET=	all
 
 OPTIONS_DEFINE=	TEST
 
 TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest \
 		${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 TEST_USES=	python:2.7,build
 TEST_ALL_TARGET=adb_test
 
 pre-install-TEST-on:
 	${BUILD_WRKSRC}/adb_test
 	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py
 	PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \
 		${PYTHON_CMD} ${BUILD_WRKSRC}/test_device.py
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-adb-devel/distinfo
===================================================================
--- head/devel/android-tools-adb-devel/distinfo	(revision 397253)
+++ head/devel/android-tools-adb-devel/distinfo	(revision 397254)
@@ -1,4 +1,4 @@
-SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 3fafd204d1ccf075fc5772937ef6e82f14d359f6ae4a9dbf9541e70314283fee
-SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 1342470
+SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 15a0a0c047d5ac809de36d1498234aaca8b64d3dc36bd623ed4fa24832b5b0e9
+SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 1342456
 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198
Index: head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp
===================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp	(nonexistent)
+++ head/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp	(revision 397254)
@@ -0,0 +1,10 @@
+--- adb/fdevent_test.cpp.orig	2015-09-05 00:01:27 UTC
++++ adb/fdevent_test.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#include <memory> // std::unique_ptr
+ #include <queue>
+ #include <string>
+ #include <vector>

Property changes on: head/devel/android-tools-adb-devel/files/patch-adb_fdevent__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 397253)
+++ head/devel/android-tools-fastboot-devel/Makefile	(revision 397254)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 DISTVERSION=	m-preview-1112
-DISTVERSIONSUFFIX=	-ge4c1bb5
-PORTREVISION=	0
+DISTVERSIONSUFFIX=	-ge4c1bb53068d
+PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 
 GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-170-ga0370d7:extras \
 		${DISTVERSIONFULL:C/-[0-9].*//}-18-g91b7d91:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
 DISTINFO_FILE=	${.CURDIR}/distinfo
 FILESDIR=	${.CURDIR}/files
 EXTRA_PATCHES+=	${.CURDIR}/files/patch-*
 
 USES=		compiler:c++11-lib
-CFLAGS+=	-DFASTBOOT_REVISION='\"${DISTVERSIONFULL}\"'
+CFLAGS+=	-DFASTBOOT_REVISION='\"${DISTVERSIONSUFFIX:S/-g//}-android\"'
 
 .include "${MASTERDIR}/Makefile"
Index: head/devel/android-tools-fastboot-devel/distinfo
===================================================================
--- head/devel/android-tools-fastboot-devel/distinfo	(revision 397253)
+++ head/devel/android-tools-fastboot-devel/distinfo	(revision 397254)
@@ -1,10 +1,10 @@
 SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1e5518cf066a04479f61e5ebf3761d4bc4
 SIZE (bash_completion.d/fastboot?id=2b8cfec) = 3051
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 3fafd204d1ccf075fc5772937ef6e82f14d359f6ae4a9dbf9541e70314283fee
-SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb5_GH0.tar.gz) = 1342470
+SHA256 (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 15a0a0c047d5ac809de36d1498234aaca8b64d3dc36bd623ed4fa24832b5b0e9
+SIZE (android-platform_system_core-android-m-preview-1112-ge4c1bb53068d_GH0.tar.gz) = 1342456
 SHA256 (jbeich-platform_system_extras-android-m-preview-170-ga0370d7_GH0.tar.gz) = 8207f52b16340dc14b5caa967683131af1edb7d602454bf7dc51cefd270d7da1
 SIZE (jbeich-platform_system_extras-android-m-preview-170-ga0370d7_GH0.tar.gz) = 675090
 SHA256 (jbeich-platform_external_libselinux-android-m-preview-18-g91b7d91_GH0.tar.gz) = 92e7867376f77d6d2699764685b36475e14a2de58ccd25fa0c5dc31d6525846d
 SIZE (jbeich-platform_external_libselinux-android-m-preview-18-g91b7d91_GH0.tar.gz) = 58379