git: 38836ff12dfb - main - databases/mongodb60: fix build with llvm19

From: Ronald Klop <ronald_at_FreeBSD.org>
Date: Tue, 24 Dec 2024 09:21:27 UTC
The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=38836ff12dfbc7a1a4c422ac22d0f2715f538c4b

commit 38836ff12dfbc7a1a4c422ac22d0f2715f538c4b
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2024-12-24 09:20:05 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2024-12-24 09:21:09 +0000

    databases/mongodb60: fix build with llvm19
    
    Build with clang from base.
    Uses 2 public patches. Documentation is in the patches themselves.
---
 databases/mongodb60/Makefile | 12 ++++++------
 databases/mongodb60/distinfo |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
index 34799c75504a..9c0d9a312634 100644
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -1,8 +1,13 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
 DISTVERSION=	6.0.20
+PORTREVISION=	1
 CATEGORIES=	databases net
+MASTER_SITES=	https://hg.mozilla.org/mozilla-central/raw-rev/:patches
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
+DISTFILES=	223087fdc29f18678f6174e9807b8780e439acf6:patches # https://bugzilla.mozilla.org/1894423
+EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONPREFIX}${DISTVERSION}_GH0.tar.gz \
+		${GH_ACCOUNT}-forks-spidermonkey-${MOZJS_TAG}_GH0.tar.gz
 
 MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	MongoDB Community Edition (6.0.x Branch)
@@ -98,12 +103,6 @@ NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500026 # llvm 19.1.2 import
-USES+=		llvm:max=18,build
-.endif
-
 .include <bsd.port.pre.mk>
 
 ALL_TARGET=	install-core
@@ -128,6 +127,7 @@ post-patch:
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
 	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
+	${PATCH} -d ${WRKSRC}/src/third_party/mozjs/extract --quiet -p1 -V none < ${DISTDIR}/223087fdc29f18678f6174e9807b8780e439acf6
 
 pre-configure:
 	# Verify we downloaded the proper mozjs git tag.
diff --git a/databases/mongodb60/distinfo b/databases/mongodb60/distinfo
index 268d3545cadf..9c00e4465484 100644
--- a/databases/mongodb60/distinfo
+++ b/databases/mongodb60/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1734888294
+TIMESTAMP = 1734952929
+SHA256 (223087fdc29f18678f6174e9807b8780e439acf6) = f234371584e2b2bc9953ae4fd145da19c99a6f04087f53d59616aecf29df039c
+SIZE (223087fdc29f18678f6174e9807b8780e439acf6) = 1597
 SHA256 (mongodb-mongo-r6.0.20_GH0.tar.gz) = 170eef6bd68991b1cda8cd7d522bc14979e065aa824550bb2d868ae94830761f
 SIZE (mongodb-mongo-r6.0.20_GH0.tar.gz) = 87674161
 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0