 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2021/01/01 08:24:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/09 14:30:09 tnn Exp $
 # This package is intentionally old to avoid:
 #   Server Side Public License
 #   c++14
 # and further exists to support net/unifi.
 DISTNAME=	mongodb-src-r3.4.24
 PKGNAME=	${DISTNAME:S/src-r//}
 PKGREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	http://fastdl.mongodb.org/src/
 MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	https://www.mongodb.com/
 @@ -96,26 +96,28 @@ SUBST_SED.varbase+=	-e 's,/var/log,${VAR
 NOT_PAX_MPROTECT_SAFE+=	bin/mongo bin/mongod
 RCD_SCRIPTS=		mongodb
 INSTALLATION_DIRS+=	share/doc/mongodb share/examples/mongodb ${PKGMANDIR}/man1
 CONF_FILES+=		share/examples/mongodb/mongod.conf \
 			${PKG_SYSCONFDIR}/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/aarch64/linux \
 		${WRKSRC}/src/third_party/mozjs-45/platform/aarch64/netbsd
 	${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} ${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 \
 		${WRKSRC}/src/mongo/db/ftdc/ftdc_system_stats_dragonfly.cpp
 	${CP} ${WRKSRC}/src/mongo/util/processinfo_openbsd.cpp \
 		${WRKSRC}/src/mongo/util/processinfo_netbsd.cpp
 	${CP} ${WRKSRC}/src/mongo/util/processinfo_freebsd.cpp \
 		${WRKSRC}/src/mongo/util/processinfo_dragonfly.cpp
 	${CP} ${WRKSRC}/src/mongo/platform/stack_locator_freebsd.cpp \

 @@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2020/03/31 14:34:41 gdt Exp $
+$NetBSD: distinfo,v 1.10 2021/04/09 14:30:09 tnn Exp $
 SHA1 (mongodb-src-r3.4.24.tar.gz) = 86909b211998f0cbc8104df774aecb3d00a01763
 RMD160 (mongodb-src-r3.4.24.tar.gz) = f7e4bfe1e2bd046f1a6c0f2695762076ffee5ae5
 SHA512 (mongodb-src-r3.4.24.tar.gz) = c19d5215f514ad0c1bd33f17f9d79198e07657260c0a8399c9a84bbf274ec4f6e61a94b36bb132e93a46e96ee8b4d994a1bed70b2d26f906ffe8e78343394226
 Size (mongodb-src-r3.4.24.tar.gz) = 40232175 bytes
 SHA1 (patch-SConstruct) = b6c2893d82d9b954c889d867ec909a05728af83d
 SHA1 (patch-src_mongo_base_initializer.h) = f82d58895251f7be08a09012ed7db64e3863a1fe
 SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
 SHA1 (patch-src_mongo_db_query_collation_collator__interface__icu.h) = 43c94a970fb91d45441a206b5d774e9e7ea55ad5
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
 SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
 SHA1 (patch-src_mongo_db_repl_oplog__fetcher.cpp) = e12dbfbd4e70ee210cdd4eb0582661666e8eb06a
 SHA1 (patch-src_mongo_db_storage_mmap__v1_durop.h) = fb4c0fa1cbd1c2f362e04bcee49f9c3db77d7874
 @@ -16,15 +16,15 @@ SHA1 (patch-src_mongo_installer_msi_SCon
 SHA1 (patch-src_mongo_platform_random.cpp) = 9af0fd82a653bf4f273ce107e54c5e63eaeb3b85
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3f67bbae82c0f3cae410a21219589bc082e7b9b1
 SHA1 (patch-src_mongo_shell_bench.cpp) = c0fd15347d35e37daf87b642148215dee3ab7220
 SHA1 (patch-src_mongo_shell_linenoise__utf8.h) = 952b1599364893d9fd0be915e3d0c2faabb9153f
 SHA1 (patch-src_mongo_util_intrusive__counter.h) = 9f1af59e1bc86e33bf183a6dda1737007afc7a18
 SHA1 (patch-src_mongo_util_processinfo__netbsd.cpp) = 6c01ad839ff31e7500d76af6622dfa726fcc8264
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_dpml__exception.c) = ef3b260e8a49227cbbabf427500b7c70bce15083
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_float128_op__system.h) = 39f6fba82e2870ee4a5d99785033621225a72a16
 SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h) = d3a85d3a3b33691466c65cdf51c56f221429aea9
 SHA1 (patch-src_third__party_asio-master_asio_include_asio_detail_impl_kqueue__reactor.ipp) = b942286acd85ca8cf5fd03bc9f70a5dff0943243
 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_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
-SHA1 (patch-src_third__party_wiredtiger_SConscript) = 71fd2326a4e95fec674326225bce5ccf5793aa5a
+SHA1 (patch-src_third__party_wiredtiger_SConscript) = f135c502c11a1d33da3a5e4c61db00dba85c27c4
 SHA1 (patch-src_third__party_wiredtiger_src_os__posix_os__fs.c) = 6da1014613231a0e56dd3449bd5d61014340575a

 @@ -1,27 +1,25 @@
-# $NetBSD: options.mk,v 1.2 2019/07/09 07:28:30 adam Exp $
+# $NetBSD: options.mk,v 1.3 2021/04/09 14:30:09 tnn Exp $
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mongodb
-PKG_SUPPORTED_OPTIONS=	ssl wiredtiger
+PKG_SUPPORTED_OPTIONS=	ssl
-.if ${MACHINE_ARCH} == "x86_64"
+# 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 ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"
 PKG_SUPPORTED_OPTIONS+=	wiredtiger
 PKG_SUGGESTED_OPTIONS+=	wiredtiger
 .endif
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mssl)
 .include "../../security/openssl/buildlink3.mk"
 SCONS_ARGS+=		--ssl
 .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
 .else
 SCONS_ARGS+=		--wiredtiger=off
 .endif

 @@ -1,28 +1,37 @@
-$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.1 2019/06/28 16:30:56 gdt Exp $
+$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.2 2021/04/09 14:30:09 tnn Exp $
 * Add NetBSD case.
---- src/third_party/wiredtiger/SConscript.orig	2017-04-20 21:43:42.000000000 +0000
+--- src/third_party/wiredtiger/SConscript.orig	2020-01-08 16:30:41.000000000 +0000
 +++ src/third_party/wiredtiger/SConscript
 @@ -62,8 +62,12 @@ elif env.TargetOSIs('solaris'):
      # For an explanation of __EXTENSIONS__,
      # see http://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
      env.Append(CPPDEFINES=["__EXTENSIONS__"])
 +elif env.TargetOSIs('dragonfly'):
 +    env.Append(CPPPATH=["build_dragonfly"])
  elif env.TargetOSIs('freebsd'):
      env.Append(CPPPATH=["build_freebsd"])
 +elif env.TargetOSIs('netbsd'):
 +    env.Append(CPPPATH=["build_netbsd"])
  elif env.TargetOSIs('openbsd'):
      env.Append(CPPPATH=["build_openbsd"])
  elif env.TargetOSIs('linux'):
 @@ -93,7 +97,7 @@ if (VERSION_MAJOR == None or
      VERSION_MINOR == None or
      VERSION_PATCH == None or
      VERSION_STRING == None):
 -    print "Failed to find version variables in " + version_file
 +    print("Failed to find version variables in " + version_file)
      Exit(1)
  wiredtiger_includes = """
@@ -169,7 +173,7 @@ if useSnappy:
  # If not available at runtime, we fall back to software in some cases.
+ #
  # On zSeries we may disable because SLES 11 kernel doe not support the instructions.
 -if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off"):
 +if not (env['TARGET_ARCH'] == 's390x' and get_option("use-s390x-crc32") == "off") and not (env.TargetOSIs('netbsd') and env['TARGET_ARCH'] == 'aarch64'):
      env.Append(CPPDEFINES=["HAVE_CRC32_HARDWARE"])
  wtlib = env.Library(