--- Makefile	(revision 436238)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	mongodb
 PORTVERSION=	2.6.12
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	http://downloads.mongodb.org/src/
 DISTNAME=	${PORTNAME}-src-r${PORTVERSION}
@@ -69,6 +70,12 @@ 
 	@${REINPLACE_CMD} 's/\["-O3"\]/"${CXXFLAGS}"/' \
 		${WRKSRC}/SConstruct
 
+post-patch-SSL-on:
+.if ${SSL_DEFAULT:Mlibressl*}
+	@${REINPLACE_CMD} 's/\([ ]*\).*MONGO_HAVE_FIPS_MODE_SET.*/\1pass/' \
+		${WRKSRC}/SConstruct
+.endif
+
 .if ${PORT_OPTIONS:MTEST}
 test: build-depends build
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
--- files/patch-src_mongo_client_connpool.h	(nonexistent)
+++ files/patch-src_mongo_client_connpool.h	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/mongo/client/connpool.h.orig	2017-03-15 08:45:26 UTC
++++ src/mongo/client/connpool.h
+@@ -323,7 +323,7 @@ namespace mongo {
+             return _conn;
+         }
+ 
+-        bool ok() const { return _conn > 0; }
++        bool ok() const { return _conn != nullptr; }
+ 
+         string getHost() const { return _host; }
+ 
--- files/patch-src_mongo_db_client.h	(nonexistent)
+++ files/patch-src_mongo_db_client.h	(working copy)
@@ -0,0 +1,10 @@ 
+--- src/mongo/db/client.h.orig	2017-03-15 08:34:10 UTC
++++ src/mongo/db/client.h
+@@ -260,6 +260,6 @@ namespace mongo {
+         return *c;
+     }
+ 
+-    inline bool haveClient() { return currentClient.get() > 0; }
++    inline bool haveClient() { return currentClient.get() != nullptr; }
+ 
+ };
--- files/patch-src_mongo_db_fts_fts__matcher.cpp	(nonexistent)
+++ files/patch-src_mongo_db_fts_fts__matcher.cpp	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/mongo/db/fts/fts_matcher.cpp.orig	2017-03-15 08:44:40 UTC
++++ src/mongo/db/fts/fts_matcher.cpp
+@@ -128,7 +128,7 @@ namespace mongo {
+          * @param haystack, raw string to be parsed
+          */
+         bool FTSMatcher::_phraseMatches( const string& phrase, const string& haystack ) const {
+-            return strcasestr( haystack.c_str(), phrase.c_str() ) > 0;
++            return strcasestr( haystack.c_str(), phrase.c_str() ) != nullptr;
+         }
+     }
+ }
--- files/patch-src_mongo_db_structure_catalog_namespace.h	(nonexistent)
+++ files/patch-src_mongo_db_structure_catalog_namespace.h	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/mongo/db/structure/catalog/namespace.h.orig	2017-03-15 08:38:13 UTC
++++ src/mongo/db/structure/catalog/namespace.h
+@@ -55,7 +55,7 @@ namespace mongo {
+         bool operator!=(const char *r) const { return strcmp(buf, r) != 0; }
+         bool operator!=(const Namespace& r) const { return strcmp(buf, r.buf) != 0; }
+ 
+-        bool hasDollarSign() const { return strchr( buf , '$' ) > 0;  }
++        bool hasDollarSign() const { return strchr( buf , '$' ) != nullptr;  }
+ 
+         int hash() const; // value returned is always > 0
+ 
--- files/patch-src_mongo_s_d__state.cpp	(nonexistent)
+++ files/patch-src_mongo_s_d__state.cpp	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/mongo/s/d_state.cpp.orig	2017-03-15 09:17:53 UTC
++++ src/mongo/s/d_state.cpp
+@@ -831,7 +831,7 @@ namespace mongo {
+         if ( ! shardingState.hasVersion( ns ) )
+             return false;
+ 
+-        return ShardedConnectionInfo::get(false) > 0;
++        return ShardedConnectionInfo::get(false) != nullptr;
+     }
+ 
+     class UnsetShardingCommand : public MongodShardCommand {
--- files/patch-src_mongo_s_shard.h	(nonexistent)
+++ files/patch-src_mongo_s_shard.h	(working copy)
@@ -0,0 +1,11 @@ 
+--- src/mongo/s/shard.h.orig	2017-03-15 08:45:54 UTC
++++ src/mongo/s/shard.h
+@@ -292,7 +292,7 @@ namespace mongo {
+             _finishedInit = true;
+         }
+         
+-        bool ok() const { return _conn > 0; }
++        bool ok() const { return _conn != nullptr; }
+ 
+         /**
+            this just passes through excpet it checks for stale configs