Index: head/databases/mongodb40/Makefile
===================================================================
--- head/databases/mongodb40/Makefile	(revision 556768)
+++ head/databases/mongodb40/Makefile	(revision 556769)
@@ -1,86 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.0.19
-PORTREVISION=	1
+DISTVERSION=	4.0.21
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
 PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
 
 MAINTAINER=	dev.ashevchuk@gmail.com
-COMMENT=	Distributed document-oriented "NoSQL" database
+COMMENT=	Distributed document-oriented "NoSQL" database (4.0.x Branch)
 
 LICENSE=	SSPLv1 APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PY_TYPING} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		${LOCALBASE}/bin/ar:devel/binutils
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libsnappy.so:archivers/snappy
 
 USES=		compiler:c++14-lang cpe python:3.5+,build scons shebangfix
 USE_RC_SUBR=	mongod
 
 CONFLICTS_BUILD=	mongo-cxx-driver
-CONFLICTS_INSTALL=	mongodb36 mongodb42
+CONFLICTS_INSTALL=	mongodb36 mongodb4[24]
 
 SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
 python_OLD_CMD=	@python_interpreter@
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--use-system-pcre --use-system-snappy \
 		--use-system-boost --use-system-zlib \
 		--cxx-std=14 --libc++ \
 		--runtime-hardening=on \
 		--disable-warnings-as-errors \
 		VERBOSE=on AR=${PREFIX}/bin/ar
 
 USERS=		mongodb
 GROUPS=		mongodb
 
 OPTIONS_DEFINE=		SASL SSL
 OPTIONS_DEFAULT=	SASL SSL
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USES=	ssl
 SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .if ${ARCH} == aarch64
 EXTRA_PATCHES=	${FILESDIR}/aarch64
 .endif
 
 ALL_TARGET=	core
 
 PORTSCOUT=	limitw:1,even
 
 CPE_PRODUCT=	mongodb
 
 post-install:
 .for f in mongo mongod mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
 
 .include <bsd.port.mk>
Index: head/databases/mongodb40/distinfo
===================================================================
--- head/databases/mongodb40/distinfo	(revision 556768)
+++ head/databases/mongodb40/distinfo	(revision 556769)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592423899
-SHA256 (mongodb-src-r4.0.19.tar.gz) = 4fe683e01c334053c805bd9ce2aa22eb56917eeb0c54858a270952bee4467ccd
-SIZE (mongodb-src-r4.0.19.tar.gz) = 50126414
+TIMESTAMP = 1605454590
+SHA256 (mongodb-src-r4.0.21.tar.gz) = 990230c4d78f60f528f6bdc353a954499f5fa8ad0f63ae8b27fb9200b1ac7e39
+SIZE (mongodb-src-r4.0.21.tar.gz) = 50203269
Index: head/databases/mongodb40/files/patch-asio-libc++7
===================================================================
--- head/databases/mongodb40/files/patch-asio-libc++7	(revision 556768)
+++ head/databases/mongodb40/files/patch-asio-libc++7	(nonexistent)
@@ -1,15 +0,0 @@
-https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51
-
---- src/third_party/asio-master/asio/include/asio/detail/config.hpp.orig	2018-07-03 21:09:33 UTC
-+++ src/third_party/asio-master/asio/include/asio/detail/config.hpp
-@@ -784,8 +784,9 @@
- # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
- #  if defined(__clang__)
- #   if (__cplusplus >= 201402)
--#    if __has_include(<experimental/string_view>)
-+#    if __has_include(<string_view>)
- #     define ASIO_HAS_STD_STRING_VIEW 1
-+#    elif __has_include(<experimental/string_view>)
- #     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- #    endif // __has_include(<experimental/string_view>)
- #   endif // (__cplusplus >= 201402)

Property changes on: head/databases/mongodb40/files/patch-asio-libc++7
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/databases/mongodb40/pkg-descr
===================================================================
--- head/databases/mongodb40/pkg-descr	(revision 556768)
+++ head/databases/mongodb40/pkg-descr	(revision 556769)
@@ -1,5 +1,5 @@
 Mongo (from "humongous") is a high-performance, open source,
 schema-free, document-oriented database. A common name in the
 "NOSQL" community.
 
-WWW: https://www.mongodb.com/
+WWW: https://docs.mongodb.com/v4.0/