Index: branches/2018Q2/devel/cxxtools/Makefile
===================================================================
--- branches/2018Q2/devel/cxxtools/Makefile	(revision 468390)
+++ branches/2018Q2/devel/cxxtools/Makefile	(revision 468391)
@@ -1,68 +1,66 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cxxtools
 PORTVERSION=	2.2.1
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of general-purpose C++ classes
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		does not configure: error: check for atomictype failed
-BROKEN_armv6=		does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD"
-BROKEN_armv7=		does not compile: string_view:204:5: error: static_assert failed "Character type of basic_string_view must be a POD"
 BROKEN_mips=		does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section
 BROKEN_mips64=		does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section
 BROKEN_sparc64=		does not configure
 
 USES=		cpe iconv libtool localbase pathfix
 CPE_VENDOR=	tntnet
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64
 PLIST_SUB+=	X86_64_ONLY=""
 .else
 PLIST_SUB+=	X86_64_ONLY="@comment "
 .endif
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386_ONLY=""
 .else
 PLIST_SUB+=	I386_ONLY="@comment "
 .endif
 
 .if (${ARCH} == amd64) || (${ARCH} == i386)
 PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 
 .if ${ARCH} == arm || ${ARCH} == armv6 || ${ARCH} == armv7
 PLIST_SUB+=	ARM_ONLY=""
 .else
 PLIST_SUB+=	ARM_ONLY="@comment "
 .endif
 
 .if ${ARCH} == mips || ${ARCH} == mips64
 PLIST_SUB+=	MIPS_ONLY=""
 .else
 PLIST_SUB+=	MIPS_ONLY="@comment "
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	PPC_ONLY=""
 .else
 PLIST_SUB+=	PPC_ONLY="@comment "
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp
===================================================================
--- branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp	(nonexistent)
+++ branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp	(revision 468391)
@@ -0,0 +1,59 @@
+Regressed by https://reviews.llvm.org/rL297872
+
+In file included from settingswriter.cpp:28:
+In file included from ./settingswriter.h:31:
+In file included from ../include/cxxtools/char.h:32:
+In file included from /usr/include/c++/v1/string:477:
+/usr/include/c++/v1/string_view:211:5: error: static_assert failed due to requirement 'is_pod<value_type>::value' "Character type of basic_string_view must be a POD"
+    static_assert(is_pod<value_type>::value, "Character type of basic_string_view must be a POD");
+    ^             ~~~~~~~~~~~~~~~~~~~~~~~~~
+settingswriter.cpp:42:21: note: in instantiation of template class 'std::__1::basic_string_view<cxxtools::Char, std::__1::char_traits<cxxtools::Char> >' requested here
+            *_os << std::endl;
+                    ^
+
+--- src/settingswriter.cpp.orig	2013-12-26 09:33:48 UTC
++++ src/settingswriter.cpp
+@@ -39,7 +39,7 @@ void SettingsWriter::write(const cxxtools::Serializati
+             String value;
+             it->getValue(value);
+             this->writeEntry( it->name(), value, it->typeName() );
+-            *_os << std::endl;
++            *_os << cxxtools::String(L"\n");
+         }
+         else if( it->category() == cxxtools::SerializationInfo::Object)
+         {
+@@ -49,7 +49,7 @@ void SettingsWriter::write(const cxxtools::Serializati
+                 *_os << cxxtools::String::widen( it->name() ) << cxxtools::String(L" = ");
+                 *_os << cxxtools::String::widen( it->typeName() ) << cxxtools::String(L"{ ");
+                 this->writeParent( *it, "");
+-                *_os << cxxtools::String(L" }") << std::endl;
++                *_os << cxxtools::String(L" }") << cxxtools::String(L"\n");
+                 continue;
+             }
+ 
+@@ -71,14 +71,14 @@ void SettingsWriter::writeParent(const cxxtools::Seria
+             String value;
+             it->getValue(value);
+             this->writeEntry( it->name(), value, it->typeName() );
+-            *_os << std::endl;
++            *_os << cxxtools::String(L"\n");
+         }
+         else if( it->category() == cxxtools::SerializationInfo::Object )
+         {
+             *_os << cxxtools::String::widen( prefix ) << '.' << cxxtools::String::widen( it->name() ) << cxxtools::String(L" = ");
+             *_os<< cxxtools::String::widen( it->typeName() ) << cxxtools::String(L"{ ");
+             this->writeChild(*it);
+-            *_os << cxxtools::String(L" }") << std::endl;
++            *_os << cxxtools::String(L" }") << cxxtools::String(L"\n");
+         }
+     }
+ }
+@@ -157,7 +157,7 @@ void SettingsWriter::writeEntry(const std::string& nam
+ 
+ void SettingsWriter::writeSection(const cxxtools::String& prefix)
+ {
+-    *_os << cxxtools::String(L"[") << prefix << cxxtools::String(L"]") << std::endl;
++    *_os << cxxtools::String(L"[") << prefix << cxxtools::String(L"]") << cxxtools::String(L"\n");
+ }
+ 
+ }

Property changes on: branches/2018Q2/devel/cxxtools/files/patch-src_settingswriter.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 468390)
+++ branches/2018Q2	(revision 468391)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468390