diff -ruN /usr/ports/devel/cquery/Makefile ./Makefile
--- /usr/ports/devel/cquery/Makefile	2020-03-08 13:01:46.000000000 -0400
+++ ./Makefile	2020-03-08 15:20:18.401056000 -0400
@@ -3,7 +3,7 @@
 PORTNAME=	cquery
 PORTVERSION=	20180718
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 
 MAINTAINER=	henry.hu.sh@gmail.com
@@ -11,13 +11,9 @@
 
 LICENSE=	MIT
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
-BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libclang.so:devel/llvm${LLVM_DEFAULT}
 
-USES=		compiler:c++14-lang python:2.7,build waf
+USES=		compiler:c++14-lang cmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cquery-project
@@ -30,8 +26,8 @@
 
 PLIST_FILES=	bin/cquery
 
-CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
-MAKE_ARGS=	--variant=system
+CMAKE_ON=	SYSTEM_CLANG
+CMAKE_ARGS=	-DCLANG_ROOT=${LOCALBASE}/llvm${LLVM_DEFAULT}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cquery