Index: net-im/libquotient/Makefile
===================================================================
--- net-im/libquotient/Makefile
+++ net-im/libquotient/Makefile
@@ -12,7 +12,7 @@
 
 LIB_DEPENDS=	libqt5keychain.so:security/qtkeychain@qt5
 
-USES=		cmake qt:5 tar:xz
+USES=		cmake compiler:c++20-lang qt:5 tar:xz
 USE_QT=		concurrent core gui multimedia network \
 		buildtools:build qmake:build testlib:build
 
@@ -24,10 +24,14 @@
 
 CMAKE_ARGS=	-DQuotient_INSTALL_TESTS=OFF
 
+.include <bsd.port.options.mk>
+
 # Work around compiler bug, see pr: 272285
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
 USES+=		llvm
-CC=		${LLVM_PREFIX}/bin/clang
-CPP=		${LLVM_PREFIX}/bin/clang-cpp
-CXX=		${LLVM_PREFIX}/bin/clang++
+CC=		clang${LLVM_VERSION}
+CXX=		clang++${LLVM_VERSION}
+CPP=		clang-cpp${LLVM_VERSION}
+.endif
 
 .include <bsd.port.mk>