Index: head/graphics/waffle/Makefile
===================================================================
--- head/graphics/waffle/Makefile
+++ head/graphics/waffle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	waffle
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/
 
@@ -11,25 +11,19 @@
 
 LICENSE=	BSD2CLAUSE
 
-USES=		cmake:outsource compiler:c11 ninja pkgconfig tar:xz
+USES=		cmake:outsource compiler:c11 localbase ninja pkgconfig tar:xz
+USE_GL=		egl gl
 USE_LDCONFIG=	yes
+USE_XORG=	x11 xcb
 
 DOCSDIR=	${PREFIX}/share/doc/waffle1
 
-OPTIONS_DEFINE=	DOCS
-
-USE_XORG=	x11 xcb
-USE_GL=		gl egl
-CFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-
-CMAKE_ARGS+=	-Dwaffle_has_glx=ON
-#CMAKE_ARGS+=	-Dwaffle_has_x11_egl=ON
+CMAKE_ARGS+=	-Dwaffle_has_glx=ON \
+		-Dwaffle_has_x11_egl=ON
 #CMAKE_ARGS+=	-Dwaffle_has_gbm=ON # FIXME: Required udev
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-post-install-DOCS-off:
-	${RM} -rf ${STAGEDIR}${DOCSDIR}
+OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
Index: head/graphics/waffle/distinfo
===================================================================
--- head/graphics/waffle/distinfo
+++ head/graphics/waffle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (waffle-1.5.1.tar.xz) = cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa
-SIZE (waffle-1.5.1.tar.xz) = 178136
+SHA256 (waffle-1.5.2.tar.xz) = d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c
+SIZE (waffle-1.5.2.tar.xz) = 179284
Index: head/graphics/waffle/pkg-plist
===================================================================
--- head/graphics/waffle/pkg-plist
+++ head/graphics/waffle/pkg-plist
@@ -9,7 +9,7 @@
 lib/cmake/Waffle/WaffleConfigVersion.cmake
 lib/libwaffle-1.so
 lib/libwaffle-1.so.0
-lib/libwaffle-1.so.0.5.1
+lib/libwaffle-1.so.0.5.2
 libdata/pkgconfig/waffle-1.pc
 share/cmake/Modules/FindWaffle.cmake
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
@@ -38,4 +38,5 @@
 %%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.3.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.4.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-%%PORTVERSION%%.txt