Index: head/databases/mongodb32/Makefile
===================================================================
--- head/databases/mongodb32/Makefile	(revision 408632)
+++ head/databases/mongodb32/Makefile	(revision 408633)
@@ -1,65 +1,86 @@
 # Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
 # $FreeBSD$
 
 PORTNAME=	mongodb32
 PORTVERSION=	3.2.1
 DISTVERSIONPREFIX=	r
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
 		http://download.mongodb.org/src/
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${PORTVERSION}
 
 MAINTAINER=	brendan+freebsd@bbqsrc.net
-COMMENT=	NOSQL distributed document-oriented database
+COMMENT=	Distributed document-oriented "NoSQL" database
 
 # mongodb is AGPLv3, C++ driver is APACHE20
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		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=	SASL SSL
-OPTIONS_DEFAULT=SSL
+OPTIONS_DEFINE=		SASL SSL WIREDTIGER
+OPTIONS_DEFAULT=	SSL WIREDTIGER
 
+# Only supported on 64-bit
+OPTIONS_EXCLUDE_i386=	WIREDTIGER
+
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-SASL_MAKE_ARGS=	--use-sasl-client
+SASL_MAKE_ARGS=		--use-sasl-client
 
 SSL_USE=	openssl=yes
 SSL_MAKE_ARGS=	--ssl
 
+WIREDTIGER_DESC=	WiredTiger database engine support
+WIREDTIGER_VARS=	wiredtiger_build=on
+WIREDTIGER_VARS_OFF=	wiredtiger_build=off
+
 USES=		cpe execinfo python:build scons
+
 MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
+		--wiredtiger=${WIREDTIGER_BUILD} \
 		--use-system-pcre --use-system-snappy \
 		--release
 
 USERS=	mongodb
 GROUPS=	mongodb
 
 USE_RC_SUBR=	mongod
 
 ALL_TARGET=	core
 TEST_TARGET=	unittests
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+WIREDTIGER_BUILD=	off
+.endif
+
+.if ${OSVERSION} < 1000000
+# Cannot be built
+IGNORE=	unsupported on FreeBSD 9 or older
+.endif
+
 post-install:
 .for f in mongo mongod mongoperf mongos mongosniff
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 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}
 
 PORTSCOUT=	limitw:1,even
 
 CPE_PRODUCT=	mongodb
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/databases/mongodb32-tools/Makefile
===================================================================
--- head/databases/mongodb32-tools/Makefile	(revision 408632)
+++ head/databases/mongodb32-tools/Makefile	(revision 408633)
@@ -1,65 +1,73 @@
 # Created by: Brendan Molloy <brendan+freebsd@bbqsrc.net>
 # $FreeBSD$
 
 PORTNAME=	mongodb32-tools
 PORTVERSION=	3.2.1
 DISTVERSIONPREFIX=	r
+PORTREVISION=	1
 CATEGORIES=	databases net
 
 MAINTAINER=	brendan+freebsd@bbqsrc.net
 COMMENT=	Tools for MongoDB
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	go>0:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
 GH_PROJECT=	mongo-tools
 
 OPTIONS_DEFINE=	SSL SASL
 OPTIONS_DEFAULT=	SSL
 
 SASL_USE=	my_tags=sasl
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
 SSL_USE=	openssl=yes my_tags=ssl
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
 
 STRIP=		# Stripping can break go binaries
 
 # Go is not our friend. Without below, ignores user-supplied flags.
 MAKE_CMD=	${LOCALBASE}/bin/go build
 MAKE_ENV=	GOPATH="${WRKSRC}/.gopath:${WRKSRC}/vendor" \
 		CGO_CFLAGS="${CFLAGS}" CGO_CPPFLAGS="${CPPFLAGS}" \
 		CGO_CXXFLAGS="${CXXFLAGS}" CGO_LDFLAGS="${LDFLAGS}"
 
 USES=	localbase
 MY_TAGS=	-tags "${USE_MY_TAGS}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000000
+# Cannot be built
+IGNORE=	unsupported on FreeBSD 9 or older
+.endif
+
 post-patch:
 	@cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \
 		${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 
 do-build:
 .for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		-o ${WRKSRC}/bin/${x} ${MY_TAGS}\
 		-ldflags "-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/common/options.Gitspec=${GH_TAGNAME}"\
 		${WRKSRC}/${x}/main/${x}.go
 .endfor
 
 do-install:
 .for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for x in LICENSE.md README.md THIRD-PARTY-NOTICES
 	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>