aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-09-29 23:34:20 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2023-09-30 02:22:48 +0000
commit517736cd9333f75734ec1507d4408f8f10e8fceb (patch)
tree7cc4a104dde4621aad28d53426bdf56349014be3
parentc393e20cc6bde9be3b008c043513399f5f4ad139 (diff)
downloadports-517736cd9333f75734ec1507d4408f8f10e8fceb.tar.gz
ports-517736cd9333f75734ec1507d4408f8f10e8fceb.zip
databases/mongodb42: Remove expired port
2023-09-30 databases/mongodb42: Upstream EOL reached on 2023-04-30
-rw-r--r--MOVED1
-rw-r--r--databases/Makefile1
-rw-r--r--databases/mongodb42/Makefile95
-rw-r--r--databases/mongodb42/distinfo7
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh24
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp41
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp59
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h79
-rw-r--r--databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h64
-rw-r--r--databases/mongodb42/files/mongod.in53
-rw-r--r--databases/mongodb42/files/patch-SConstruct33
-rw-r--r--databases/mongodb42/files/patch-rpm_mongod.conf25
-rw-r--r--databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp11
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp13
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh24
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp23
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp59
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h81
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h64
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist11
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S14
-rw-r--r--databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h393
-rw-r--r--databases/mongodb42/pkg-descr3
-rw-r--r--databases/mongodb42/pkg-plist5
109 files changed, 1 insertions, 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
-+#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
-\ 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__src19.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index 07492522a4c0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ 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__src2.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 70e2c7d7ca91..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Stream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Stream.cpp 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/Stream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/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 "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/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 "builtin/Symbol.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
-\ 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__src20.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index abbfe301d77d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ 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__src21.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 000003d1e76a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ 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__src22.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index 3464e75d9f19..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/WasmBCE.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/WasmBCE.cpp 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/WasmBCE.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Architecture-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Architecture-arm64.cpp 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/arm64/Architecture-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Assembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Assembler-arm64.cpp 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/arm64/Assembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Bailouts-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Bailouts-arm64.cpp 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/arm64/Bailouts-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/BaselineIC-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/BaselineIC-arm64.cpp 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/arm64/BaselineIC-arm64.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__src23.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index c577a3ea9e8e..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/CodeGenerator-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/CodeGenerator-arm64.cpp 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/arm64/CodeGenerator-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Disassembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Disassembler-arm64.cpp 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/arm64/Disassembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Lowering-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Lowering-arm64.cpp 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/arm64/Lowering-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/MacroAssembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/MacroAssembler-arm64.cpp 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/arm64/MacroAssembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/MoveEmitter-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/MoveEmitter-arm64.cpp 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/arm64/MoveEmitter-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/SharedIC-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/SharedIC-arm64.cpp 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/arm64/SharedIC-arm64.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__src24.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index 2e35b91b9e92..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/Trampoline-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Trampoline-arm64.cpp 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/arm64/Trampoline-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Assembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Assembler-vixl.cpp 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/arm64/vixl/Assembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Cpu-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Cpu-vixl.cpp 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/arm64/vixl/Cpu-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Decoder-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Decoder-vixl.cpp 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/arm64/vixl/Decoder-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Disasm-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Disasm-vixl.cpp 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/arm64/vixl/Disasm-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Instructions-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Instructions-vixl.cpp 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/arm64/vixl/Instructions-vixl.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__src25.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index d39b20212787..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/vixl/Instrument-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Instrument-vixl.cpp 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/arm64/vixl/Instrument-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MacroAssembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MacroAssembler-vixl.cpp 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/arm64/vixl/MacroAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MozAssembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MozAssembler-vixl.cpp 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/arm64/vixl/MozAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MozInstructions-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MozInstructions-vixl.cpp 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/arm64/vixl/MozInstructions-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Utils-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Utils-vixl.cpp 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/arm64/vixl/Utils-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Assembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Assembler-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/Assembler-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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index bde86b89f01a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#include "jit/shared/Disassembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Disassembler-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/Disassembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#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 "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
-\ 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__src27.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 2f2a96949763..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.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 "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 "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 "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
-\ 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__src28.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 75283e764239..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/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
-+#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/ScriptedProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedProxyHandler.cpp 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/ScriptedProxyHandler.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
-\ 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__src29.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index e0da0383a810..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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 "threading/Mutex.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/Mutex.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/Mutex.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/ProtectedData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/ProtectedData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/CpuCount.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/CpuCount.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/Thread.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/Thread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/Thread.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/AllocPolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/AllocPolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/AllocPolicy.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__src3.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index d6d1247e788c..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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 "builtin/intl/Collator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/Collator.cpp 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/Collator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/CommonFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/CommonFunctions.cpp 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/CommonFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/DateTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/DateTimeFormat.cpp 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/DateTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/IntlObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/IntlObject.cpp 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/IntlObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/NumberFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/NumberFormat.cpp 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/NumberFormat.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__src30.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 9f85f3d707af..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "util/NativeStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/NativeStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Printf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Printf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Printf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/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 "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Text.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Text.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Text.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/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 "util/Unicode.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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index f8b699e92f64..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.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/AsyncFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncFunction.cpp 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/AsyncFunction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/AsyncIteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncIteration.cpp 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/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/BytecodeUtil.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/BytecodeUtil.cpp 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/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Caches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Caches.cpp 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/Caches.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
-\ 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__src32.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index 68c0ecfdb271..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ 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__src33.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index b964b35b9f72..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/EnvironmentObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/EnvironmentObject.cpp 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/EnvironmentObject.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/ErrorReporting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorReporting.cpp 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/ErrorReporting.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/GeckoProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeckoProfiler.cpp 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/GeckoProfiler.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
-\ 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__src34.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp
deleted file mode 100644
index 4ac8f1c3a893..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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/Initialization.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Initialization.cpp 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/Initialization.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp
deleted file mode 100644
index cf2691f19256..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src35.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src35.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/JSContext.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSContext.cpp 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/JSContext.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSFunction.cpp 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/JSFunction.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/JSONPrinter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONPrinter.cpp 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/JSONPrinter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSObject.cpp 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/JSObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSScript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/JSScript.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__src36.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp
deleted file mode 100644
index 9133f272e1df..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src36.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src36.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/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
-\ 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__src37.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp
deleted file mode 100644
index c9332164f542..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src37.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src37.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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/Realm.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Realm.cpp 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/Realm.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
-\ 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__src38.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp
deleted file mode 100644
index e0647efc2708..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src38.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src38.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/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/Scope.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Scope.cpp 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/Scope.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
-\ 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__src39.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp
deleted file mode 100644
index 5af83c9fe9b0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src39.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src39.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SharedImmutableStringsCache.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedImmutableStringsCache.cpp 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/SharedImmutableStringsCache.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
-+#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/StringType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringType.cpp 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/StringType.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/SymbolType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SymbolType.cpp 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/SymbolType.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__src4.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index a462e63844f8..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/intl/PluralRules.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/PluralRules.cpp 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/PluralRules.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/RelativeTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/RelativeTimeFormat.cpp 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/RelativeTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/SharedIntlData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/SharedIntlData.cpp 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/SharedIntlData.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
-+#include "ds/Bitmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/Bitmap.cpp 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/Bitmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#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
-\ 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__src40.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp
deleted file mode 100644
index b1a376efbfec..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src40.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src40.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ 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__src41.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp
deleted file mode 100644
index ffe530456196..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src41.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src41.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/UbiNodeShortestPaths.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeShortestPaths.cpp 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/UbiNodeShortestPaths.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
-+#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/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
-+#include "wasm/AsmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/AsmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/AsmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBaselineCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBaselineCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBaselineCompile.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__src42.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp
deleted file mode 100644
index 9fb1cd7dea06..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src42.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src42.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmBinaryIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToText.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToText.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToText.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBuiltins.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBuiltins.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBuiltins.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompartment.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__src43.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp
deleted file mode 100644
index 137f5cbc5bf6..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src43.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src43.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmDebug.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmDebug.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmDebug.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmInstance.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmInstance.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmInstance.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmIonCompile.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__src44.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp
deleted file mode 100644
index 6a593e5792c2..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src44.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src44.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmProcess.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmProcess.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmProcess.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTable.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTable.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTable.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__src45.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp
deleted file mode 100644
index aa22938a6bed..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src45.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src45.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmTextToBinary.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextToBinary.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextToBinary.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextUtils.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextUtils.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextUtils.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTypes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTypes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTypes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmValidate.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__src5.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index f4a959845523..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/MemoryProtectionExceptionHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/MemoryProtectionExceptionHandler.cpp 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/MemoryProtectionExceptionHandler.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/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
-\ 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__src6.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index d51813d5851d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/AtomMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/AtomMarking.cpp 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/AtomMarking.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/GC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GC.cpp 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/GC.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
-\ 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__src7.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index 721b997eb42a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src7.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/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/PublicIterators.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/PublicIterators.cpp 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/PublicIterators.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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index ec1dc0a33d9e..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src8.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/WeakMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMap.cpp 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/WeakMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/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 "gc/WeakMapPtr.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 "gc/ZoneGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/ZoneGroup.cpp 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/ZoneGroup.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__src9.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 75b99301ed55..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/RegExpCharacters.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpCharacters.cpp 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/RegExpCharacters.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index 117a1ec6cf65..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,79 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/js-confdefs.h.orig 2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/js-confdefs.h
-@@ -0,0 +1,76 @@
-+/* 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
-+
-+// Expands to all the defines from configure.
-+#define CPP_THROW_NEW throw()
-+#define CROSS_COMPILE
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INTTYPES_H 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_NETINET_IN_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_SINCOS 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STDINT_H 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_QUEUE_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_SYS_TYPES_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___CXA_DEMANGLE 1
-+#define JS_64BIT 1
-+#define JS_CODEGEN_ARM64 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#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 "60.0"
-+#define MOZILLA_VERSION "60.3.0"
-+#define MOZILLA_VERSION_U 60.3.0
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+#define MOZ_BUILD_APP js
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_OR_BETA 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/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index 8d6a984696b8..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/include/js-config.h.orig 2019-11-14 10:50:21 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/include/js-config.h
-@@ -0,0 +1,61 @@
-+/* -*- 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 */
-+
-+/*
-+ * NB: We have a special case for rust-bindgen, which wants to be able to
-+ * generate both debug and release bindings on a single objdir.
-+ */
-+#ifdef JS_DEBUG
-+#if !defined(DEBUG) && !defined(RUST_BINDGEN)
-+# error "SpiderMonkey was configured with --enable-debug, so DEBUG must be defined when including this header"
-+# endif
-+#else
-+# if defined(DEBUG) && !defined(RUST_BINDGEN)
-+# error "SpiderMonkey was configured with --disable-debug, so DEBUG must be not defined when including this header"
-+# endif
-+#endif
-+
-+/* 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 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 60
-+#define MOZJS_MINOR_VERSION 3
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb42/files/mongod.in b/databases/mongodb42/files/mongod.in
deleted file mode 100644
index 20b0f5c0f43d..000000000000
--- a/databases/mongodb42/files/mongod.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mongod
-# REQUIRE: NETWORK ldconfig
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mongod_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable mongod.
-# mongod_dbpath (str): Default to "/var/db/mongodb"
-# Base database directory.
-# mongod_flags (str): Custom additional arguments to be passed to mongod.
-# Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
-# mongod_config (str): Default to "%%PREFIX%%/etc/mongodb.conf"
-# Path to config file
-#
-
-. /etc/rc.subr
-
-name="mongod"
-rcvar=mongod_enable
-
-load_rc_config $name
-
-: ${mongod_enable="NO"}
-: ${mongod_dbpath="/var/db/mongodb"}
-: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
-: ${mongod_user="mongodb"}
-: ${mongod_group="mongodb"}
-: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
-
-pidfile="${mongod_dbpath}/mongod.lock"
-command=%%PREFIX%%/bin/${name}
-command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-mongod_create_dbpath()
-{
- mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
- [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
-}
-
-mongod_prestart()
-{
- if [ ! -d ${mongod_dbpath} ]; then
- mongod_create_dbpath || return 1
- fi
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb42/files/patch-SConstruct b/databases/mongodb42/files/patch-SConstruct
deleted file mode 100644
index 1fdba0cc4cd7..000000000000
--- a/databases/mongodb42/files/patch-SConstruct
+++ /dev/null
@@ -1,33 +0,0 @@
---- SConstruct.orig 2021-06-30 17:39:08 UTC
-+++ SConstruct
-@@ -1092,9 +1092,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(list(unknown_vars.keys())))
-+#unknown_vars = env_vars.UnknownVariables()
-+#if unknown_vars:
-+# 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
-@@ -1884,7 +1884,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'],
- )
-
-@@ -1898,7 +1898,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/mongodb42/files/patch-rpm_mongod.conf b/databases/mongodb42/files/patch-rpm_mongod.conf
deleted file mode 100644
index 1a21e4250707..000000000000
--- a/databases/mongodb42/files/patch-rpm_mongod.conf
+++ /dev/null
@@ -1,25 +0,0 @@
---- rpm/mongod.conf.orig 2019-08-08 20:06:23 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:
-@@ -20,7 +20,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/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp
deleted file mode 100644
index fc5562f61763..000000000000
--- a/databases/mongodb42/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp.orig 2023-06-29 10:06:20 UTC
-+++ src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp
-@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
- // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
- // while some other don't like 'value + 1' (Borland), and some don't like
- // either
--#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
-+#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
- private:
- BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
- BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp
deleted file mode 100644
index 7041fb8157a7..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/third_party/mozjs-60/extract/js/src/wasm/WasmSignalHandlers.cpp.orig 2020-11-24 21:49:40 UTC
-+++ src/third_party/mozjs-60/extract/js/src/wasm/WasmSignalHandlers.cpp
-@@ -263,6 +263,10 @@ struct AutoSignalHandler
- # define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
- # define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
- # endif
-+# if defined(__FreeBSD__) && defined(__powerpc64__)
-+# define R01_sig(p) ((p)->uc_mcontext.mc_frame[1])
-+# define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
-+# endif
- #elif defined(XP_DARWIN)
- # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
- # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp)
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh
deleted file mode 100644
index 046501068238..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/third_party/mozjs-60/gen-config.sh.orig 2020-11-25 13:19:42 UTC
-+++ src/third_party/mozjs-60/gen-config.sh
-@@ -31,6 +31,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"
- ;;
-@@ -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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index e98d92ce22e3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 73a4afcb3c5b..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index ac0b01bf919c..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index 0fd01bd3892d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index f5c544cfec07..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index f0a2c6fc3965..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index ca5e42d58f62..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index a15d8fb5f012..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index b8e483979145..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 3b604bf23e19..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index 7b9b354581de..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index f67b77e0a7b3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 48af4435ee55..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Stream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Stream.cpp 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/Stream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/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 "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/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 "builtin/Symbol.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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index 886f831e464d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 2f70a4a54368..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index c4b342f141d0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/WasmBCE.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/WasmBCE.cpp 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/WasmBCE.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/Assembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Assembler-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/Assembler-shared.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/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index d53f90d32a9b..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Disassembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Disassembler-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/Disassembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#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 "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 "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 "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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index dc5fbe20141a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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 "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 "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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index e1252834cbdf..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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/ScriptedProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedProxyHandler.cpp 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/ScriptedProxyHandler.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 "threading/Mutex.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/Mutex.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/Mutex.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index 6797c9a971fb..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "threading/ProtectedData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/ProtectedData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/CpuCount.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/CpuCount.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/Thread.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/Thread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/Thread.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/AllocPolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/AllocPolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/AllocPolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/NativeStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/NativeStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Printf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Printf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Printf.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 52810c7c9d69..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "util/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/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 "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Text.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Text.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Text.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/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 "util/Unicode.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
-+#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/AsyncFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncFunction.cpp 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/AsyncFunction.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 91be25909161..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/AsyncIteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncIteration.cpp 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/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/BytecodeUtil.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/BytecodeUtil.cpp 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/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Caches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Caches.cpp 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/Caches.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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index 7aabe50eca82..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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/EnvironmentObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/EnvironmentObject.cpp 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/EnvironmentObject.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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index 6ee624b440ba..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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 "builtin/intl/Collator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/Collator.cpp 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/Collator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/CommonFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/CommonFunctions.cpp 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/CommonFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/DateTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/DateTimeFormat.cpp 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/DateTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/IntlObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/IntlObject.cpp 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/IntlObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/NumberFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/NumberFormat.cpp 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/NumberFormat.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index ad2dbddad1d9..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ErrorReporting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorReporting.cpp 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/ErrorReporting.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/GeckoProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeckoProfiler.cpp 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/GeckoProfiler.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index b0767fabc340..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/Initialization.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Initialization.cpp 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/Initialization.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/JSCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSContext.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSContext.cpp 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/JSContext.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSFunction.cpp 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/JSFunction.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index 29dea373c40d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/JSONPrinter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONPrinter.cpp 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/JSONPrinter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSObject.cpp 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/JSObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSScript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/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 "vm/JSScript.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/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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index 057cfb09434a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp
deleted file mode 100644
index c1eba4e8d74f..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src34.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src34.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Realm.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Realm.cpp 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/Realm.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/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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp
deleted file mode 100644
index c097a69fc0b3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src35.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src35.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Scope.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Scope.cpp 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/Scope.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/SharedImmutableStringsCache.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedImmutableStringsCache.cpp 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/SharedImmutableStringsCache.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/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp
deleted file mode 100644
index acffed21d717..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src36.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src36.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/StringType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringType.cpp 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/StringType.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/SymbolType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SymbolType.cpp 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/SymbolType.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp
deleted file mode 100644
index bf5596c49070..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src37.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src37.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/UbiNodeShortestPaths.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeShortestPaths.cpp 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/UbiNodeShortestPaths.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/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp
deleted file mode 100644
index 68678ab7a5fd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src38.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src38.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/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
-+#include "wasm/AsmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/AsmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/AsmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBaselineCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBaselineCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBaselineCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToAST.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp
deleted file mode 100644
index f5881eb0e9a0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src39.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src39.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmBinaryToText.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToText.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToText.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBuiltins.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBuiltins.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBuiltins.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmDebug.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmDebug.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmDebug.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index 89b4a1b63ae1..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/intl/PluralRules.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/PluralRules.cpp 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/PluralRules.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/RelativeTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/RelativeTimeFormat.cpp 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/RelativeTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/SharedIntlData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/SharedIntlData.cpp 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/SharedIntlData.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
-+#include "ds/Bitmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/Bitmap.cpp 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/Bitmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp
deleted file mode 100644
index aa6405477bcd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src40.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src40.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmInstance.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmInstance.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmInstance.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmModule.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp
deleted file mode 100644
index 7c915d58149a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src41.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src41.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmProcess.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmProcess.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmProcess.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/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 "wasm/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTable.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTable.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTable.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextToBinary.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextToBinary.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextToBinary.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextUtils.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextUtils.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextUtils.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp
deleted file mode 100644
index d2244553adb0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src42.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src42.cpp
-@@ -0,0 +1,19 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmTypes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTypes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTypes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmValidate.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index faf1d28cc02f..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/MemoryProtectionExceptionHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/MemoryProtectionExceptionHandler.cpp 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/MemoryProtectionExceptionHandler.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/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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index e8536a3bfefd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/AtomMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/AtomMarking.cpp 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/AtomMarking.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/GC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GC.cpp 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/GC.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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index daf3e28f9f1a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.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/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/PublicIterators.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/PublicIterators.cpp 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/PublicIterators.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/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index bce289ac0055..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.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/WeakMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMap.cpp 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/WeakMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/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 "gc/WeakMapPtr.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 "gc/ZoneGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/ZoneGroup.cpp 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/ZoneGroup.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/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 3db79fe94816..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp.orig 2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#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/RegExpCharacters.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpCharacters.cpp 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/RegExpCharacters.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
-+#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
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h
deleted file mode 100644
index dc00035b30ef..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/js-confdefs.h.orig 2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/js-confdefs.h
-@@ -0,0 +1,78 @@
-+/* 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
-+
-+// Expands to all the defines from configure.
-+#define CPP_THROW_NEW throw()
-+#define CROSS_COMPILE
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INTTYPES_H 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_MALLOC_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MEMALIGN 1
-+#define HAVE_NETINET_IN_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_PTHREAD_GETNAME_NP 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SINCOS 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STDINT_H 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_QUEUE_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_SYS_TYPES_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___CXA_DEMANGLE 1
-+#define JS_64BIT 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#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 "60.0"
-+#define MOZILLA_VERSION "60.3.0"
-+#define MOZILLA_VERSION_U 60.3.0
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+#define MOZ_BUILD_APP js
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_OR_BETA 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/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h
deleted file mode 100644
index 54067136fd77..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/include/js-config.h.orig 2020-11-25 14:27:30 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/include/js-config.h
-@@ -0,0 +1,61 @@
-+/* -*- 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 */
-+
-+/*
-+ * NB: We have a special case for rust-bindgen, which wants to be able to
-+ * generate both debug and release bindings on a single objdir.
-+ */
-+#ifdef JS_DEBUG
-+#if !defined(DEBUG) && !defined(RUST_BINDGEN)
-+# error "SpiderMonkey was configured with --enable-debug, so DEBUG must be defined when including this header"
-+# endif
-+#else
-+# if defined(DEBUG) && !defined(RUST_BINDGEN)
-+# error "SpiderMonkey was configured with --disable-debug, so DEBUG must be not defined when including this header"
-+# endif
-+#endif
-+
-+/* 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 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 60
-+#define MOZJS_MINOR_VERSION 3
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
deleted file mode 100644
index 6964d23f0932..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/third_party/wiredtiger/dist/filelist.orig 2020-11-25 14:29:56 UTC
-+++ src/third_party/wiredtiger/dist/filelist
-@@ -51,7 +51,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/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
deleted file mode 100644
index fe2e707d16a7..000000000000
--- a/databases/mongodb42/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/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
deleted file mode 100644
index 7cd3eb43c89c..000000000000
--- a/databases/mongodb42/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/mongodb42/pkg-descr b/databases/mongodb42/pkg-descr
deleted file mode 100644
index 59930ca8f679..000000000000
--- a/databases/mongodb42/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
diff --git a/databases/mongodb42/pkg-plist b/databases/mongodb42/pkg-plist
deleted file mode 100644
index 83149ff7676d..000000000000
--- a/databases/mongodb42/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongos
-@sample etc/mongodb.conf.sample