diff --git a/graphics/wrapland/Makefile b/graphics/wrapland/Makefile
index 0b0dd96edc9b..cf6427b44fa4 100644
--- a/graphics/wrapland/Makefile
+++ b/graphics/wrapland/Makefile
@@ -1,32 +1,52 @@
 PORTNAME=	wrapland
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.600.0
+DISTVERSION=	0.601.0
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	d4d703bc4676.patch:-p1 # https://github.com/winft/wrapland/pull/92
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Qt/C++ library wrapping libwayland
 WWW=		https://github.com/winft/wrapland
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		microsoft-gsl>0:devel/microsoft-gsl \
 		wayland-protocols>=1.27:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 RUN_DEPENDS=	microsoft-gsl>0:devel/microsoft-gsl
 
 USES=		cmake:testing gl kde:6 pkgconfig qt:6
 USE_GITHUB=	yes
 USE_GL=		egl
 USE_KDE=	ecm:build
 USE_LDCONFIG=	yes
 USE_QT=		base
 GH_ACCOUNT=	winft
 LDFLAGS+=	-Wl,--as-needed # GL, xkbcommon
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo)
+.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
+USES+=		llvm:min=16,build,export
+PATH:=		${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
+CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CPP="${CPP}"
+
+# XXX Move into separate port and standardize via USES
+GH_TUPLE+=	llvm:llvm-project:llvmorg-16.0.1:libcxx
+CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
+# Don't link against new libc++ as it's not necessary
+#LDFLAGS+=	-nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
+
+pre-configure:	bundled-libcxx
+bundled-libcxx:
+	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
+		-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
+		-DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
+		-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
+	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
+.endif
+.endif # exists(/usr/lib/libc++.so)
+
 .include <bsd.port.mk>
diff --git a/graphics/wrapland/distinfo b/graphics/wrapland/distinfo
index 0483cd981800..540bd657e871 100644
--- a/graphics/wrapland/distinfo
+++ b/graphics/wrapland/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1709033936
-SHA256 (winft-wrapland-v0.600.0_GH0.tar.gz) = 2a07b69b6489c2c83f75c346a3aeecf28cc79a7f5040ace467022f554290287e
-SIZE (winft-wrapland-v0.600.0_GH0.tar.gz) = 562189
-SHA256 (d4d703bc4676.patch) = 5903679438ea0c792a8fba66258c79b9a7f353620279563fe56b565de4e75e70
-SIZE (d4d703bc4676.patch) = 1646
+TIMESTAMP = 1718810495
+SHA256 (winft-wrapland-v0.601.0_GH0.tar.gz) = 46b39f09c3fb8f3effb21955d75f26ea6f79d50f516f7116453c3bc4a3a5eb8b
+SIZE (winft-wrapland-v0.601.0_GH0.tar.gz) = 562166
+SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
+SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803