mongodb4: updated to 4.2.3

4.2.3:
Issues fixed:
SERVER-42565: Aggregations and find commands sort missing fields differently’
SERVER-44174: $push and $addToSet should restrict memory usage
SERVER-40435: A clearJumboFlag command to clear the jumbo flag
SERVER-45270: Increased vulnerability to slow DNS
TOOLS-1952: Use –forceTableScan by default when running against WiredTiger nodes
TOOLS-2453: Index keys not escaped correctly
SERVER-45396: fix the “me” field in isMaster responses when using splithorizon
SERVER-45309: Ensure bind credentials live longer than LDAP operations
WT-5120: Checkpoint hangs when reconciliation doesn’t release the eviction generation

4.2.2:
Issues fixed:
SERVER-31083: Allow passing primary shard to “enableSharding” command for a new database
SERVER-33272: The DatabaseHolder::close() function no longer requires a global write lock and neither does the dropDatabase command
SERVER-44050: Arrays along ‘hashed’ index key path are not correctly rejected
SERVER-43882: Building indexes for startup recovery uses unowned RecordData after yielding its cursor
SERVER-44617: $regexFind crash when one of the capture group doesn’t match the input but pattern matches
SERVER-44721: Shell KMS AWS support cannot decrypt responses
WT-4961: Checkpoints with cache overflow must keep history for reads

4.2.1:
Issues fixed:
SERVER-37768: Platform Support: Add Community & Enterprise Debian 10 x64
SERVER-37772: Platform Support: Add Community & Enterprise RHEL 8 x64
SERVER-41506: Track metrics associated with a node calling an election
SERVER-41499: Track number of elections called for each reason in serverStatus
SERVER-42518: Wildcard index plans miss results when the query path has multiple subsequent array indexes
SERVER-42856: Transactions with write can be sent to the wrong shard

15 files changed, 245 insertions, 181 deletions

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index c7217ad7485..d1634187324 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.49 2020/01/18 21:48:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2020/02/01 20:00:08 adam Exp $
 
-DISTNAME=	mongodb-src-r4.0.6
+DISTNAME=	mongodb-src-r4.2.3
 PKGNAME=	${DISTNAME:S/src-r//}
-PKGREVISION=	10
 CATEGORIES=	databases
 MASTER_SITES=	http://fastdl.mongodb.org/src/
 
-MAINTAINER=	pkgsrc-users@netbsd.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.mongodb.com/
 COMMENT=	NoSQL distributed document-oriented database
 LICENSE=	server-side-public-license # Client and tools licensed under apache-2.0
@@ -16,8 +15,8 @@ NOT_FOR_PLATFORM+=	*-*-i386
 
 EXTRACT_USING=	bsdtar
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
-BUILD_DEPENDS+=	${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
+BUILD_DEPENDS+=	${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah3
+BUILD_DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
 BUILD_DEPENDS+=	${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 BUILD_DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
@@ -31,9 +30,10 @@ GCC_REQD+=	8
 USE_TOOLS+=	pkg-config
 
 SCONS_ARGS=	${_MAKE_JOBS}
+SCONS_ARGS+=	--dbg=off # on: argument parsing problem
 SCONS_ARGS+=	--disable-warnings-as-errors
 SCONS_ARGS+=	--release
-SCONS_ARGS+=	--runtime-hardening=off # does not produce executables
+SCONS_ARGS+=	--runtime-hardening=off # on: does not produce executables
 #SCONS_ARGS+=	--use-system-asio
 SCONS_ARGS+=	--use-system-boost
 SCONS_ARGS+=	--use-system-icu
@@ -45,8 +45,9 @@ SCONS_ARGS+=	--use-system-tcmalloc
 #SCONS_ARGS+=	--use-system-wiredtiger
 SCONS_ARGS+=	--use-system-yaml
 SCONS_ARGS+=	--use-system-zlib
+SCONS_ARGS+=	--use-system-zstd
 
-PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -123,10 +124,10 @@ CONF_FILES+=		share/examples/mongodb/mongod.conf \
 # Copy system specific files for NetBSD and DragonFly
 post-extract:
 	${CHMOD} -R g-w ${WRKSRC}
-	${CP} -R ${WRKSRC}/src/third_party/mozjs-45/platform/x86_64/freebsd \
-		${WRKSRC}/src/third_party/mozjs-45/platform/x86_64/dragonfly
-	${CP} -R ${WRKSRC}/src/third_party/mozjs-45/platform/x86_64/openbsd \
-		${WRKSRC}/src/third_party/mozjs-45/platform/x86_64/netbsd
+	${CP} -R ${WRKSRC}/src/third_party/mozjs-60/platform/x86_64/freebsd \
+		${WRKSRC}/src/third_party/mozjs-60/platform/x86_64/dragonfly
+	${CP} -R ${WRKSRC}/src/third_party/mozjs-60/platform/x86_64/freebsd \
+		${WRKSRC}/src/third_party/mozjs-60/platform/x86_64/netbsd
 	${CP} ${WRKSRC}/src/mongo/db/ftdc/ftdc_system_stats_openbsd.cpp \
 		${WRKSRC}/src/mongo/db/ftdc/ftdc_system_stats_netbsd.cpp
 	${CP} ${WRKSRC}/src/mongo/db/ftdc/ftdc_system_stats_freebsd.cpp \
@@ -156,11 +157,11 @@ do-install:
 	--prefix=${DESTDIR}${PREFIX} install
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mongodb
 	${INSTALL_MAN} ${WRKSRC}/debian/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/debian/mongod.conf \
 		${DESTDIR}${PREFIX}/share/examples/mongodb
 
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../databases/mongo-c-driver/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 #.include "../../databases/wiredtiger/buildlink3.mk"
diff --git a/databases/mongodb/PLIST b/databases/mongodb/PLIST
index dee025ed0b1..9c72d98908f 100644
--- a/databases/mongodb/PLIST
+++ b/databases/mongodb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/03/05 19:35:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/02/01 20:00:08 adam Exp $
 bin/install_compass
 bin/mongo
 bin/mongod
@@ -10,9 +10,10 @@ man/man1/mongodump.1
 man/man1/mongoexport.1
 man/man1/mongofiles.1
 man/man1/mongoimport.1
+man/man1/mongoldap.1
+man/man1/mongoreplay.1
 man/man1/mongorestore.1
 man/man1/mongos.1
 man/man1/mongostat.1
 man/man1/mongotop.1
-share/doc/mongodb/README
 share/examples/mongodb/mongod.conf
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index 06d7476c6ec..cff962ee016 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.24 2019/03/05 19:35:58 adam Exp $
+$NetBSD: distinfo,v 1.25 2020/02/01 20:00:08 adam Exp $
 
-SHA1 (mongodb-src-r4.0.6.tar.gz) = 460caeb57bae951c0c019e0519c58695902d3f9c
-RMD160 (mongodb-src-r4.0.6.tar.gz) = 4bcb89f6e386699723119da71071a9bfb15742e9
-SHA512 (mongodb-src-r4.0.6.tar.gz) = 72e04154cf221833522bb0c2cc99acc2a86d20e2dcbf1f8c6ff0a870edf7b2529a55b6821c664805c00c12a311ae374a276ef1e3ccea1ed84fb125bb8726906a
-Size (mongodb-src-r4.0.6.tar.gz) = 49511958 bytes
-SHA1 (patch-SConstruct) = ec9987638b202ed8314667993c03414a1601563c
-SHA1 (patch-site__scons_mongo_platform.py) = ae62ec86206b9e20bd82c4b22621cab887390c72
+SHA1 (mongodb-src-r4.2.3.tar.gz) = 89c9f46a350d3149c2d9b486618f6c8fd62529e2
+RMD160 (mongodb-src-r4.2.3.tar.gz) = ce03973377b61285d973b2814680dda6520be2be
+SHA512 (mongodb-src-r4.2.3.tar.gz) = 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
+Size (mongodb-src-r4.2.3.tar.gz) = 61565615 bytes
+SHA1 (patch-SConstruct) = 027d8c9bd69256fe93ac40ae3e14e052ac367eb5
+SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 2fb5947703f4292acc1306f92ca7938e8cbc62e0
-SHA1 (patch-src_mongo_base_initializer.h) = 675d655f4472f055a1d10144bbbebd75fbde6cb2
-SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = f95cd3fc88f1dfdf0d3aa5431d0c3407da020dfa
+SHA1 (patch-src_mongo_base_initializer.h) = efaec2e3b5b8a4bfb15c65c6952924cd1469bdc7
+SHA1 (patch-src_mongo_db_query_collation_collator__interface__icu.h) = f6382a3dcdbaed26fe692aa1ea43b2640168b253
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
-SHA1 (patch-src_mongo_platform_random.cpp) = e6265dc33d1de7e9bfce63fa96aad67bb762e789
+SHA1 (patch-src_mongo_platform_random.cpp) = 0b42d1b8bf41f8a7448daca0b72bfed1ba462b99
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 0826e976048c79598ead6146f143ab3b4a2577fb
 SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = a29cbf034716ce48a23192320caf4928282b6c1a
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = 4c8e0d2e834686403a557de489ad518071851911
-SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = fec6c7304f253204ccc03c11e93f6c430453c980
-SHA1 (patch-src_mongo_util_time__support.cpp) = 29dc7b0a0d278d2f92ae63882e87ce674d258ccf
-SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 6cb2473f13ec3f8946959f3dfb94a70e95965703
+SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 9f3161c0693b3905299e0e022b9eb68d466d30c4
+SHA1 (patch-src_mongo_util_time__support.cpp) = d576d8d39b10c496e492c8f0faf7e81f09ca875c
+SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 3c168389b9288df9055df0b01e8d26cf2f67293e
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = aed897879501d74b19dd06a142ded0abf910898d
-SHA1 (patch-src_third__party_asio-master_asio_include_asio_detail_config.hpp) = c7464a56a2eb03fdb93f8ab90bf5732f6a0f9095
-SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
-SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
+SHA1 (patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp) = 49a74ef12f20c4b243d328a2cd8317aa1a668b18
+SHA1 (patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h) = 2474fc221f0c59381c8529e986db1f3f67c405ec
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
 SHA1 (patch-src_third__party_wiredtiger_SConscript) = e97dea310463f246c0a8007a1ba9c5385105036d
+SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = 374deec76d92ee55587a9216b881bf1a1d35799a
diff --git a/databases/mongodb/options.mk b/databases/mongodb/options.mk
index 90dd7e7d8bd..4a21ff685f4 100644
--- a/databases/mongodb/options.mk
+++ b/databases/mongodb/options.mk
@@ -1,23 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2019/03/05 19:35:58 adam Exp $
+# $NetBSD: options.mk,v 1.5 2020/02/01 20:00:08 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mongodb
-PKG_SUPPORTED_OPTIONS=	ssl wiredtiger
+PKG_SUPPORTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
-SCONS_ARGS+=		--ssl=openssl
-.endif
-
-# The prospect of using databases/wiredtiger is unclear yet;
-# MongoDB doesn't provide guarantees for non-bundled WiredTiger:
-# https://groups.google.com/forum/#!msg/mongodb-dev/31FQSo4KVCI/Fx-WtJ9fzU4J
-.if !empty(PKG_OPTIONS:Mwiredtiger)
-.  if ${MACHINE_ARCH} == "x86_64"
-PKG_FAIL_REASON+=	"WiredTiger is not supported on 32-bit platforms"
-.  endif
-SCONS_ARGS+=		--wiredtiger=on
+SCONS_ARGS+=		--ssl=on
+SCONS_ARGS+=		--ssl-provider=openssl
 .else
-SCONS_ARGS+=		--wiredtiger=off
+SCONS_ARGS+=		--ssl=off
 .endif
diff --git a/databases/mongodb/patches/patch-SConstruct b/databases/mongodb/patches/patch-SConstruct
index ec843f8aca1..ae0608f5fae 100644
--- a/databases/mongodb/patches/patch-SConstruct
+++ b/databases/mongodb/patches/patch-SConstruct
@@ -1,4 +1,4 @@
-$NetBSD: patch-SConstruct,v 1.8 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-SConstruct,v 1.9 2020/02/01 20:00:08 adam Exp $
 
 Add support for NetBSD and Dragonfly.
 Fix locations.
@@ -6,17 +6,17 @@ Don't compile with debug info.
 Don't mess with the linker.
 Respect LDFLAGS and CXXFLAGS.
 
---- SConstruct.orig	2019-01-30 14:26:33.000000000 +0000
+--- SConstruct.orig	2019-12-04 23:29:59.000000000 +0000
 +++ SConstruct
-@@ -974,6 +974,7 @@ envDict = dict(BUILD_ROOT=buildDir,
+@@ -1015,6 +1015,7 @@ envDict = dict(BUILD_ROOT=buildDir,
                 INSTALL_DIR=installDir,
                 CONFIG_HEADER_DEFINES={},
                 LIBDEPS_TAG_EXPANSIONS=[],
-+               ENV = os.environ,
++               ENV=os.environ,
                 )
  
  env = Environment(variables=env_vars, **envDict)
-@@ -1110,7 +1111,9 @@ def CheckForProcessor(context, which_arc
+@@ -1169,7 +1170,9 @@ def CheckForProcessor(context, which_arc
  os_macros = {
      "windows": "defined(_WIN32)",
      "solaris": "defined(__sun)",
@@ -26,7 +26,7 @@ Respect LDFLAGS and CXXFLAGS.
      "openbsd": "defined(__OpenBSD__)",
      "iOS": "defined(__APPLE__) && TARGET_OS_IOS && !TARGET_OS_SIMULATOR",
      "iOS-sim": "defined(__APPLE__) && TARGET_OS_IOS && TARGET_OS_SIMULATOR",
-@@ -1514,7 +1517,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
+@@ -1557,7 +1560,7 @@ if env['_LIBDEPS'] == '$_LIBDEPS_LIBS':
      if not env.TargetOSIs('solaris', 'darwin', 'windows', 'openbsd'):
          env.Tool('thin_archive')
  
@@ -35,31 +35,32 @@ Respect LDFLAGS and CXXFLAGS.
      env['LINK_LIBGROUP_START'] = '-Wl,--start-group'
      env['LINK_LIBGROUP_END'] = '-Wl,--end-group'
      # NOTE: The leading and trailing spaces here are important. Do not remove them.
-@@ -1554,9 +1557,15 @@ elif env.TargetOSIs('freebsd'):
+@@ -1593,14 +1596,14 @@ if env.TargetOSIs('linux'):
+ elif env.TargetOSIs('solaris'):
+      env.Append( LIBS=["socket","resolv","lgrp"] )
+ 
+-elif env.TargetOSIs('freebsd'):
++elif env.TargetOSIs('freebsd', 'dragonfly'):
      env.Append( LIBS=[ "kvm" ] )
      env.Append( CCFLAGS=[ "-fno-omit-frame-pointer" ] )
  
-+elif env.TargetOSIs('dragonfly'):
-+    env.Append( LIBS=["m", "kvm"] )
-+
  elif env.TargetOSIs('darwin'):
-      env.Append( LIBS=["resolv"] )
+     env.Append( LIBS=["resolv"] )
  
-+elif env.TargetOSIs('netbsd'):
-+    env.Append( LIBS=["m", "kvm"] )
-+
- elif env.TargetOSIs('openbsd'):
+-elif env.TargetOSIs('openbsd'):
++elif env.TargetOSIs('netbsd', 'openbsd'):
      env.Append( LIBS=[ "kvm" ] )
  
-@@ -1777,7 +1786,6 @@ if env.TargetOSIs('posix'):
+ elif env.TargetOSIs('windows'):
+@@ -1858,7 +1861,6 @@ if env.TargetOSIs('posix'):
      # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
      env.Append( CCFLAGS=["-fno-omit-frame-pointer",
                           "-fno-strict-aliasing",
--                         "-ggdb",
+-                         "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
                           "-pthread",
                           "-Wall",
                           "-Wsign-compare",
-@@ -2413,9 +2421,9 @@ def doConfigure(myenv):
+@@ -2500,9 +2502,9 @@ def doConfigure(myenv):
      if usingLibStdCxx:
          def CheckModernLibStdCxx(context):
              test_body = """
@@ -72,7 +73,7 @@ Respect LDFLAGS and CXXFLAGS.
              """
  
              context.Message('Checking for libstdc++ 5.3.0 or better... ')
-@@ -2649,7 +2657,7 @@ def doConfigure(myenv):
+@@ -2746,7 +2748,7 @@ def doConfigure(myenv):
          #
          myenv.Append( CCFLAGS=["/Zc:inline"])
  
@@ -81,7 +82,7 @@ Respect LDFLAGS and CXXFLAGS.
          # This tells clang/gcc to use the gold linker if it is available - we prefer the gold linker
          # because it is much faster. Don't use it if the user has already configured another linker
          # selection manually.
-@@ -3202,7 +3210,7 @@ def doConfigure(myenv):
+@@ -3332,7 +3334,7 @@ def doConfigure(myenv):
          myenv.ConfError("Couldn't find SASL header/libraries")
  
      # requires ports devel/libexecinfo to be installed
@@ -90,12 +91,3 @@ Respect LDFLAGS and CXXFLAGS.
          if not conf.CheckLib("execinfo"):
              myenv.ConfError("Cannot find libexecinfo, please install devel/libexecinfo.")
  
-@@ -3427,7 +3435,7 @@ def doConfigure(myenv):
- 
-         outputIndex = next((idx for idx in [0,1] if conf.CheckAltivecVbpermqOutput(idx)), None)
-         if outputIndex is not None:
--	    conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-+            conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-         else:
-             myenv.ConfError("Running on ppc64le, but can't find a correct vec_vbpermq output index.  Compiler or platform not supported")
- 
diff --git a/databases/mongodb/patches/patch-site__scons_mongo_platform.py b/databases/mongodb/patches/patch-site__scons_mongo_platform.py
index cd7dfa9fa36..ce747494ca1 100644
--- a/databases/mongodb/patches/patch-site__scons_mongo_platform.py
+++ b/databases/mongodb/patches/patch-site__scons_mongo_platform.py
@@ -1,8 +1,8 @@
-$NetBSD: patch-site__scons_mongo_platform.py,v 1.1 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-site__scons_mongo_platform.py,v 1.2 2020/02/01 20:00:08 adam Exp $
 
 Add NetBSD and Dragonfly support.
 
---- site_scons/mongo/platform.py.orig	2019-03-04 21:59:06.197965476 +0000
+--- site_scons/mongo/platform.py.orig	2019-12-04 23:29:59.000000000 +0000
 +++ site_scons/mongo/platform.py
 @@ -22,6 +22,10 @@ def get_running_os_name():
          running_os = 'linux'
@@ -15,12 +15,12 @@ Add NetBSD and Dragonfly support.
      elif running_os.startswith('openbsd'):
          running_os = 'openbsd'
      elif running_os == 'sunos5':
-@@ -40,7 +44,7 @@ def env_get_os_name_wrapper(self):
+@@ -42,7 +46,7 @@ def env_get_os_name_wrapper(self):
  def is_os_raw(target_os, os_list_to_check):
-     darwin_os_list = [ 'macOS', 'tvOS', 'tvOS-sim', 'iOS', 'iOS-sim', 'watchOS', 'watchOS-sim' ]
-     linux_os_list = [ 'android', 'linux' ]
--    posix_os_list = [ 'openbsd', 'freebsd', 'solaris' ] + darwin_os_list + linux_os_list
-+    posix_os_list = [ 'netbsd', 'openbsd', 'freebsd', 'dragonfly', 'solaris' ] + darwin_os_list + linux_os_list
+     darwin_os_list = ['macOS', 'tvOS', 'tvOS-sim', 'iOS', 'iOS-sim', 'watchOS', 'watchOS-sim']
+     linux_os_list = ['android', 'linux']
+-    posix_os_list = ['openbsd', 'freebsd', 'solaris', 'emscripten'] + darwin_os_list + linux_os_list
++    posix_os_list = ['netbsd', 'openbsd', 'freebsd', 'dragonfly', 'solaris', 'emscripten'] + darwin_os_list + linux_os_list
  
      os_families = {
-             "darwin": darwin_os_list,
+         "darwin": darwin_os_list,
diff --git a/databases/mongodb/patches/patch-src_mongo_base_initializer.h b/databases/mongodb/patches/patch-src_mongo_base_initializer.h
index 2547071a752..f54ca36ed28 100644
--- a/databases/mongodb/patches/patch-src_mongo_base_initializer.h
+++ b/databases/mongodb/patches/patch-src_mongo_base_initializer.h
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_mongo_base_initializer.h,v 1.2 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-src_mongo_base_initializer.h,v 1.3 2020/02/01 20:00:08 adam Exp $
 
 Fixes at least SunOS.
 
---- src/mongo/base/initializer.h.orig	2019-01-30 14:26:33.000000000 +0000
+--- src/mongo/base/initializer.h.orig	2019-12-04 23:29:59.000000000 +0000
 +++ src/mongo/base/initializer.h
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
  
  #include <string>
  #include <vector>
 +#include <unistd.h>
  
- #include "mongo/base/disallow_copying.h"
  #include "mongo/base/initializer_context.h"
+ #include "mongo/base/initializer_dependency_graph.h"
diff --git a/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp b/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp
deleted file mode 100644
index 100823504fb..00000000000
--- a/databases/mongodb/patches/patch-src_mongo_db_matcher_expression__leaf.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mongo_db_matcher_expression__leaf.cpp,v 1.2 2019/03/05 19:35:58 adam Exp $
-
-Fix building.
-
---- src/mongo/db/matcher/expression_leaf.cpp.orig	2019-01-30 14:26:33.000000000 +0000
-+++ src/mongo/db/matcher/expression_leaf.cpp
-@@ -33,6 +33,7 @@
- #include "mongo/db/matcher/expression_leaf.h"
- 
- #include <cmath>
-+#include <string>
- #include <pcrecpp.h>
- 
- #include "mongo/bson/bsonelement_comparator.h"
-@@ -48,6 +49,7 @@
- #include "mongo/util/mongoutils/str.h"
- 
- namespace mongo {
-+using std::string;
- 
- ComparisonMatchExpressionBase::ComparisonMatchExpressionBase(
-     MatchType type,
diff --git a/databases/mongodb/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h b/databases/mongodb/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h
new file mode 100644
index 00000000000..68db38dc547
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_db_query_collation_collator__interface__icu.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_mongo_db_query_collation_collator__interface__icu.h,v 1.1 2020/02/01 20:00:08 adam Exp $
+
+Fix for newer ICU.
+
+--- src/mongo/db/query/collation/collator_interface_icu.h.orig	2020-01-26 09:25:13.000000000 +0000
++++ src/mongo/db/query/collation/collator_interface_icu.h
+@@ -33,9 +33,7 @@
+ 
+ #include <memory>
+ 
+-namespace icu {
+-class Collator;
+-}  // namespace icu
++#include <unicode/coll.h>
+ 
+ namespace mongo {
+ 
+@@ -45,7 +43,7 @@ namespace mongo {
+  */
+ class CollatorInterfaceICU final : public CollatorInterface {
+ public:
+-    CollatorInterfaceICU(CollationSpec spec, std::unique_ptr<icu::Collator> collator);
++    CollatorInterfaceICU(CollationSpec spec, std::unique_ptr<U_ICU_NAMESPACE::Collator> collator);
+ 
+     std::unique_ptr<CollatorInterface> clone() const final;
+ 
+@@ -56,7 +54,7 @@ public:
+ private:
+     // The ICU implementation of the collator to which we delegate interesting work. Const methods
+     // on the ICU collator are expected to be thread-safe.
+-    const std::unique_ptr<icu::Collator> _collator;
++    const std::unique_ptr<U_ICU_NAMESPACE::Collator> _collator;
+ };
+ 
+ }  // namespace mongo
diff --git a/databases/mongodb/patches/patch-src_mongo_platform_random.cpp b/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
index 25bc2eabee0..82e9c387628 100644
--- a/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
+++ b/databases/mongodb/patches/patch-src_mongo_platform_random.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_mongo_platform_random.cpp,v 1.4 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-src_mongo_platform_random.cpp,v 1.5 2020/02/01 20:00:08 adam Exp $
 
-Add NetBSD support.
+Add NetBSD and DragonFly support.
 
---- src/mongo/platform/random.cpp.orig	2019-01-30 14:26:33.000000000 +0000
+--- src/mongo/platform/random.cpp.orig	2019-12-04 23:29:59.000000000 +0000
 +++ src/mongo/platform/random.cpp
-@@ -150,7 +150,7 @@ std::unique_ptr<SecureRandom> SecureRand
-     return stdx::make_unique<WinSecureRandom>();
+@@ -148,7 +148,7 @@ std::unique_ptr<SecureRandom> SecureRand
  }
  
--#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__)
-+#elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+ #elif defined(__linux__) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || \
+-    defined(__EMSCRIPTEN__)
++    defined(__EMSCRIPTEN__) || defined(__DragonFly__) || defined(__NetBSD__)
  
  class InputStreamSecureRandom : public SecureRandom {
  public:
diff --git a/databases/mongodb/patches/patch-src_mongo_util_processinfo__netbsd.cpp b/databases/mongodb/patches/patch-src_mongo_util_processinfo__netbsd.cpp
index ab468b2052b..551add8cc66 100644
--- a/databases/mongodb/patches/patch-src_mongo_util_processinfo__netbsd.cpp
+++ b/databases/mongodb/patches/patch-src_mongo_util_processinfo__netbsd.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_mongo_util_processinfo__netbsd.cpp,v 1.3 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-src_mongo_util_processinfo__netbsd.cpp,v 1.4 2020/02/01 20:00:08 adam Exp $
 
-NetBSD support.
+Add NetBSD support.
 
---- src/mongo/util/processinfo_netbsd.cpp.orig	2019-03-04 22:59:41.311405065 +0000
+--- src/mongo/util/processinfo_netbsd.cpp.orig	2020-01-27 09:41:08.452841019 +0000
 +++ src/mongo/util/processinfo_netbsd.cpp
-@@ -27,6 +27,7 @@
+@@ -26,6 +26,7 @@
   *    exception statement from all source files in the program, then also delete
   *    it in the license file.
   */
@@ -12,7 +12,7 @@ NetBSD support.
  
  #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl
  
-@@ -39,7 +40,6 @@
+@@ -38,7 +39,6 @@
  #include <sys/param.h>
  #include <sys/sysctl.h>
  #include <sys/types.h>
@@ -20,7 +20,16 @@ NetBSD support.
  #include <sys/vmmeter.h>
  #include <unistd.h>
  
-@@ -112,7 +112,7 @@ int ProcessInfo::getVirtualMemorySize() 
+@@ -85,7 +85,7 @@ template <>
+ int getSysctlByIDWithDefault<std::string>(const int* sysctlID,
+                                           const int idLen,
+                                           const std::string& defaultValue,
+-                                          string* result) {
++                                          std::string* result) {
+     char value[256] = {0};
+     size_t len = sizeof(value);
+     if (sysctl(sysctlID, idLen, &value, &len, NULL, 0) == -1) {
+@@ -109,7 +109,7 @@ int ProcessInfo::getVirtualMemorySize() 
          return -1;
      }
  
@@ -29,7 +38,7 @@ NetBSD support.
      int vss = ((task->p_vm_dsize + task->p_vm_ssize + task->p_vm_tsize) * sysconf(_SC_PAGESIZE)) /
          1048576;
      kvm_close(kd);
-@@ -127,7 +127,7 @@ int ProcessInfo::getResidentSize() {
+@@ -124,7 +124,7 @@ int ProcessInfo::getResidentSize() {
          log() << "Unable to get res mem size: " << err;
          return -1;
      }
@@ -38,3 +47,12 @@ NetBSD support.
      int rss = (task->p_vm_rssize * sysconf(_SC_PAGESIZE)) / 1048576;  // convert from pages to MB
      kvm_close(kd);
      return rss;
+@@ -136,7 +136,7 @@ double ProcessInfo::getSystemMemoryPress
+ 
+ void ProcessInfo::SystemInfo::collectSystemInfo() {
+     osType = "BSD";
+-    osName = "OpenBSD";
++    osName = "NetBSD";
+     int mib[2];
+ 
+     mib[0] = CTL_KERN;
diff --git a/databases/mongodb/patches/patch-src_mongo_util_time__support.cpp b/databases/mongodb/patches/patch-src_mongo_util_time__support.cpp
index 02cf883697c..9bbadf7d852 100644
--- a/databases/mongodb/patches/patch-src_mongo_util_time__support.cpp
+++ b/databases/mongodb/patches/patch-src_mongo_util_time__support.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_mongo_util_time__support.cpp,v 1.1 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-src_mongo_util_time__support.cpp,v 1.2 2020/02/01 20:00:08 adam Exp $
 
 Add support for NetBSD, OpenBSD, and DragonFly.
 
---- src/mongo/util/time_support.cpp.orig	2019-03-04 22:11:39.324289612 +0000
+--- src/mongo/util/time_support.cpp.orig	2019-12-04 23:29:59.000000000 +0000
 +++ src/mongo/util/time_support.cpp
-@@ -938,7 +938,7 @@ private:
+@@ -952,7 +952,7 @@ private:
  // Find minimum timer resolution of OS
  Nanoseconds getMinimumTimerResolution() {
      Nanoseconds minTimerResolution;
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__)
      struct timespec tp;
      clock_getres(CLOCK_REALTIME, &tp);
      minTimerResolution = Nanoseconds{tp.tv_nsec};
diff --git a/databases/mongodb/patches/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h b/databases/mongodb/patches/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h
index b5aabc738cc..b34b1cb85c7 100644
--- a/databases/mongodb/patches/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h
+++ b/databases/mongodb/patches/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h
@@ -1,122 +1,132 @@
-$NetBSD: patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h,v 1.2 2019/03/05 19:35:58 adam Exp $
+$NetBSD: patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h,v 1.3 2020/02/01 20:00:08 adam Exp $
 
 Support NetBSD.
 
---- src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h.orig	2017-04-20 21:43:42.000000000 +0000
+--- src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h.orig	2019-12-04 23:29:59.000000000 +0000
 +++ src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/op_system.h
-@@ -44,6 +44,7 @@
- #       undef  win64 

+@@ -45,6 +45,7 @@
  #       undef  darwin 

- #       undef  interix 

-+#       undef  netbsd

+ #       undef  interix

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define dos 1

  #	define OP_SYSTEM dos

-@@ -62,6 +63,7 @@
- #       undef   win64

+@@ -64,6 +65,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define vms 2

  #	define OP_SYSTEM vms

-@@ -80,6 +82,7 @@
- #       undef  win64

+@@ -83,6 +85,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define wnt 3

  #	define OP_SYSTEM wnt

-@@ -98,6 +101,7 @@
- #       undef  win64

+@@ -102,6 +105,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define linux 8

  #	define OP_SYSTEM linux

-@@ -117,6 +121,7 @@
- #       undef  win64

+@@ -122,6 +126,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define osf 4

  #	define OP_SYSTEM osf

-@@ -135,6 +140,7 @@
- #       undef  win64

+@@ -141,6 +146,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define hp_ux 5

  #	define OP_SYSTEM hp_ux

-@@ -153,6 +159,7 @@
- #       undef  win64

+@@ -160,6 +166,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define unicos 6

  #	define OP_SYSTEM unicos

-@@ -171,6 +178,7 @@
- #       undef  win64

+@@ -179,6 +186,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #	define ultrix 7

  #	define OP_SYSTEM ultrix

-@@ -188,6 +196,7 @@
- #       undef  win64

+@@ -197,6 +205,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #       define win64 9

  #       define OP_SYSTEM win64

-@@ -205,6 +214,7 @@
- #       undef  win64

+@@ -215,6 +224,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #       define darwin 10

  #       define OP_SYSTEM darwin

-@@ -221,9 +231,27 @@
- #       undef  win64

+@@ -232,6 +242,7 @@
  #       undef  darwin 

  #       undef  interix 

-+#       undef  netbsd

+ #       undef  emscripten

++#	undef  netbsd

  

  #       define interix 11

  #       define OP_SYSTEM interix

-+

+@@ -250,10 +261,29 @@
+ #       undef  darwin 

+ #       undef  interix 

+ #       undef  emscripten

++#	undef  netbsd

+ 

+ #	define emscripten 12

+ #	define OP_SYSTEM emscripten

+ 

 +#elif defined(__NetBSD__)

-+#       undef  dos

-+#       undef  vms

-+#       undef  wnt

-+#       undef  osf

-+#       undef  hp_ux

-+#       undef  linux

-+#       undef  unicos

-+#       undef  ultrix

-+#       undef  win64

-+#       undef  darwin 

-+#       undef  interix 

-+#       undef  netbsd

++#	undef  dos

++#	undef  vms

++#	undef  wnt

++#	undef  osf

++#	undef  hp_ux

++#	undef  linux

++#	undef  unicos

++#	undef  ultrix

++#	undef  win64

++#	undef  darwin 

++#	undef  interix 

++#	undef  emscripten

++#	undef  netbsd

++

++#	define netbsd 12

++#	define OP_SYSTEM netbsd

 +

-+#       define netbsd 12

-+#       define OP_SYSTEM netbsd

  #else

  

  #	error Operating system must be specified.

-@@ -235,6 +263,7 @@
- 	OP_SYSTEM == linux || \

+@@ -266,6 +296,7 @@
  	OP_SYSTEM == osf || \

  	OP_SYSTEM == ultrix || \

+ 	OP_SYSTEM == unicos || \

 +	OP_SYSTEM == netbsd || \

- 	OP_SYSTEM == unicos \

+ 	OP_SYSTEM == emscripten \

  )

  

diff --git a/databases/mongodb/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp b/databases/mongodb/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp
new file mode 100644
index 00000000000..07b01b60bc6
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp,v 1.1 2020/02/01 20:00:08 adam Exp $
+
+Fix build with recent NetBSD 9.99.
+
+--- src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp.orig	2020-01-26 17:31:51.341577994 +0000
++++ src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp
+@@ -28,6 +28,10 @@
+ #include "asio/detail/push_options.hpp"
+ 
+ #if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++
++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001500
+ # define ASIO_KQUEUE_EV_SET(ev, ident, filt, flags, fflags, data, udata) \
+     EV_SET(ev, ident, filt, flags, fflags, data, \
+       reinterpret_cast<intptr_t>(static_cast<void*>(udata)))
diff --git a/databases/mongodb/patches/patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h b/databases/mongodb/patches/patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h
new file mode 100644
index 00000000000..36b122f73c9
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_third__party_mozjs-60_platform_x86__64_netbsd_build_js-confdefs.h,v 1.1 2020/02/01 20:00:08 adam Exp $
+
+--- src/third_party/mozjs-60/platform/x86_64/netbsd/build/js-confdefs.h.orig	2020-01-29 20:09:04.581823530 +0000
++++ src/third_party/mozjs-60/platform/x86_64/netbsd/build/js-confdefs.h
+@@ -31,7 +31,6 @@
+ #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
+@@ -54,7 +53,7 @@
+ #define JS_POSIX_NSPR 1
+ #define JS_PUNBOX64 1
+ #define JS_STANDALONE 1
+-#define MALLOC_H <malloc_np.h>
++#define MALLOC_H <stdlib.h>
+ #define MALLOC_USABLE_SIZE_CONST_PTR const
+ #define MOZILLA_UAVERSION "60.0"
+ #define MOZILLA_VERSION "60.3.0"