Index: head/devel/libphonenumber/Makefile
===================================================================
--- head/devel/libphonenumber/Makefile	(revision 539674)
+++ head/devel/libphonenumber/Makefile	(revision 539675)
@@ -1,26 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	libphonenumber
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.12.5
+DISTVERSION=	8.12.6
 CATEGORIES=	devel
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library for parsing, formatting, and validating phone numbers
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	googletest>0:devel/googletest
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libicui18n.so:devel/icu \
 		libprotobuf.so:devel/protobuf
 
 USES=		cmake:noninja compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	googlei18n
 
 CMAKE_ON=	USE_STD_MAP
 
 WRKSRC_SUBDIR=	cpp
 
 .include <bsd.port.mk>
Index: head/devel/libphonenumber/distinfo
===================================================================
--- head/devel/libphonenumber/distinfo	(revision 539674)
+++ head/devel/libphonenumber/distinfo	(revision 539675)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591330476
-SHA256 (googlei18n-libphonenumber-v8.12.5_GH0.tar.gz) = 5acc2f679220ba7e1d9f256ff4de470db00949dd60220268ee5d73c720f0ec44
-SIZE (googlei18n-libphonenumber-v8.12.5_GH0.tar.gz) = 7743794
+TIMESTAMP = 1592595176
+SHA256 (googlei18n-libphonenumber-v8.12.6_GH0.tar.gz) = 99525172e34405326a0e882fa51ab03c1cf66297d0ee893d846eae8380090a35
+SIZE (googlei18n-libphonenumber-v8.12.6_GH0.tar.gz) = 7977157
Index: head/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h
===================================================================
--- head/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h	(revision 539674)
+++ head/devel/libphonenumber/files/patch-src_phonenumbers_base_memory_singleton.h	(revision 539675)
@@ -1,11 +1,11 @@
---- src/phonenumbers/base/memory/singleton.h.orig	2020-01-18 23:13:06 UTC
+--- src/phonenumbers/base/memory/singleton.h.orig	2020-06-18 13:06:40 UTC
 +++ src/phonenumbers/base/memory/singleton.h
-@@ -56,7 +56,7 @@ template <class T> boost::once_flag Singleton<T>::flag
- #include "phonenumbers/base/logging.h"
- #include "phonenumbers/base/thread_checker.h"
- 
--#if !defined(__linux__) && !defined(__APPLE__)
-+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- 
- namespace i18n {
- namespace phonenumbers {
+@@ -22,7 +22,7 @@
+ #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
+ // C++11 Lock implementation based on std::mutex.
+ #include "phonenumbers/base/memory/singleton_stdmutex.h"
+-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
++#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) || defined(__FreeBSD__)
+ #include "phonenumbers/base/memory/singleton_posix.h"
+ #elif defined(WIN32)
+ #include "phonenumbers/base/memory/singleton_win32.h"
Index: head/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h
===================================================================
--- head/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h	(revision 539674)
+++ head/devel/libphonenumber/files/patch-src_phonenumbers_base_synchronization_lock.h	(revision 539675)
@@ -1,11 +1,11 @@
---- src/phonenumbers/base/synchronization/lock.h.orig	2020-01-18 23:13:17 UTC
+--- src/phonenumbers/base/synchronization/lock.h.orig	2020-06-18 13:06:40 UTC
 +++ src/phonenumbers/base/synchronization/lock.h
-@@ -63,7 +63,7 @@ class Lock { (private)
- // Dummy lock implementation on non-POSIX platforms. If you are running on a
- // different platform and care about thread-safety, please compile with
- // -DI18N_PHONENUMBERS_USE_BOOST.
--#elif !defined(__linux__) && !defined(__APPLE__)
-+#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- 
- namespace i18n {
- namespace phonenumbers {
+@@ -22,7 +22,7 @@
+ #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)
+ // C++11 Lock implementation based on std::mutex.
+ #include "phonenumbers/base/synchronization/lock_stdmutex.h"
+-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)
++#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) || defined(__FreeBSD__)
+ #include "phonenumbers/base/synchronization/lock_posix.h"
+ #elif defined(WIN32)
+ #include "phonenumbers/base/synchronization/lock_win32.h"
Index: head/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h
===================================================================
--- head/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h	(revision 539674)
+++ head/devel/libphonenumber/files/patch-src_phonenumbers_base_thread__checker.h	(revision 539675)
@@ -1,20 +1,11 @@
---- src/phonenumbers/base/thread_checker.h.orig	2020-01-18 23:13:13 UTC
+--- src/phonenumbers/base/thread_checker.h.orig	2020-06-18 13:06:40 UTC
 +++ src/phonenumbers/base/thread_checker.h
 @@ -22,7 +22,7 @@
  // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the
  // user of the library know that it can't be used in a thread-safe manner when
  // it is not depending on Boost.
--#if !defined(__linux__) && !defined(__APPLE__) && \
-+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && \
-     !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
- #error Building without Boost, please provide \
-        -DI18N_PHONENUMBERS_NO_THREAD_SAFETY
-@@ -31,7 +31,7 @@
- #endif
- 
- #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \
--    (defined(__linux__) || defined(__apple__))
-+    (defined(__linux__) || defined(__apple__) || defined(__FreeBSD__))
- 
- #include <pthread.h>
- 
+-#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \
++#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && !defined(__FreeBSD__) \
+     !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \
+ 	!((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \
+ 	!defined(WIN32)
Index: head/devel/libphonenumber/pkg-plist
===================================================================
--- head/devel/libphonenumber/pkg-plist	(revision 539674)
+++ head/devel/libphonenumber/pkg-plist	(revision 539675)
@@ -1,33 +1,41 @@
 include/phonenumbers/asyoutypeformatter.h
 include/phonenumbers/base/basictypes.h
 include/phonenumbers/base/logging.h
 include/phonenumbers/base/memory/scoped_ptr.h
 include/phonenumbers/base/memory/singleton.h
+include/phonenumbers/base/memory/singleton_boost.h
 include/phonenumbers/base/memory/singleton_posix.h
+include/phonenumbers/base/memory/singleton_stdmutex.h
+include/phonenumbers/base/memory/singleton_unsafe.h
+include/phonenumbers/base/memory/singleton_win32.h
 include/phonenumbers/base/synchronization/lock.h
+include/phonenumbers/base/synchronization/lock_boost.h
 include/phonenumbers/base/synchronization/lock_posix.h
+include/phonenumbers/base/synchronization/lock_stdmutex.h
+include/phonenumbers/base/synchronization/lock_unsafe.h
+include/phonenumbers/base/synchronization/lock_win32.h
 include/phonenumbers/base/template_util.h
 include/phonenumbers/base/thread_checker.h
 include/phonenumbers/callback.h
 include/phonenumbers/geocoding/phonenumber_offline_geocoder.h
 include/phonenumbers/logger.h
 include/phonenumbers/matcher_api.h
 include/phonenumbers/phonemetadata.pb.h
 include/phonenumbers/phonenumber.pb.h
 include/phonenumbers/phonenumbermatch.h
 include/phonenumbers/phonenumbermatcher.h
 include/phonenumbers/phonenumberutil.h
 include/phonenumbers/regexp_adapter.h
 include/phonenumbers/regexp_cache.h
 include/phonenumbers/region_code.h
 include/phonenumbers/shortnumberinfo.h
 include/phonenumbers/unicodestring.h
 include/phonenumbers/utf/unicodetext.h
 lib/libgeocoding.a
 lib/libgeocoding.so
 lib/libgeocoding.so.8
 lib/libgeocoding.so.8.12
 lib/libphonenumber.a
 lib/libphonenumber.so
 lib/libphonenumber.so.8
 lib/libphonenumber.so.8.12