Index: Makefile
===================================================================
--- Makefile	(revision 407196)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	afl
-PORTVERSION=	1.95b
+PORTVERSION=	1.96b
 CATEGORIES=	security
 MASTER_SITES=	http://lcamtuf.coredump.cx/afl/releases/
 
@@ -10,15 +10,15 @@
 COMMENT=	Fast instrumented fuzzer
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 USES=		compiler gmake tar:tgz
 
-OPTIONS_DEFINE=			DEBUG DOCS MINIMIZE_CORPUS \
-				PLOT_SUPPORT TEST_INSTRUMENTATION
+OPTIONS_DEFINE=		DEBUG DOCS MINIMIZE_CORPUS PLOT_SUPPORT TEST_INSTRUMENTATION
 MINIMIZE_CORPUS_DESC=	Install afl-cmin. Adds bash dependency
 PLOT_SUPPORT_DESC=	Support progress plotting. Adds Gnuplot dependency
-TEST_INSTRUMENTATION_DESC=	Execute tests expected to fail in jails
-OPTIONS_DEFAULT=		MINIMIZE_CORPUS PLOT_SUPPORT
+TEST_INSTRUMENTATION_DESC=	Execute tests (expected to fail in jails)
+OPTIONS_DEFAULT=		DOCS MINIMIZE_CORPUS PLOT_SUPPORT
 
 OPTIONS_SUB=	yes
 
@@ -27,8 +27,6 @@
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	Uses binary instrumentation
 
-# XXX replace with bsd.port.options.mk once 8.4-RELEASE is EOL
-# COMPILER_TYPE is defined in .pre without /usr/share/mk/bsd.compiler.mk
 .include <bsd.port.pre.mk>
 
 .if (${COMPILER_TYPE} == "clang" && ${ARCH} == "i386")
@@ -52,7 +50,7 @@
 		-e 's@ afl-(cmin|plot|whatsup) @ @g' \
 		${WRKSRC}/Makefile
 .if (${COMPILER_TYPE} == "clang" && ${ARCH} == "i386")
-	${REINPLACE_CMD} -e 's@\(  as_params\[0\] = "\)@\1${LOCALBASE}/bin/@' \
+	${REINPLACE_CMD} -e 's@\(  as_params\[0\] = afl_as ? afl_as : \)\(.*\)@\1(u8*)"${LOCALBASE}/bin/as";@' \
 		${WRKSRC}/afl-as.c
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 407196)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (afl-1.95b.tgz) = 21ec6bb8c182fd821d25c8b67283f81a632c4f74419c9db5fec0135dd0c9ae2a
-SIZE (afl-1.95b.tgz) = 804542
+SHA256 (afl-1.96b.tgz) = 03beb06f8993dcb37d348e53da19ca9d064c83fcedc9d87b0b506c73c310f27c
+SIZE (afl-1.96b.tgz) = 804864