Index: head/devel/cquery/Makefile
===================================================================
--- head/devel/cquery/Makefile	(revision 468561)
+++ head/devel/cquery/Makefile	(revision 468562)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	cquery
-PORTVERSION=	20180213
+PORTVERSION=	20180302
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Highly-scalable, low-latency language server for C/C++/Objective-C
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	llvm-config50:devel/llvm50
-LIB_DEPENDS=	libclang.so:devel/llvm50
+BUILD_DEPENDS=	llvm-config60:devel/llvm60
+LIB_DEPENDS=	libclang.so:devel/llvm60
 
-USES=		waf
+USES=		compiler:c++14-lang waf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cquery-project
 GH_TUPLE=	miloyip:rapidjson:daabb88:rapidjson/third_party/rapidjson \
 		onqtam:doctest:b40b7e7:doctest/third_party/doctest \
 		greg7mdp:sparsepp:1ca7189:sparsepp/third_party/sparsepp \
 		msgpack:msgpack-c:208595b:msgpack/third_party/msgpack-c \
 		emilk:loguru:2c35b5e:loguru/third_party/loguru
 
 PLIST_FILES=	bin/cquery
 
-CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config50
+CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config60
 MAKE_ARGS=	--variant=system
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cquery
 
 .include <bsd.port.mk>
Index: head/devel/cquery/distinfo
===================================================================
--- head/devel/cquery/distinfo	(revision 468561)
+++ head/devel/cquery/distinfo	(revision 468562)
@@ -1,13 +1,13 @@
-TIMESTAMP = 1518578749
-SHA256 (cquery-project-cquery-v20180213_GH0.tar.gz) = 368dda96bf9f2689f0eb6ed4747df62e1fc7deb51f06c23577132dbed70de754
-SIZE (cquery-project-cquery-v20180213_GH0.tar.gz) = 375511
+TIMESTAMP = 1524888709
+SHA256 (cquery-project-cquery-v20180302_GH0.tar.gz) = 273b317f6ad13f29db1e5e14ff7103e8946e6208ab246166ce1afc6f3381d65e
+SIZE (cquery-project-cquery-v20180302_GH0.tar.gz) = 379569
 SHA256 (miloyip-rapidjson-daabb88_GH0.tar.gz) = bb649179af18e19dbc849fcf7902694573d5885a6c8d18f4ee8d64ad77af89bc
 SIZE (miloyip-rapidjson-daabb88_GH0.tar.gz) = 1047783
 SHA256 (onqtam-doctest-b40b7e7_GH0.tar.gz) = 6d954ba4b7de0cc7874257787f7d0cf7bb74087f92b95f6c9204b82eea35bbb2
 SIZE (onqtam-doctest-b40b7e7_GH0.tar.gz) = 2350263
 SHA256 (greg7mdp-sparsepp-1ca7189_GH0.tar.gz) = 8939512469e32ddd79a8ccd56c5713f191a9b3fa0263fad823be56280f1a3690
 SIZE (greg7mdp-sparsepp-1ca7189_GH0.tar.gz) = 122785
 SHA256 (msgpack-msgpack-c-208595b_GH0.tar.gz) = 4bd076f34f06238181d23ba6825bbc22cd50cf6f503f0cddf0485e6ca42edcc4
 SIZE (msgpack-msgpack-c-208595b_GH0.tar.gz) = 461967
 SHA256 (emilk-loguru-2c35b5e_GH0.tar.gz) = 531c6fa7866d4f8de79a6c9425cb466ac2c5e1cafce8eb3427e3716338b5f2bb
 SIZE (emilk-loguru-2c35b5e_GH0.tar.gz) = 196008