--- /usr/local/poudriere/ports/default/benchmarks/bonnie++/Makefile	2014-04-28 11:39:52.000000000 +0000
+++ /usr/local/poudriere/ports/default/benchmarks/bonnie++/Makefile	2014-05-09 14:04:33.164637103 +0000
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	bonnie++
 PORTVERSION=	1.97
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/bonnie++/experimental/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +15,7 @@ 
 
 GNU_CONFIGURE=	yes
 
-USES=	shebangfix
+USES=	shebangfix compiler
 SHEBANG_FILES=	bon_csv2txt.in
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-1.97.1
@@ -24,6 +24,16 @@ 
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+# XXX Only builds with clang and base gcc (4.2.1)
+.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} >= 46
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang33:${PORTSDIR}/lang/clang33
+CPP=	${LOCALBASE}/bin/clang-cpp33
+CC=	${LOCALBASE}/bin/clang33
+CXX=	${LOCALBASE}/bin/clang++33
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} \
 		's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8
@@ -34,4 +44,4 @@ 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>