Index: head/devel/nlohmann-json/files/patch-libc++7
===================================================================
--- head/devel/nlohmann-json/files/patch-libc++7	(revision 485706)
+++ head/devel/nlohmann-json/files/patch-libc++7	(nonexistent)
@@ -1,126 +0,0 @@
-https://github.com/nlohmann/json/commit/8165707990e4
-
---- include/nlohmann/detail/conversions/from_json.hpp.orig	2018-03-14 20:48:03 UTC
-+++ include/nlohmann/detail/conversions/from_json.hpp
-@@ -70,6 +70,25 @@ void from_json(const BasicJsonType& j, typename BasicJ
-     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
- }
- 
-+template <
-+    typename BasicJsonType, typename CompatibleStringType,
-+    enable_if_t <
-+        is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
-+        not std::is_same<typename BasicJsonType::string_t,
-+                         CompatibleStringType>::value and
-+        std::is_constructible <
-+            BasicJsonType, typename CompatibleStringType::value_type >::value,
-+        int > = 0 >
-+void from_json(const BasicJsonType& j, CompatibleStringType& s)
-+{
-+    if (JSON_UNLIKELY(not j.is_string()))
-+    {
-+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-+    }
-+
-+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-+}
-+
- template<typename BasicJsonType>
- void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
- {
---- include/nlohmann/detail/meta.hpp.orig	2018-03-14 20:48:03 UTC
-+++ include/nlohmann/detail/meta.hpp
-@@ -120,6 +120,16 @@ struct is_compatible_object_type_impl<true, RealType, 
-         std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
- };
- 
-+template<bool B, class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl : std::false_type {};
-+
-+template<class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl<true, RealType, CompatibleStringType>
-+{
-+    static constexpr auto value =
-+        std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
-+};
-+
- template<class BasicJsonType, class CompatibleObjectType>
- struct is_compatible_object_type
- {
-@@ -128,6 +138,15 @@ struct is_compatible_object_type
-                                   has_mapped_type<CompatibleObjectType>,
-                                   has_key_type<CompatibleObjectType>>::value,
-                                   typename BasicJsonType::object_t, CompatibleObjectType >::value;
-+};
-+
-+template<class BasicJsonType, class CompatibleStringType>
-+struct is_compatible_string_type
-+{
-+    static auto constexpr value = is_compatible_string_type_impl <
-+                                  conjunction<negation<std::is_same<void, CompatibleStringType>>,
-+                                  has_value_type<CompatibleStringType>>::value,
-+                                  typename BasicJsonType::string_t, CompatibleStringType >::value;
- };
- 
- template<typename BasicJsonType, typename T>
---- single_include/nlohmann/json.hpp.orig	2018-03-14 20:48:03 UTC
-+++ single_include/nlohmann/json.hpp
-@@ -353,6 +353,16 @@ struct is_compatible_object_type_impl<true, RealType, 
-         std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
- };
- 
-+template<bool B, class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl : std::false_type {};
-+
-+template<class RealType, class CompatibleStringType>
-+struct is_compatible_string_type_impl<true, RealType, CompatibleStringType>
-+{
-+    static constexpr auto value =
-+        std::is_same<typename RealType::value_type, typename CompatibleStringType::value_type>::value;
-+};
-+
- template<class BasicJsonType, class CompatibleObjectType>
- struct is_compatible_object_type
- {
-@@ -363,6 +373,15 @@ struct is_compatible_object_type
-                                   typename BasicJsonType::object_t, CompatibleObjectType >::value;
- };
- 
-+template<class BasicJsonType, class CompatibleStringType>
-+struct is_compatible_string_type
-+{
-+    static auto constexpr value = is_compatible_string_type_impl <
-+                                  conjunction<negation<std::is_same<void, CompatibleStringType>>,
-+                                  has_value_type<CompatibleStringType>>::value,
-+                                  typename BasicJsonType::string_t, CompatibleStringType >::value;
-+};
-+
- template<typename BasicJsonType, typename T>
- struct is_basic_json_nested_type
- {
-@@ -974,6 +993,25 @@ void from_json(const BasicJsonType& j, typename BasicJ
-     {
-         JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-     }
-+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-+}
-+
-+template <
-+    typename BasicJsonType, typename CompatibleStringType,
-+    enable_if_t <
-+        is_compatible_string_type<BasicJsonType, CompatibleStringType>::value and
-+        not std::is_same<typename BasicJsonType::string_t,
-+                         CompatibleStringType>::value and
-+        std::is_constructible <
-+            BasicJsonType, typename CompatibleStringType::value_type >::value,
-+        int > = 0 >
-+void from_json(const BasicJsonType& j, CompatibleStringType& s)
-+{
-+    if (JSON_UNLIKELY(not j.is_string()))
-+    {
-+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-+    }
-+
-     s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
- }
- 

Property changes on: head/devel/nlohmann-json/files/patch-libc++7
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/devel/nlohmann-json/Makefile
===================================================================
--- head/devel/nlohmann-json/Makefile	(revision 485706)
+++ head/devel/nlohmann-json/Makefile	(revision 485707)
@@ -1,36 +1,36 @@
 # Created by: Viacheslav Mikerov <SlavaMikerov@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	json
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.2
-PORTREVISION=	1
+DISTVERSION=	3.3.0
 CATEGORIES=	devel
 PKGNAMEPREFIX=	nlohmann-
 
 MAINTAINER=	SlavaMikerov@gmail.com
 COMMENT=	JSON library for Modern C++
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.MIT
 
 USES=		cmake:outsource compiler:c++11-lib
 USE_GITHUB=	yes
 GH_ACCOUNT=	nlohmann
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 CMAKE_OFF=	JSON_BuildTests
 
 PLIST_FILES=	lib/cmake/nlohmann_json/nlohmann_jsonConfig.cmake \
 		lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake \
 		lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake \
 		include/nlohmann/json.hpp
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DJSON_BuildTests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
Index: head/devel/nlohmann-json/distinfo
===================================================================
--- head/devel/nlohmann-json/distinfo	(revision 485706)
+++ head/devel/nlohmann-json/distinfo	(revision 485707)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522527522
-SHA256 (nlohmann-json-v3.1.2_GH0.tar.gz) = e8fffa6cbdb3c15ecdff32eebf958b6c686bc188da8ad5c6489462d16f83ae54
-SIZE (nlohmann-json-v3.1.2_GH0.tar.gz) = 114293094
+TIMESTAMP = 1540694993
+SHA256 (nlohmann-json-v3.3.0_GH0.tar.gz) = 2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801
+SIZE (nlohmann-json-v3.3.0_GH0.tar.gz) = 114604713