Index: head/devel/android-tools-adb/Makefile
===================================================================
--- head/devel/android-tools-adb/Makefile	(revision 529293)
+++ head/devel/android-tools-adb/Makefile	(revision 529294)
@@ -1,87 +1,81 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	platform-tools-
 DISTVERSION?=	29.0.6
 PORTREVISION?=	0
 CATEGORIES=	devel comms
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android debug bridge command line tool
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_TUPLE=	aosp-mirror:platform_system_core:${DISTVERSIONFULL}
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
 USES=		compiler:c++17-lang pkgconfig ssl uidfix
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE?=	${.CURDIR}/files/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \
 		VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}"
 ALL_TARGET=	all
 TEST_TARGET=	test
 PLIST_FILES=	bin/adb
 PORTDOCS=	*
 
-# XXX Remove after FreeBSD 11.2/12.0 reach EOL i.e., around 2020-02-01
-# XXX Switch to bundled libc++ to avoid error-prone reverts
-.if !exists(/usr/include/c++/v1/charconv) && exists(/usr/lib/libc++.so)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-revert-d3d650628c8c
-.endif
-
 OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON
 OPTIONS_DEFAULT=MDNSRESPONDER
 OPTIONS_SUB=	yes
 
 .if make(makesum) # for optional distfiles
 .MAKEFLAGS:	WITH="${OPTIONS_DEFINE}"
 .endif
 
 BASH_GH_TUPLE=		mbrubeck:android-completion:c1b0656:bashcomp
 BASH_PLIST_FILES=	etc/bash_completion.d/adb
 BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi
 
 DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 
 MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_USES=		localbase:ldflags
 MDNSRESPONDER_LDFLAGS=		-ldns_sd
 MDNSRESPONDER_MAKE_ENV_OFF=	MDNSEXT=_unsupported
 
 TEST_BUILD_DEPENDS+=	googletest>=1.6.0:devel/googletest
 TEST_ALL_TARGET=	adb_test
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_TUPLE=	aosp-mirror:platform_development:${DISTVERSIONFULL}:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 TEST_PYTHON_USES=	python:2.7,build
 
 post-patch:
 # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0
 	@if [ ! -e /dev/full ]; then \
 		${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \
 			${WRKSRC}/adb/adb_io_test.cpp; \
 	fi
 # XXX getcwd fails and not connected upstream
 	@${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \
 		${WRKSRC}/adb/bugreport_test.cpp
 
 pre-install-TEST-on: do-test
 
 pre-install-TEST_PYTHON-on:
 # XXX python tests may leave behind running adb server
 	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
 		PYTHONPATH=${WRKSRC_development}/python-packages \
 		${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC}
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H}
 	${INSTALL_DATA} ${WRKSRC_bashcomp}/android \
 		${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c
===================================================================
--- head/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c	(revision 529293)
+++ head/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c	(nonexistent)
@@ -1,56 +0,0 @@
-In file included from adb_utils.cpp:19:
-adb/adb_utils.h:19:10: fatal error: 'charconv' file not found
-#include <charconv>
-         ^~~~~~~~~~
-
---- adb/adb_utils.h.orig	2019-10-18 00:22:21 UTC
-+++ adb/adb_utils.h
-@@ -16,7 +16,6 @@
- 
- #pragma once
- 
--#include <charconv>
- #include <condition_variable>
- #include <mutex>
- #include <string>
-@@ -113,17 +112,33 @@ inline std::string_view StripTrailingNulls(std::string
- // Base-10 stroll on a string_view.
- template <typename T>
- inline bool ParseUint(T* result, std::string_view str, std::string_view* remaining = nullptr) {
--    T value;
--    const auto res = std::from_chars(str.begin(), str.end(), value);
--    if (res.ec != std::errc{}) {
-+    if (str.empty() || !isdigit(str[0])) {
-         return false;
-     }
--    if (res.ptr != str.end() && !remaining) {
--        return false;
-+
-+    T value = 0;
-+    std::string_view::iterator it;
-+    constexpr T max = std::numeric_limits<T>::max();
-+    for (it = str.begin(); it != str.end() && isdigit(*it); ++it) {
-+        if (value > max / 10) {
-+            return false;
-+        }
-+
-+        value *= 10;
-+
-+        T digit = *it - '0';
-+        if (value > max - digit) {
-+            return false;
-+        }
-+
-+        value += digit;
-     }
-+    *result = value;
-     if (remaining) {
--        *remaining = std::string_view(res.ptr, str.end() - res.ptr);
-+        *remaining = str.substr(it - str.begin());
-+    } else {
-+      return it == str.end();
-     }
--    *result = value;
-+
-     return true;
- }

Property changes on: head/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c
___________________________________________________________________
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