svn commit: r461011 - in head/databases: . mongodb36 mongodb36/files
Nikolai Lifanov
lifanov at FreeBSD.org
Mon Feb 5 18:43:22 UTC 2018
Author: lifanov
Date: Mon Feb 5 18:43:20 2018
New Revision: 461011
URL: https://svnweb.freebsd.org/changeset/ports/461011
Log:
re-add databases/mongodb36 - it was not repocopied
Pointyhat to: lifanov
Spotted by: danfe, mat
PR: 224303
Submitted by: dev at dudu.ro
Differential Revision: https://reviews.freebsd.org/D13594
Added:
head/databases/mongodb36/
- copied from r460973, head/databases/mongodb34/
Deleted:
head/databases/mongodb36/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
head/databases/mongodb36/files/patch-src_mongo_db_fts_unicode_string.cpp
head/databases/mongodb36/files/patch-src_mongo_util_net_ssl__manager.cpp
Modified:
head/databases/Makefile
head/databases/mongodb36/Makefile
head/databases/mongodb36/distinfo
head/databases/mongodb36/files/patch-SConstruct
head/databases/mongodb36/files/patch-rpm_mongod.conf
head/databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
head/databases/mongodb36/pkg-descr
head/databases/mongodb36/pkg-plist
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Mon Feb 5 18:26:28 2018 (r461010)
+++ head/databases/Makefile Mon Feb 5 18:43:20 2018 (r461011)
@@ -196,6 +196,7 @@
SUBDIR += mongodb34
SUBDIR += mongodb34-rocks
SUBDIR += mongodb34-tools
+ SUBDIR += mongodb36
SUBDIR += mroonga
SUBDIR += mrtg-mysql-load
SUBDIR += mtools-mongodb
Modified: head/databases/mongodb36/Makefile
==============================================================================
--- head/databases/mongodb34/Makefile Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/Makefile Mon Feb 5 18:43:20 2018 (r461011)
@@ -2,8 +2,7 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
-DISTVERSION= 3.4.9
-PORTREVISION= 2
+DISTVERSION= 3.6.2
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/ \
@@ -11,7 +10,7 @@ MASTER_SITES= https://fastdl.mongodb.org/src/ \
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-MAINTAINER= eric at camachat.org
+MAINTAINER= galu at packetdam.com
COMMENT= Distributed document-oriented "NoSQL" database
# mongodb is AGPLv3, C++ driver is APACHE20
@@ -21,19 +20,21 @@ LICENSE_COMB= multi
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)"
-LIB_DEPENDS= libpcre.so:devel/pcre \
- libsnappy.so:archivers/snappy \
- libboost_system.so:devel/boost-libs
-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
- ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}typing>=3.6.2:devel/py-typing@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+LIB_DEPENDS= libboost_system.so:devel/boost-libs \
+ libpcre.so:devel/pcre \
+ libsnappy.so:archivers/snappy
CONFLICTS_BUILD= mongo-cxx-driver
+CONFLICTS_INSTALL= mongodb[32-4]*
-CHOSEN_COMPILER_TYPE= clang
-
-USES= compiler:c++14-lang cpe python:build scons
+USES= compiler:c++14-lang cpe python:build scons shebangfix
USE_RC_SUBR= mongod
+SHEBANG_FILES= src/mongo/installer/compass/install_compass.in
+python_OLD_CMD= @python_interpreter@
MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \
--use-system-pcre --use-system-snappy \
--use-system-boost --use-system-zlib \
@@ -57,7 +58,6 @@ SSL_USES= ssl
SSL_MAKE_ARGS= --ssl
ALL_TARGET= core
-TEST_TARGET= unittests
PORTSCOUT= limitw:1,even
@@ -68,11 +68,5 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
.endfor
${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
-
-do-test:
- @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\
- ${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\
- --suites=unittests --jobs=${MAKE_JOBS_NUMBER}
.include <bsd.port.mk>
Modified: head/databases/mongodb36/distinfo
==============================================================================
--- head/databases/mongodb34/distinfo Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/distinfo Mon Feb 5 18:43:20 2018 (r461011)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507229382
-SHA256 (mongodb-src-r3.4.9.tar.gz) = 2fd0f47a5f9175e71d3d381e81a1b6a2500c9c414dd6ae0940ad6194a0e85549
-SIZE (mongodb-src-r3.4.9.tar.gz) = 39943857
+TIMESTAMP = 1515676780
+SHA256 (mongodb-src-r3.6.2.tar.gz) = 018788bd31d6953e55cda0ad0771d23e6b78e024a8a6404a80a900c67215b0a7
+SIZE (mongodb-src-r3.6.2.tar.gz) = 39999539
Modified: head/databases/mongodb36/files/patch-SConstruct
==============================================================================
--- head/databases/mongodb34/files/patch-SConstruct Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/files/patch-SConstruct Mon Feb 5 18:43:20 2018 (r461011)
@@ -1,7 +1,7 @@
---- SConstruct.orig 2017-06-08 16:11:03 UTC
+--- SConstruct.orig 2018-01-04 23:28:55 UTC
+++ SConstruct
-@@ -929,9 +929,9 @@ if has_option('variables-help'):
- print env_vars.GenerateHelpText(env)
+@@ -922,9 +922,9 @@ if has_option('variables-help'):
+ print(env_vars.GenerateHelpText(env))
Exit(0)
-unknown_vars = env_vars.UnknownVariables()
@@ -13,7 +13,7 @@
def set_config_header_define(env, varname, varval = 1):
env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'):
+@@ -1612,7 +1612,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(
@@ -22,16 +22,16 @@
PROGLINKFLAGS=['-pie'],
)
-@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'):
+@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
"-Wno-unknown-pragmas",
"-Winvalid-pch"] )
# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-- if env.TargetOSIs('linux', 'osx', 'solaris'):
-+ if env.TargetOSIs('linux', 'osx', 'solaris', 'freebsd'):
+- if env.TargetOSIs('linux', 'darwin', 'solaris'):
++ if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
if not has_option("disable-warnings-as-errors"):
env.Append( CCFLAGS=["-Werror"] )
-@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'):
+@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'):
env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
@@ -46,27 +46,3 @@
# Promote linker warnings into errors. We can't yet do this on OS X because its linker considers
# noall_load obsolete and warns about it.
-- if not env.TargetOSIs('osx'):
-- env.Append(
-- LINKFLAGS=[
-- "-Wl,--fatal-warnings",
-- ],
-- )
-+ #if not env.TargetOSIs('osx'):
-+ # env.Append(
-+ # LINKFLAGS=[
-+ # "-Wl,--fatal-warnings",
-+ # ],
-+ # )
-
- mmapv1 = False
- if get_option('mmapv1') == 'auto':
-@@ -2461,7 +2461,7 @@ def doConfigure(myenv):
- }}
- """.format(storage_class)
- context.Message('Checking for storage class {0} '.format(storage_class))
-- ret = context.TryLink(textwrap.dedent(test_body), ".cpp")
-+ ret = context.TryCompile(textwrap.dedent(test_body), ".cpp")
- context.Result(ret)
- return ret
-
Modified: head/databases/mongodb36/files/patch-rpm_mongod.conf
==============================================================================
--- head/databases/mongodb34/files/patch-rpm_mongod.conf Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/files/patch-rpm_mongod.conf Mon Feb 5 18:43:20 2018 (r461011)
@@ -1,22 +1,16 @@
---- rpm/mongod.conf.orig 2017-04-20 21:43:42 UTC
+--- rpm/mongod.conf.orig 2018-01-04 23:28:55 UTC
+++ rpm/mongod.conf
-@@ -1,4 +1,4 @@
--# mongod.conf
-+# mongodb.conf
-
- # for documentation of all options, see:
- # http://docs.mongodb.org/manual/reference/configuration-options/
@@ -7,11 +7,11 @@
systemLog:
destination: file
logAppend: true
- path: /var/log/mongodb/mongod.log
-+ path: /var/db/mongodb/mongod.log
++ path: /var/db/mongodb/mongod.log
# Where and how to store data.
storage:
- dbPath: /var/lib/mongo
-+ dbPath: /var/db/mongodb
++ dbPath: /var/db/mongodb
journal:
enabled: true
# engine:
@@ -26,6 +20,6 @@
fork: true # fork and run in background
- pidFilePath: /var/run/mongodb/mongod.pid # location of pidfile
+ pidFilePath: /var/db/mongodb/mongod.lock # location of pidfile
+ timeZoneInfo: /usr/share/zoneinfo
# network interfaces
- net:
Modified: head/databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
==============================================================================
--- head/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/files/patch-src_mongo_db_repl_oplog__fetcher.cpp Mon Feb 5 18:43:20 2018 (r461011)
@@ -1,9 +1,6 @@
-https://jira.mongodb.org/browse/SERVER-32516
-https://github.com/mongodb/mongo/commit/3c34eda8d8a3
-
---- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC
+--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2018-01-18 12:18:49 UTC
+++ src/mongo/db/repl/oplog_fetcher.cpp
-@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
+@@ -245,7 +245,7 @@ StatusWith<boost::optional<rpc::OplogQue
if (!metadataResult.isOK()) {
return metadataResult.getStatus();
}
Modified: head/databases/mongodb36/pkg-descr
==============================================================================
--- head/databases/mongodb34/pkg-descr Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/pkg-descr Mon Feb 5 18:43:20 2018 (r461011)
@@ -2,4 +2,4 @@ Mongo (from "humongous") is a high-performance, open s
schema-free, document-oriented database. A common name in the
"NOSQL" community.
-WWW: http://www.mongodb.org/
+WWW: https://www.mongodb.com/
Modified: head/databases/mongodb36/pkg-plist
==============================================================================
--- head/databases/mongodb34/pkg-plist Mon Feb 5 13:46:01 2018 (r460973)
+++ head/databases/mongodb36/pkg-plist Mon Feb 5 18:43:20 2018 (r461011)
@@ -1,5 +1,6 @@
- at sample etc/mongodb.conf.sample
+bin/install_compass
bin/mongo
bin/mongod
bin/mongoperf
bin/mongos
+ at sample etc/mongodb.conf.sample
More information about the svn-ports-head
mailing list