aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-03-25 13:42:14 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-03-30 23:59:35 +0000
commita2bcb1168981399be8f18f0559478b5e576dcf5c (patch)
tree9d97dfb22d19cf65d7e5204a819921010b7ad970
parenta45080cfa41fe51413e1704e53bfacd22cc368be (diff)
databases/mongodb36: Remove expired port:
2023-03-31 databases/mongodb36: Upstream EOL reached on 2021-04-30
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/mongodb36/Makefile77
-rw-r--r--databases/mongodb36/distinfo3
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h20
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript18
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp41
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp59
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h91
-rw-r--r--databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h62
-rw-r--r--databases/mongodb36/files/mongod.in53
-rw-r--r--databases/mongodb36/files/patch-SConstruct48
-rw-r--r--databases/mongodb36/files/patch-asio-libc++715
-rw-r--r--databases/mongodb36/files/patch-python31977
-rw-r--r--databases/mongodb36/files/patch-rpm_mongod.conf25
-rw-r--r--databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h11
-rw-r--r--databases/mongodb36/pkg-descr3
-rw-r--r--databases/mongodb36/pkg-plist6
50 files changed, 1 insertions, 4398 deletions
diff --git a/MOVED b/MOVED
index 9f92d5e5e220..3c539d7a8af9 100644
--- a/MOVED
+++ b/MOVED
@@ -17845,3 +17845,4 @@ audio/tagtool||2023-03-31|Has expired: Abandonware and obsolete, doesn't properl
audio/vo-aacenc||2023-03-31|Has expired: Obsolete AAC encoder library, consider using audio/fdk-aac or audio/exhale
audio/wav2cdr||2023-03-31|Has expired: Obsolete utility, consider using multimedia/ffmpeg
databases/mongodb36-tools|databases/mongodb40-tools|2023-03-31|Has expired: Upstream EOL reached on 2021-04-30
+databases/mongodb36|databases/mongodb40|2023-03-31|Has expired: Upstream EOL reached on 2021-04-30
diff --git a/databases/Makefile b/databases/Makefile
index 62eb54f6be8c..ae005bc6004b 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -185,7 +185,6 @@
SUBDIR += memcached
SUBDIR += metabase
SUBDIR += mongodb-tools
- SUBDIR += mongodb36
SUBDIR += mongodb40
SUBDIR += mongodb40-tools
SUBDIR += mongodb42
diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
deleted file mode 100644
index 82de6032b048..000000000000
--- a/databases/mongodb36/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-PORTNAME= mongodb
-DISTVERSIONPREFIX= r
-DISTVERSION= 3.6.23
-PORTREVISION= 1
-CATEGORIES= databases net
-MASTER_SITES= https://fastdl.mongodb.org/src/ \
- http://fastdl.mongodb.org/src/
-PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
-DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Distributed document-oriented "NoSQL" database
-WWW= https://docs.mongodb.com/v3.6/
-
-# mongodb is SSPLv1, C++ driver is APACHE20
-LICENSE= SSPLv1 APACHE20
-LICENSE_COMB= multi
-LICENSE_NAME_SSPLv1= Server Side Public License Version 1
-LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt
-LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED= Upstream EOL reached on 2021-04-30
-EXPIRATION_DATE= 2023-03-31
-ONLY_FOR_ARCHS= aarch64 amd64
-ONLY_FOR_ARCHS_REASON= only supported on amd64 and aarch64; i386 deprecated in v3
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libsnappy.so:archivers/snappy
-
-USES= compiler:c++14-lang cpe python:3.7+,build scons shebangfix
-USE_RC_SUBR= mongod
-
-CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
-
-SHEBANG_FILES= src/mongo/installer/compass/install_compass.in
-python_OLD_CMD= @python_interpreter@
-MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
- --use-system-pcre --use-system-snappy \
- --use-system-zlib \
- --cxx-std=14 --libc++ \
- --runtime-hardening=on \
- --disable-warnings-as-errors \
- VERBOSE=on
-
-USERS= mongodb
-GROUPS= mongodb
-
-OPTIONS_DEFINE= SASL SSL
-OPTIONS_DEFAULT= SASL SSL
-
-SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS= --use-sasl-client
-
-SSL_USES= ssl
-SSL_MAKE_ARGS= --ssl
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == aarch64
-EXTRA_PATCHES= ${FILESDIR}/aarch64
-.endif
-
-ALL_TARGET= core
-
-PORTSCOUT= limitw:1,even
-
-CPE_PRODUCT= mongodb
-
-post-install:
-.for f in mongo mongod mongoperf mongos
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
-.endfor
- ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
-
-.include <bsd.port.mk>
diff --git a/databases/mongodb36/distinfo b/databases/mongodb36/distinfo
deleted file mode 100644
index 69d2d4a9758c..000000000000
--- a/databases/mongodb36/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1615977097
-SHA256 (mongodb-src-r3.6.23.tar.gz) = 109a487ab5b8cdc189bc77ea27ae5f1bcc8db0b465527464bd87c2fa3928149e
-SIZE (mongodb-src-r3.6.23.tar.gz) = 41087578
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h b/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
deleted file mode 100644
index c0bbc7a702e4..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig 2018-12-13 15:47:17 UTC
-+++ src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
-@@ -42,7 +42,7 @@
- #include <ctype.h>
-
- // Fix system header issue on Sun solaris and define required type by ourselves
--#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
-+#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(_WCHAR_T_DECLARED)
- typedef int wchar_t;
- #endif
-
-@@ -150,7 +150,7 @@ typedef BID_UINT128 _Quad;
- ///////////////////////////////////////////////////////
- // This section may move to fenv_support.h
-
--#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED) /* Otherwise we already defined fexcept_t type */
-+#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED) && !defined (_FENV_H_) /* Otherwise we already defined fexcept_t type */
- #if defined(__ECL) || defined(__ECC) /* Intel(R) Itanium(R) architecture */
- /* Default 64-bit Floating Point Status Register */
- #if defined(__linux__)
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript
deleted file mode 100644
index 5a19c5616a34..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/third_party/mozjs-45/SConscript.orig 2019-01-18 20:35:17 UTC
-+++ src/third_party/mozjs-45/SConscript
-@@ -97,7 +97,6 @@ env.Prepend(CPPPATH=[
- sources = [
- "extract/js/src/builtin/RegExp.cpp",
- "extract/js/src/frontend/Parser.cpp",
-- "extract/js/src/jit/ProcessExecutableMemory.cpp",
- "extract/js/src/jsarray.cpp",
- "extract/js/src/jsatom.cpp",
- "extract/js/src/jsmath.cpp",
-@@ -112,6 +111,7 @@ sources = [
-
- if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('solaris'):
- sources.extend([
-+ "extract/js/src/jit/ProcessExecutableMemory.cpp",
- "extract/js/src/jit/x86-shared/Disassembler-x86-shared.cpp",
- ])
-
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index 7447e35fc0e6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/AsmJSFrameIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSLink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 3bc2df08b0be..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Intl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index 9dd333c2b0a5..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index b9474a34514b..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index 963d167804d9..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index b65b58bcc20a..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonCaches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 3c06d8f9dcfb..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 816eb4adc1a6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index 26fe3aa060dc..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 2038f8cd00ac..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index 1ada547bd5b6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/none/Trampoline-none.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index cbd28046fca1..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsalloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscntxt.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 81ea41928119..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index 742426e01211..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsdtoa.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfun.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsgc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 2d7e591192e7..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsiter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnativestack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsobj.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "json.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsopcode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index d5575e9cf371..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsprf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jspropertytree.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsscript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsstr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jswatchpoint.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsweakmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index e4f39b8ae2bb..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index 09aa08d66d26..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedDirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedIndirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index a495f144a4bd..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index a48c7b4354ba..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 3c86bb4e4860..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Interpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Monitor.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 9c71115c00c0..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index fa188e4bbe64..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SPSProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index ac11b2e77a32..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/SymbolObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 31b1a180bd26..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ScopeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index 6dedacb8aa84..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index cf2c9a3453c5..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig 2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index e3be88056d29..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index 76228a440849..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseMaps.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index 857e9272b201..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index ca87a387e54a..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/MemoryProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index 7a98bfe58b7f..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index 7afdd362289e..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 20f11700164f..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index a24659c5a145..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h.orig 2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h
-@@ -0,0 +1,88 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+#define CPP_THROW_NEW throw()
-+#define D_INO d_ino
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_ACOSH 1
-+#define HAVE_ASINH 1
-+#define HAVE_ATANH 1
-+#define HAVE_CBRT 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_EXPM1 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_I18N_LC_MESSAGES 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LOG1P 1
-+#define HAVE_LOG2 1
-+#define HAVE_MACHINE_ENDIAN_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MBRTOWC 1
-+#define HAVE_MEMORY_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SETLOCALE 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_CDEFS_H 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE_WCRTOMB 1
-+#define HAVE_X11_XKBLIB_H 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc_np.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "45.0"
-+#define MOZILLA_VERSION "45.9.0"
-+#define MOZILLA_VERSION_U 45.9.0
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+#define MOZ_DEBUG_SYMBOLS 1
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_GLUE_IN_PROGRAM 1
-+#define MOZ_MEMORY 1
-+#define MOZ_MEMORY_BSD 1
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_BUILD 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index c11f55644c87..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h.orig 2019-01-18 22:48:29 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+ This header file is generated by the SpiderMonkey configure script,
-+ and installed along with jsapi.h. */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients. */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support. */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+ entirely too much GC. */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if the <endian.h> header is present and
-+ useable. See jscpucfg.h. */
-+/* #undef JS_HAVE_ENDIAN_H */
-+
-+/* Define to 1 if the <machine/endian.h> header is present and
-+ useable. See jscpucfg.h. */
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+
-+/* Define to 1 if the <sys/isa_defs.h> header is present and
-+ useable. See jscpucfg.h. */
-+/* #undef JS_HAVE_SYS_ISA_DEFS_H */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb36/files/mongod.in b/databases/mongodb36/files/mongod.in
deleted file mode 100644
index 20b0f5c0f43d..000000000000
--- a/databases/mongodb36/files/mongod.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mongod
-# REQUIRE: NETWORK ldconfig
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mongod_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable mongod.
-# mongod_dbpath (str): Default to "/var/db/mongodb"
-# Base database directory.
-# mongod_flags (str): Custom additional arguments to be passed to mongod.
-# Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
-# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf"
-# Path to config file
-#
-
-. /etc/rc.subr
-
-name="mongod"
-rcvar=mongod_enable
-
-load_rc_config $name
-
-: ${mongod_enable="NO"}
-: ${mongod_dbpath="/var/db/mongodb"}
-: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
-: ${mongod_user="mongodb"}
-: ${mongod_group="mongodb"}
-: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
-
-pidfile="${mongod_dbpath}/mongod.lock"
-command=%%PREFIX%%/bin/${name}
-command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-mongod_create_dbpath()
-{
- mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
- [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
-}
-
-mongod_prestart()
-{
- if [ ! -d ${mongod_dbpath} ]; then
- mongod_create_dbpath || return 1
- fi
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb36/files/patch-SConstruct b/databases/mongodb36/files/patch-SConstruct
deleted file mode 100644
index d7b1c853af78..000000000000
--- a/databases/mongodb36/files/patch-SConstruct
+++ /dev/null
@@ -1,48 +0,0 @@
---- SConstruct.orig 2018-01-04 23:28:55 UTC
-+++ SConstruct
-@@ -922,9 +922,9 @@ if has_option('variables-help'):
- print(env_vars.GenerateHelpText(env))
- Exit(0)
-
--unknown_vars = env_vars.UnknownVariables()
--if unknown_vars:
-- env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+#unknown_vars = env_vars.UnknownVariables()
-+#if unknown_vars:
-+# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-
- def set_config_header_define(env, varname, varval = 1):
- env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'):
- # If runtime hardening is requested, then build anything
- # destined for an executable with the necessary flags for PIE.
- env.AppendUnique(
-- PROGCCFLAGS=['-fPIE'],
-+ PROGCCFLAGS=['-fpic'],
- PROGLINKFLAGS=['-pie'],
- )
-
-@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
- "-Wno-unknown-pragmas",
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-- if env.TargetOSIs('linux', 'darwin', 'solaris'):
-+ if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
- if not has_option("disable-warnings-as-errors"):
- env.Append( CCFLAGS=["-Werror"] )
-
-@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'):
- env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
- env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
-
-- if optBuild:
-- env.Append( CCFLAGS=["-O2"] )
-- else:
-- env.Append( CCFLAGS=["-O0"] )
-+ #if optBuild:
-+ # env.Append( CCFLAGS=["-O2"] )
-+ #else:
-+ # env.Append( CCFLAGS=["-O0"] )
-
- # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers
- # noall_load obsolete and warns about it.
diff --git a/databases/mongodb36/files/patch-asio-libc++7 b/databases/mongodb36/files/patch-asio-libc++7
deleted file mode 100644
index 59e617b3b5de..000000000000
--- a/databases/mongodb36/files/patch-asio-libc++7
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51
-
---- src/third_party/asio-master/asio/include/asio/detail/config.hpp.orig 2018-07-03 21:09:33 UTC
-+++ src/third_party/asio-master/asio/include/asio/detail/config.hpp
-@@ -784,8 +784,9 @@
- # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
- # if defined(__clang__)
- # if (__cplusplus >= 201402)
--# if __has_include(<experimental/string_view>)
-+# if __has_include(<string_view>)
- # define ASIO_HAS_STD_STRING_VIEW 1
-+# elif __has_include(<experimental/string_view>)
- # define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- # endif // __has_include(<experimental/string_view>)
- # endif // (__cplusplus >= 201402)
diff --git a/databases/mongodb36/files/patch-python3 b/databases/mongodb36/files/patch-python3
deleted file mode 100644
index 3b529242503b..000000000000
--- a/databases/mongodb36/files/patch-python3
+++ /dev/null
@@ -1,1977 +0,0 @@
-From cbfdc41e1d05aa1bfc298b8bd1a2fae9b3477e87 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:26:21 +0200
-Subject: [PATCH 01/24] Backport SConstruct patch
-
----
- SConstruct | 61 ++++++++++++++++++++++++++++--------------------------
- 1 file changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index cd4100e9..63f22862 100644
---- SConstruct
-+++ SConstruct
-@@ -28,8 +28,8 @@ import mongo.platform as mongo_platform
- import mongo.toolchain as mongo_toolchain
- import mongo.generators as mongo_generators
-
--EnsurePythonVersion(2, 7)
--EnsureSConsVersion(2, 5)
-+EnsurePythonVersion(3, 5)
-+EnsureSConsVersion(3, 0, 4)
-
- from buildscripts import utils
- from buildscripts import moduleconfig
-@@ -389,7 +389,7 @@ win_version_min_choices = {
- }
-
- add_option('win-version-min',
-- choices=win_version_min_choices.keys(),
-+ choices=list(win_version_min_choices.keys()),
- default=None,
- help='minimum Windows version to support',
- type='choice',
-@@ -482,7 +482,7 @@ try:
- except IOError as e:
- # If the file error wasn't because the file is missing, error out
- if e.errno != errno.ENOENT:
-- print("Error opening version.json: {0}".format(e.strerror))
-+ print(("Error opening version.json: {0}".format(e.strerror)))
- Exit(1)
-
- version_data = {
-@@ -491,14 +491,14 @@ except IOError as e:
- }
-
- except ValueError as e:
-- print("Error decoding version.json: {0}".format(e))
-+ print(("Error decoding version.json: {0}".format(e)))
- Exit(1)
-
- # Setup the command-line variables
- def variable_shlex_converter(val):
- # If the argument is something other than a string, propogate
- # it literally.
-- if not isinstance(val, basestring):
-+ if not isinstance(val, str):
- return val
- parse_mode = get_option('variable-parse-mode')
- if parse_mode == 'auto':
-@@ -563,7 +563,7 @@ def variable_distsrc_converter(val):
-
- variables_files = variable_shlex_converter(get_option('variables-files'))
- for file in variables_files:
-- print("Using variable customization file %s" % file)
-+ print(("Using variable customization file %s" % file))
-
- env_vars = Variables(
- files=variables_files,
-@@ -572,7 +572,7 @@ env_vars = Variables(
-
- sconsflags = os.environ.get('SCONSFLAGS', None)
- if sconsflags:
-- print("Using SCONSFLAGS environment variable arguments: %s" % sconsflags)
-+ print(("Using SCONSFLAGS environment variable arguments: %s" % sconsflags))
-
- env_vars.Add('ABIDW',
- help="Configures the path to the 'abidw' (a libabigail) utility")
-@@ -691,7 +691,7 @@ env_vars.Add('MONGO_DISTNAME',
- def validate_mongo_version(key, val, env):
- regex = r'^(\d+)\.(\d+)\.(\d+)-?((?:(rc)(\d+))?.*)?'
- if not re.match(regex, val):
-- print("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val))
-+ print(("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val)))
- Exit(1)
-
- env_vars.Add('MONGO_VERSION',
-@@ -822,12 +822,12 @@ if installDir[0] not in ['$', '#']:
- Exit(1)
-
- sconsDataDir = Dir(buildDir).Dir('scons')
--SConsignFile(str(sconsDataDir.File('sconsign')))
-+SConsignFile(str(sconsDataDir.File('sconsign.py3')))
-
- def printLocalInfo():
- import sys, SCons
-- print( "scons version: " + SCons.__version__ )
-- print( "python version: " + " ".join( [ `i` for i in sys.version_info ] ) )
-+ print(( "scons version: " + SCons.__version__ ))
-+ print(( "python version: " + " ".join( [ repr(i) for i in sys.version_info ] ) ))
-
- printLocalInfo()
-
-@@ -904,12 +904,12 @@ env.AddMethod(mongo_platform.env_os_is_wrapper, 'TargetOSIs')
- env.AddMethod(mongo_platform.env_get_os_name_wrapper, 'GetTargetOSName')
-
- def fatal_error(env, msg, *args):
-- print(msg.format(*args))
-+ print((msg.format(*args)))
- Exit(1)
-
- def conf_error(env, msg, *args):
-- print(msg.format(*args))
-- print("See {0} for details".format(env.File('$CONFIGURELOG').abspath))
-+ print((msg.format(*args)))
-+ print(("See {0} for details".format(env.File('$CONFIGURELOG').abspath)))
- Exit(1)
-
- env.AddMethod(fatal_error, 'FatalError')
-@@ -928,12 +928,12 @@ else:
- env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
-
- if has_option('variables-help'):
-- print(env_vars.GenerateHelpText(env))
-+ print((env_vars.GenerateHelpText(env)))
- Exit(0)
-
- #unknown_vars = env_vars.UnknownVariables()
- #if unknown_vars:
--# env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+# env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
-
- def set_config_header_define(env, varname, varval = 1):
- env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1018,7 +1018,7 @@ def CheckForProcessor(context, which_arch):
- context.Result(ret)
- return ret;
-
-- for k in processor_macros.keys():
-+ for k in list(processor_macros.keys()):
- ret = run_compile_check(k)
- if ret:
- context.Result('Detected a %s processor' % k)
-@@ -1136,7 +1136,7 @@ else:
- env['TARGET_ARCH'] = detected_processor
-
- if env['TARGET_OS'] not in os_macros:
-- print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
-+ print(("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])))
- elif not detectConf.CheckForOS(env['TARGET_OS']):
- env.ConfError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
-
-@@ -1922,7 +1922,7 @@ def doConfigure(myenv):
- # form -Wno-xxx (but not -Wno-error=xxx), we also add -Wxxx to the flags. GCC does
- # warn on unknown -Wxxx style flags, so this lets us probe for availablity of
- # -Wno-xxx.
-- for kw in test_mutation.keys():
-+ for kw in list(test_mutation.keys()):
- test_flags = test_mutation[kw]
- for test_flag in test_flags:
- if test_flag.startswith("-Wno-") and not test_flag.startswith("-Wno-error="):
-@@ -1936,7 +1936,7 @@ def doConfigure(myenv):
- # to make them real errors.
- cloned.Append(CCFLAGS=['-Werror'])
- conf = Configure(cloned, help=False, custom_tests = {
-- 'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag)
-+ 'CheckFlag' : lambda ctx : CheckFlagTest(ctx, tool, extension, flag)
- })
- available = conf.CheckFlag()
- conf.Finish()
-@@ -2408,7 +2408,7 @@ def doConfigure(myenv):
- "undefined" : myenv.File("#etc/ubsan.blacklist"),
- }
-
-- blackfiles = set([v for (k, v) in blackfiles_map.iteritems() if k in sanitizer_list])
-+ blackfiles = {v for (k, v) in blackfiles_map.items() if k in sanitizer_list}
- blacklist_options=["-fsanitize-blacklist=%s" % blackfile
- for blackfile in blackfiles
- if os.stat(blackfile.path).st_size != 0]
-@@ -2420,7 +2420,7 @@ def doConfigure(myenv):
- llvm_symbolizer = get_option('llvm-symbolizer')
- if os.path.isabs(llvm_symbolizer):
- if not myenv.File(llvm_symbolizer).exists():
-- print("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer)
-+ print(("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer))
- llvm_symbolizer = None
- else:
- llvm_symbolizer = myenv.WhereIs(llvm_symbolizer)
-@@ -2710,7 +2710,7 @@ def doConfigure(myenv):
- files = ['ssleay32.dll', 'libeay32.dll']
- for extra_file in files:
- if not addOpenSslLibraryToDistArchive(extra_file):
-- print("WARNING: Cannot find SSL library '%s'" % extra_file)
-+ print(("WARNING: Cannot find SSL library '%s'" % extra_file))
-
- # Used to import system certificate keychains
- if conf.env.TargetOSIs('darwin'):
-@@ -2738,7 +2738,7 @@ def doConfigure(myenv):
- # TODO: If we could programmatically extract the paths from the info output
- # we could give a better message here, but brew info's machine readable output
- # doesn't seem to include the whole 'caveats' section.
-- message = subprocess.check_output([brew, "info", "openssl"])
-+ message = subprocess.check_output([brew, "info", "openssl"]).decode('utf-8')
- advice = textwrap.dedent(
- """\
- NOTE: HomeBrew installed to {0} appears to have OpenSSL installed.
-@@ -3114,7 +3114,7 @@ def doConfigure(myenv):
-
- outputIndex = next((idx for idx in [0,1] if conf.CheckAltivecVbpermqOutput(idx)), None)
- if outputIndex is not None:
-- conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-+ conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
- else:
- myenv.ConfError("Running on ppc64le, but can't find a correct vec_vbpermq output index. Compiler or platform not supported")
-
-@@ -3176,9 +3176,12 @@ def doLint( env , target , source ):
- import buildscripts.pylinters
- buildscripts.pylinters.lint_all(None, {}, [])
-
-- import buildscripts.lint
-- if not buildscripts.lint.run_lint( [ "src/mongo/" ] ):
-- raise Exception( "lint errors" )
-+ env.Command(
-+ target="#run_lint",
-+ source=["buildscripts/lint.py", "src/mongo"],
-+ action="$PYTHON $SOURCES[0] $SOURCES[1]",
-+ )
-+
-
- env.Alias( "lint" , [] , [ doLint ] )
- env.AlwaysBuild( "lint" )
---
-2.28.0
-
-
-From 81abd3f9ba48ffb27919e574c8d518f4a1d8fbf3 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:27:46 +0200
-Subject: [PATCH 02/24] Backport buildscripts/aggregate_tracefiles.py
-
----
- buildscripts/aggregate_tracefiles.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildscripts/aggregate_tracefiles.py b/buildscripts/aggregate_tracefiles.py
-index 8f1db785..0b4bfd24 100644
---- buildscripts/aggregate_tracefiles.py
-+++ buildscripts/aggregate_tracefiles.py
-@@ -16,7 +16,7 @@ def aggregate(inputs, output):
-
- args += ['-o', output]
-
-- print ' '.join(args)
-+ print(' '.join(args))
-
- return subprocess.call(args)
-
---
-2.28.0
-
-
-From 035a04745cb159c2a971180d1d76bca51de9245c Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:32:28 +0200
-Subject: [PATCH 03/24] Backport buildscripts/aws_ec2.py
-
----
- buildscripts/aws_ec2.py | 83 ++++++++++++++++++-----------------------
- 1 file changed, 37 insertions(+), 46 deletions(-)
-
-diff --git a/buildscripts/aws_ec2.py b/buildscripts/aws_ec2.py
-index bc467d6e..f2e033a4 100755
---- buildscripts/aws_ec2.py
-+++ buildscripts/aws_ec2.py
-@@ -2,7 +2,7 @@
-
- """AWS EC2 instance launcher and controller."""
-
--from __future__ import print_function
-+
-
- import base64
- import collections
-@@ -94,12 +94,13 @@ class AwsEc2(object):
- if reached_state:
- print(" Instance {}!".format(instance.state["Name"]), file=sys.stdout)
- else:
-- print(" Instance in state '{}', failed to reach state '{}'{}!".format(
-- instance.state["Name"], state, client_error), file=sys.stdout)
-+ print(
-+ " Instance in state '{}', failed to reach state '{}'{}!".format(
-+ instance.state["Name"], state, client_error), file=sys.stdout)
- sys.stdout.flush()
- return 0 if reached_state else 1
-
-- def control_instance( #pylint: disable=too-many-arguments,too-many-branches
-+ def control_instance( #pylint: disable=too-many-arguments,too-many-branches,too-many-locals
- self, mode, image_id, wait_time_secs=0, show_progress=False, console_output_file=None,
- console_screenshot_file=None):
- """Control an AMI instance. Returns 0 & status information, if successful."""
-@@ -257,40 +258,34 @@ def main():
- create_options = optparse.OptionGroup(parser, "Create options")
- status_options = optparse.OptionGroup(parser, "Status options")
-
-- parser.add_option("--mode",
-- dest="mode",
-- choices=_MODES,
-- default="status",
-- help="Operations to perform on an EC2 instance, choose one of"
-- " '{}', defaults to '%default'.".format(", ".join(_MODES)))
-+ parser.add_option(
-+ "--mode", dest="mode", choices=_MODES, default="status",
-+ help=("Operations to perform on an EC2 instance, choose one of"
-+ " '{}', defaults to '%default'.".format(", ".join(_MODES))))
-
- control_options.add_option("--imageId",
- dest="image_id",
- default=None,
- help="EC2 image_id to perform operation on [REQUIRED for control].")
-
-- control_options.add_option("--waitTimeSecs",
-- dest="wait_time_secs",
-- type=int,
-- default=5 * 60,
-- help="Time to wait for EC2 instance to reach it's new state,"
-- " defaults to '%default'.")
-+ control_options.add_option(
-+ "--waitTimeSecs", dest="wait_time_secs", type=int, default=5 * 60,
-+ help=("Time to wait for EC2 instance to reach it's new state,"
-+ " defaults to '%default'."))
-+
-
- create_options.add_option("--ami",
- dest="ami",
- default=None,
- help="EC2 AMI to launch [REQUIRED for create].")
-
-- create_options.add_option("--blockDevice",
-- dest="block_devices",
-- metavar="DEVICE-NAME DEVICE-SIZE-GB",
-- action="append",
-- default=[],
-- nargs=2,
-- help="EBS device name and volume size in GiB."
-- " More than one device can be attached, by specifying"
-- " this option more than once."
-- " The device will be deleted on termination of the instance.")
-+ create_options.add_option(
-+ "--blockDevice", dest="block_devices", metavar="DEVICE-NAME DEVICE-SIZE-GB",
-+ action="append", default=[], nargs=2,
-+ help=("EBS device name and volume size in GiB."
-+ " More than one device can be attached, by specifying"
-+ " this option more than once."
-+ " The device will be deleted on termination of the instance."))
-
- create_options.add_option("--instanceType",
- dest="instance_type",
-@@ -302,19 +297,15 @@ def main():
- default=None,
- help="EC2 key name [REQUIRED for create].")
-
-- create_options.add_option("--securityGroupIds",
-- dest="security_group_ids",
-- action="append",
-- default=[],
-- help="EC2 security group ids. More than one security group id can be"
-- " added, by specifying this option more than once.")
-+ create_options.add_option(
-+ "--securityGroupIds", dest="security_group_ids", action="append", default=[],
-+ help=("EC2 security group ids. More than one security group id can be"
-+ " added, by specifying this option more than once."))
-
-- create_options.add_option("--securityGroup",
-- dest="security_groups",
-- action="append",
-- default=[],
-- help="EC2 security group. More than one security group can be added,"
-- " by specifying this option more than once.")
-+ create_options.add_option(
-+ "--securityGroup", dest="security_groups", action="append", default=[],
-+ help=("EC2 security group. More than one security group can be added,"
-+ " by specifying this option more than once."))
-
- create_options.add_option("--subnetId",
- dest="subnet_id",
-@@ -350,14 +341,15 @@ def main():
- default=None,
- help="Save the status into the specified YAML file.")
-
-- status_options.add_option("--consoleOutputFile", dest="console_output_file", default=None,
-- help="Save the console output into the specified file, if"
-- " available.")
-+ status_options.add_option(
-+ "--consoleOutputFile", dest="console_output_file", default=None,
-+ help="Save the console output into the specified file, if"
-+ " available.")
-
-- status_options.add_option("--consoleScreenshotFile", dest="console_screenshot_file",
-- default=None,
-- help="Save the console screenshot (JPG format) into the specified"
-- " file, if available.")
-+ status_options.add_option(
-+ "--consoleScreenshotFile", dest="console_screenshot_file", default=None,
-+ help="Save the console screenshot (JPG format) into the specified"
-+ " file, if available.")
-
- parser.add_option_group(control_options)
- parser.add_option_group(create_options)
-@@ -382,7 +374,6 @@ def main():
- parser.error("Block size must be an integer")
- block_devices[device_name] = device_size
-
-- # The 'expire-on' key is a UTC time.
- expire_dt = datetime.datetime.utcnow() + datetime.timedelta(hours=options.tag_expire_hours)
- tags = [{"Key": "expire-on", "Value": expire_dt.strftime("%Y-%m-%d %H:%M:%S")},
- {"Key": "Name", "Value": options.tag_name},
---
-2.28.0
-
-
-From b6f97aeb89868c62c3c01f7f2e6f47ecda846d94 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:33:44 +0200
-Subject: [PATCH 04/24] backport site_scons/mongo/__init__.py
-
----
- site_scons/mongo/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/site_scons/mongo/__init__.py b/site_scons/mongo/__init__.py
-index 510bd7bc..f7747809 100644
---- site_scons/mongo/__init__.py
-+++ site_scons/mongo/__init__.py
-@@ -5,4 +5,4 @@
- def print_build_failures():
- from SCons.Script import GetBuildFailures
- for bf in GetBuildFailures():
-- print "%s failed: %s" % (bf.node, bf.errstr)
-+ print("%s failed: %s" % (bf.node, bf.errstr))
---
-2.28.0
-
-
-From 054ba812f02c54663a76b7092aa0c1eeeaf9925e Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:35:06 +0200
-Subject: [PATCH 05/24] backport site_scons/mongo/generators.py
-
----
- site_scons/mongo/generators.py | 75 +++++++++++++++++++++++++++-------
- 1 file changed, 61 insertions(+), 14 deletions(-)
-
-diff --git a/site_scons/mongo/generators.py b/site_scons/mongo/generators.py
-index c07e86a4..052f18d3 100644
---- site_scons/mongo/generators.py
-+++ site_scons/mongo/generators.py
-@@ -1,6 +1,6 @@
- # -*- mode: python; -*-
-
--import md5
-+import hashlib
-
- # Default and alternative generator definitions go here.
-
-@@ -15,22 +15,69 @@ import md5
- # want to define them.
- def default_buildinfo_environment_data():
- return (
-- ('distmod', '$MONGO_DISTMOD', True, True,),
-- ('distarch', '$MONGO_DISTARCH', True, True,),
-- ('cc', '$CC_VERSION', True, False,),
-- ('ccflags', '$CCFLAGS', True, False,),
-- ('cxx', '$CXX_VERSION', True, False,),
-- ('cxxflags', '$CXXFLAGS', True, False,),
-- ('linkflags', '$LINKFLAGS', True, False,),
-- ('target_arch', '$TARGET_ARCH', True, True,),
-- ('target_os', '$TARGET_OS', True, False,),
-+ (
-+ 'distmod',
-+ '$MONGO_DISTMOD',
-+ True,
-+ True,
-+ ),
-+ (
-+ 'distarch',
-+ '$MONGO_DISTARCH',
-+ True,
-+ True,
-+ ),
-+ (
-+ 'cc',
-+ '$CC_VERSION',
-+ True,
-+ False,
-+ ),
-+ (
-+ 'ccflags',
-+ '$CCFLAGS',
-+ True,
-+ False,
-+ ),
-+ (
-+ 'cxx',
-+ '$CXX_VERSION',
-+ True,
-+ False,
-+ ),
-+ (
-+ 'cxxflags',
-+ '$CXXFLAGS',
-+ True,
-+ False,
-+ ),
-+ (
-+ 'linkflags',
-+ '$LINKFLAGS',
-+ True,
-+ False,
-+ ),
-+ (
-+ 'target_arch',
-+ '$TARGET_ARCH',
-+ True,
-+ True,
-+ ),
-+ (
-+ 'target_os',
-+ '$TARGET_OS',
-+ True,
-+ False,
-+ ),
- )
-
-+
- # If you want buildInfo and --version to be relatively empty, set
- # MONGO_BUILDINFO_ENVIRONMENT_DATA = empty_buildinfo_environment_data()
- def empty_buildinfo_environment_data():
- return ()
-
-+
- def default_variant_dir_generator(target, source, env, for_signature):
-
- if env.GetOption('cache') != None:
-@@ -44,11 +91,11 @@ def default_variant_dir_generator(target, source, env, for_signature):
-
- # Hash the named options and their values, and take the first 8 characters of the hash as
- # the variant name
-- hasher = md5.md5()
-+ hasher = hashlib.md5()
- for option in variant_options:
-- hasher.update(option)
-- hasher.update(str(env.GetOption(option)))
-- variant_dir = hasher.hexdigest()[0:8]
-+ hasher.update(option.encode('utf-8'))
-+ hasher.update(str(env.GetOption(option)).encode('utf-8'))
-+ variant_dir = str(hasher.hexdigest()[0:8])
-
- # If our option hash yields a well known hash, replace it with its name.
- known_variant_hashes = {
---
-2.28.0
-
-
-From 83a4ac06adfa2d7adfb6dedeb6fb258130ab3015 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:36:14 +0200
-Subject: [PATCH 06/24] backport buildscripts/utils.py
-
----
- buildscripts/utils.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/buildscripts/utils.py b/buildscripts/utils.py
-index 69a78921..1c08bdf8 100644
---- buildscripts/utils.py
-+++ buildscripts/utils.py
-@@ -107,7 +107,7 @@ def getGitDescribe():
- stderr=devnull,
- stdin=devnull,
- shell=True)
-- return proc.communicate()[0].strip()
-+ return proc.communicate()[0].strip().decode('utf-8')
-
- def execsys( args ):
- import subprocess
-@@ -122,7 +122,7 @@ def getprocesslist():
- raw = ""
- try:
- raw = execsys( "/bin/ps axww" )[0]
-- except Exception,e:
-+ except Exception as e:
- print( "can't get processlist: " + str( e ) )
-
- r = re.compile( "[\r\n]+" )
-@@ -176,7 +176,7 @@ def didMongodStart( port=27017 , timeout=20 ):
- try:
- checkMongoPort( port )
- return True
-- except Exception,e:
-+ except Exception as e:
- print( e )
- timeout = timeout - 1
- return False
---
-2.28.0
-
-
-From f38206bde5a4e7cf14a7e17b67ccf074b222c9a6 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:48:44 +0200
-Subject: [PATCH 07/24] backport site_scons/libdeps.py
-
----
- site_scons/libdeps.py | 46 ++++++++++++++++++++++++++-----------------
- 1 file changed, 28 insertions(+), 18 deletions(-)
-
-diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py
-index 632ed29b..62272052 100644
---- site_scons/libdeps.py
-+++ site_scons/libdeps.py
-@@ -61,7 +61,7 @@ syslibdeps_env_var = 'SYSLIBDEPS'
- missing_syslibdep = 'MISSING_LIBDEP_'
-
- class dependency(object):
-- Public, Private, Interface = range(3)
-+ Public, Private, Interface = list(range(3))
-
- def __init__(self, value, dynamic, deptype):
- self.target_node = value
-@@ -74,7 +74,7 @@ class dependency(object):
- class DependencyCycleError(SCons.Errors.UserError):
- """Exception representing a cycle discovered in library dependencies."""
-
-- def __init__(self, first_node ):
-+ def __init__(self, first_node):
- super(DependencyCycleError, self).__init__()
- self.cycle_nodes = [first_node]
-
-@@ -89,8 +89,8 @@ def __get_sorted_direct_libdeps(node):
- setattr(node.attributes, "libdeps_direct_sorted", direct_sorted)
- return direct_sorted
-
--def __get_libdeps(node):
-
-+def __get_libdeps(node):
- """Given a SCons Node, return its library dependencies, topologically sorted.
-
- Computes the dependencies if they're not already cached.
-@@ -122,7 +122,7 @@ def __get_libdeps(node):
- marked.add(n.target_node)
- tsorted.append(n.target_node)
-
-- except DependencyCycleError, e:
-+ except DependencyCycleError as e:
- if len(e.cycle_nodes) == 1 or e.cycle_nodes[0] != e.cycle_nodes[-1]:
- e.cycle_nodes.insert(0, n.target_node)
- raise
-@@ -139,6 +139,7 @@ def __get_libdeps(node):
-
- return tsorted
-
-+
- def __get_syslibdeps(node):
- """ Given a SCons Node, return its system library dependencies.
-
-@@ -150,11 +151,11 @@ def __get_syslibdeps(node):
- for lib in __get_libdeps(node):
- for syslib in node.get_env().Flatten(lib.get_env().get(syslibdeps_env_var, [])):
- if syslib:
-- if type(syslib) in (str, unicode) and syslib.startswith(missing_syslibdep):
-- print("Target '%s' depends on the availability of a "
-+ if type(syslib) is str and syslib.startswith(missing_syslibdep):
-+ print(("Target '%s' depends on the availability of a "
- "system provided library for '%s', "
- "but no suitable library was found during configuration." %
-- (str(node), syslib[len(missing_syslibdep):]))
-+ (str(node), syslib[len(missing_syslibdep):])))
- node.get_env().Exit(1)
- syslibdeps.append(syslib)
- setattr(node.attributes, cached_var_name, syslibdeps)
-@@ -170,17 +171,20 @@ def update_scanner(builder):
-
- if old_scanner:
- path_function = old_scanner.path_function
-+
- def new_scanner(node, env, path=()):
- result = old_scanner.function(node, env, path)
- result.extend(__get_libdeps(node))
- return result
- else:
- path_function = None
-+
- def new_scanner(node, env, path=()):
- return __get_libdeps(node)
-
- builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
-- path_function=path_function)
-+ path_function=path_function)
-+
-
- def get_libdeps(source, target, env, for_signature):
- """Implementation of the special _LIBDEPS environment variable.
-@@ -191,6 +195,7 @@ def get_libdeps(source, target, env, for_signature):
- target = env.Flatten([target])
- return __get_libdeps(target[0])
-
-+
- def get_libdeps_objs(source, target, env, for_signature):
- objs = []
- for lib in get_libdeps(source, target, env, for_signature):
-@@ -198,6 +203,7 @@ def get_libdeps_objs(source, target, env, for_signature):
- objs.extend(lib.sources)
- return objs
-
-+
- def get_syslibdeps(source, target, env, for_signature):
- deps = __get_syslibdeps(target[0])
- lib_link_prefix = env.subst('$LIBLINKPREFIX')
-@@ -209,7 +215,7 @@ def get_syslibdeps(source, target, env, for_signature):
- # they're believed to represent library short names, that should be prefixed with -l
- # or the compiler-specific equivalent. I.e., 'm' becomes '-lm', but 'File("m.a") is passed
- # through whole cloth.
-- if type(d) in (str, unicode):
-+ if type(d) is str:
- result.append('%s%s%s' % (lib_link_prefix, d, lib_link_suffix))
- else:
- result.append(d)
-@@ -252,8 +258,8 @@ def libdeps_emitter(target, source, env):
- prereqs.extend(dependency(l, False, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', []) if l)
-
- for prereq in prereqs:
-- prereqWithIxes = SCons.Util.adjustixes(
-- prereq.target_node, lib_builder.get_prefix(env), lib_builder.get_suffix(env))
-+ prereqWithIxes = SCons.Util.adjustixes(prereq.target_node, lib_builder.get_prefix(env),
-+ lib_builder.get_suffix(env))
- prereq.target_node = lib_node_factory(prereqWithIxes)
-
- for t in target:
-@@ -264,16 +270,16 @@ def libdeps_emitter(target, source, env):
- for dependent in env.get('LIBDEPS_DEPENDENTS', []):
- if dependent is None:
- continue
-- dependentWithIxes = SCons.Util.adjustixes(
-- dependent, lib_builder.get_prefix(env), lib_builder.get_suffix(env))
-+ dependentWithIxes = SCons.Util.adjustixes(dependent, lib_builder.get_prefix(env),
-+ lib_builder.get_suffix(env))
- dependentNode = lib_node_factory(dependentWithIxes)
- __append_direct_libdeps(dependentNode, [dependency(target[0], False, dependency.Public)])
-
- for dependent in env.get('PROGDEPS_DEPENDENTS', []):
- if dependent is None:
- continue
-- dependentWithIxes = SCons.Util.adjustixes(
-- dependent, prog_builder.get_prefix(env), prog_builder.get_suffix(env))
-+ dependentWithIxes = SCons.Util.adjustixes(dependent, prog_builder.get_prefix(env),
-+ prog_builder.get_suffix(env))
- dependentNode = prog_node_factory(dependentWithIxes)
- __append_direct_libdeps(dependentNode, [dependency(target[0], False, dependency.Public)])
-
-@@ -372,9 +378,11 @@ def setup_environment(env, emitting_shared=False):
- if 'init-no-global-side-effects' in env.Entry(lib).get_env().get('LIBDEPS_TAGS', []):
- result.append(str(lib))
- else:
-- result.extend(env.subst('$LINK_WHOLE_ARCHIVE_LIB_START'
-- '$TARGET'
-- '$LINK_WHOLE_ARCHIVE_LIB_END', target=lib).split())
-+ result.extend(
-+ env.subst(
-+ '$LINK_WHOLE_ARCHIVE_LIB_START'
-+ '$TARGET'
-+ '$LINK_WHOLE_ARCHIVE_LIB_END', target=lib).split())
- return result
-
- env['_LIBDEPS_LIBS_WITH_TAGS'] = expand_libdeps_with_extraction_flags
-@@ -394,6 +402,7 @@ def setup_environment(env, emitting_shared=False):
- except KeyError:
- pass
-
-+
- def setup_conftests(conf):
- def FindSysLibDep(context, name, libs, **kwargs):
- var = "LIBDEPS_" + name.upper() + "_SYSLIBDEP"
-@@ -406,4 +415,5 @@ def setup_conftests(conf):
- return context.Result(result)
- context.env[var] = __missing_syslib(name)
- return context.Result(result)
-+
- conf.AddTest('FindSysLibDep', FindSysLibDep)
---
-2.28.0
-
-
-From 2bc91392ab7dba6a09aa4100a9e8666a82dd7941 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:49:45 +0200
-Subject: [PATCH 08/24] backport site_scons/site_tools/distsrc.py
-
----
- site_scons/site_tools/distsrc.py | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/site_scons/site_tools/distsrc.py b/site_scons/site_tools/distsrc.py
-index 861f5d9e..cc72c065 100644
---- site_scons/site_tools/distsrc.py
-+++ site_scons/site_tools/distsrc.py
-@@ -20,7 +20,7 @@ import shutil
- import tarfile
- import time
- import zipfile
--import StringIO
-+import io
-
- from distutils.spawn import find_executable
-
-@@ -28,7 +28,7 @@ __distsrc_callbacks = []
-
- class DistSrcFile:
- def __init__(self, **kwargs):
-- [ setattr(self, key, val) for (key, val) in kwargs.items() ]
-+ [ setattr(self, key, val) for (key, val) in list(kwargs.items()) ]
-
- def __str__(self):
- return self.name
-@@ -60,6 +60,7 @@ class DistSrcArchive:
- def close(self):
- self.archive_file.close()
-
-+
- class DistSrcTarArchive(DistSrcArchive):
- def __iter__(self):
- file_list = self.archive_file.getnames()
-@@ -82,7 +83,7 @@ class DistSrcTarArchive(DistSrcArchive):
-
- def append_file_contents(self, filename, file_contents,
- mtime=time.time(),
-- mode=0644,
-+ mode=0o644,
- uname="root",
- gname="root"):
- file_metadata = tarfile.TarInfo(name=filename)
-@@ -91,7 +92,7 @@ class DistSrcTarArchive(DistSrcArchive):
- file_metadata.uname = uname
- file_metadata.gname = gname
- file_metadata.size = len(file_contents)
-- file_buf = StringIO.StringIO(file_contents)
-+ file_buf = io.BytesIO(file_contents.encode('utf-8'))
- if self.archive_mode == 'r':
- self.archive_file.close()
- self.archive_file = tarfile.open(
-@@ -105,6 +106,7 @@ class DistSrcTarArchive(DistSrcArchive):
- def append_file(self, filename, localfile):
- self.archive_file.add(localfile, arcname=filename)
-
-+
- class DistSrcZipArchive(DistSrcArchive):
- def __iter__(self):
- file_list = self.archive_file.namelist()
-@@ -119,7 +121,7 @@ class DistSrcZipArchive(DistSrcArchive):
- name=key,
- size=item_data.file_size,
- mtime=time.mktime(fixed_time),
-- mode=0775 if is_dir else 0664,
-+ mode=0o775 if is_dir else 0o664,
- type=tarfile.DIRTYPE if is_dir else tarfile.REGTYPE,
- uid=0,
- gid=0,
-@@ -129,7 +131,7 @@ class DistSrcZipArchive(DistSrcArchive):
-
- def append_file_contents(self, filename, file_contents,
- mtime=time.time(),
-- mode=0644,
-+ mode=0o644,
- uname="root",
- gname="root"):
- self.archive_file.writestr(filename, file_contents)
-@@ -139,7 +141,7 @@ class DistSrcZipArchive(DistSrcArchive):
-
- def build_error_action(msg):
- def error_stub(target=None, source=None, env=None):
-- print msg
-+ print(msg)
- env.Exit(1)
- return [ error_stub ]
-
-@@ -162,7 +164,7 @@ def distsrc_action_generator(source, target, env, for_signature):
-
- target_ext = str(target[0])[-3:]
- if not target_ext in [ 'zip', 'tar' ]:
-- print "Invalid file format for distsrc. Must be tar or zip file"
-+ print("Invalid file format for distsrc. Must be tar or zip file")
- env.Exit(1)
-
- git_cmd = "\"%s\" archive --format %s --output %s --prefix ${MONGO_DIST_SRC_PREFIX} HEAD" % (
-@@ -173,14 +175,14 @@ def distsrc_action_generator(source, target, env, for_signature):
- SCons.Action.Action(run_distsrc_callbacks, "Running distsrc callbacks for $TARGET")
- ]
-
-+
- def add_callback(env, fn):
- __distsrc_callbacks.append(fn)
-
-+
- def generate(env, **kwargs):
- env.AddMethod(add_callback, 'AddDistSrcCallback')
-- env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(
-- generator=distsrc_action_generator,
-- )
-+ env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(generator=distsrc_action_generator, )
-
- def DistSrc(env, target):
- result = env.__DISTSRC(target=target, source=[])
-@@ -190,5 +192,6 @@ def generate(env, **kwargs):
-
- env.AddMethod(DistSrc, 'DistSrc')
-
-+
- def exists(env):
- return True
---
-2.28.0
-
-
-From b27a4fc533e5290495f3b2d2bc78ea208d607bf5 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:50:41 +0200
-Subject: [PATCH 09/24] backport site_scons/site_tools/mongo_benchmark.py
-
----
- site_scons/site_tools/mongo_benchmark.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_benchmark.py b/site_scons/site_tools/mongo_benchmark.py
-index 7c12627b..f3f84d73 100644
---- site_scons/site_tools/mongo_benchmark.py
-+++ site_scons/site_tools/mongo_benchmark.py
-@@ -11,10 +11,10 @@ def register_benchmark(env, test):
- env.Alias('$BENCHMARK_ALIAS', test)
-
- def benchmark_list_builder_action(env, target, source):
-- ofile = open(str(target[0]), 'wb')
-+ ofile = open(str(target[0]), 'w')
- try:
- for s in _benchmarks:
-- print '\t' + str(s)
-+ print('\t' + str(s))
- ofile.write('%s\n' % s)
- finally:
- ofile.close()
-@@ -37,9 +37,10 @@ def build_benchmark(env, target, source, **kwargs):
- bmEnv.Install("#/build/benchmark/", result[0])
- return result
-
-+
- def generate(env):
- env.Command('$BENCHMARK_LIST', env.Value(_benchmarks),
-- Action(benchmark_list_builder_action, "Generating $TARGET"))
-+ Action(benchmark_list_builder_action, "Generating $TARGET"))
- env.AddMethod(register_benchmark, 'RegisterBenchmark')
- env.AddMethod(build_benchmark, 'Benchmark')
- env.Alias('$BENCHMARK_ALIAS', '$BENCHMARK_LIST')
---
-2.28.0
-
-
-From 2059bb295d0d440a615241a834094dba3c840d6f Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:51:30 +0200
-Subject: [PATCH 10/24] backport site_scons/site_tools/mongo_integrationtest.py
-
----
- site_scons/site_tools/mongo_integrationtest.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_integrationtest.py b/site_scons/site_tools/mongo_integrationtest.py
-index ff9a5f45..324cac63 100644
---- site_scons/site_tools/mongo_integrationtest.py
-+++ site_scons/site_tools/mongo_integrationtest.py
-@@ -12,10 +12,10 @@ def register_integration_test(env, test):
- env.Alias('$INTEGRATION_TEST_ALIAS', installed_test)
-
- def integration_test_list_builder_action(env, target, source):
-- ofile = open(str(target[0]), 'wb')
-+ ofile = open(str(target[0]), 'w')
- try:
- for s in _integration_tests:
-- print '\t' + str(s)
-+ print('\t' + str(s))
- ofile.write('%s\n' % s)
- finally:
- ofile.close()
-@@ -30,9 +30,10 @@ def build_cpp_integration_test(env, target, source, **kwargs):
- env.RegisterIntegrationTest(result[0])
- return result
-
-+
- def generate(env):
- env.Command('$INTEGRATION_TEST_LIST', env.Value(_integration_tests),
-- Action(integration_test_list_builder_action, "Generating $TARGET"))
-+ Action(integration_test_list_builder_action, "Generating $TARGET"))
- env.AddMethod(register_integration_test, 'RegisterIntegrationTest')
- env.AddMethod(build_cpp_integration_test, 'CppIntegrationTest')
- env.Alias('$INTEGRATION_TEST_ALIAS', '$INTEGRATION_TEST_LIST')
---
-2.28.0
-
-
-From 747ce174e66d87aa71d6a3943457228ecd1d6aa2 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:54:25 +0200
-Subject: [PATCH 11/24] backport site_scons/site_tools/mongo_unittest.py
-
----
- site_scons/site_tools/mongo_unittest.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_unittest.py b/site_scons/site_tools/mongo_unittest.py
-index ec99ab2d..28504767 100644
---- site_scons/site_tools/mongo_unittest.py
-+++ site_scons/site_tools/mongo_unittest.py
-@@ -11,10 +11,10 @@ def register_unit_test(env, test):
- env.Alias('$UNITTEST_ALIAS', test)
-
- def unit_test_list_builder_action(env, target, source):
-- ofile = open(str(target[0]), 'wb')
-+ ofile = open(str(target[0]), 'w')
- try:
- for s in _unittests:
-- print '\t' + str(s)
-+ print('\t' + str(s))
- ofile.write('%s\n' % s)
- finally:
- ofile.close()
-@@ -30,9 +30,10 @@ def build_cpp_unit_test(env, target, source, **kwargs):
- env.Install("#/build/unittests/", result[0])
- return result
-
-+
- def generate(env):
- env.Command('$UNITTEST_LIST', env.Value(_unittests),
-- Action(unit_test_list_builder_action, "Generating $TARGET"))
-+ Action(unit_test_list_builder_action, "Generating $TARGET"))
- env.AddMethod(register_unit_test, 'RegisterUnitTest')
- env.AddMethod(build_cpp_unit_test, 'CppUnitTest')
- env.Alias('$UNITTEST_ALIAS', '$UNITTEST_LIST')
---
-2.28.0
-
-
-From 72af34f1fbb1341dbb4f91147346eba24ad3bba1 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:54:44 +0200
-Subject: [PATCH 12/24] backport site_scons/site_tools/split_dwarf.py
-
----
- site_scons/site_tools/split_dwarf.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/site_scons/site_tools/split_dwarf.py b/site_scons/site_tools/split_dwarf.py
-index 95130c9e..c57b9e96 100644
---- site_scons/site_tools/split_dwarf.py
-+++ site_scons/site_tools/split_dwarf.py
-@@ -26,6 +26,7 @@ _CXXSuffixes = ['.cpp', '.cc', '.cxx', '.c++', '.C++']
- if SCons.Util.case_sensitive_suffixes('.c', '.C'):
- _CXXSuffixes.append('.C')
-
-+
- def _dwo_emitter(target, source, env):
- new_targets = []
- for t in target:
-@@ -40,6 +41,7 @@ def _dwo_emitter(target, source, env):
- targets = target + new_targets
- return (targets, source)
-
-+
- def generate(env):
- suffixes = []
- if _splitDwarfFlag in env['CCFLAGS']:
-@@ -52,7 +54,7 @@ def generate(env):
-
- for object_builder in SCons.Tool.createObjBuilders(env):
- emitterdict = object_builder.builder.emitter
-- for suffix in emitterdict.iterkeys():
-+ for suffix in emitterdict.keys():
- if not suffix in suffixes:
- continue
- base = emitterdict[suffix]
-@@ -61,5 +63,6 @@ def generate(env):
- _dwo_emitter,
- ])
-
-+
- def exists(env):
- return any(_splitDwarfFlag in env[f] for f in ['CCFLAGS', 'CFLAGS', 'CXXFLAGS'])
---
-2.28.0
-
-
-From 1e6b16c197766c1f9b19d32cacb658dff44b52b5 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:56:46 +0200
-Subject: [PATCH 13/24] backport site_scons/site_tools/thin_archive.py
-
----
- site_scons/site_tools/thin_archive.py | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/site_scons/site_tools/thin_archive.py b/site_scons/site_tools/thin_archive.py
-index 511c0ef6..500c3355 100644
---- site_scons/site_tools/thin_archive.py
-+++ site_scons/site_tools/thin_archive.py
-@@ -17,6 +17,7 @@ import SCons
- import re
- import subprocess
-
-+
- def exists(env):
- if not 'AR' in env:
- return False
-@@ -30,10 +31,9 @@ def exists(env):
- if not "rc" in env['ARFLAGS']:
- return False
-
-- pipe = SCons.Action._subproc(env, SCons.Util.CLVar(ar) + ['--version'],
-- stdin = 'devnull',
-- stderr = 'devnull',
-- stdout = subprocess.PIPE)
-+ pipe = SCons.Action._subproc(env,
-+ SCons.Util.CLVar(ar) + ['--version'], stdin='devnull',
-+ stderr='devnull', stdout=subprocess.PIPE)
- if pipe.wait() != 0:
- return False
-
-@@ -41,7 +41,7 @@ def exists(env):
- for line in pipe.stdout:
- if isgnu:
- continue # consume all data
-- isgnu = re.search(r'^GNU ar', line)
-+ isgnu = re.search(r'^GNU ar', line.decode('utf-8'))
-
- return bool(isgnu)
-
-@@ -56,6 +56,7 @@ def _add_emitter(builder):
- new_emitter = SCons.Builder.ListEmitter([base_emitter, new_emitter])
- builder.emitter = new_emitter
-
-+
- def _add_scanner(builder):
- old_scanner = builder.target_scanner
- path_function = old_scanner.path_function
-@@ -69,13 +70,16 @@ def _add_scanner(builder):
- new_results.extend(base.children())
- return new_results
-
-- builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner, path_function=path_function)
-+ builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
-+ path_function=path_function)
-+
-
- def generate(env):
- if not exists(env):
- return
-
-- env['ARFLAGS'] = SCons.Util.CLVar([arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
-+ env['ARFLAGS'] = SCons.Util.CLVar(
-+ [arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
-
- def noop_action(env, target, source):
- pass
---
-2.28.0
-
-
-From 5c0d6355043aa07402eea9e85100f7cfc19897ce Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:07:05 +0200
-Subject: [PATCH 14/24] python3 buildscripts/errorcodes.py
-
----
- buildscripts/errorcodes.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py
-index cc467899..7d83b11e 100755
---- buildscripts/errorcodes.py
-+++ buildscripts/errorcodes.py
-@@ -9,7 +9,7 @@ Optionally replaces zero codes in source code with new distinct values.
- import bisect
- import os
- import sys
--import utils
-+from . import utils
- from collections import defaultdict, namedtuple
- from optparse import OptionParser
-
-@@ -66,7 +66,7 @@ def parseSourceFiles( callback ):
-
- for sourceFile in utils.getAllSourceFiles(prefix='src/mongo/'):
- if list_files:
-- print 'scanning file: ' + sourceFile
-+ print ('scanning file: ' + sourceFile)
-
- with open(sourceFile) as f:
- text = f.read()
-@@ -159,7 +159,7 @@ def readErrorCodes():
-
- parseSourceFiles( checkDups )
-
-- if seen.has_key("0"):
-+ if "0" in seen:
- code = "0"
- bad = seen[code]
- errors.append( bad )
-@@ -196,12 +196,12 @@ def replaceBadCodes( errors, nextCode ):
- for assertLoc in reversed(sorted(set(zero_errors))):
- (sourceFile, byteOffset, lines, code) = assertLoc
- lineNum, _ = getLineAndColumnForPosition(assertLoc)
-- print "UPDATING_FILE: %s:%s" % (sourceFile, lineNum)
-+ print ("UPDATING_FILE: %s:%s" % (sourceFile, lineNum))
-
- ln = lineNum - 1
-
- with open(sourceFile, 'r+') as f:
-- print "LINE_%d_BEFORE:%s" % (lineNum, f.readlines()[ln].rstrip())
-+ print ("LINE_%d_BEFORE:%s" % (lineNum, f.readlines()[ln].rstrip()))
-
- f.seek(0)
- text = f.read()
-@@ -212,7 +212,7 @@ def replaceBadCodes( errors, nextCode ):
- f.write(text[byteOffset+1:])
- f.seek(0)
-
-- print "LINE_%d_AFTER :%s" % (lineNum, f.readlines()[ln].rstrip())
-+ print ("LINE_%d_AFTER :%s" % (lineNum, f.readlines()[ln].rstrip()))
- nextCode += 1
-
-
-@@ -281,7 +281,7 @@ def main():
- elif options.replace:
- replaceBadCodes(errors, next)
- else:
-- print ERROR_HELP
-+ print (ERROR_HELP)
- sys.exit(1)
-
-
---
-2.28.0
-
-
-From 6aec2eae836c40b8c3a3f0663ada65a85d593a4e Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:22:46 +0200
-Subject: [PATCH 15/24] backport src/mongo/SConscript
-
----
- src/mongo/SConscript | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index d93eb08f..aa4f6123 100644
---- src/mongo/SConscript
-+++ src/mongo/SConscript
-@@ -157,9 +157,9 @@ js_engine_ver = get_option("js-engine") if get_option("server-js") == "on" else
-
- # On windows, we need to escape the backslashes in the command-line
- # so that windows paths look okay.
--cmd_line = " ".join(sys.argv).encode('string-escape')
-+cmd_line = " ".join(sys.argv).encode('unicode_escape')
- if env.TargetOSIs('windows'):
-- cmd_line = cmd_line.replace('\\', r'\\')
-+ cmd_line = cmd_line.replace(b'\\', b'\\')
-
- module_list = '{ %s }' % ', '.join([ '"{0}"'.format(x) for x in env['MONGO_MODULES'] ])
-
-@@ -613,7 +613,7 @@ env.Append(MODULE_BANNERS = [distsrc.File('README'),
- distsrc.File('MPL-2')])
-
- # If no module has introduced a file named LICENSE.txt, then inject the license.
--if sum(itertools.imap(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
-+if sum(map(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
- env.Append(MODULE_BANNERS = [distsrc.File('LICENSE-Community.txt')])
-
- # All module banners get staged to the top level of the tarfile, so we
-@@ -632,7 +632,7 @@ module_banner_transforms = ["--transform %s=$SERVER_DIST_BASENAME" % d for d in
- # Allow modules to map original file name directories to subdirectories
- # within the archive (e.g. { "src/mongo/db/modules/enterprise/docs": "snmp"})
- archive_addition_transforms = []
--for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
-+for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
- archive_addition_transforms.append("--transform \"%s=$SERVER_DIST_BASENAME/%s\"" %
- (full_dir, archive_dir))
-
---
-2.28.0
-
-
-From 0ef150e257dedb2fbe3512020ce9583b604b836d Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:25:00 +0200
-Subject: [PATCH 16/24] backport buildscripts/idl/idlc.py
-
----
- buildscripts/idl/idlc.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/buildscripts/idl/idlc.py b/buildscripts/idl/idlc.py
-index c6bf5056..90cb9ac1 100644
---- buildscripts/idl/idlc.py
-+++ buildscripts/idl/idlc.py
-@@ -29,8 +29,6 @@
- #
- """IDL Compiler Driver Main Entry point."""
-
--from __future__ import absolute_import, print_function
--
- import argparse
- import logging
- import sys
---
-2.28.0
-
-
-From 18d0c5440d9c6f6b6d2a38d600347c92eb47e4d8 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:25:52 +0200
-Subject: [PATCH 17/24] backport src/mongo/db/auth/generate_action_types.py
-
----
- src/mongo/db/auth/generate_action_types.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/mongo/db/auth/generate_action_types.py b/src/mongo/db/auth/generate_action_types.py
-index 3d3a36c0..618669fd 100755
---- src/mongo/db/auth/generate_action_types.py
-+++ src/mongo/db/auth/generate_action_types.py
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate action_type.{h,cpp}
-
- Usage:
-@@ -35,7 +34,6 @@ Usage:
-
- import sys
-
--
- headerFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT
- // See src/mongo/db/auth/generate_action_types.py
- /**
-@@ -194,14 +192,14 @@ namespace mongo {
- } // namespace mongo
- """
-
-+
- def writeSourceFile(actionTypes, sourceOutputFile):
- actionTypeConstants = ""
- fromStringIfStatements = ""
- toStringCaseStatements = ""
- for actionType in actionTypes:
- actionTypeConstants += (" const ActionType ActionType::%(actionType)s"
-- "(%(actionType)sValue);\n" %
-- dict(actionType=actionType))
-+ "(%(actionType)sValue);\n" % dict(actionType=actionType))
- fromStringIfStatements += """ if (action == "%(actionType)s") {
- *result = %(actionType)s;
- return Status::OK();
-@@ -215,6 +213,7 @@ def writeSourceFile(actionTypes, sourceOutputFile):
-
- pass
-
-+
- def writeHeaderFile(actionTypes, headerOutputFile):
- actionTypeConstants = ""
- actionTypeIdentifiers = ""
-@@ -225,6 +224,7 @@ def writeHeaderFile(actionTypes, headerOutputFile):
- actionTypeIdentifiers=actionTypeIdentifiers)
- headerOutputFile.write(formattedHeaderFile)
-
-+
- def hasDuplicateActionTypes(actionTypes):
- sortedActionTypes = sorted(actionTypes)
-
-@@ -232,7 +232,7 @@ def hasDuplicateActionTypes(actionTypes):
- prevActionType = sortedActionTypes[0]
- for actionType in sortedActionTypes[1:]:
- if actionType == prevActionType:
-- print 'Duplicate actionType %s\n' % actionType
-+ print('Duplicate actionType %s\n' % actionType)
- didFail = True
- prevActionType = actionType
-
-@@ -245,7 +245,7 @@ def parseActionTypesFromFile(actionTypesFilename):
-
- if __name__ == "__main__":
- if len(sys.argv) != 4:
-- print "Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>"
-+ print("Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>")
- sys.exit(-1)
-
- actionTypes = parseActionTypesFromFile(sys.argv[1])
---
-2.28.0
-
-
-From 6df9773b207f90692bda010f2778f57f957944ff Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:29:19 +0200
-Subject: [PATCH 18/24] backport buildscripts/idl/idl/compiler.py
-
----
- buildscripts/idl/idl/compiler.py | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/buildscripts/idl/idl/compiler.py b/buildscripts/idl/idl/compiler.py
-index 0905a18e..19aaf436 100644
---- buildscripts/idl/idl/compiler.py
-+++ buildscripts/idl/idl/compiler.py
-@@ -31,8 +31,6 @@ IDL compiler driver.
- Orchestrates the 3 passes (parser, binder, and generator) together.
- """
-
--from __future__ import absolute_import, print_function, unicode_literals
--
- import io
- import logging
- import os
-@@ -66,14 +64,14 @@ class CompilerImportResolver(parser.ImportResolverBase):
- """Class for the IDL compiler to resolve imported files."""
-
- def __init__(self, import_directories):
-- # type: (List[unicode]) -> None
-+ # type: (List[str]) -> None
- """Construct a ImportResolver."""
- self._import_directories = import_directories
-
- super(CompilerImportResolver, self).__init__()
-
- def resolve(self, base_file, imported_file_name):
-- # type: (unicode, unicode) -> unicode
-+ # type: (str, str) -> str
- """Return the complete path to an imported file name."""
-
- logging.debug("Resolving imported file '%s' for file '%s'", imported_file_name, base_file)
-@@ -104,7 +102,7 @@ class CompilerImportResolver(parser.ImportResolverBase):
- raise errors.IDLError(msg)
-
- def open(self, resolved_file_name):
-- # type: (unicode) -> Any
-+ # type: (str) -> Any
- """Return an io.Stream for the requested file."""
- return io.open(resolved_file_name, encoding='utf-8')
-
-@@ -121,7 +119,7 @@ def _write_dependencies(spec):
-
-
- def _update_import_includes(args, spec, header_file_name):
-- # type: (CompilerArgs, syntax.IDLSpec, unicode) -> None
-+ # type: (CompilerArgs, syntax.IDLSpec, str) -> None
- """Update the list of imports with a list of include files for each import with structs."""
- # This function is fragile:
- # In order to try to generate headers with an "include what you use" set of headers, the IDL
---
-2.28.0
-
-
-From 8e28ce9f7b396b16ad9d574a754b5e40fd063ed4 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:31:51 +0200
-Subject: [PATCH 19/24] backport buildscripts/idl/idl/syntax.py
-
----
- buildscripts/idl/idl/syntax.py | 83 ++++++++++++++++------------------
- 1 file changed, 40 insertions(+), 43 deletions(-)
-
-diff --git a/buildscripts/idl/idl/syntax.py b/buildscripts/idl/idl/syntax.py
-index 492a7b99..96ac5090 100644
---- buildscripts/idl/idl/syntax.py
-+++ buildscripts/idl/idl/syntax.py
-@@ -33,8 +33,6 @@ It maps 1-1 to the YAML file, and has not been checked if
- it follows the rules of the IDL, etc.
- """
-
--from __future__ import absolute_import, print_function, unicode_literals
--
- import itertools
- from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
-
-@@ -70,7 +68,7 @@ class IDLSpec(object):
-
-
- def parse_array_type(name):
-- # type: (unicode) -> unicode
-+ # type: (str) -> str
- """Parse a type name of the form 'array<type>' and extract type."""
- if not name.startswith("array<") and not name.endswith(">"):
- return None
-@@ -94,8 +92,7 @@ def _zip_scalar(items, obj):
- def _item_and_type(dic):
- # type: (Dict[Any, List[Any]]) -> Iterator[Tuple[Any, Any]]
- """Return an Iterator of (key, value) pairs from a dictionary."""
-- return itertools.chain.from_iterable((_zip_scalar(value, key)
-- for (key, value) in dic.viewitems()))
-+ return itertools.chain.from_iterable((_zip_scalar(value, key) for (key, value) in dic.items()))
-
-
- class SymbolTable(object):
-@@ -115,7 +112,7 @@ class SymbolTable(object):
- self.types = [] # type: List[Type]
-
- def _is_duplicate(self, ctxt, location, name, duplicate_class_name):
-- # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> bool
-+ # type: (errors.ParserContext, common.SourceLocation, str, str) -> bool
- """Return true if the given item already exist in the symbol table."""
- for (item, entity_type) in _item_and_type({
- "command": self.commands,
-@@ -179,12 +176,12 @@ class SymbolTable(object):
- self.add_type(ctxt, idltype)
-
- def resolve_field_type(self, ctxt, location, field_name, type_name):
-- # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+ # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
- """Find the type or struct a field refers to or log an error."""
- return self._resolve_field_type(ctxt, location, field_name, type_name)
-
- def _resolve_field_type(self, ctxt, location, field_name, type_name):
-- # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+ # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
- """Find the type or struct a field refers to or log an error."""
- # pylint: disable=too-many-return-statements
-
-@@ -237,15 +234,15 @@ class Import(common.SourceLocation):
- """IDL imports object."""
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct an Imports section."""
-- self.imports = [] # type: List[unicode]
-+ self.imports = [] # type: List[str]
-
- # These are not part of the IDL syntax but are produced by the parser.
- # List of imports with structs.
-- self.resolved_imports = [] # type: List[unicode]
-+ self.resolved_imports = [] # type: List[str]
- # All imports directly or indirectly included
-- self.dependencies = [] # type: List[unicode]
-+ self.dependencies = [] # type: List[str]
-
- super(Import, self).__init__(file_name, line, column)
-
-@@ -262,16 +259,16 @@ class Type(common.SourceLocation):
- # pylint: disable=too-many-instance-attributes
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct a Type."""
-- self.name = None # type: unicode
-- self.description = None # type: unicode
-- self.cpp_type = None # type: unicode
-- self.bson_serialization_type = None # type: List[unicode]
-- self.bindata_subtype = None # type: unicode
-- self.serializer = None # type: unicode
-- self.deserializer = None # type: unicode
-- self.default = None # type: unicode
-+ self.name = None # type: str
-+ self.description = None # type: str
-+ self.cpp_type = None # type: str
-+ self.bson_serialization_type = None # type: List[str]
-+ self.bindata_subtype = None # type: str
-+ self.serializer = None # type: str
-+ self.deserializer = None # type: str
-+ self.default = None # type: str
-
- super(Type, self).__init__(file_name, line, column)
-
-@@ -288,15 +285,15 @@ class Field(common.SourceLocation):
- # pylint: disable=too-many-instance-attributes
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct a Field."""
-- self.name = None # type: unicode
-- self.cpp_name = None # type: unicode
-- self.description = None # type: unicode
-- self.type = None # type: unicode
-+ self.name = None # type: str
-+ self.cpp_name = None # type: str
-+ self.description = None # type: str
-+ self.type = None # type: str
- self.ignore = False # type: bool
- self.optional = False # type: bool
-- self.default = None # type: unicode
-+ self.default = None # type: str
- self.supports_doc_sequence = False # type: bool
-
- # Internal fields - not generated by parser
-@@ -314,10 +311,10 @@ class ChainedStruct(common.SourceLocation):
- """
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct a Type."""
-- self.name = None # type: unicode
-- self.cpp_name = None # type: unicode
-+ self.name = None # type: str
-+ self.cpp_name = None # type: str
-
- super(ChainedStruct, self).__init__(file_name, line, column)
-
-@@ -330,10 +327,10 @@ class ChainedType(common.SourceLocation):
- """
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct a Type."""
-- self.name = None # type: unicode
-- self.cpp_name = None # type: unicode
-+ self.name = None # type: str
-+ self.cpp_name = None # type: str
-
- super(ChainedType, self).__init__(file_name, line, column)
-
-@@ -348,10 +345,10 @@ class Struct(common.SourceLocation):
- # pylint: disable=too-many-instance-attributes
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct a Struct."""
-- self.name = None # type: unicode
-- self.description = None # type: unicode
-+ self.name = None # type: str
-+ self.description = None # type: str
- self.strict = True # type: bool
- self.immutable = False # type: bool
- self.inline_chained_structs = False # type: bool
-@@ -389,10 +386,10 @@ class EnumValue(common.SourceLocation):
- """
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct an Enum."""
-- self.name = None # type: unicode
-- self.value = None # type: unicode
-+ self.name = None # type: str
-+ self.value = None # type: str
-
- super(EnumValue, self).__init__(file_name, line, column)
-
-@@ -405,11 +402,11 @@ class Enum(common.SourceLocation):
- """
-
- def __init__(self, file_name, line, column):
-- # type: (unicode, int, int) -> None
-+ # type: (str, int, int) -> None
- """Construct an Enum."""
-- self.name = None # type: unicode
-- self.description = None # type: unicode
-- self.type = None # type: unicode
-+ self.name = None # type: str
-+ self.description = None # type: str
-+ self.type = None # type: str
- self.values = None # type: List[EnumValue]
-
- # Internal property that is not represented as syntax. An imported enum is read from an
---
-2.28.0
-
-
-From 90f2a9fb3ebe659b3d884e3a94bb5fc0a8ef5f69 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:35:50 +0200
-Subject: [PATCH 20/24] backport src/mongo/base/generate_error_codes.py
-
----
- src/mongo/base/generate_error_codes.py | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/mongo/base/generate_error_codes.py b/src/mongo/base/generate_error_codes.py
-index 5de9e524..6538b6b5 100644
---- src/mongo/base/generate_error_codes.py
-+++ src/mongo/base/generate_error_codes.py
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate error_codes.{h,cpp} from error_codes.err.
-
- Format of error_codes.err:
-@@ -51,10 +50,9 @@ def render_template(template_path, **kw):
- returns the result as a string'''
-
- template = Template.compile(
-- file=template_path,
-- compilerSettings=dict(directiveStartToken="//#",directiveEndToken="//#"),
-- baseclass=dict,
-- useCache=False)
-+ file=template_path,
-+ compilerSettings=dict(directiveStartToken="//#", directiveEndToken="//#",
-+ commentStartToken="//##"), baseclass=dict, useCache=False)
- return str(template(**kw))
-
- class ErrorCode:
-@@ -63,11 +61,13 @@ class ErrorCode:
- self.code = code
- self.categories = []
-
-+
- class ErrorClass:
- def __init__(self, name, codes):
- self.name = name
- self.codes = codes
-
-+
- def main(argv):
- # Parse and validate argv.
- if len(sys.argv) < 2:
-@@ -94,7 +94,7 @@ def main(argv):
- categories=error_classes,
- )
-
-- with open(output, 'wb') as outfile:
-+ with open(output, 'w') as outfile:
- outfile.write(text)
-
- def die(message=None):
-@@ -126,6 +126,7 @@ def check_for_conflicts(error_codes, error_classes):
- if failed:
- die()
-
-+
- def has_duplicate_error_codes(error_codes):
- sorted_by_name = sorted(error_codes, key=lambda x: x.name)
- sorted_by_code = sorted(error_codes, key=lambda x: x.code)
-@@ -134,21 +135,22 @@ def has_duplicate_error_codes(error_codes):
- prev = sorted_by_name[0]
- for curr in sorted_by_name[1:]:
- if curr.name == prev.name:
-- sys.stdout.write('Duplicate name %s with codes %s and %s\n'
-- % (curr.name, curr.code, prev.code))
-+ sys.stdout.write(
-+ 'Duplicate name %s with codes %s and %s\n' % (curr.name, curr.code, prev.code))
- failed = True
- prev = curr
-
- prev = sorted_by_code[0]
- for curr in sorted_by_code[1:]:
- if curr.code == prev.code:
-- sys.stdout.write('Duplicate code %s with names %s and %s\n'
-- % (curr.code, curr.name, prev.name))
-+ sys.stdout.write(
-+ 'Duplicate code %s with names %s and %s\n' % (curr.code, curr.name, prev.name))
- failed = True
- prev = curr
-
- return failed
-
-+
- def has_duplicate_error_classes(error_classes):
- names = sorted(ec.name for ec in error_classes)
-
-@@ -161,6 +163,7 @@ def has_duplicate_error_classes(error_classes):
- prev_name = name
- return failed
-
-+
- def has_missing_error_codes(error_codes, error_classes):
- code_names = dict((ec.name, ec) for ec in error_codes)
- failed = False
-@@ -174,5 +177,6 @@ def has_missing_error_codes(error_codes, error_classes):
-
- return failed
-
-+
- if __name__ == '__main__':
- main(sys.argv)
---
-2.28.0
-
-
-From 4418d8f8c9e432e380a4e611f5475ba3a4d76699 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 19:34:19 +0200
-Subject: [PATCH 21/24] backport site_scons/site_tools/idl_tool.py
-
----
- site_scons/site_tools/idl_tool.py | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/site_scons/site_tools/idl_tool.py b/site_scons/site_tools/idl_tool.py
-index 78bedfaa..fc53b3ae 100755
---- site_scons/site_tools/idl_tool.py
-+++ site_scons/site_tools/idl_tool.py
-@@ -21,6 +21,7 @@ import sys
-
- import SCons
-
-+
- def idlc_emitter(target, source, env):
- """For each input IDL file, the tool produces a .cpp and .h file."""
- first_source = str(source[0])
-@@ -43,7 +44,7 @@ IDLCAction = SCons.Action.Action('$IDLCCOM', '$IDLCCOMSTR')
- def idl_scanner(node, env, path):
- # Use the import scanner mode of the IDL compiler to file imported files
- cmd = [sys.executable, "buildscripts/idl/idlc.py", '--include','src', str(node), '--write-dependencies']
-- deps_str = subprocess.check_output(cmd)
-+ deps_str = subprocess.check_output(cmd).decode('utf-8')
-
- deps_list = deps_str.splitlines()
-
-@@ -57,19 +58,14 @@ def idl_scanner(node, env, path):
- idl_scanner = SCons.Scanner.Scanner(function=idl_scanner, skeys=['.idl'])
-
- # TODO: create a scanner for imports when imports are implemented
--IDLCBuilder = SCons.Builder.Builder(
-- action=IDLCAction,
-- emitter=idlc_emitter,
-- srcsuffx=".idl",
-- suffix=".cpp",
-- source_scanner = idl_scanner
-- )
-+IDLCBuilder = SCons.Builder.Builder(action=IDLCAction, emitter=idlc_emitter, srcsuffx=".idl",
-+ suffix=".cpp", source_scanner=idl_scanner)
-
-
- def generate(env):
- bld = IDLCBuilder
-
-- env.Append(SCANNERS = idl_scanner)
-+ env.Append(SCANNERS=idl_scanner)
-
- env['BUILDERS']['Idlc'] = bld
-
---
-2.28.0
-
-
-From 185809c361b8c495002ed26485237164d31de367 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 19:53:37 +0200
-Subject: [PATCH 22/24] backport
- src/mongo/db/query/collation/generate_icu_init_cpp.py
-
----
- src/mongo/db/query/collation/generate_icu_init_cpp.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/mongo/db/query/collation/generate_icu_init_cpp.py b/src/mongo/db/query/collation/generate_icu_init_cpp.py
-index a95740b8..2a550a0c 100755
---- src/mongo/db/query/collation/generate_icu_init_cpp.py
-+++ src/mongo/db/query/collation/generate_icu_init_cpp.py
-@@ -31,6 +31,7 @@ import optparse
- import os
- import sys
-
-+
- def main(argv):
- parser = optparse.OptionParser()
- parser.add_option('-o', '--output', action='store', dest='output_cpp_file',
-@@ -46,6 +47,7 @@ def main(argv):
- parser.error("input ICU data file unspecified")
- generate_cpp_file(options.input_data_file, options.output_cpp_file)
-
-+
- def generate_cpp_file(data_file_path, cpp_file_path):
- source_template = '''// AUTO-GENERATED FILE DO NOT EDIT
- // See generate_icu_init_cpp.py.
-@@ -112,8 +114,8 @@ MONGO_INITIALIZER(LoadICUData)(InitializerContext* context) {
- '''
- decimal_encoded_data = ''
- with open(data_file_path, 'rb') as data_file:
-- decimal_encoded_data = ','.join([str(ord(byte)) for byte in data_file.read()])
-- with open(cpp_file_path, 'wb') as cpp_file:
-+ decimal_encoded_data = ','.join([str(byte) for byte in data_file.read()])
-+ with open(cpp_file_path, 'w') as cpp_file:
- cpp_file.write(source_template % dict(decimal_encoded_data=decimal_encoded_data))
-
- if __name__ == '__main__':
---
-2.28.0
-
-
-From 636d99fde6ba86fb3d4ae959e5ea9433e94f2390 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 20:02:29 +0200
-Subject: [PATCH 23/24] backport site_scons/site_tools/jstoh.py
-
----
- site_scons/site_tools/jstoh.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/jstoh.py b/site_scons/site_tools/jstoh.py
-index dc90b324..d8998179 100644
---- site_scons/site_tools/jstoh.py
-+++ site_scons/site_tools/jstoh.py
-@@ -39,8 +39,8 @@ def jsToHeader(target, source):
-
- text = '\n'.join(h)
-
-- print "writing: %s" % outFile
-- with open(outFile, 'wb') as out:
-+ print ("writing: %s" % outFile)
-+ with open(outFile, 'w') as out:
- try:
- out.write(text)
- finally:
-@@ -49,7 +49,7 @@ def jsToHeader(target, source):
-
- if __name__ == "__main__":
- if len(sys.argv) < 3:
-- print "Must specify [target] [source] "
-+ print("Must specify [target] [source] ")
- sys.exit(1)
-
- jsToHeader(sys.argv[1], sys.argv[2:])
---
-2.28.0
-
-
-From 7edbc7b873c0dc04fb96b125a8749fa29f7b8baf Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 20:08:21 +0200
-Subject: [PATCH 24/24] backport src/mongo/db/fts/generate_stop_words.py
-
----
- src/mongo/db/fts/generate_stop_words.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/mongo/db/fts/generate_stop_words.py b/src/mongo/db/fts/generate_stop_words.py
-index e0dc801c..6893ba91 100644
---- src/mongo/db/fts/generate_stop_words.py
-+++ src/mongo/db/fts/generate_stop_words.py
-@@ -7,7 +7,7 @@ def generate( header, source, language_files ):
- for x in language_files:
- print( "\t%s" % x )
-
-- out = open( header, "wb" )
-+ out = open( header, "w" )
- out.write( """
- #pragma once
- #include <set>
-@@ -24,8 +24,8 @@ namespace fts {
-
-
-
-- out = open( source, "wb" )
-- out.write( '#include "%s"' % header.rpartition( "/" )[2].rpartition( "\\" )[2] )
-+ out = open( source, "w", encoding='utf-8')
-+ out.write( '#include "{}"'.format(header.rpartition( "/" )[2].rpartition( "\\" )[2]) )
- out.write( """
- namespace mongo {
- namespace fts {
-@@ -41,12 +41,13 @@ namespace fts {
- out.write( ' {\n' )
- out.write( ' const char* const words[] = {\n' )
- for word in open( l_file, "rb" ):
-- out.write( ' "%s",\n' % word.strip() )
-+ out.write( ' "%s",\n' % word.decode('utf-8').strip() )
- out.write( ' };\n' )
- out.write( ' const size_t wordcnt = sizeof(words) / sizeof(words[0]);\n' )
- out.write( ' std::set< std::string >& l = (*m)["%s"];\n' % l )
- out.write( ' l.insert(&words[0], &words[wordcnt]);\n' )
- out.write( ' }\n' )
-+
- out.write( """
- }
- } // namespace fts
---
-2.28.0
-
diff --git a/databases/mongodb36/files/patch-rpm_mongod.conf b/databases/mongodb36/files/patch-rpm_mongod.conf
deleted file mode 100644
index 77f3b6026daf..000000000000
--- a/databases/mongodb36/files/patch-rpm_mongod.conf
+++ /dev/null
@@ -1,25 +0,0 @@
---- rpm/mongod.conf.orig 2018-01-04 23:28:55 UTC
-+++ rpm/mongod.conf
-@@ -7,11 +7,11 @@
- systemLog:
- destination: file
- logAppend: true
-- path: /var/log/mongodb/mongod.log
-+ path: /var/db/mongodb/mongod.log
-
- # Where and how to store data.
- storage:
-- dbPath: /var/lib/mongo
-+ dbPath: /var/db/mongodb
- journal:
- enabled: true
- # engine:
-@@ -21,7 +21,7 @@ storage:
- # how the process runs
- processManagement:
- fork: true # fork and run in background
-- pidFilePath: /var/run/mongodb/mongod.pid # location of pidfile
-+ pidFilePath: /var/db/mongodb/mongod.lock # location of pidfile
- timeZoneInfo: /usr/share/zoneinfo
-
- # network interfaces
diff --git a/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h b/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h
deleted file mode 100644
index b8846b503b70..000000000000
--- a/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mongo/base/error_codes.tpl.h.orig 2019-08-13 23:47:34 UTC
-+++ src/mongo/base/error_codes.tpl.h
-@@ -118,7 +118,7 @@ template <int32_t code>
- constexpr bool isNamedCode = false;
- //#for $ec in $codes
- template <>
--constexpr bool isNamedCode<ErrorCodes::$ec.name> = true;
-+constexpr inline bool isNamedCode<ErrorCodes::$ec.name> = true;
- //#end for
-
- MONGO_COMPILER_NORETURN void throwExceptionForStatus(const Status& status);
diff --git a/databases/mongodb36/pkg-descr b/databases/mongodb36/pkg-descr
deleted file mode 100644
index 59930ca8f679..000000000000
--- a/databases/mongodb36/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
diff --git a/databases/mongodb36/pkg-plist b/databases/mongodb36/pkg-plist
deleted file mode 100644
index d47470ba2b6b..000000000000
--- a/databases/mongodb36/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongoperf
-bin/mongos
-@sample etc/mongodb.conf.sample