Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 23 Jan 2016 12:46:58 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406969 - in head/databases/mongodb32: . files
Message-ID:  <201601231246.u0NCkwSx001975@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Sat Jan 23 12:46:58 2016
New Revision: 406969
URL: https://svnweb.freebsd.org/changeset/ports/406969

Log:
  Add a port for mongodb version 3.2.
  
  PR:		205510
  Submitted by:	Brendan Molloy <brendan+freebsd@bbqsrc.net>
  Maintainer of databases/mongodb port timeout (3 weeks)
  
  I bumped version to 3.2.1.
  
  mongodb32-tools port coming soon.

Added:
  head/databases/mongodb32/
     - copied from r406966, head/databases/mongodb/
Deleted:
  head/databases/mongodb32/files/patch-src_mongo_SConscript
  head/databases/mongodb32/files/patch-src_mongo_db_kill_current_op.cpp
  head/databases/mongodb32/files/patch-src_mongo_db_ops_modifier_push.cpp
  head/databases/mongodb32/files/patch-src_third_party_boost_libs_filesystem_v3_src_path.cpp
Modified:
  head/databases/mongodb32/Makefile
  head/databases/mongodb32/distinfo
  head/databases/mongodb32/files/patch-SConstruct
  head/databases/mongodb32/pkg-plist

Modified: head/databases/mongodb32/Makefile
==============================================================================
--- head/databases/mongodb/Makefile	Sat Jan 23 11:23:17 2016	(r406966)
+++ head/databases/mongodb32/Makefile	Sat Jan 23 12:46:58 2016	(r406969)
@@ -1,13 +1,16 @@
-# Created by: Mirko Zinn <mail@derzinn.de>
+# Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
 # $FreeBSD$
 
-PORTNAME=	mongodb
-PORTVERSION=	2.6.7
+PORTNAME=	mongodb32
+PORTVERSION=	3.2.1
+DISTVERSIONPREFIX=	r
 CATEGORIES=	databases net
-MASTER_SITES=	http://downloads.mongodb.org/src/
-DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
+MASTER_SITES=	https://fastdl.mongodb.org/src/ \
+		http://fastdl.mongodb.org/src/ \
+		http://download.mongodb.org/src/
+DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION}
 
-MAINTAINER=	ale@FreeBSD.org
+MAINTAINER=	brendan+freebsd@bbqsrc.net
 COMMENT=	NOSQL distributed document-oriented database
 
 # mongodb is AGPLv3, C++ driver is APACHE20
@@ -15,64 +18,48 @@ LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libsnappy.so:${PORTSDIR}/archivers/snappy \
-		libv8.so:${PORTSDIR}/lang/v8 \
-# boost 1.52/1.55 from ports make mongod segfaulting with many tests
-# LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
-# MAKE_ARGS+=	--use-system-boost
-# use bundled yaml
-# MAKE_ARGS+=	--use-system-yaml
-# LIB_DEPENDS+=	libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+		libsnappy.so:${PORTSDIR}/archivers/snappy
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.11:${PORTSDIR}/devel/py-yaml \
+		${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:${PORTSDIR}/databases/pymongo
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
 
-OPTIONS_DEFINE=	SSL SASL TEST
+OPTIONS_DEFINE=	SASL SSL
 OPTIONS_DEFAULT=SSL
-TEST_DESC=	Add support for running regression test
 
-USES=		cpe execinfo scons
-MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} --cc=${CC} --cxx=${CXX} \
-		--use-system-pcre --use-system-snappy --use-system-v8
+SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
+SASL_MAKE_ARGS=	--use-sasl-client
+
+SSL_USE=	openssl=yes
+SSL_MAKE_ARGS=	--ssl
+
+USES=		cpe execinfo python:build scons
+MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
+		--use-system-pcre --use-system-snappy \
+		--release
 
 USERS=	mongodb
 GROUPS=	mongodb
 
 USE_RC_SUBR=	mongod
 
-PORTSCOUT=	limitw:1,even
-
-.include <bsd.port.options.mk>
+ALL_TARGET=	core
+TEST_TARGET=	unittests
 
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-MAKE_ARGS+=	--ssl
-.endif
-
-.if ${PORT_OPTIONS:MSASL}
-MAKE_ARGS+=	--use-sasl-client
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-.endif
-
-.if ${PORT_OPTIONS:MTEST}
-USES+=		python:build
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:${PORTSDIR}/databases/pymongo
-TEST_TARGET=	smokeAll smokeCppUnittests
-.	if ${PORT_OPTIONS:MSSL}
-TEST_TARGET+=	smokeSsl
-.	endif
-.else
-ALL_TARGET=	core tools
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/\["-O3"\]/"${CXXFLAGS}"/' \
-		${WRKSRC}/SConstruct
+post-install:
+.for f in mongo mongod mongoperf mongos mongosniff
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
 
-.if ${PORT_OPTIONS:MTEST}
-test: build-depends build
+do-test:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET}
-.endif
+		${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${TEST_TARGET} &&\
+		${PYTHON_CMD} ${BUILD_WRKSRC}/buildscripts/resmoke.py\
+		--suites=unittests --jobs=${MAKE_JOBS_NUMBER}
+
+PORTSCOUT=	limitw:1,even
+
+CPE_PRODUCT=	mongodb
 
 .include <bsd.port.mk>

Modified: head/databases/mongodb32/distinfo
==============================================================================
--- head/databases/mongodb/distinfo	Sat Jan 23 11:23:17 2016	(r406966)
+++ head/databases/mongodb32/distinfo	Sat Jan 23 12:46:58 2016	(r406969)
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r2.6.7.tar.gz) = 512254d1adeaf19cc8188032ac75ce01ac114811b5a27ef3a95dc79eeedd6bc9
-SIZE (mongodb-src-r2.6.7.tar.gz) = 14540119
+SHA256 (mongodb-src-r3.2.1.tar.gz) = 50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15
+SIZE (mongodb-src-r3.2.1.tar.gz) = 26397562

Modified: head/databases/mongodb32/files/patch-SConstruct
==============================================================================
--- head/databases/mongodb/files/patch-SConstruct	Sat Jan 23 11:23:17 2016	(r406966)
+++ head/databases/mongodb32/files/patch-SConstruct	Sat Jan 23 12:46:58 2016	(r406969)
@@ -1,11 +1,15 @@
---- SConstruct.orig	2014-05-05 02:29:43.000000000 +0000
-+++ SConstruct	2014-05-12 09:50:56.999470711 +0000
-@@ -843,7 +843,7 @@
-     env.Append( LIBS=[] )
+--- SConstruct.orig	2015-12-02 19:01:34 UTC
++++ SConstruct
+@@ -840,9 +840,9 @@ if has_option('variables-help'):
+     print env_vars.GenerateHelpText(env)
+     Exit(0)
  
-     #make scons colorgcc friendly
--    for key in ('HOME', 'TERM'):
-+    for key in ('HOME', 'TERM', 'PATH', 'CCACHE_DIR'):
-         try:
-             env['ENV'][key] = os.environ[key]
-         except KeyError:
+-unknown_vars = env_vars.UnknownVariables()
+-if unknown_vars:
+-    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
++#unknown_vars = env_vars.UnknownVariables()
++#if unknown_vars:
++#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
+ 
+ def set_config_header_define(env, varname, varval = 1):
+     env['CONFIG_HEADER_DEFINES'][varname] = varval

Modified: head/databases/mongodb32/pkg-plist
==============================================================================
--- head/databases/mongodb/pkg-plist	Sat Jan 23 11:23:17 2016	(r406966)
+++ head/databases/mongodb32/pkg-plist	Sat Jan 23 12:46:58 2016	(r406969)
@@ -1,16 +1,7 @@
 @unexec if [ ! -s %D/etc/mongodb.conf ]; then /bin/rm -f %D/etc/mongodb.conf; fi
 @exec  if [ ! -f %D/etc/mongodb.conf ]; then /usr/bin/touch %D/etc/mongodb.conf; fi
-bin/bsondump
 bin/mongo
 bin/mongod
-bin/mongodump
-bin/mongoexport
-bin/mongofiles
-bin/mongoimport
-bin/mongooplog
 bin/mongoperf
-bin/mongorestore
 bin/mongos
 bin/mongosniff
-bin/mongostat
-bin/mongotop



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601231246.u0NCkwSx001975>