diff -ruN /usr/ports/devel/cquery/distinfo ./distinfo
--- /usr/ports/devel/cquery/distinfo	2018-02-14 10:55:48.447876000 -0500
+++ ./distinfo	2018-04-28 00:11:49.760983000 -0400
@@ -1,6 +1,6 @@
-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
diff -ruN /usr/ports/devel/cquery/Makefile ./Makefile
--- /usr/ports/devel/cquery/Makefile	2018-02-14 10:55:48.447507000 -0500
+++ ./Makefile	2018-04-28 13:52:23.683870000 -0400
@@ -1,7 +1,7 @@
 # $FreeBSD: head/devel/cquery/Makefile 461814 2018-02-14 15:54:50Z lwhsu $
 
 PORTNAME=	cquery
-PORTVERSION=	20180213
+PORTVERSION=	20180302
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -10,8 +10,8 @@
 
 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
 
@@ -25,10 +25,16 @@
 
 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
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
+CXXFLAGS+=	-std=c++1y
+.endif
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cquery
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>