Index: devel/rapidjson/Makefile
===================================================================
--- devel/rapidjson/Makefile
+++ devel/rapidjson/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	rapidjson
 PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel textproc
 
-MAINTAINER=	yuri@rawbw.com
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast JSON parser/generator for C++ with both SAX/DOM style API
 
 LICENSE=	unknown
@@ -15,8 +15,6 @@
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_armv7=		does not build: include/rapidjson/internal/../allocators.h:128:36: error: zero as null pointer constant
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	miloyip
 
@@ -30,12 +28,17 @@
 DOXYGEN_CMAKE_BOOL=	RAPIDJSON_BUILD_DOC
 EXAMPLES_CMAKE_BOOL=	RAPIDJSON_BUILD_EXAMPLES
 
-CXXFLAGS+=	-Wno-c++98-compat # for EXAMPLES option, due to this bug: https://github.com/miloyip/rapidjson/issues/761
-CMAKE_ARGS=	-DRAPIDJSON_BUILD_TESTS:BOOL=OFF
-
 DATADIR=	${PREFIX}/share/doc/RapidJSON
 PORTDATA=	*
 
+.include <bsd.port.pre.mk>
+
+CXXFLAGS+=	-Wno-c++98-compat # for EXAMPLES option, due to this bug: https://github.com/miloyip/rapidjson/issues/761
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 50
+CXXFLAGS+=	-Wno-zero-as-null-pointer-constant
+.endif
+CMAKE_ARGS+=	-DRAPIDJSON_BUILD_TESTS:BOOL=OFF
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|DOC_INSTALL_DIR}/examples"|CMAKE_INSTALL_PREFIX}/share/examples/${PORTNAME}"| ; s| -march=native||' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/example/CMakeLists.txt ${WRKSRC}/test/unittest/CMakeLists.txt
@@ -45,4 +48,4 @@
 post-install:
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/CMake*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: devel/rapidjson/files/patch-include_rapidjson_schema.h
===================================================================
--- /dev/null
+++ devel/rapidjson/files/patch-include_rapidjson_schema.h
@@ -0,0 +1,10 @@
+--- include/rapidjson/schema.h.orig	2016-08-25 07:59:05 UTC
++++ include/rapidjson/schema.h
+@@ -379,7 +379,6 @@ class Schema { (public)
+         exclusiveMinimum_(false),
+         exclusiveMaximum_(false)
+     {
+-        typedef typename SchemaDocumentType::ValueType ValueType;
+         typedef typename ValueType::ConstValueIterator ConstValueIterator;
+         typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
+