databases/mongodb70: update to 7.0.0 RC3

Still Release Candidate status. Read the notes: https://www.mongodb.com/docs/v7.0/release-notes/7.0/ I had no time to test fixes for FreeBSD 14 yet. So 14 is broken still.
freebsd · Jun 9, 2023 · be053ac · be053ac
1 parent b988824
commit be053ac
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 51 deletions.
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	7.0.0-rc2
+DISTVERSION=	7.0.0-rc3
 CATEGORIES=	databases net
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 

diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1684994747
-SHA256 (mongodb-mongo-r7.0.0-rc2_GH0.tar.gz) = ed6abfbf4ad410e958ce89cc898bcd7570aceeb795935a5e8762db7623e65372
-SIZE (mongodb-mongo-r7.0.0-rc2_GH0.tar.gz) = 113451210
+TIMESTAMP = 1686214843
+SHA256 (mongodb-mongo-r7.0.0-rc3_GH0.tar.gz) = 21af02667bbf7fecc3f78a5f7dc6fa2008b9865a7be3c4882e479042d16b1391
+SIZE (mongodb-mongo-r7.0.0-rc3_GH0.tar.gz) = 113471331
 SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
 SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901
diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct
@@ -1,58 +1,31 @@
---- SConstruct.orig	2023-04-24 16:15:19 UTC
+--- SConstruct.orig	2023-06-07 17:07:38 UTC
 +++ SConstruct
-@@ -23,9 +23,9 @@ import SCons.Script
+@@ -23,7 +23,6 @@ import SCons.Script
 
  import SCons
  import SCons.Script
--from mongo_tooling_metrics.client import get_mongo_metrics_client
--from mongo_tooling_metrics.errors import ExternalHostException
 -from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
-+#from mongo_tooling_metrics.client import get_mongo_metrics_client
-+#from mongo_tooling_metrics.errors import ExternalHostException
-+#from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
  from site_scons.mongo import build_profiles
 
  # This must be first, even before EnsureSConsVersion, if
-@@ -1659,22 +1659,22 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n
-
- # The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
- # We should only register this function after env, env_vars and the parser have been properly initialized.
--try:
--    metrics_client = get_mongo_metrics_client()
--    metrics_client.register_metrics(
--        SConsToolingMetrics,
--        utc_starttime=datetime.utcnow(),
--        artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
--        env_vars=env_vars,
--        env=env,
--        parser=_parser,
--    )
--except ExternalHostException as _:
--    pass
--except Exception as _:
--    print(
--        "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform"
--    )
-+#try:
-+#    metrics_client = get_mongo_metrics_client()
-+#    metrics_client.register_metrics(
-+#        SConsToolingMetrics,
-+#        utc_starttime=datetime.utcnow(),
-+#        artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
-+#        env_vars=env_vars,
-+#        env=env,
-+#        parser=_parser,
-+#    )
-+#except ExternalHostException as _:
-+#    pass
-+#except Exception as _:
-+#    print(
-+#        "This MongoDB Virtual Workstation could not connect to the internal cluster\nThis is a non-issue, but if this message persists feel free to reach out in #server-dev-platform"
-+#    )
+@@ -1655,16 +1654,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n
+ del envDict
+ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption')
 
+-# The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
+-# We should only register this function after env, env_vars and the parser have been properly initialized.
+-SConsToolingMetrics.register_metrics(
+-    utc_starttime=datetime.utcnow(),
+-    artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
+-    env_vars=env_vars,
+-    env=env,
+-    parser=_parser,
+-)
+-
  if get_option('build-metrics'):
      env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
-@@ -1812,9 +1812,9 @@ if has_option('variables-help'):
+     env.Tool('build_metrics')
+@@ -1801,9 +1790,9 @@ if has_option('variables-help'):
      print(env_vars.GenerateHelpText(env))
      Exit(0)
 
@@ -65,7 +38,7 @@
 
  install_actions.setup(env, get_option('install-action'))
 
-@@ -3033,7 +3033,7 @@ if env.TargetOSIs('posix'):
+@@ -3026,7 +3015,7 @@ if env.TargetOSIs('posix'):
              # If runtime hardening is requested, then build anything
              # destined for an executable with the necessary flags for PIE.
              env.AppendUnique(
@@ -74,15 +47,15 @@
                  PROGLINKFLAGS=['-pie'],
              )
 
-@@ -3041,7 +3041,6 @@ if env.TargetOSIs('posix'):
+@@ -3034,7 +3023,6 @@ if env.TargetOSIs('posix'):
      env.Append(
          CCFLAGS=[
              "-fasynchronous-unwind-tables",
 -            "-g2" if not env.TargetOSIs('emscripten') else "-g",
              "-Wall",
              "-Wsign-compare",
              "-Wno-unknown-pragmas",
-@@ -3224,8 +3223,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
      # setting it for both C and C++ by setting both of CFLAGS and
      # CXXFLAGS.