git: 1f5e8f29b49e - main - devel/electron12: make online detection always positive

The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1f5e8f29b49efc9569b74330cd1b225a4e9187b6

commit 1f5e8f29b49efc9569b74330cd1b225a4e9187b6
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2021-11-17 10:47:48 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2021-11-17 10:49:12 +0000

    devel/electron12: make online detection always positive
    
    Obtained from: https://svnweb.freebsd.org/ports?view=revision&revision=555115
---
 devel/electron12/Makefile                           |  1 +
 .../patch-net_base_network__change__notifier.cc     | 21 +++++++++++----------
 editors/vscode/Makefile                             |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/devel/electron12/Makefile b/devel/electron12/Makefile
index 2518f9cf6af4..ff490741896c 100644
--- a/devel/electron12/Makefile
+++ b/devel/electron12/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
 		https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
diff --git a/devel/electron12/files/patch-net_base_network__change__notifier.cc b/devel/electron12/files/patch-net_base_network__change__notifier.cc
index f8dc53ace48b..301736f1b94c 100644
--- a/devel/electron12/files/patch-net_base_network__change__notifier.cc
+++ b/devel/electron12/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig	2021-04-14 01:08:52 UTC
+--- net/base/network_change_notifier.cc.orig	2021-04-14 18:41:06 UTC
 +++ net/base/network_change_notifier.cc
 @@ -38,7 +38,7 @@
  #include "net/base/network_change_notifier_linux.h"
@@ -9,12 +9,13 @@
  #include "net/base/network_change_notifier_posix.h"
  #elif defined(OS_FUCHSIA)
  #include "net/base/network_change_notifier_fuchsia.h"
-@@ -241,7 +241,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
-   // service in a separate process.
-   return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
-                                                       initial_subtype);
--#elif BUILDFLAG(IS_CHROMEOS_ASH)
-+#elif BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD)
-   return std::make_unique<NetworkChangeNotifierPosix>(initial_type,
-                                                       initial_subtype);
- #elif defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -252,6 +252,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+ #elif defined(OS_FUCHSIA)
+   return std::make_unique<NetworkChangeNotifierFuchsia>(
+       /*require_wlan=*/false);
++#elif defined(OS_BSD)
++  return std::make_unique<MockNetworkChangeNotifier>(
++      /*dns_config_notifier*/nullptr);
+ #else
+   NOTIMPLEMENTED();
+   return NULL;
diff --git a/editors/vscode/Makefile b/editors/vscode/Makefile
index 8337771c1232..fa942f0ac858 100644
--- a/editors/vscode/Makefile
+++ b/editors/vscode/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vscode
 DISTVERSION=	1.58.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	https://registry.npmjs.org/esbuild-freebsd-64/-/:esbuild_binary \
 		https://nodejs.org/dist/v${NODE_VER}/:node_headers \