devel/android-tools-adb: drop FreeBSD 12.0 support after r527628

2 files changed, 0 insertions, 62 deletions

diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index ed7de25c2051..27059efe5021 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -28,12 +28,6 @@ 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
diff --git a/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c b/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c
deleted file mode 100644
index b843ecbe7f4e..000000000000
--- a/devel/android-tools-adb/files/extra-patch-revert-d3d650628c8c
+++ /dev/null
@@ -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;
- }