git: 3cd9974edbf6 - main - databases/mongodb42: Update to 4.2.16

[Li-Wen Hsu]

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3cd9974edbf6f82bae14a9c61fe65088f38fb35a

commit 3cd9974edbf6f82bae14a9c61fe65088f38fb35a
Author:     Ronald Klop <ronald-lists at klop.ws>
AuthorDate: 2021-09-22 07:54:13 +0000
Commit:     Li-Wen Hsu <lwhsu at FreeBSD.org>
CommitDate: 2021-09-22 07:54:13 +0000

    databases/mongodb42: Update to 4.2.16
    
    - register conflict with mongodb50
    - enable outline-atomics (needs >= 1400033; FreeBSD 11/12/13 do not try to enable it)
    
    https://docs.mongodb.com/manual/release-notes/4.2-changelog/#4.2.16-changelog
    
    PR:             258455
---
 databases/mongodb42/Makefile               | 10 ++++++++--
 databases/mongodb42/distinfo               |  6 +++---
 databases/mongodb42/files/patch-SConstruct | 10 ----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
index 2e91c1936951..e2a5d99ea132 100644
--- a/databases/mongodb42/Makefile
+++ b/databases/mongodb42/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.2.15
+DISTVERSION=	4.2.16
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
@@ -32,7 +32,7 @@ USES=		compiler:c++17-lang cpe python:3.5+,build scons shebangfix
 USE_RC_SUBR=	mongod
 
 CONFLICTS_BUILD=	mongo-cxx-driver
-CONFLICTS_INSTALL=	mongodb36 mongodb4[04]
+CONFLICTS_INSTALL=	mongodb36 mongodb4[04] mongodb50
 
 OPTIONS_DEFINE=	LTO SASL SSL
 OPTIONS_DEFAULT=LTO SASL SSL
@@ -41,6 +41,7 @@ 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 \
@@ -68,6 +69,11 @@ SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD && ((${OSREL:R} >= 14 && ${OSVERSION} < 1400033) \
+                        && ${ARCH} == "aarch64")
+BROKEN=	Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a
+.endif
+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
diff --git a/databases/mongodb42/distinfo b/databases/mongodb42/distinfo
index 565217003185..6ea9c771935b 100644
--- a/databases/mongodb42/distinfo
+++ b/databases/mongodb42/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626038087
-SHA256 (mongodb-src-r4.2.15.tar.gz) = 22f704dd35c0abe182cfd244ce08f43783c1ece6be23e47a6f1872798c312deb
-SIZE (mongodb-src-r4.2.15.tar.gz) = 62187847
+TIMESTAMP = 1631386367
+SHA256 (mongodb-src-r4.2.16.tar.gz) = d7509aea31b3df2c9e1c3aa4b0ad4aa752f6bdab7fd4efadd4d0291377977bca
+SIZE (mongodb-src-r4.2.16.tar.gz) = 62206525
diff --git a/databases/mongodb42/files/patch-SConstruct b/databases/mongodb42/files/patch-SConstruct
index 47fc2da88d30..1fdba0cc4cd7 100644
--- a/databases/mongodb42/files/patch-SConstruct
+++ b/databases/mongodb42/files/patch-SConstruct
@@ -31,13 +31,3 @@
          if not has_option("disable-warnings-as-errors"):
              env.Append( CCFLAGS=["-Werror"] )
  
-@@ -3627,7 +3627,8 @@ def doConfigure(myenv):
-     myenv = conf.Finish()
- 
-     if env['TARGET_ARCH'] == "aarch64":
--        AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
-+        # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
-+        AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
- 
-     return myenv
-