Index: head/devel/libcutl/Makefile
===================================================================
--- head/devel/libcutl/Makefile	(revision 494546)
+++ head/devel/libcutl/Makefile	(revision 494547)
@@ -1,38 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	libcutl
 PORTVERSION=	1.10.0
 PORTREVISION=	13
 CATEGORIES=	devel
 MASTER_SITES=	http://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
 
 MAINTAINER=	rakuco@FreeBSD.org
 COMMENT=	C++ utility library with generic and independent components
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2
 
 BROKEN_sparc64=	Does not build: cannot configure with boost
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		compiler:c++11-lib libtool
 
 # The checks for external boost and external expat are quite limited and do not
 # add the ${LOCALBASE} paths correctly (libboost.m4 uses wrong paths and
 # libexpat.m4 does nothing at all).
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS=	--disable-static \
 		--with-boost=${LOCALBASE} \
 		--with-external-boost \
 		--with-external-expat \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
+	@${REINPLACE_CMD} -i .c++20 '/doc_DATA/s/version/&.txt/' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
Index: head/devel/libcutl/pkg-plist
===================================================================
--- head/devel/libcutl/pkg-plist	(revision 494546)
+++ head/devel/libcutl/pkg-plist	(revision 494547)
@@ -1,64 +1,64 @@
 include/cutl/compiler/code-stream.hxx
 include/cutl/compiler/code-stream.txx
 include/cutl/compiler/context.hxx
 include/cutl/compiler/context.txx
 include/cutl/compiler/cxx-indenter.hxx
 include/cutl/compiler/cxx-indenter.ixx
 include/cutl/compiler/cxx-indenter.txx
 include/cutl/compiler/sloc-counter.hxx
 include/cutl/compiler/sloc-counter.txx
 include/cutl/compiler/traversal.hxx
 include/cutl/compiler/traversal.txx
 include/cutl/compiler/type-id.hxx
 include/cutl/compiler/type-id.ixx
 include/cutl/compiler/type-id.txx
 include/cutl/compiler/type-info.hxx
 include/cutl/compiler/type-info.ixx
 include/cutl/container/any.hxx
 include/cutl/container/graph.hxx
 include/cutl/container/graph.txx
 include/cutl/container/key.hxx
 include/cutl/container/map-iterator.hxx
 include/cutl/container/multi-index.hxx
 include/cutl/container/pointer-iterator.hxx
 include/cutl/details/config.h
 include/cutl/details/config.hxx
 include/cutl/details/export.hxx
 include/cutl/details/genx/genx.h
 include/cutl/exception.hxx
 include/cutl/fs/auto-remove.hxx
 include/cutl/fs/exception.hxx
 include/cutl/fs/path.hxx
 include/cutl/fs/path.ixx
 include/cutl/fs/path.txx
 include/cutl/meta/answer.hxx
 include/cutl/meta/class-p.hxx
 include/cutl/meta/polymorphic-p.hxx
 include/cutl/meta/remove-c.hxx
 include/cutl/meta/remove-cv.hxx
 include/cutl/meta/remove-p.hxx
 include/cutl/meta/remove-v.hxx
 include/cutl/re.hxx
 include/cutl/re/re.txx
 include/cutl/shared-ptr.hxx
 include/cutl/shared-ptr/base.hxx
 include/cutl/shared-ptr/base.ixx
 include/cutl/shared-ptr/base.txx
 include/cutl/static-ptr.hxx
 include/cutl/xml/exception.hxx
 include/cutl/xml/parser.hxx
 include/cutl/xml/parser.ixx
 include/cutl/xml/parser.txx
 include/cutl/xml/qname.hxx
 include/cutl/xml/serializer.hxx
 include/cutl/xml/serializer.ixx
 include/cutl/xml/value-traits.hxx
 include/cutl/xml/value-traits.txx
 lib/libcutl-1.10.so
 lib/libcutl.so
 libdata/pkgconfig/libcutl.pc
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/version
+%%PORTDOCS%%%%DOCSDIR%%/version.txt