aboutsummaryrefslogtreecommitdiff
path: root/databases/mongodb40
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mongodb40')
-rw-r--r--databases/mongodb40/Makefile82
-rw-r--r--databases/mongodb40/distinfo3
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp41
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp59
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h91
-rw-r--r--databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h62
-rw-r--r--databases/mongodb40/files/mongod.in62
-rw-r--r--databases/mongodb40/files/patch-SConstruct32
-rw-r--r--databases/mongodb40/files/patch-python31397
-rw-r--r--databases/mongodb40/files/patch-rpm_mongod.conf25
-rw-r--r--databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h14
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh21
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp41
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp59
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h94
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h62
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist11
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S14
-rw-r--r--databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h393
-rw-r--r--databases/mongodb40/pkg-descr5
-rw-r--r--databases/mongodb40/pkg-plist5
85 files changed, 0 insertions, 6349 deletions
diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
deleted file mode 100644
index f56d4fb23ea2..000000000000
--- a/databases/mongodb40/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-PORTNAME= mongodb
-DISTVERSIONPREFIX= r
-DISTVERSION= 4.0.25
-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= dev.ashevchuk@gmail.com
-COMMENT= Distributed document-oriented "NoSQL" database (4.0.x Branch)
-
-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
-
-ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON= Only supported on amd64, aarch64 and powerpc64le (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} \
- ${LOCALBASE}/bin/ar:devel/binutils
-LIB_DEPENDS= libboost_system.so:devel/boost-libs \
- libpcre.so:devel/pcre \
- libcurl.so:ftp/curl \
- libsnappy.so:archivers/snappy
-
-USES= compiler:c++14-lang cpe python:3.5+,build scons
-USE_RC_SUBR= mongod
-
-CONFLICTS_INSTALL= mongodb36 mongodb4[24]
-
-MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
- --use-system-pcre --use-system-snappy \
- --use-system-boost --use-system-zlib \
- --cxx-std=14 --libc++ \
- --runtime-hardening=on \
- --disable-warnings-as-errors \
- VERBOSE=on AR=${PREFIX}/bin/ar
-
-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 ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
-EXTRA_PATCHES= ${FILESDIR}/${ARCH}
-.endif
-
-ALL_TARGET= core
-
-PORTSCOUT= limitw:1,even
-
-CPE_PRODUCT= mongodb
-
-pre-patch:
- ${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
-
-post-install:
-.for f in mongo mongod 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/mongodb40/distinfo b/databases/mongodb40/distinfo
deleted file mode 100644
index 766d8f0341c9..000000000000
--- a/databases/mongodb40/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1623237574
-SHA256 (mongodb-src-r4.0.25.tar.gz) = c51f1f78bc121a260023e5419dd219456ed4fbb6da3f8954654263a0b260b0fd
-SIZE (mongodb-src-r4.0.25.tar.gz) = 50516290
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb40/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/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index a24659c5a145..000000000000
--- a/databases/mongodb40/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/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index c11f55644c87..000000000000
--- a/databases/mongodb40/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/mongodb40/files/mongod.in b/databases/mongodb40/files/mongod.in
deleted file mode 100644
index e885be83196c..000000000000
--- a/databases/mongodb40/files/mongod.in
+++ /dev/null
@@ -1,62 +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.
-%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%# just before mongod starts.
-# 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"}
-%%LEGACY_LIMITS%%: ${mongod_limits="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
-%%LEGACY_LIMITS%% if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb40/files/patch-SConstruct b/databases/mongodb40/files/patch-SConstruct
deleted file mode 100644
index 3c44d579d094..000000000000
--- a/databases/mongodb40/files/patch-SConstruct
+++ /dev/null
@@ -1,32 +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"] )
diff --git a/databases/mongodb40/files/patch-python3 b/databases/mongodb40/files/patch-python3
deleted file mode 100644
index 2d8b2ea8bfab..000000000000
--- a/databases/mongodb40/files/patch-python3
+++ /dev/null
@@ -1,1397 +0,0 @@
-diff -ru /data/ports-build/mongodb-src-r4.0.21/SConstruct ./SConstruct
---- /data/ports-build/mongodb-src-r4.0.21/SConstruct 2020-11-15 22:50:25.001942000 +0100
-+++ ./SConstruct 2020-11-16 20:09:38.793885000 +0100
-@@ -28,8 +28,8 @@
- 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
-@@ -435,7 +435,7 @@
- }
-
- 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',
-@@ -547,7 +547,7 @@
- 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 = {
-@@ -556,14 +556,14 @@
- }
-
- 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':
-@@ -627,7 +627,7 @@
-
- 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,
-@@ -636,7 +636,7 @@
-
- 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")
-@@ -770,7 +770,7 @@
- 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',
-@@ -901,12 +901,12 @@
- 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()
-
-@@ -986,12 +986,12 @@
- 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')
-@@ -1010,12 +1010,12 @@
- 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
-@@ -1100,7 +1100,7 @@
- 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)
-@@ -1222,7 +1222,7 @@
- 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'])
-
-@@ -2081,7 +2081,7 @@
- # 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="):
-@@ -2095,7 +2095,7 @@
- # 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()
-@@ -2611,7 +2611,7 @@
- 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)
-@@ -2922,7 +2922,7 @@
- # 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.
-@@ -3082,7 +3082,7 @@
- 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))
-
-
-
-@@ -3423,7 +3423,7 @@
-
- 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")
-
-@@ -3523,9 +3523,12 @@
- 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" )
-Only in .: build
-Only in ./buildscripts: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/aggregate_tracefiles.py ./buildscripts/aggregate_tracefiles.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/aggregate_tracefiles.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/aggregate_tracefiles.py 2020-11-16 20:09:38.798317000 +0100
-@@ -20,7 +20,7 @@
-
- args += ['-o', output]
-
-- print ' '.join(args)
-+ print(' '.join(args))
-
- return subprocess.call(args)
-
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/aws_ec2.py ./buildscripts/aws_ec2.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/aws_ec2.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/aws_ec2.py 2020-11-16 20:09:38.801388000 +0100
-@@ -1,8 +1,8 @@
- #!/usr/bin/env python
- """AWS EC2 instance launcher and controller."""
-
--from __future__ import print_function
-
-+
- import base64
- import collections
- import datetime
-@@ -88,12 +88,13 @@
- 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."""
-@@ -296,14 +297,15 @@
- status_options.add_option("--yamlFile", dest="yaml_file", 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)
-@@ -328,7 +330,6 @@
- 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",
-Only in ./buildscripts/idl/idl: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/compiler.py ./buildscripts/idl/idl/compiler.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/compiler.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idl/compiler.py 2020-11-16 20:09:38.804248000 +0100
-@@ -31,8 +31,6 @@
- Orchestrates the 3 passes (parser, binder, and generator) together.
- """
-
--from __future__ import absolute_import, print_function, unicode_literals
--
- import io
- import logging
- import os
-@@ -70,14 +68,14 @@
- """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)
-@@ -108,7 +106,7 @@
- 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')
-
-@@ -125,7 +123,7 @@
-
-
- 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
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/syntax.py ./buildscripts/idl/idl/syntax.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/syntax.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idl/syntax.py 2020-11-16 20:09:38.806128000 +0100
-@@ -33,8 +33,6 @@
- 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 @@
-
-
- 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
-@@ -95,7 +93,7 @@
- # 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()))
-+ (_zip_scalar(value, key) for (key, value) in dic.items()))
-
-
- class SymbolTable(object):
-@@ -115,7 +113,7 @@
- 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 +177,12 @@
- 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 +235,15 @@
- """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 +260,16 @@
- # 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 +286,15 @@
- # 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
- self.comparison_order = -1 # type: int
- self.non_const_getter = False # type: bool
-@@ -316,10 +314,10 @@
- """
-
- 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)
-
-@@ -332,10 +330,10 @@
- """
-
- 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)
-
-@@ -350,10 +348,10 @@
- # 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 = True # type: bool
-@@ -399,10 +397,10 @@
- """
-
- 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)
-
-@@ -415,11 +413,11 @@
- """
-
- 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
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idlc.py ./buildscripts/idl/idlc.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idlc.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idlc.py 2020-11-16 20:09:38.807705000 +0100
-@@ -29,8 +29,6 @@
- #
- """IDL Compiler Driver Main Entry point."""
-
--from __future__ import absolute_import, print_function
--
- import argparse
- import logging
- import sys
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/utils.py ./buildscripts/utils.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/utils.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/utils.py 2020-11-16 20:09:38.809660000 +0100
-@@ -99,7 +99,7 @@
- with open(os.devnull, "r+") as devnull:
- proc = subprocess.Popen("git describe --abbrev=7", stdout=subprocess.PIPE, stderr=devnull,
- stdin=devnull, shell=True)
-- return proc.communicate()[0].strip()
-+ return proc.communicate()[0].strip().decode('utf-8')
-
-
- def execsys(args):
-Only in ./site_scons: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/libdeps.py ./site_scons/libdeps.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/libdeps.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/libdeps.py 2020-11-16 20:09:38.813403000 +0100
-@@ -61,7 +61,7 @@
- missing_syslibdep = 'MISSING_LIBDEP_'
-
- class dependency(object):
-- Public, Private, Interface = range(3)
-+ Public, Private, Interface = list(range(3))
-
- def __init__(self, value, deptype):
- self.target_node = value
-@@ -85,7 +85,7 @@
- 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]
-
-@@ -100,8 +100,8 @@
- 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.
-@@ -133,7 +133,7 @@
- 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
-@@ -150,6 +150,7 @@
-
- return tsorted
-
-+
- def __get_syslibdeps(node):
- """ Given a SCons Node, return its system library dependencies.
-
-@@ -161,11 +162,11 @@
- 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)
-@@ -181,18 +182,21 @@
-
- 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.
-
-@@ -202,6 +206,7 @@
- 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):
-@@ -209,6 +214,7 @@
- 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')
-@@ -220,7 +226,7 @@
- # 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)
-@@ -382,6 +388,7 @@
- except KeyError:
- pass
-
-+
- def setup_conftests(conf):
- def FindSysLibDep(context, name, libs, **kwargs):
- var = "LIBDEPS_" + name.upper() + "_SYSLIBDEP"
-@@ -394,4 +401,5 @@
- return context.Result(result)
- context.env[var] = __missing_syslib(name)
- return context.Result(result)
-+
- conf.AddTest('FindSysLibDep', FindSysLibDep)
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/__init__.py ./site_scons/mongo/__init__.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/__init__.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/mongo/__init__.py 2020-11-16 20:09:38.815614000 +0100
-@@ -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))
-Only in ./site_scons/mongo: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/generators.py ./site_scons/mongo/generators.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/generators.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/mongo/generators.py 2020-11-16 20:09:38.817602000 +0100
-@@ -1,6 +1,6 @@
- # -*- mode: python; -*-
-
--import md5
-+import hashlib
-
- # Default and alternative generator definitions go here.
-
-@@ -15,22 +15,69 @@
- # 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 @@
-
- # 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 = {
-Only in ./site_scons/site_tools: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/distsrc.py ./site_scons/site_tools/distsrc.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/distsrc.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/distsrc.py 2020-11-16 20:09:38.819994000 +0100
-@@ -20,7 +20,7 @@
- import tarfile
- import time
- import zipfile
--import StringIO
-+import io
-
- from distutils.spawn import find_executable
-
-@@ -28,7 +28,7 @@
-
- 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 @@
- def close(self):
- self.archive_file.close()
-
-+
- class DistSrcTarArchive(DistSrcArchive):
- def __iter__(self):
- file_list = self.archive_file.getnames()
-@@ -82,7 +83,7 @@
-
- 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 @@
- 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 @@
- 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 @@
- 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 @@
-
- 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 @@
-
- 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 @@
-
- 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 @@
- 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=[])
-@@ -189,6 +191,7 @@
- return result
-
- env.AddMethod(DistSrc, 'DistSrc')
-+
-
- def exists(env):
- return True
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/idl_tool.py ./site_scons/site_tools/idl_tool.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/idl_tool.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/idl_tool.py 2020-11-16 20:09:38.821062000 +0100
-@@ -21,6 +21,7 @@
-
- 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 @@
- 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 @@
- 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
-
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/jstoh.py ./site_scons/site_tools/jstoh.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/jstoh.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/jstoh.py 2020-11-16 20:30:59.809428000 +0100
-@@ -39,7 +39,7 @@
-
- text = '\n'.join(h)
-
-- with open(outFile, 'wb') as out:
-+ with open(outFile, 'w') as out:
- try:
- out.write(text)
- finally:
-@@ -48,7 +48,7 @@
-
- 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:])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_benchmark.py ./site_scons/site_tools/mongo_benchmark.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_benchmark.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_benchmark.py 2020-11-16 20:09:38.823525000 +0100
-@@ -11,10 +11,10 @@
- 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()
-@@ -40,9 +40,10 @@
- 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')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_integrationtest.py ./site_scons/site_tools/mongo_integrationtest.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_integrationtest.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_integrationtest.py 2020-11-16 20:09:38.824569000 +0100
-@@ -12,10 +12,10 @@
- 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()
-@@ -31,9 +31,10 @@
- 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')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_unittest.py ./site_scons/site_tools/mongo_unittest.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_unittest.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_unittest.py 2020-11-16 20:09:38.825577000 +0100
-@@ -11,10 +11,10 @@
- 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()
-@@ -33,9 +33,10 @@
- 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')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/split_dwarf.py ./site_scons/site_tools/split_dwarf.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/split_dwarf.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/split_dwarf.py 2020-11-16 20:09:38.826716000 +0100
-@@ -26,6 +26,7 @@
- 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 @@
- targets = target + new_targets
- return (targets, source)
-
-+
- def generate(env):
- suffixes = []
- if _splitDwarfFlag in env['CCFLAGS']:
-@@ -52,7 +54,7 @@
-
- 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]
-@@ -60,6 +62,7 @@
- base,
- _dwo_emitter,
- ])
-+
-
- def exists(env):
- return any(_splitDwarfFlag in env[f] for f in ['CCFLAGS', 'CFLAGS', 'CXXFLAGS'])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/thin_archive.py ./site_scons/site_tools/thin_archive.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/thin_archive.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/thin_archive.py 2020-11-16 20:09:38.827857000 +0100
-@@ -17,6 +17,7 @@
- import re
- import subprocess
-
-+
- def exists(env):
- if not 'AR' in env:
- return False
-@@ -30,10 +31,9 @@
- 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 @@
- for line in pipe.stdout:
- if found:
- continue # consume all data
-- found = re.search(r'^GNU ar|^LLVM', line)
-+ found = re.search(r'^GNU ar|^LLVM', line.decode('utf-8'))
-
- return bool(found)
-
-@@ -56,6 +56,7 @@
- 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 @@
- 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
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/SConscript ./src/mongo/SConscript
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/SConscript 2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/SConscript 2020-11-16 20:09:38.834118000 +0100
-@@ -155,9 +155,9 @@
-
- # 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'] ])
-
-@@ -662,7 +662,7 @@
-
- # If no module has introduced a file named LICENSE-Enterprise.txt then this
- # is a Community build, so inject the Community license
--if sum(itertools.imap(lambda x: x.name == "LICENSE-Enterprise.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
-@@ -681,7 +681,7 @@
- # 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))
-
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/base/generate_error_codes.py ./src/mongo/base/generate_error_codes.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/base/generate_error_codes.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/base/generate_error_codes.py 2020-11-16 20:09:38.838467000 +0100
-@@ -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:
-@@ -68,11 +67,13 @@
- self.extra = extra
- 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:
-@@ -99,7 +100,7 @@
- categories=error_classes,
- )
-
-- with open(output, 'wb') as outfile:
-+ with open(output, 'w') as outfile:
- outfile.write(text)
-
- def die(message=None):
-@@ -131,6 +132,7 @@
- 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)
-@@ -139,21 +141,22 @@
- 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)
-
-@@ -166,6 +169,7 @@
- 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
-@@ -178,6 +182,7 @@
- failed = True
-
- return failed
-+
-
- if __name__ == '__main__':
- main(sys.argv)
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/auth/generate_action_types.py ./src/mongo/db/auth/generate_action_types.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/auth/generate_action_types.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/db/auth/generate_action_types.py 2020-11-16 20:09:38.846414000 +0100
-@@ -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 @@
-
- import sys
-
--
- headerFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT
- // See src/mongo/db/auth/generate_action_types.py
- /**
-@@ -194,14 +192,14 @@
- } // 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 @@
-
- pass
-
-+
- def writeHeaderFile(actionTypes, headerOutputFile):
- actionTypeConstants = ""
- actionTypeIdentifiers = ""
-@@ -225,6 +224,7 @@
- actionTypeIdentifiers=actionTypeIdentifiers)
- headerOutputFile.write(formattedHeaderFile)
-
-+
- def hasDuplicateActionTypes(actionTypes):
- sortedActionTypes = sorted(actionTypes)
-
-@@ -232,7 +232,7 @@
- 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 @@
-
- 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])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/fts/generate_stop_words.py ./src/mongo/db/fts/generate_stop_words.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/fts/generate_stop_words.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/db/fts/generate_stop_words.py 2020-11-16 20:09:38.851050000 +0100
-@@ -1,7 +1,7 @@
- import sys
-
- def generate( header, source, language_files ):
-- out = open( header, "wb" )
-+ out = open( header, "w" )
- out.write( """
- #pragma once
- #include <set>
-@@ -18,8 +18,8 @@
-
-
-
-- 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 {
-@@ -35,12 +35,13 @@
- 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
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/util/generate_icu_init_cpp.py ./src/mongo/util/generate_icu_init_cpp.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/util/generate_icu_init_cpp.py 2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/util/generate_icu_init_cpp.py 2020-11-16 21:01:59.537644000 +0100
-@@ -112,8 +112,8 @@
- '''
- 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__':
diff --git a/databases/mongodb40/files/patch-rpm_mongod.conf b/databases/mongodb40/files/patch-rpm_mongod.conf
deleted file mode 100644
index 77f3b6026daf..000000000000
--- a/databases/mongodb40/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/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h b/databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h
deleted file mode 100644
index 3ad2213ceaac..000000000000
--- a/databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-# based on: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245976#c12
-# https://jira.mongodb.org/browse/SERVER-44025
-# https://github.com/mongodb/mongo/commit/e484c9af6b4ae4a1d22c905e252ad3ad13f30bfc
---- src/mongo/base/error_codes.tpl.h.orig 2020-06-07 14:38:05 UTC
-+++ src/mongo/base/error_codes.tpl.h
-@@ -127,7 +127,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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh
deleted file mode 100644
index e23398b0c2d4..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/third_party/mozjs-45/gen-config.sh.orig 2020-11-30 15:51:50 UTC
-+++ src/third_party/mozjs-45/gen-config.sh
-@@ -27,6 +27,9 @@ case "$_Path" in
- "platform/aarch64/linux")
- _CONFIG_OPTS="--host=aarch64-linux"
- ;;
-+ "platform/ppc64le/freebsd")
-+ _CONFIG_OPTS="--host=ppc64le-freebsd"
-+ ;;
- "platform/ppc64le/linux")
- _CONFIG_OPTS="--host=ppc64le-linux"
- ;;
-@@ -81,7 +84,7 @@ esac
- cd mozilla-release/js/src
- rm config.cache
-
--PYTHON=python ./configure --without-x --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging "$_CONFIG_OPTS"
-+PYTHON=python2.7 ./configure --without-x --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging "$_CONFIG_OPTS"
-
- cd ../../..
-
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index d40c2c1e0fdb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 4e1c13f94c5b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index 67f43a616044..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index 5ac645ebe559..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index b4f17aa42ca9..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index d556257c3793..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 6b5029b9a591..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 212274b5c11e..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index a4f687fb5e6b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 4a66bc9f228e..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index fad4b24e34e8..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index aaa14d91c821..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 60657353c208..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index a3c40f89e0d9..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 998ebde49058..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index bcade7ee2385..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index 7a758062b229..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index c6ce0f718c67..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index 65d34854466b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index a36ff8d65028..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 355d40846169..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index a457d4201566..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index a9c961858082..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index 1199e24af625..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 385677b5118b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index b9abd3bc6e98..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index a52eb2388cd7..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index ad07c75831b1..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index f5eb5525c788..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index 9de0f34031d5..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index cccf3ddf96bb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index af993bfa3266..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index da4f72d1555a..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 3616d83653d8..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h
deleted file mode 100644
index 4f20bfd858bb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/js-confdefs.h.orig 2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/js-confdefs.h
-@@ -0,0 +1,91 @@
-+/* 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_H 1
-+#define HAVE_MALLOC_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MBRTOWC 1
-+#define HAVE_MEMALIGN 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___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.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 X_DISPLAY_MISSING 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h
deleted file mode 100644
index d479e798ab52..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/include/js-config.h.orig 2020-11-30 15:55:21 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/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/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
deleted file mode 100644
index 096454a20016..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/third_party/wiredtiger/dist/filelist.orig 2020-11-30 17:45:30 UTC
-+++ src/third_party/wiredtiger/dist/filelist
-@@ -49,7 +49,7 @@ src/btree/row_modify.c
- src/btree/row_srch.c
- src/cache/cache_las.c
- src/checksum/arm64/crc32-arm64.c ARM64_HOST
--src/checksum/power8/crc32.sx POWERPC_HOST
-+src/checksum/power8/crc32.S POWERPC_HOST
- src/checksum/power8/crc32_wrapper.c POWERPC_HOST
- src/checksum/software/checksum.c
- src/checksum/x86/crc32-x86.c X86_HOST
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
deleted file mode 100644
index fe2e707d16a7..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/crc32.S.orig 2020-09-02 06:34:58 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/crc32.S
-@@ -26,7 +26,11 @@
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-+#ifdef __clang__
-+#include "ppc-asm.h"
-+#else
- #include <ppc-asm.h>
-+#endif
- #include "ppc-opcode.h"
-
- #undef toc
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
deleted file mode 100644
index 7cd3eb43c89c..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
+++ /dev/null
@@ -1,393 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h.orig 2020-11-25 13:26:22 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h
-@@ -0,0 +1,390 @@
-+/* PowerPC asm definitions for GNU C.
-+
-+Copyright (C) 2002-2020 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
-+<http://www.gnu.org/licenses/>. */
-+
-+/* Under winnt, 1) gas supports the following as names and 2) in particular
-+ defining "toc" breaks the FUNC_START macro as ".toc" becomes ".2" */
-+
-+#define r0 0
-+#define sp 1
-+#define toc 2
-+#define r3 3
-+#define r4 4
-+#define r5 5
-+#define r6 6
-+#define r7 7
-+#define r8 8
-+#define r9 9
-+#define r10 10
-+#define r11 11
-+#define r12 12
-+#define r13 13
-+#define r14 14
-+#define r15 15
-+#define r16 16
-+#define r17 17
-+#define r18 18
-+#define r19 19
-+#define r20 20
-+#define r21 21
-+#define r22 22
-+#define r23 23
-+#define r24 24
-+#define r25 25
-+#define r26 26
-+#define r27 27
-+#define r28 28
-+#define r29 29
-+#define r30 30
-+#define r31 31
-+
-+#define cr0 0
-+#define cr1 1
-+#define cr2 2
-+#define cr3 3
-+#define cr4 4
-+#define cr5 5
-+#define cr6 6
-+#define cr7 7
-+
-+#define f0 0
-+#define f1 1
-+#define f2 2
-+#define f3 3
-+#define f4 4
-+#define f5 5
-+#define f6 6
-+#define f7 7
-+#define f8 8
-+#define f9 9
-+#define f10 10
-+#define f11 11
-+#define f12 12
-+#define f13 13
-+#define f14 14
-+#define f15 15
-+#define f16 16
-+#define f17 17
-+#define f18 18
-+#define f19 19
-+#define f20 20
-+#define f21 21
-+#define f22 22
-+#define f23 23
-+#define f24 24
-+#define f25 25
-+#define f26 26
-+#define f27 27
-+#define f28 28
-+#define f29 29
-+#define f30 30
-+#define f31 31
-+
-+#ifdef __VSX__
-+#define f32 32
-+#define f33 33
-+#define f34 34
-+#define f35 35
-+#define f36 36
-+#define f37 37
-+#define f38 38
-+#define f39 39
-+#define f40 40
-+#define f41 41
-+#define f42 42
-+#define f43 43
-+#define f44 44
-+#define f45 45
-+#define f46 46
-+#define f47 47
-+#define f48 48
-+#define f49 49
-+#define f50 50
-+#define f51 51
-+#define f52 52
-+#define f53 53
-+#define f54 54
-+#define f55 55
-+#define f56 56
-+#define f57 57
-+#define f58 58
-+#define f59 59
-+#define f60 60
-+#define f61 61
-+#define f62 62
-+#define f63 63
-+#endif
-+
-+#ifdef __ALTIVEC__
-+#define v0 0
-+#define v1 1
-+#define v2 2
-+#define v3 3
-+#define v4 4
-+#define v5 5
-+#define v6 6
-+#define v7 7
-+#define v8 8
-+#define v9 9
-+#define v10 10
-+#define v11 11
-+#define v12 12
-+#define v13 13
-+#define v14 14
-+#define v15 15
-+#define v16 16
-+#define v17 17
-+#define v18 18
-+#define v19 19
-+#define v20 20
-+#define v21 21
-+#define v22 22
-+#define v23 23
-+#define v24 24
-+#define v25 25
-+#define v26 26
-+#define v27 27
-+#define v28 28
-+#define v29 29
-+#define v30 30
-+#define v31 31
-+#endif
-+
-+#ifdef __VSX__
-+#define vs0 0
-+#define vs1 1
-+#define vs2 2
-+#define vs3 3
-+#define vs4 4
-+#define vs5 5
-+#define vs6 6
-+#define vs7 7
-+#define vs8 8
-+#define vs9 9
-+#define vs10 10
-+#define vs11 11
-+#define vs12 12
-+#define vs13 13
-+#define vs14 14
-+#define vs15 15
-+#define vs16 16
-+#define vs17 17
-+#define vs18 18
-+#define vs19 19
-+#define vs20 20
-+#define vs21 21
-+#define vs22 22
-+#define vs23 23
-+#define vs24 24
-+#define vs25 25
-+#define vs26 26
-+#define vs27 27
-+#define vs28 28
-+#define vs29 29
-+#define vs30 30
-+#define vs31 31
-+#define vs32 32
-+#define vs33 33
-+#define vs34 34
-+#define vs35 35
-+#define vs36 36
-+#define vs37 37
-+#define vs38 38
-+#define vs39 39
-+#define vs40 40
-+#define vs41 41
-+#define vs42 42
-+#define vs43 43
-+#define vs44 44
-+#define vs45 45
-+#define vs46 46
-+#define vs47 47
-+#define vs48 48
-+#define vs49 49
-+#define vs50 50
-+#define vs51 51
-+#define vs52 52
-+#define vs53 53
-+#define vs54 54
-+#define vs55 55
-+#define vs56 56
-+#define vs57 57
-+#define vs58 58
-+#define vs59 59
-+#define vs60 60
-+#define vs61 61
-+#define vs62 62
-+#define vs63 63
-+#endif
-+
-+/*
-+ * Macros to glue together two tokens.
-+ */
-+
-+#ifdef __STDC__
-+#define XGLUE(a,b) a##b
-+#else
-+#define XGLUE(a,b) a/**/b
-+#endif
-+
-+#define GLUE(a,b) XGLUE(a,b)
-+
-+/*
-+ * Macros to begin and end a function written in assembler. If -mcall-aixdesc
-+ * or -mcall-nt, create a function descriptor with the given name, and create
-+ * the real function with one or two leading periods respectively.
-+ */
-+
-+#if defined(__powerpc64__) && _CALL_ELF == 2
-+
-+/* Defining "toc" above breaks @toc in assembler code. */
-+#undef toc
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#ifdef __PCREL__
-+#define JUMP_TARGET(name) GLUE(FUNC_NAME(name),@notoc)
-+#define FUNC_START(name) \
-+ .type FUNC_NAME(name),@function; \
-+ .globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+ .localentry FUNC_NAME(name),1
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+ .type FUNC_NAME(name),@function; \
-+ .globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+0: addis 2,12,(.TOC.-0b)@ha; \
-+ addi 2,2,(.TOC.-0b)@l; \
-+ .localentry FUNC_NAME(name),.-FUNC_NAME(name)
-+#endif /* !__PCREL__ */
-+
-+#define HIDDEN_FUNC(name) \
-+ FUNC_START(name) \
-+ .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+ .size FUNC_NAME(name),.-FUNC_NAME(name)
-+
-+#elif defined (__powerpc64__)
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+ .section ".opd","aw"; \
-+name: \
-+ .quad GLUE(.,name); \
-+ .quad .TOC.@tocbase; \
-+ .quad 0; \
-+ .previous; \
-+ .type GLUE(.,name),@function; \
-+ .globl name; \
-+ .globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+ FUNC_START(name) \
-+ .hidden name; \
-+ .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+ .size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#elif defined(_CALL_AIXDESC)
-+
-+#ifdef _RELOCATABLE
-+#define DESC_SECTION ".got2"
-+#else
-+#define DESC_SECTION ".got1"
-+#endif
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+ .section DESC_SECTION,"aw"; \
-+name: \
-+ .long GLUE(.,name); \
-+ .long _GLOBAL_OFFSET_TABLE_; \
-+ .long 0; \
-+ .previous; \
-+ .type GLUE(.,name),@function; \
-+ .globl name; \
-+ .globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+ FUNC_START(name) \
-+ .hidden name; \
-+ .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+ .size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#else
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#if defined __PIC__ || defined __pic__
-+#define JUMP_TARGET(name) FUNC_NAME(name@plt)
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#endif
-+#define FUNC_START(name) \
-+ .type FUNC_NAME(name),@function; \
-+ .globl FUNC_NAME(name); \
-+FUNC_NAME(name):
-+
-+#define HIDDEN_FUNC(name) \
-+ FUNC_START(name) \
-+ .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+ .size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
-+#endif
-+
-+#ifdef IN_GCC
-+/* For HAVE_GAS_CFI_DIRECTIVE. */
-+#include "auto-host.h"
-+
-+#ifdef HAVE_GAS_CFI_DIRECTIVE
-+# define CFI_STARTPROC .cfi_startproc
-+# define CFI_ENDPROC .cfi_endproc
-+# define CFI_OFFSET(reg, off) .cfi_offset reg, off
-+# define CFI_DEF_CFA_REGISTER(reg) .cfi_def_cfa_register reg
-+# define CFI_RESTORE(reg) .cfi_restore reg
-+#else
-+# define CFI_STARTPROC
-+# define CFI_ENDPROC
-+# define CFI_OFFSET(reg, off)
-+# define CFI_DEF_CFA_REGISTER(reg)
-+# define CFI_RESTORE(reg)
-+#endif
-+#endif
-+
-+#if defined __linux__ && !defined __powerpc64__
-+ .section .note.GNU-stack
-+ .previous
-+#endif
diff --git a/databases/mongodb40/pkg-descr b/databases/mongodb40/pkg-descr
deleted file mode 100644
index e51df526ebcc..000000000000
--- a/databases/mongodb40/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
-
-WWW: https://docs.mongodb.com/v4.0/
diff --git a/databases/mongodb40/pkg-plist b/databases/mongodb40/pkg-plist
deleted file mode 100644
index 83149ff7676d..000000000000
--- a/databases/mongodb40/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongos
-@sample etc/mongodb.conf.sample