git: 517736cd9333 - main - databases/mongodb42: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Sep 2023 02:23:50 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=517736cd9333f75734ec1507d4408f8f10e8fceb
commit 517736cd9333f75734ec1507d4408f8f10e8fceb
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-09-29 23:34:20 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-09-30 02:22:48 +0000
databases/mongodb42: Remove expired port
2023-09-30 databases/mongodb42: Upstream EOL reached on 2023-04-30
---
MOVED | 1 +
databases/Makefile | 1 -
databases/mongodb42/Makefile | 95 -----
databases/mongodb42/distinfo | 7 -
.../patch-src_third__party_mozjs-60_gen-config.sh | 24 --
...arch64_freebsd_build_Unified__cpp__js__src0.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src1.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src10.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src11.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src12.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src13.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src14.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src15.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src16.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src17.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src18.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src19.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src2.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src20.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src21.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src22.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src23.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src24.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src25.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src26.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src27.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src28.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src29.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src3.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src30.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src31.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src32.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src33.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src34.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src35.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src36.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src37.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src38.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src39.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src4.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src40.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src41.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src42.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src43.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src44.cpp | 59 ----
...rch64_freebsd_build_Unified__cpp__js__src45.cpp | 41 ---
...arch64_freebsd_build_Unified__cpp__js__src5.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src6.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src7.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src8.cpp | 59 ----
...arch64_freebsd_build_Unified__cpp__js__src9.cpp | 59 ----
...60_platform_aarch64_freebsd_build_js-confdefs.h | 79 -----
...60_platform_aarch64_freebsd_include_js-config.h | 64 ----
databases/mongodb42/files/mongod.in | 53 ---
databases/mongodb42/files/patch-SConstruct | 33 --
databases/mongodb42/files/patch-rpm_mongod.conf | 25 --
...st-1.70.0_boost_mpl_aux___integral__wrapper.hpp | 11 -
...s-60_extract_js_src_wasm_WasmSignalHandlers.cpp | 13 -
.../patch-src_third__party_mozjs-60_gen-config.sh | 24 --
...pc64le_freebsd_build_Unified__cpp__js__src0.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src1.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src10.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src11.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src12.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src13.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src14.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src15.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src16.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src17.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src18.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src19.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src2.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src20.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src21.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src22.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src23.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src24.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src25.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src26.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src27.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src28.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src29.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src3.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src30.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src31.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src32.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src33.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src34.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src35.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src36.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src37.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src38.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src39.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src4.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src40.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src41.cpp | 59 ----
...c64le_freebsd_build_Unified__cpp__js__src42.cpp | 23 --
...pc64le_freebsd_build_Unified__cpp__js__src5.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src6.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src7.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src8.cpp | 59 ----
...pc64le_freebsd_build_Unified__cpp__js__src9.cpp | 59 ----
...60_platform_ppc64le_freebsd_build_js-confdefs.h | 81 -----
...60_platform_ppc64le_freebsd_include_js-config.h | 64 ----
...patch-src_third__party_wiredtiger_dist_filelist | 11 -
...d__party_wiredtiger_src_checksum_power8_crc32.S | 14 -
..._party_wiredtiger_src_checksum_power8_ppc-asm.h | 393 ---------------------
databases/mongodb42/pkg-descr | 3 -
databases/mongodb42/pkg-plist | 5 -
109 files changed, 1 insertion(+), 6197 deletions(-)
diff --git a/MOVED b/MOVED
index 6726af87cd8f..0ec5fa58980d 100644
--- a/MOVED
+++ b/MOVED
@@ -7871,3 +7871,4 @@ audio/libtremor||2023-09-30|Has expired: Obsolete, we only support hardware with
audio/rioutil||2023-09-30|Has expired: Obsolete, supported hardware ia about 20 years old
audio/waveplay||2023-09-30|Has expired: Abandoned upstream
databases/mongodb42-tools||2023-09-30|Has expired: Upstream EOL reached on 2023-04-30
+databases/mongodb42|databases/mongodb44|2023-09-30|Has expired: Upstream EOL reached on 2023-04-30
diff --git a/databases/Makefile b/databases/Makefile
index 2b10af146055..b5ca7f63e8dd 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -187,7 +187,6 @@
SUBDIR += memcached
SUBDIR += metabase
SUBDIR += mongodb-tools
- SUBDIR += mongodb42
SUBDIR += mongodb44
SUBDIR += mongodb50
SUBDIR += mongodb60
diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
deleted file mode 100644
index d5df687f88b5..000000000000
--- a/databases/mongodb42/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-PORTNAME= mongodb
-DISTVERSIONPREFIX= r
-DISTVERSION= 4.2.24
-CATEGORIES= databases net
-MASTER_SITES= https://fastdl.mongodb.org/src/ \
- http://fastdl.mongodb.org/src/
-PKGNAMESUFFIX= ${DISTVERSION:R:S/.//}
-DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-
-PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME:S/db//}/commit/
-PATCHFILES+= a0a70c53cc7a.patch:-p1 # https://jira.mongodb.org/browse/SERVER-41827
-PATCHFILES+= edf4ab0f8174.patch:-p1 # https://jira.mongodb.org/browse/SERVER-43979
-
-MAINTAINER= ronald@FreeBSD.org
-COMMENT= Distributed document-oriented "NoSQL" database (4.2.x Branch)
-WWW= https://docs.mongodb.com/v4.2/
-
-LICENSE= SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is APACHE20
-LICENSE_COMB= multi
-LICENSE_NAME_SSPLv1= Server Side Public License
-LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt
-LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-DEPRECATED= Upstream EOL reached on 2023-04-30
-EXPIRATION_DATE= 2023-09-30
-ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
-
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libcurl.so:ftp/curl \
- libsnappy.so:archivers/snappy
-
-USES= compiler:c++17-lang cpe python:build scons shebangfix
-USE_RC_SUBR= mongod
-
-CFLAGS+= -D_HAS_AUTO_PTR_ETC=0
-
-CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample
-
-OPTIONS_DEFINE= LTO SASL SSL
-OPTIONS_DEFAULT=LTO SASL SSL
-OPTIONS_EXCLUDE_aarch64= ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_aarch64_14= LTO # Does not work with llvm12 on aarch64.
-
-SHEBANG_FILES= src/mongo/installer/compass/install_compass
-python_OLD_CMD= @python_interpreter@
-
-MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
- --use-system-zlib \
- --use-system-pcre \
- --use-system-snappy \
- --libc++ \
- --cxx-std=17 \
- --runtime-hardening=on \
- -j ${MAKE_JOBS_NUMBER} \
- --disable-warnings-as-errors \
- VERBOSE=on \
- AR=llvm-ar
-
-USERS= mongodb
-GROUPS= mongodb
-
-LTO_MAKE_ARGS= --lto=on
-
-SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS= --use-sasl-client
-
-SSL_USES= ssl
-SSL_MAKE_ARGS= --ssl
-
-.include <bsd.port.pre.mk>
-
-.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.post.mk>
diff --git a/databases/mongodb42/distinfo b/databases/mongodb42/distinfo
deleted file mode 100644
index b86024c146f1..000000000000
--- a/databases/mongodb42/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1677248280
-SHA256 (mongodb-src-r4.2.24.tar.gz) = 3ba9d1e307e6ba9b9cfd58e6ef656df161666c69bd187477a751a512d8042698
-SIZE (mongodb-src-r4.2.24.tar.gz) = 62282513
-SHA256 (a0a70c53cc7a.patch) = 1435de7b6e6343c996fd58556d721f184b208d90d280996bd0c35dd32339b6b2
-SIZE (a0a70c53cc7a.patch) = 1078
-SHA256 (edf4ab0f8174.patch) = 87be45f996b1b7fc3700407d6d6671ec6b4b6a593de54ca5355bb6daec3d0213
-SIZE (edf4ab0f8174.patch) = 1220
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
deleted file mode 100644
index d9a2e1c3f075..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/third_party/mozjs-60/gen-config.sh.orig 2019-10-11 03:28:57 UTC
-+++ src/third_party/mozjs-60/gen-config.sh
-@@ -28,6 +28,9 @@ _xcode_setup() {
- }
-
- case "$_Path" in
-+ "platform/aarch64/freebsd")
-+ _CONFIG_OPTS="--host=aarch64-freebsd"
-+ ;;
- "platform/aarch64/linux")
- _CONFIG_OPTS="--host=aarch64-linux"
- ;;
-@@ -82,9 +85,9 @@ esac
- cd mozilla-release/js/src
- rm config.cache || true
-
--PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
-+PYTHON=python2.7 ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
-
--make recurse_export
-+gmake recurse_export
-
- cd ../../..
-
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index 35267bd71800..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/DataViewObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/DataViewObject.cpp 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/DataViewObject.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/JSON.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/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 "builtin/JSON.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index efbdb9d15a2c..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/Promise.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Promise.cpp 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/Promise.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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index c39f94663e23..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/AliasAnalysisShared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysisShared.cpp 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/AliasAnalysisShared.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index cf4689b32cf0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/BaselineCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCacheIRCompiler.cpp 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/BaselineCacheIRCompiler.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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index ad4e5e7518fa..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index 328213eb2f0d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.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/CacheIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIR.cpp 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/CacheIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRCompiler.cpp 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/CacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRSpewer.cpp 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/CacheIRSpewer.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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 08e8256eb971..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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/FlowAliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FlowAliasAnalysis.cpp 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/FlowAliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 139e4275d6f0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/FoldLinearArithConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FoldLinearArithConstants.cpp 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/FoldLinearArithConstants.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
-+#include "jit/IonCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCacheIRCompiler.cpp 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/IonCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index ac06eda07ebb..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonControlFlow.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonControlFlow.cpp 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/IonControlFlow.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonIC.cpp 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/IonIC.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/JSJitFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSJitFrameIter.cpp 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/JSJitFrameIter.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/Jit.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Jit.cpp 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/Jit.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index a6ac50a8e649..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index b2b96ea13a42..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Linker.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Linker.cpp 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/Linker.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
*** 5998 LINES SKIPPED ***