svn commit: r448014 - in head/databases/mongodb34-rocks: . files

Tue Aug 15 21:30:05 UTC 2017

Author: ultima
Date: Tue Aug 15 21:30:03 2017
New Revision: 448014
URL: https://svnweb.freebsd.org/changeset/ports/448014

Log:
  * Updated to 3.4.6
  * Cleanup Makefile
  * Added CONFLICTS to solves compatibility with the version of databases/rocksdb
  
  PR:		220847
  Submitted by:	Šimun Mikecin (maintainer)
  Reviewed by:	matthew (mentor)
  Approved by:	matthew (mentor)
  Differential Revision:	https://reviews.freebsd.org/D12031

Added:
  head/databases/mongodb34-rocks/pkg-message   (contents, props changed)
Modified:
  head/databases/mongodb34-rocks/Makefile
  head/databases/mongodb34-rocks/distinfo
  head/databases/mongodb34-rocks/files/patch-SConstruct

Modified: head/databases/mongodb34-rocks/Makefile
==============================================================================

--- head/databases/mongodb34-rocks/Makefile	Tue Aug 15 21:21:47 2017	(r448013)
+++ head/databases/mongodb34-rocks/Makefile	Tue Aug 15 21:30:03 2017	(r448014)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb
-PORTVERSION=	3.4.4
+PORTVERSION=	3.4.6
 DISTVERSIONPREFIX=	r
-PORTREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
@@ -19,6 +18,9 @@ COMMENT=	Distributed document-oriented database with a
 LICENSE=	AGPLv3 APACHE20
 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 \
@@ -27,51 +29,48 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
 		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo
 
-CHOSEN_COMPILER_TYPE=	clang
-
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
-
-CONFLICTS_BUILD=	mongo-cxx-driver
-OPTIONS_DEFINE=		SASL SSL
-OPTIONS_DEFAULT=	SASL SSL
-
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS=		--use-sasl-client
-
-SSL_USE=	yes
-SSL_MAKE_ARGS=	--ssl
-
 USES=		compiler:c++14-lang cpe execinfo python:build scons
+USE_RC_SUBR=	mongod \
+		mongos
+
 USE_GITHUB=	nodefault
 GH_TUPLE=	mongodb-partners:mongo-rocks:r${PORTVERSION}:module/src/mongo/db/modules/rocks
 
+CHOSEN_COMPILER_TYPE=	clang
+CXXSTD=		c++14
+
+CONFLICTS_BUILD=	mongo-cxx-driver
+CONFLICTS_INSTALL=	mongodb \
+			mongodb32 \
+			mongodb34
+
 WITH_DEBUG=yes
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
 		--use-system-pcre --use-system-snappy \
 		--use-system-boost --use-system-zlib \
-		--cxx-std=14 --libc++ \
-		--runtime-hardening=on \
+		--libc++ --runtime-hardening=on \
 		--disable-warnings-as-errors \
 		VERBOSE=on
 
 USERS=	mongodb
 GROUPS=	mongodb
 
-USE_RC_SUBR=	mongod \
-		mongos
+PORTSCOUT=	limitw:1,even
 
-ALL_TARGET=	core
-TEST_TARGET=	unittests
+CPE_PRODUCT=	mongodb
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=		SASL SSL
+OPTIONS_DEFAULT=	SASL SSL
 
-.if ${PORT_OPTIONS:MSSL}
-USES+=	ssl
-.endif
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_MAKE_ARGS=		--use-sasl-client
 
-.include <bsd.port.pre.mk>
+SSL_MAKE_ARGS=	--ssl
+SSL_USES=	ssl
 
+ALL_TARGET=	core
+TEST_TARGET=	unittests
+
 post-install:
 .for f in mongo mongod mongoperf mongos
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
@@ -84,8 +83,4 @@ do-test:
 		${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\
 		--suites=unittests --jobs=${MAKE_JOBS_NUMBER}
 
-PORTSCOUT=	limitw:1,even
-
-CPE_PRODUCT=	mongodb
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/mongodb34-rocks/distinfo
==============================================================================
--- head/databases/mongodb34-rocks/distinfo	Tue Aug 15 21:21:47 2017	(r448013)
+++ head/databases/mongodb34-rocks/distinfo	Tue Aug 15 21:30:03 2017	(r448014)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1496741213
-SHA256 (mongodb-src-r3.4.4.tar.gz) = 09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6
-SIZE (mongodb-src-r3.4.4.tar.gz) = 39867133
-SHA256 (mongodb-partners-mongo-rocks-r3.4.4_GH0.tar.gz) = ec8ca07013672dad538b0e64c7645fa61ce2f464f8912d412fc89e7649dc3fdc
-SIZE (mongodb-partners-mongo-rocks-r3.4.4_GH0.tar.gz) = 56756
+TIMESTAMP = 1500297969
+SHA256 (mongodb-src-r3.4.6.tar.gz) = 8170360f6dfede9c19c131f3d76831e952b3f1494925aa7e2a3a2f95b58ad901
+SIZE (mongodb-src-r3.4.6.tar.gz) = 39922209
+SHA256 (mongodb-partners-mongo-rocks-r3.4.6_GH0.tar.gz) = 08535859da87f2223a546f8f6b9c498e20cebf80eab00cc9cfbe072743cd6f8f
+SIZE (mongodb-partners-mongo-rocks-r3.4.6_GH0.tar.gz) = 58872

Modified: head/databases/mongodb34-rocks/files/patch-SConstruct
==============================================================================
--- head/databases/mongodb34-rocks/files/patch-SConstruct	Tue Aug 15 21:21:47 2017	(r448013)
+++ head/databases/mongodb34-rocks/files/patch-SConstruct	Tue Aug 15 21:30:03 2017	(r448014)
@@ -1,4 +1,4 @@
---- SConstruct.orig	2017-04-20 21:43:42 UTC
+--- SConstruct.orig	2017-06-08 16:11:03 UTC
 +++ SConstruct
 @@ -929,9 +929,9 @@ if has_option('variables-help'):
      print env_vars.GenerateHelpText(env)
@@ -70,3 +70,11 @@
          context.Result(ret)
          return ret
  
+@@ -2645,6 +2645,7 @@ def doConfigure(myenv):
+ 
+         conf = Configure(myenv, custom_tests = {
+             'CheckPThreadSetNameNP': CheckPThreadSetNameNP,
++            'CheckBoostMinVersion': CheckBoostMinVersion,
+         })
+ 
+         if conf.CheckPThreadSetNameNP():

Added: head/databases/mongodb34-rocks/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mongodb34-rocks/pkg-message	Tue Aug 15 21:30:03 2017	(r448014)
@@ -0,0 +1,4 @@
+To use RocksDB please use "rocksdb" as a name for a Storage Engine.
+
+For more options use:
+mongod --help
