CVS commit: pkgsrc/databases/mongodb4

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Aug 17 15:51:43 UTC 2024

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

Log Message:
mongodb4: Python 3.12 support


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mongodb4/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mongodb4/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/mongodb4/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/mongodb4/Makefile
diff -u pkgsrc/databases/mongodb4/Makefile:1.14 pkgsrc/databases/mongodb4/Makefile:1.15
--- pkgsrc/databases/mongodb4/Makefile:1.14     Sun Jun 16 15:28:27 2024
+++ pkgsrc/databases/mongodb4/Makefile  Sat Aug 17 15:51:43 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2024/06/16 15:28:27 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2024/08/17 15:51:43 tnn Exp $
 
 DISTNAME=      mongodb-4.4.29
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mongodb/}
 GITHUB_TAG=    r${PKGVERSION_NOREV}
@@ -53,7 +54,7 @@ SCONS_BUILD_ARGS+=    --use-system-zstd
 SCONS_BUILD_ARGS+=     --modules='' # avoid enterprise build
 SCONS_BUILD_ARGS+=     MONGO_VERSION=${PKGVERSION_NOREV} # github source does not include version.json
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 312
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/databases/mongodb4/distinfo
diff -u pkgsrc/databases/mongodb4/distinfo:1.6 pkgsrc/databases/mongodb4/distinfo:1.7
--- pkgsrc/databases/mongodb4/distinfo:1.6      Sun Jun 16 15:28:27 2024
+++ pkgsrc/databases/mongodb4/distinfo  Sat Aug 17 15:51:43 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2024/06/16 15:28:27 tnn Exp $
+$NetBSD: distinfo,v 1.7 2024/08/17 15:51:43 tnn Exp $
 
 BLAKE2s (mongodb-4.4.29.tar.gz) = 53d8f9da9a74edd82a01f4a5dc1fa0a1f08dd79f4a1781e3b2c3d6dd8f3209fb
 SHA512 (mongodb-4.4.29.tar.gz) = 3c32a918c8b5587b04ee9263788c250a9bbd64f34ed2c19939e78607456215697966e596c2cfd160604b629188e4bdf3fff071db268bb3c25de3077a7c2ef335
 Size (mongodb-4.4.29.tar.gz) = 51651007 bytes
 SHA1 (patch-SConstruct) = 2f8402c96d5a94c65a422a063e34785277ef7cc9
+SHA1 (patch-buildscripts_moduleconfig.py) = c88d13662bc30c627184d36690650e61c853dad5
 SHA1 (patch-site__scons_mongo_platform.py) = 6a6daba04876f9779a26c579e6f6a66f55e1cbe6
 SHA1 (patch-site__scons_site__tools_libtool.py) = 5663c0095939fa5404776bfb7b472b27cfe3a254
 SHA1 (patch-src_mongo_base_initializer.h) = efaec2e3b5b8a4bfb15c65c6952924cd1469bdc7

Added files:

Index: pkgsrc/databases/mongodb4/patches/patch-buildscripts_moduleconfig.py
diff -u /dev/null pkgsrc/databases/mongodb4/patches/patch-buildscripts_moduleconfig.py:1.1
--- /dev/null   Sat Aug 17 15:51:43 2024
+++ pkgsrc/databases/mongodb4/patches/patch-buildscripts_moduleconfig.py        Sat Aug 17 15:51:43 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-buildscripts_moduleconfig.py,v 1.1 2024/08/17 15:51:43 tnn Exp $
+
+Python 3.12 support. Fix similar to waf.
+
+--- buildscripts/moduleconfig.py.orig  2024-08-17 15:28:15.030051822 +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
+