Index: head/devel/cquery/Makefile
===================================================================
--- head/devel/cquery/Makefile	(revision 490542)
+++ head/devel/cquery/Makefile	(revision 490543)
@@ -1,40 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	cquery
 PORTVERSION=	20180718
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Highly-scalable, low-latency language server for C/C++/Objective-C
 
 LICENSE=	MIT
 
 BROKEN_powerpc64=	fails to build: Checking for 'clang++' (C++ compiler): not found
 
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LIB_DEPENDS=	libclang.so.${LLVM_DEFAULT:C/[0-9]$//}:devel/llvm${LLVM_DEFAULT}
 
 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:6bf94c:loguru/third_party/loguru \
 		zeux:pugixml:24a7064:pugixml/third_party/pugixml
 
-LLVM_DEFAULT?=	60
-
 PLIST_FILES=	bin/cquery
 
 CONFIGURE_ARGS=	--variant=system --llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
 MAKE_ARGS=	--variant=system
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cquery
 
 .include <bsd.port.mk>
Index: head/security/afl/Makefile
===================================================================
--- head/security/afl/Makefile	(revision 490542)
+++ head/security/afl/Makefile	(revision 490543)
@@ -1,90 +1,85 @@
 # Created by: Fabian Keil <fk@fabiankeil.de>
 # $FreeBSD$
 
 PORTNAME=	afl
 PORTVERSION=	2.52
 DISTVERSIONSUFFIX=	b
 PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://lcamtuf.coredump.cx/afl/releases/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Fast instrumented fuzzer
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 # In theory afl supports other architectures with the LLVM plugin.
 # It has to be compiled with AFL_NO_X86=1 in that case.
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Uses binary instrumentation
 
 USES=	gmake tar:tgz
 
 ALL_TARGET=	all libdislocator
 TEST_TARGET=	test_build
 
 OPTIONS_DEFINE=	DEBUG DOCS LLVM
 OPTIONS_DEFAULT=	LLVM
 OPTIONS_SUB=	yes
 
 LLVM_DESC=	LLVM-based instrumentation
 
-# You have implicit approval to bump the LLVM version here as long as
-# it builds WITH=LLVM and `make test` passes on all supported
-# releases.
-LLVM_DEFAULT?= 70
-
 LLVM_ALL_TARGET=	llvm_mode
 LLVM_BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LLVM_RUN_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 LLVM_TEST_TARGET=	test_llvm_mode
 LLVM_MAKE_ARGS=		LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
 LLVM_VARS=	CC=clang${LLVM_DEFAULT} CXX=clang++${LLVM_DEFAULT}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 # Clang i386 emits .cfi_sections which base as(1) doesn't understand
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 .endif
 
 post-patch:
 # Disable the instrumentation tests to make sure building packages in
 # jails works by default.  afl needs shmget() which usually isn't
 # available in jails.
 	@${REINPLACE_CMD} 's@^\(all.*\) test_build@\1@' \
 		${WRKSRC}/Makefile ${WRKSRC}/llvm_mode/Makefile
 .if ${ARCH} == "i386"
 	@${REINPLACE_CMD} 's@\(  as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \
 		${WRKSRC}/afl-as.c
 .endif
 	@${CAT} ${FILESDIR}/Makefile.extra >> ${WRKSRC}/Makefile
 
 post-patch-LLVM-on:
 	@${REINPLACE_CMD} \
 		-e 's|"clang"|"clang${LLVM_DEFAULT}"|g' \
 		-e 's|"clang\+\+"|"clang\+\+${LLVM_DEFAULT}"|g' \
 		${WRKSRC}/llvm_mode/afl-clang-fast.c
 
 post-install:
 .for script in afl-cmin afl-plot afl-whatsup
 	${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-as
 .for prog in afl-analyze afl-fuzz afl-gcc afl-gotcpu afl-showmap afl-tmin
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${prog}
 .endfor
 	${INSTALL_LIB} ${WRKSRC}/libdislocator/libdislocator.so \
 		${STAGEDIR}${PREFIX}/lib/afl
 	${INSTALL_DATA} ${WRKSRC}/libdislocator/README.dislocator \
 		${STAGEDIR}${DOCSDIR}
 
 post-install-LLVM-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/afl/afl-llvm-pass.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/afl-clang-fast
 	${INSTALL_DATA} ${WRKSRC}/llvm_mode/README.llvm \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>