devel/folly: Update 2021.04.12.00 -> 2021.04.19.00

7 files changed, 5 insertions, 53 deletions

diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index d8e832efe9e4..4dc2880ab930 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2021.04.12.00
+DISTVERSION=	2021.04.19.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index 88478526f651..704fd7bfe86e 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618268094
-SHA256 (facebook-folly-v2021.04.12.00_GH0.tar.gz) = 39106681847294372a547912de030c32204a0ccc5a81446c66672bd7bacbee4c
-SIZE (facebook-folly-v2021.04.12.00_GH0.tar.gz) = 3371879
+TIMESTAMP = 1618823172
+SHA256 (facebook-folly-v2021.04.19.00_GH0.tar.gz) = 5cf7e81efc8b27c9c647122dff067315f8e8e69911f901a9a81a2bed16d3d107
+SIZE (facebook-folly-v2021.04.19.00_GH0.tar.gz) = 3375288
diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp b/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp
deleted file mode 100644
index 05977fb685e5..000000000000
--- a/devel/folly/files/patch-folly_experimental_symbolizer_Dwarf.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- folly/experimental/symbolizer/Dwarf.cpp.orig	2020-08-03 02:16:39 UTC
-+++ folly/experimental/symbolizer/Dwarf.cpp
-@@ -1286,9 +1286,11 @@ Dwarf::LineNumberVM::StepResult Dwarf::LineNumberVM::s
-       // use unbounded amounts of state (ie. use the heap).  We'll do a second
-       // pass (using nextDefineFile()) if necessary.
-       break;
-+#if !defined(__FreeBSD__)
-     case DW_LNE_set_discriminator:
-       discriminator_ = readULEB(program);
-       return CONTINUE;
-+#endif
-   }
- 
-   // Unrecognized extended opcode
diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
deleted file mode 100644
index 4c442d64f869..000000000000
--- a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- folly/experimental/symbolizer/Elf.h.orig	2020-09-03 08:32:48 UTC
-+++ folly/experimental/symbolizer/Elf.h
-@@ -41,7 +41,7 @@ namespace symbolizer {
- #if defined(ElfW)
- #define FOLLY_ELF_ELFW(name) ElfW(name)
- #elif defined(__FreeBSD__)
--#define FOLLY_ELF_ELFW(...) Elf_##name
-+#define FOLLY_ELF_ELFW(name) Elf_##name
- #endif
- 
- using ElfAddr = FOLLY_ELF_ELFW(Addr);
diff --git a/devel/folly/files/patch-folly_memory_detail_MallocImpl.h b/devel/folly/files/patch-folly_memory_detail_MallocImpl.h
deleted file mode 100644
index 967190b13203..000000000000
--- a/devel/folly/files/patch-folly_memory_detail_MallocImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- folly/memory/detail/MallocImpl.h.orig	2020-08-03 02:16:39 UTC
-+++ folly/memory/detail/MallocImpl.h
-@@ -38,9 +38,9 @@ int mallctlnametomib(const char*, size_t*, size_t*)
-     __attribute__((__nothrow__, __weak__));
- int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, size_t)
-     __attribute__((__nothrow__, __weak__));
-+#endif
- bool MallocExtension_Internal_GetNumericProperty(const char*, size_t, size_t*)
-     __attribute__((__weak__));
--#endif
- #else
- #if (!defined(USE_JEMALLOC) && !defined(FOLLY_USE_JEMALLOC)) || FOLLY_SANITIZE
- // we do not want to declare these if we have jemalloc support
diff --git a/devel/folly/files/patch-folly_portability_Stdlib.h b/devel/folly/files/patch-folly_portability_Stdlib.h
deleted file mode 100644
index 3b2a7785c147..000000000000
--- a/devel/folly/files/patch-folly_portability_Stdlib.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- folly/portability/Stdlib.h.orig	2020-05-27 18:53:42 UTC
-+++ folly/portability/Stdlib.h
-@@ -52,7 +52,7 @@ char*** _NSGetEnviron(void);
- 
- #if defined(__FreeBSD__)
- // Needed to resolve linkage
--char** environ;
-+extern char** environ;
- #endif
- 
- #if !__linux__ && !FOLLY_MOBILE
diff --git a/devel/folly/pkg-plist b/devel/folly/pkg-plist
index 413f41149f6e..b3f90af8d4ef 100644
--- a/devel/folly/pkg-plist
+++ b/devel/folly/pkg-plist
@@ -18,6 +18,7 @@ include/folly/ConcurrentLazy.h
 include/folly/ConcurrentSkipList-inl.h
 include/folly/ConcurrentSkipList.h
 include/folly/ConstexprMath.h
+include/folly/ConstructorCallback.h
 include/folly/Conv.h
 include/folly/CppAttributes.h
 include/folly/CpuId.h