mongodb: fix scons-3.0 compatibility issues

4 files changed, 111 insertions, 7 deletions

diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index 795590fa15e..f66fd323ef4 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.20 2017/07/11 19:35:51 joerg Exp $
+$NetBSD: distinfo,v 1.21 2017/10/08 22:17:06 tnn Exp $
 
 SHA1 (mongodb-src-r3.4.4.tar.gz) = 6f9f2d8a3c1c2f4089fd03f8be0b86ff0431d955
 RMD160 (mongodb-src-r3.4.4.tar.gz) = 2a65f380204a92762ceea2be35dbe2c671e106f6
 SHA512 (mongodb-src-r3.4.4.tar.gz) = dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940
 Size (mongodb-src-r3.4.4.tar.gz) = 39867133 bytes
-SHA1 (patch-SConstruct) = 5e920c85dd27f1dd761fe7083074fed0eb1edeae
+SHA1 (patch-SConstruct) = 6ec188274fb25614494ec192be7809a6a01962de
 SHA1 (patch-debian_mongod.conf) = e5074b5f7ad50560b99d652feab58da764ba542c
 SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5
 SHA1 (patch-src_mongo_db_dbwebserver.cpp) = 1e7bb9588930742839d2bc9e26b33751a64f98c7
@@ -12,6 +12,7 @@ SHA1 (patch-src_mongo_db_fts_unicode_string.cpp) = 98c5b1b39c07190f08ec9f22ec300
 SHA1 (patch-src_mongo_db_matcher_expression__leaf.cpp) = 52064034fabb5de63eccf87ddd140303c54f0312
 SHA1 (patch-src_mongo_db_repl_isself.c) = 82321c918b91ce1a68ce79c14589126aca6baf96
 SHA1 (patch-src_mongo_db_repl_master__slave.cpp) = 2f37f0819a2b2743df01f6b6ab0b3013b3b7d726
+SHA1 (patch-src_mongo_installer_msi_SConscript) = 78424fa10f90470dd941b900ef8fd131d28f6e65
 SHA1 (patch-src_mongo_platform_random.cpp) = 59c31e55fc2dc5a2b82b8f16dacf8736d8354cdb
 SHA1 (patch-src_mongo_platform_stack__locator__dragonfly.cpp) = fb885c491e4de1cfbc2875620d854af726e5b45f
 SHA1 (patch-src_mongo_platform_stack__locator__netbsd.cpp) = 3b09e86b2401555b6ab4c31d14c0693d766119c2
@@ -27,6 +28,6 @@ SHA1 (patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h)
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_build_js-confdefs.h) = c2ad1041b5c1ff9fac9085d2a8963781f51873a8
 SHA1 (patch-src_third__party_mozjs-38_platform_x86__64_netbsd_include_js-config.h) = 7ddbb4e3bf4126a1be2195acc82ff859e8130a01
 SHA1 (patch-src_third__party_s2_base_port.h) = 892ce91b5aaa432f34e1e7c169b7fd6eea2a3e94
-SHA1 (patch-src_third__party_wiredtiger_SConscript) = 9b11a7703f4db845fb38ba996238fe1ca7f24767
+SHA1 (patch-src_third__party_wiredtiger_SConscript) = 71fd2326a4e95fec674326225bce5ccf5793aa5a
 SHA1 (patch-src_third__party_wiredtiger_build__dragonfly_wiredtiger__config.h) = 0b00da401f832d985107dfa5dcc6447db4beec6d
 SHA1 (patch-src_third__party_wiredtiger_build__netbsd_wiredtiger__config.h) = edd3c4e5784e52ad0078bcb7ef1e0902bc354285
diff --git a/databases/mongodb/patches/patch-SConstruct b/databases/mongodb/patches/patch-SConstruct
index d80ebdc75b0..5ee02944c46 100644
--- a/databases/mongodb/patches/patch-SConstruct
+++ b/databases/mongodb/patches/patch-SConstruct
@@ -1,10 +1,19 @@
-$NetBSD: patch-SConstruct,v 1.6 2017/05/29 14:44:47 ryoon Exp $
+$NetBSD: patch-SConstruct,v 1.7 2017/10/08 22:17:06 tnn Exp $
 
 Add support for NetBSD/Dragonfly, fix locations.
 Respect LDFLAGS and CXXFLAGS
 
 --- SConstruct.orig	2017-04-20 21:43:42.000000000 +0000
 +++ SConstruct
+@@ -30,7 +30,7 @@ EnsureSConsVersion( 2, 3, 0 )
+ def print_build_failures():
+     from SCons.Script import GetBuildFailures
+     for bf in GetBuildFailures():
+-        print "%s failed: %s" % (bf.node, bf.errstr)
++        print("%s failed: %s" % (bf.node, bf.errstr))
+ atexit.register(print_build_failures)
+ 
+ def versiontuple(v):
 @@ -49,8 +49,12 @@ def get_running_os_name():
      running_os = os.sys.platform
      if running_os.startswith('linux'):
@@ -27,6 +36,42 @@ Respect LDFLAGS and CXXFLAGS
  
      for p in os_list_to_check:
          if p == 'posix' and target_os in posix_os_list:
+@@ -511,7 +515,7 @@ try:
+         version_data = json.load(version_fp)
+ 
+     if 'version' not in version_data:
+-        print "version.json does not contain a version string"
++        print("version.json does not contain a version string")
+         Exit(1)
+     if 'githash' not in version_data:
+         version_data['githash'] = utils.getGitVersion()
+@@ -519,7 +523,7 @@ try:
+ except IOError as e:
+     # If the file error wasn't because the file is missing, error out
+     if e.errno != errno.ENOENT:
+-        print "Error opening version.json: {0}".format(e.strerror)
++        print("Error opening version.json: {0}".format(e.strerror))
+         Exit(1)
+ 
+     version_data = {
+@@ -528,7 +532,7 @@ except IOError as e:
+     }
+ 
+ except ValueError as e:
+-    print "Error decoding version.json: {0}".format(e)
++    print("Error decoding version.json: {0}".format(e))
+     Exit(1)
+ 
+ # Setup the command-line variables
+@@ -598,7 +602,7 @@ def variable_distsrc_converter(val):
+ 
+ variables_files = variable_shlex_converter(get_option('variables-files'))
+ for file in variables_files:
+-    print "Using variable customization file %s" % file
++    print("Using variable customization file %s" % file)
+ 
+ env_vars = Variables(
+     files=variables_files,
 @@ -892,6 +896,7 @@ envDict = dict(BUILD_ROOT=buildDir,
                 INSTALL_DIR=installDir,
                 CONFIG_HEADER_DEFINES={},
@@ -35,6 +80,31 @@ Respect LDFLAGS and CXXFLAGS
                 )
  
  env = Environment(variables=env_vars, **envDict)
+@@ -901,12 +906,12 @@ env.AddMethod(env_os_is_wrapper, 'Target
+ env.AddMethod(env_get_os_name_wrapper, 'GetTargetOSName')
+ 
+ def fatal_error(env, msg, *args):
+-    print msg.format(*args)
++    print(msg.format(*args))
+     Exit(1)
+ 
+ def conf_error(env, msg, *args):
+-    print msg.format(*args)
+-    print "See {0} for details".format(env['CONFIGURELOG'].abspath)
++    print(msg.format(*args))
++    print("See {0} for details".format(env['CONFIGURELOG'].abspath))
+ 
+     Exit(1)
+ 
+@@ -926,7 +931,7 @@ else:
+ env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
+ 
+ if has_option('variables-help'):
+-    print env_vars.GenerateHelpText(env)
++    print(env_vars.GenerateHelpText(env))
+     Exit(0)
+ 
+ unknown_vars = env_vars.UnknownVariables()
 @@ -1029,7 +1034,9 @@ def CheckForProcessor(context, which_arc
  os_macros = {
      "windows": "_WIN32",
@@ -45,6 +115,15 @@ Respect LDFLAGS and CXXFLAGS
      "openbsd": "__OpenBSD__",
      "osx": "__APPLE__",
      "linux": "__linux__",
+@@ -1124,7 +1131,7 @@ else:
+     env['TARGET_ARCH'] = detected_processor
+ 
+ if env['TARGET_OS'] not in os_macros:
+-    print "No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])
++    print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
+ elif not detectConf.CheckForOS(env['TARGET_OS']):
+     env.ConfError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
+ 
 @@ -1360,7 +1367,7 @@ elif env['_LIBDEPS'] == '$_LIBDEPS_LIBS'
  
  libdeps.setup_environment(env, emitting_shared=(link_model.startswith("dynamic")))
diff --git a/databases/mongodb/patches/patch-src_mongo_installer_msi_SConscript b/databases/mongodb/patches/patch-src_mongo_installer_msi_SConscript
new file mode 100644
index 00000000000..85f706357ca
--- /dev/null
+++ b/databases/mongodb/patches/patch-src_mongo_installer_msi_SConscript
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mongo_installer_msi_SConscript,v 1.1 2017/10/08 22:17:06 tnn Exp $
+
+--- src/mongo/installer/msi/SConscript.orig	2017-04-20 21:43:42.000000000 +0000
++++ src/mongo/installer/msi/SConscript
+@@ -69,8 +69,8 @@ else:
+       upgrade_code = '9295A251-1B1F-45FB-96FF-35B57E490613'
+ 
+ if 'msi' in BUILD_TARGETS and msi_edition == 'SSL' and msi_flavor != '2008R2Plus':
+-  print "Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms."
+-  print "You must add --win-version-min=ws08r2 to your scons flags"
++  print("Building the MongoDB SSL MSI is only supported on Windows 2008 R2+ or Windows 7+ platforms.")
++  print("You must add --win-version-min=ws08r2 to your scons flags")
+   exit(1)
+ 
+ if msi_platform == 'x64':
diff --git a/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript b/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript
index 2314d210b65..c418d4d2684 100644
--- a/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript
+++ b/databases/mongodb/patches/patch-src_third__party_wiredtiger_SConscript
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.4 2016/06/17 11:51:08 fhajny Exp $
+$NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.5 2017/10/08 22:17:06 tnn Exp $
 
 * Add NetBSD case.
 
---- src/third_party/wiredtiger/SConscript.orig	2016-06-02 14:46:27.000000000 +0000
+--- src/third_party/wiredtiger/SConscript.orig	2017-04-20 21:43:42.000000000 +0000
 +++ src/third_party/wiredtiger/SConscript
-@@ -51,8 +51,12 @@ elif env.TargetOSIs('solaris'):
+@@ -62,8 +62,12 @@ elif env.TargetOSIs('solaris'):
      # For an explanation of __EXTENSIONS__,
      # see http://docs.oracle.com/cd/E19253-01/816-5175/standards-5/index.html
      env.Append(CPPDEFINES=["__EXTENSIONS__"])
@@ -17,3 +17,12 @@ $NetBSD: patch-src_third__party_wiredtiger_SConscript,v 1.4 2016/06/17 11:51:08
  elif env.TargetOSIs('openbsd'):
      env.Append(CPPPATH=["build_openbsd"])
  elif env.TargetOSIs('linux'):
+@@ -93,7 +97,7 @@ if (VERSION_MAJOR == None or
+     VERSION_MINOR == None or
+     VERSION_PATCH == None or
+     VERSION_STRING == None):
+-    print "Failed to find version variables in " + version_file
++    print("Failed to find version variables in " + version_file)
+     Exit(1)
+ 
+ wiredtiger_includes = """