CVS commit: pkgsrc/databases/mongodb

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 17 10:00:58 UTC 2024

Modified Files:
        pkgsrc/databases/mongodb: Makefile distinfo
Added Files:
        pkgsrc/databases/mongodb/patches: patch-buildscripts_moduleconfig.py

Log Message:
mongodb: Python 3.12 support


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/databases/mongodb/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/databases/mongodb/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb/patches/patch-buildscripts_moduleconfig.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mongodb/Makefile
diff -u pkgsrc/databases/mongodb/Makefile:1.92 pkgsrc/databases/mongodb/Makefile:1.93
--- pkgsrc/databases/mongodb/Makefile:1.92      Sun Jun 16 15:28:27 2024
+++ pkgsrc/databases/mongodb/Makefile   Sat Aug 17 10:00:58 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2024/06/16 15:28:27 tnn Exp $
+# $NetBSD: Makefile,v 1.93 2024/08/17 10:00:58 tnn Exp $
 
 DISTNAME=      mongodb-src-r6.0.13
 PKGNAME=       ${DISTNAME:S/src-r//}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    databases
 MASTER_SITES=  http://fastdl.mongodb.org/src/
 
@@ -53,7 +53,7 @@ SCONS_BUILD_ARGS+=    --use-system-yaml
 SCONS_BUILD_ARGS+=     --use-system-zlib
 SCONS_BUILD_ARGS+=     --use-system-zstd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 312
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/databases/mongodb/distinfo
diff -u pkgsrc/databases/mongodb/distinfo:1.40 pkgsrc/databases/mongodb/distinfo:1.41
--- pkgsrc/databases/mongodb/distinfo:1.40      Sun Jun 16 15:28:27 2024
+++ pkgsrc/databases/mongodb/distinfo   Sat Aug 17 10:00:58 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.40 2024/06/16 15:28:27 tnn Exp $
+$NetBSD: distinfo,v 1.41 2024/08/17 10:00:58 tnn Exp $
 
 BLAKE2s (mongodb-src-r6.0.13.tar.gz) = 84316d44874c482709a6352c3ee7c9752a498bf835b6d6038fc6925543358980
 SHA512 (mongodb-src-r6.0.13.tar.gz) = 8117e8bc4e2b298c36c83a6376b7e23a31606300fa34ca28f4c1624e3dbffe4a1bf7d869c4939e91690250c5bac361d899a2189d74e7afd5cf90ded94170ad33
 Size (mongodb-src-r6.0.13.tar.gz) = 89792150 bytes
 SHA1 (patch-SConstruct) = 247af4df0f9f13da774e58d0f22994b5e092f166
+SHA1 (patch-buildscripts_moduleconfig.py) = efa510420e97850a7c02aac3d0ddd54b4141d189
 SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 72ec0ff7fa1c06d6d7d3881d7ed521c8c1285124
 SHA1 (patch-src_mongo_base_initializer.h) = 955a3762a26a89af6b91331289885de8f0cc8585

Added files:

Index: pkgsrc/databases/mongodb/patches/patch-buildscripts_moduleconfig.py
diff -u /dev/null pkgsrc/databases/mongodb/patches/patch-buildscripts_moduleconfig.py:1.1
--- /dev/null   Sat Aug 17 10:00:58 2024
+++ pkgsrc/databases/mongodb/patches/patch-buildscripts_moduleconfig.py Sat Aug 17 10:00:58 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-buildscripts_moduleconfig.py,v 1.1 2024/08/17 10:00:58 tnn Exp $
+
+Python 3.12 support. Fix similar to waf.
+
+--- buildscripts/moduleconfig.py.orig  2024-01-04 00:34:55.000000000 +0000
++++ buildscripts/moduleconfig.py
+@@ -27,7 +27,13 @@ MongoDB SConscript files do.
+ __all__ = ('discover_modules', 'discover_module_directories', 'configure_modules',
+            'register_module_test')  # pylint: disable=undefined-all-variable
+ 
+-import imp
++import sys
++if sys.hexversion > 0x3040000:
++    import types
++    class imp(object):
++        new_module = lambda x: types.ModuleType(x)
++else:
++    import imp
+ import inspect
+ import os
+