5 files changed, 20 insertions, 9 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 688c8f10530f..f6e9ac0db180 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-DISTVERSION=	m-preview-1112
-DISTVERSIONSUFFIX=	-ge4c1bb53068d
-PORTREVISION=	1
+DISTVERSION=	m-preview-1212
+DISTVERSIONSUFFIX=	-g94c617ccbba4
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index 7c0dc9f8868d..6cd41d6d933f 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -1,4 +1,4 @@
-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 (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 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile
index a76c118d406f..2602f8264550 100644
--- a/devel/android-tools-adb-devel/files/Makefile
+++ b/devel/android-tools-adb-devel/files/Makefile
@@ -26,8 +26,8 @@ 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
-CFLAGS.shell_service_protocol_test.cpp+= -Dsighandler_t=sig_t
 
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
new file mode 100644
index 000000000000..9442e9aa10f4
--- /dev/null
+++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
@@ -0,0 +1,11 @@
+--- 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));
diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp
index 7fa09ed98233..492e538cf860 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp
+++ b/devel/android-tools-adb-devel/files/patch-adb_fdevent__test.cpp
@@ -1,9 +1,9 @@
---- adb/fdevent_test.cpp.orig	2015-09-05 00:01:27 UTC
+--- adb/fdevent_test.cpp.orig	2015-09-17 22:58:36 UTC
 +++ adb/fdevent_test.cpp
-@@ -18,6 +18,7 @@
- 
+@@ -19,6 +19,7 @@
  #include <gtest/gtest.h>
  
+ #include <limits>
 +#include <memory> // std::unique_ptr
  #include <queue>
  #include <string>