devel/folly: Update to 2021.06.28.00

4 files changed, 16 insertions, 13 deletions

diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index 49c3b54229ac..6132bb1f7f84 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2021.05.17.00
+DISTVERSION=	2021.06.28.00
 CATEGORIES=	devel
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	e4cfd54f6bbfa990a0a38223a7540f2aed249a97.patch:-p1 # port exception_ptr_get_object to freebsd
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index a45016e8784e..e2bf44cf4b70 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1621479277
-SHA256 (facebook-folly-v2021.05.17.00_GH0.tar.gz) = 10449ec28542a8da0f93600b45d2be51ccb5debfcaad2c42d1cbdf6ad204510b
-SIZE (facebook-folly-v2021.05.17.00_GH0.tar.gz) = 3388449
-SHA256 (e4cfd54f6bbfa990a0a38223a7540f2aed249a97.patch) = e41cbb2a8ce61e572469357462fb3e387e064d050357c4ac97fa978433756f81
-SIZE (e4cfd54f6bbfa990a0a38223a7540f2aed249a97.patch) = 3756
+TIMESTAMP = 1625430903
+SHA256 (facebook-folly-v2021.06.28.00_GH0.tar.gz) = 0d33e580cf701559e82f30a9c0caad90c2012f6e28f740f5c44d6b43a78a4494
+SIZE (facebook-folly-v2021.06.28.00_GH0.tar.gz) = 3425546
diff --git a/devel/folly/files/patch-CMake_folly-deps.cmake b/devel/folly/files/patch-CMake_folly-deps.cmake
index fc2d62654370..4a59f42e8d72 100644
--- a/devel/folly/files/patch-CMake_folly-deps.cmake
+++ b/devel/folly/files/patch-CMake_folly-deps.cmake
@@ -1,9 +1,9 @@
---- CMake/folly-deps.cmake.orig	2020-10-10 00:44:38 UTC
+--- CMake/folly-deps.cmake.orig	2021-06-27 11:38:58 UTC
 +++ CMake/folly-deps.cmake
-@@ -169,7 +169,7 @@ find_package(Backtrace)
+@@ -175,7 +175,7 @@ find_package(Backtrace)
  set(FOLLY_HAVE_BACKTRACE ${Backtrace_FOUND})
  set(FOLLY_HAVE_DWARF ${LIBDWARF_FOUND})
- if (NOT WIN32)
+ if (NOT WIN32 AND NOT APPLE)
 -  set(FOLLY_USE_SYMBOLIZER ON)
 +  set(FOLLY_USE_SYMBOLIZER ${FREEBSD_FOLLY_USE_SYMBOLIZER})
  endif()
diff --git a/devel/folly/pkg-plist b/devel/folly/pkg-plist
index 469b3081a0f3..10024be615a4 100644
--- a/devel/folly/pkg-plist
+++ b/devel/folly/pkg-plist
@@ -56,7 +56,6 @@ include/folly/IndexedMemPool.h
 include/folly/IntrusiveList.h
 include/folly/Lazy.h
 include/folly/Likely.h
-include/folly/LockTraits.h
 include/folly/MPMCPipeline.h
 include/folly/MPMCQueue.h
 include/folly/MacAddress.h
@@ -121,6 +120,7 @@ include/folly/concurrency/AtomicSharedPtr.h
 include/folly/concurrency/CacheLocality.h
 include/folly/concurrency/ConcurrentHashMap.h
 include/folly/concurrency/CoreCachedSharedPtr.h
+include/folly/concurrency/DeadlockDetector.h
 include/folly/concurrency/DynamicBoundedQueue.h
 include/folly/concurrency/PriorityUnboundedQueueSet.h
 include/folly/concurrency/QueueObserver.h
@@ -199,6 +199,7 @@ include/folly/executors/GlobalExecutor.h
 include/folly/executors/GlobalThreadPoolList.h
 include/folly/executors/IOExecutor.h
 include/folly/executors/IOObjectCache.h
+include/folly/executors/IOThreadPoolDeadlockDetectorObserver.h
 include/folly/executors/IOThreadPoolExecutor.h
 include/folly/executors/InlineExecutor.h
 include/folly/executors/ManualExecutor.h
@@ -267,6 +268,7 @@ include/folly/experimental/TimerFD.h
 include/folly/experimental/TimerFDTimeoutManager.h
 include/folly/experimental/TupleOps.h
 include/folly/experimental/bser/Bser.h
+include/folly/experimental/channels/detail/AtomicQueue.h
 include/folly/experimental/coro/Accumulate-inl.h
 include/folly/experimental/coro/Accumulate.h
 include/folly/experimental/coro/AsyncGenerator.h
@@ -305,6 +307,7 @@ include/folly/experimental/coro/SharedLock.h
 include/folly/experimental/coro/SharedMutex.h
 include/folly/experimental/coro/Sleep-inl.h
 include/folly/experimental/coro/Sleep.h
+include/folly/experimental/coro/SmallUnboundedQueue.h
 include/folly/experimental/coro/Task.h
 include/folly/experimental/coro/TimedWait.h
 include/folly/experimental/coro/Timeout-inl.h
@@ -333,6 +336,7 @@ include/folly/experimental/exception_tracer/ExceptionAbi.h
 include/folly/experimental/exception_tracer/ExceptionCounterLib.h
 include/folly/experimental/exception_tracer/ExceptionTracer.h
 include/folly/experimental/exception_tracer/ExceptionTracerLib.h
+include/folly/experimental/exception_tracer/SmartExceptionTracer.h
 include/folly/experimental/exception_tracer/StackTrace.h
 include/folly/experimental/flat_combining/FlatCombining.h
 include/folly/experimental/io/FsUtil.h
@@ -459,6 +463,7 @@ include/folly/io/Cursor-inl.h
 include/folly/io/Cursor.h
 include/folly/io/GlobalShutdownSocketSet.h
 include/folly/io/IOBuf.h
+include/folly/io/IOBufIovecBuilder.h
 include/folly/io/IOBufQueue.h
 include/folly/io/RecordIO-inl.h
 include/folly/io/RecordIO.h
@@ -604,6 +609,8 @@ include/folly/memory/not_null.h
 include/folly/net/NetOps.h
 include/folly/net/NetOpsDispatcher.h
 include/folly/net/NetworkSocket.h
+include/folly/net/TcpInfo.h
+include/folly/net/TcpInfoTypes.h
 include/folly/net/detail/SocketFileDescriptorMap.h
 include/folly/poly/Nullable.h
 include/folly/poly/Regular.h
@@ -708,6 +715,7 @@ include/folly/synchronization/HazptrObjLinked.h
 include/folly/synchronization/HazptrRec.h
 include/folly/synchronization/HazptrThrLocal.h
 include/folly/synchronization/HazptrThreadPoolExecutor.h
+include/folly/synchronization/Latch.h
 include/folly/synchronization/LifoSem.h
 include/folly/synchronization/Lock.h
 include/folly/synchronization/MicroSpinLock.h