Index: databases/Makefile =================================================================== --- databases/Makefile (revision 488223) +++ databases/Makefile (working copy) @@ -206,6 +206,7 @@ SUBDIR += mongodb34-tools SUBDIR += mongodb36 SUBDIR += mongodb36-tools + SUBDIR += mongodb40 SUBDIR += mroonga SUBDIR += mrtg-mysql-load SUBDIR += mtools-mongodb Index: databases/mongodb40/Makefile =================================================================== --- databases/mongodb40/Makefile (revision 488223) +++ databases/mongodb40/Makefile (working copy) @@ -2,8 +2,7 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r -DISTVERSION= 3.6.6 -PORTREVISION= 4 +DISTVERSION= 4.0.5 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ \ @@ -26,10 +25,11 @@ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libpcre.so:devel/pcre \ + libcurl.so:ftp/curl \ libsnappy.so:archivers/snappy CONFLICTS_BUILD= mongo-cxx-driver -CONFLICTS_INSTALL= mongodb[32-4]* +CONFLICTS_INSTALL= mongodb[32-6]* USES= compiler:c++14-lang cpe python:2.7,build scons shebangfix USE_RC_SUBR= mongod @@ -71,7 +71,7 @@ CPE_PRODUCT= mongodb post-install: -.for f in mongo mongod mongoperf mongos +.for f in mongo mongod mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample Index: databases/mongodb40/distinfo =================================================================== --- databases/mongodb40/distinfo (revision 488223) +++ databases/mongodb40/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1532785629 -SHA256 (mongodb-src-r3.6.6.tar.gz) = e3b9e30941f314d0b1d89f85af3b1258aa2f72a9df21e44cf4aa08faf262e406 -SIZE (mongodb-src-r3.6.6.tar.gz) = 40391572 +TIMESTAMP = 1545599243 +SHA256 (mongodb-src-r4.0.5.tar.gz) = d967098fc91d105cdb0f400c8b837e5c2795c3638d7720392bc47afb1efe1c10 +SIZE (mongodb-src-r4.0.5.tar.gz) = 49507822 Index: databases/mongodb40/files/mongod.in =================================================================== Index: databases/mongodb40/files/patch-SConstruct =================================================================== --- databases/mongodb40/files/patch-SConstruct (revision 488223) +++ databases/mongodb40/files/patch-SConstruct (working copy) @@ -1,6 +1,6 @@ ---- SConstruct.orig 2018-01-04 23:28:55 UTC -+++ SConstruct -@@ -922,9 +922,9 @@ if has_option('variables-help'): +--- SConstruct.orig 2018-12-13 19:53:46.000000000 +0100 ++++ SConstruct 2018-12-23 22:10:10.927789000 +0100 +@@ -1010,9 +1010,9 @@ print(env_vars.GenerateHelpText(env)) Exit(0) @@ -13,7 +13,7 @@ def set_config_header_define(env, varname, varval = 1): env['CONFIG_HEADER_DEFINES'][varname] = varval -@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'): +@@ -1770,7 +1770,7 @@ # If runtime hardening is requested, then build anything # destined for an executable with the necessary flags for PIE. env.AppendUnique( @@ -22,7 +22,7 @@ PROGLINKFLAGS=['-pie'], ) -@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'): +@@ -1784,7 +1784,7 @@ "-Wno-unknown-pragmas", "-Winvalid-pch"] ) # env.Append( " -Wconversion" ) TODO: this doesn't really work yet @@ -31,16 +31,20 @@ if not has_option("disable-warnings-as-errors"): env.Append( CCFLAGS=["-Werror"] ) -@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'): +@@ -1820,12 +1820,12 @@ env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] ) -- if optBuild: +- if optBuild and not optBuildForSize: - env.Append( CCFLAGS=["-O2"] ) +- elif optBuild and optBuildForSize: +- env.Append( CCFLAGS=["-Os"] ) - else: - env.Append( CCFLAGS=["-O0"] ) -+ #if optBuild: ++ #if optBuild and not optBuildForSize: + # env.Append( CCFLAGS=["-O2"] ) ++ #elif optBuild and optBuildForSize: ++ # env.Append( CCFLAGS=["-Os"] ) + #else: + # env.Append( CCFLAGS=["-O0"] ) Index: databases/mongodb40/files/patch-asio-libc++7 =================================================================== Index: databases/mongodb40/files/patch-boost-1.67 =================================================================== Index: databases/mongodb40/files/patch-rpm_mongod.conf =================================================================== Index: databases/mongodb40/pkg-descr =================================================================== Index: databases/mongodb40/pkg-plist =================================================================== --- databases/mongodb40/pkg-plist (revision 488223) +++ databases/mongodb40/pkg-plist (working copy) @@ -1,6 +1,5 @@ bin/install_compass bin/mongo bin/mongod -bin/mongoperf bin/mongos @sample etc/mongodb.conf.sample