Update to 2.4.7 release and fix build with clang [1].

PR:		ports/182110 [1]
Submitted by:	Florent Peterschmitt <florent@peterschmitt.fr>

7 files changed, 65 insertions, 22 deletions

diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index 073d7a62d86b..7a58a7f60be0 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mongodb
-PORTVERSION=	2.4.6
+PORTVERSION=	2.4.7
 CATEGORIES=	databases net
 MASTER_SITES=	http://downloads.mongodb.org/src/
 DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
@@ -14,11 +14,11 @@ COMMENT=	NOSQL distributed document-oriented database
 LICENSE=	AGPLv3 AL2
 LICENSE_COMB=	multi
 
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
-		pcre:${PORTSDIR}/devel/pcre \
-		snappy:${PORTSDIR}/archivers/snappy
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libsnappy.so:${PORTSDIR}/archivers/snappy
 # boost 1.52 from ports make mongod segfaulting with many tests
-# LIB_DEPENDS+=	boost_system:${PORTSDIR}/devel/boost-libs
+# LIB_DEPENDS+=	libboost_system.so:${PORTSDIR}/devel/boost-libs
 # SCONS_ARGS+=	--use-system-boost
 
 ONLY_FOR_ARCHS=	i386 amd64
@@ -30,7 +30,7 @@ SM_DESC=	Use SpiderMonkey instead of V8 for JavaScript
 TEST_DESC=	Add support for running regression test
 
 USE_SCONS=	yes
-SCONS_ARGS=	--prefix=${PREFIX} --cc=${CC} --cxx=${CXX} \
+SCONS_ARGS=	--prefix=${STAGEDIR}${PREFIX} --cc=${CC} --cxx=${CXX} \
 		--use-system-pcre --use-system-snappy \
 		--full --sharedclient
 
@@ -39,17 +39,14 @@ GROUPS=	mongodb
 
 USE_RC_SUBR=	mongod
 
-USE_LDCONFIG=	yes
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSM}
 SCONS_ARGS+=	--usesm --use-system-sm
-LIB_DEPENDS+=	js:${PORTSDIR}/lang/spidermonkey17
+LIB_DEPENDS+=	libjs.so:${PORTSDIR}/lang/spidermonkey17
 .else
 SCONS_ARGS+=	--usev8 --use-system-v8
-LIB_DEPENDS+=	v8:${PORTSDIR}/lang/v8
+LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8
 .endif
 
 .if ${PORT_OPTIONS:MSSL}
@@ -59,7 +56,7 @@ SCONS_ARGS+=	--ssl
 
 .if ${PORT_OPTIONS:MSASL}
 SCONS_ARGS+=	--use-sasl-client
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
 .if ${PORT_OPTIONS:MTEST}
@@ -73,17 +70,19 @@ SMOKE_TESTS+=	smokeSsl
 SCONS_TARGET=	core tools
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 1000024
+EXTRA_PATCHES=	${PATCHDIR}/clang-patch-src_mongo_db_fts_stemmer.cpp \
+		${PATCHDIR}/clang-patch-src_mongo_platform_unordered_map.h \
+		${PATCHDIR}/clang-patch-src_mongo_platform_unordered_set.h \
+		${PATCHDIR}/clang-patch-src_third_party_s2_hash.h
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's/\["-O3"\]/"${CFLAGS}"/' \
 		${WRKSRC}/SConstruct
 
-post-install:
-	@${LN} -s ${PREFIX}/lib/libmongoclient.so \
-		${PREFIX}/lib/libmongoclient.so.0
-	@if [ ! -f ${PREFIX}/etc/mongodb.conf ]; then \
-		${TOUCH} ${PREFIX}/etc/mongodb.conf ; \
-	fi
-
 .if ${PORT_OPTIONS:MTEST}
 test: build-depends build
 	@cd ${BUILD_WRKSRC} && \
diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo
index 68dfcd2ebf2c..4b657e3a78ea 100644
--- a/databases/mongodb/distinfo
+++ b/databases/mongodb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mongodb-src-r2.4.6.tar.gz) = b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb
-SIZE (mongodb-src-r2.4.6.tar.gz) = 14141660
+SHA256 (mongodb-src-r2.4.7.tar.gz) = 69e3cf697225efa2e6e65f5cfdc31742f3e4b2e069c27d84fc713abe0bf67ca7
+SIZE (mongodb-src-r2.4.7.tar.gz) = 14157198
diff --git a/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp b/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp
new file mode 100644
index 000000000000..baacec4f0d6b
--- /dev/null
+++ b/databases/mongodb/files/clang-patch-src_mongo_db_fts_stemmer.cpp
@@ -0,0 +1,10 @@
+--- src/mongo/db/fts/stemmer.cpp.orig	2013-10-14 09:21:23.732674604 +0000
++++ src/mongo/db/fts/stemmer.cpp	2013-10-14 09:21:35.339894547 +0000
+@@ -16,6 +16,7 @@
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <cstdlib>
+ #include <string>
+ 
+ #include "mongo/db/fts/stemmer.h"
diff --git a/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h b/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h
new file mode 100644
index 000000000000..2881a633fbac
--- /dev/null
+++ b/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_map.h
@@ -0,0 +1,11 @@
+--- src/mongo/platform/unordered_map.h.orig  2013-08-18 18:24:57.000000000 +0000
++++ src/mongo/platform/unordered_map.h       2013-09-15 14:09:09.843821449 +0000
+@@ -48,7 +48,7 @@
+ 
+ namespace mongo {
+ 
+-    using std::tr1::unordered_map;
++    using std::unordered_map;
+ 
+ }  // namespace mongo
+ 
diff --git a/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h b/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h
new file mode 100644
index 000000000000..8c9bd317f648
--- /dev/null
+++ b/databases/mongodb/files/clang-patch-src_mongo_platform_unordered_set.h
@@ -0,0 +1,11 @@
+--- src/mongo/platform/unordered_set.h.orig   2013-09-15 14:05:01.015524128 +0000
++++ src/mongo/platform/unordered_set.h        2013-08-18 18:24:57.000000000 +0000
+@@ -48,7 +48,7 @@
+ 
+ namespace mongo {
+ 
+-    using std::tr1::unordered_set;
++    using std::unordered_set;
+ 
+ }  // namespace mongo
+ 
diff --git a/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h b/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h
new file mode 100644
index 000000000000..b18a9090de9c
--- /dev/null
+++ b/databases/mongodb/files/clang-patch-src_third_party_s2_hash.h
@@ -0,0 +1,13 @@
+--- src/third_party/s2/hash_orig.h	2013-09-15 13:43:35.601932885 +0000
++++ src/third_party/s2/hash.h		2013-09-15 13:43:49.767929768 +0000
+@@ -8,8 +8,8 @@
+ #define hash_set mongo::unordered_set
+ 
+ #if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
+-#define HASH_NAMESPACE_START namespace std { namespace tr1 {
+-#define HASH_NAMESPACE_END }}
++#define HASH_NAMESPACE_START namespace std {
++#define HASH_NAMESPACE_END }
+ #elif defined OS_WINDOWS
+ #define HASH_NAMESPACE_START namespace std {
+ #define HASH_NAMESPACE_END }
diff --git a/databases/mongodb/pkg-plist b/databases/mongodb/pkg-plist
index c7c5a01dd4d6..1af6495bbb68 100644
--- a/databases/mongodb/pkg-plist
+++ b/databases/mongodb/pkg-plist
@@ -389,7 +389,6 @@ include/mongo/util/version.h
 include/mongo/util/winutil.h
 lib/libmongoclient.a
 lib/libmongoclient.so
-lib/libmongoclient.so.0
 @dirrm include/mongo/base
 @dirrm include/mongo/bson/util
 @dirrm include/mongo/bson