Index: Makefile
===================================================================
--- Makefile	(revision 448867)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cegui
-PORTVERSION=	0.8.4
-PORTREVISION=	7
+PORTVERSION=	0.8.7
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.8
 
@@ -17,7 +16,7 @@
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
-USES=		compiler:c++11-lib cmake execinfo pkgconfig tar:bzip2
+USES=		compiler:c++11-lib cmake execinfo iconv localbase pkgconfig tar:bzip2
 
 PORTDOCS=	*
 
@@ -24,12 +23,12 @@
 OPTIONS_DEFINE=	FREETYPE PCRE LUA FRIBIDI DOCS
 OPTIONS_GROUP=	XMLPARSER IMAGECODEC RENDERER
 OPTIONS_GROUP_XMLPARSER=	EXPAT XERCES LIBXML2 RAPIDXML TINYXML
-OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE
+OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE SDL2
 OPTIONS_GROUP_RENDERER=	OPENGL OPENGL3 OGRE IRRLICHT
 
 OPTIONS_DEFAULT=	FREETYPE PCRE LUA FRIBIDI PYTHON
 OPTIONS_DEFAULT+=	EXPAT LIBXML2 TINYXML
-OPTIONS_DEFAULT+=	DEVIL FREEIMAGE
+OPTIONS_DEFAULT+=	DEVIL FREEIMAGE SDL2
 OPTIONS_DEFAULT+=	OPENGL OPENGL3 OGRE
 
 OPTIONS_SUB=	yes
@@ -78,6 +77,10 @@
 FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
 FREEIMAGE_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 FREEIMAGE_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
+SDL2_DESC=		SDL2 based ImageCodec module
+SDL2_USE=		SDL=sdl2,image2
+SDL2_CMAKE_ON=		-DCEGUI_BUILD_IMAGECODEC_SDL2=ON
+SDL2_CMAKE_OFF=		-DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
 
 OGRE_DESC=		Ogre3D support
 OGRE_LIB_DEPENDS=	libOgreMain.so:graphics/ogre3d
@@ -88,7 +91,7 @@
 IRRLICHT_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 IRRLICHT_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
 OPENGL_BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
-OPENGL_USE=		GL=gl,glew
+OPENGL_USE=		GL=gl,glew,glu
 OPENGL_CMAKE_ON=	-DCEGUI_BUILD_RENDERER_OPENGL=ON
 OPENGL_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL=OFF
 OPENGL3_DESC=		OpenGL 3+ support (core profile)
Index: distinfo
===================================================================
--- distinfo	(revision 448867)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (cegui-0.8.4.tar.bz2) = b5fcbd548b83045e92c4da413928113be77ebee0117368925e1904b3b957a388
-SIZE (cegui-0.8.4.tar.bz2) = 17894771
+TIMESTAMP = 1503998272
+SHA256 (cegui-0.8.7.tar.bz2) = b351e8957716d9c170612c13559e49530ef911ae4bac2feeb2dacd70b430e518
+SIZE (cegui-0.8.7.tar.bz2) = 18114465
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 448867)
+++ pkg-plist	(working copy)
@@ -60,6 +60,8 @@
 %%DEVIL%%include/cegui-0/CEGUI/ImageCodecModules/DevIL/ImageCodecModule.h
 %%FREEIMAGE%%include/cegui-0/CEGUI/ImageCodecModules/FreeImage/ImageCodec.h
 %%FREEIMAGE%%include/cegui-0/CEGUI/ImageCodecModules/FreeImage/ImageCodecModule.h
+%%SDL2%%include/cegui-0/CEGUI/ImageCodecModules/SDL2/ImageCodec.h
+%%SDL2%%include/cegui-0/CEGUI/ImageCodecModules/SDL2/ImageCodecModule.h
 include/cegui-0/CEGUI/ImageFactory.h
 include/cegui-0/CEGUI/ImageManager.h
 include/cegui-0/CEGUI/InjectedInputReceiver.h
@@ -317,27 +319,28 @@
 %%XERCES%%lib/cegui-0.8/libCEGUIXercesParser.so
 lib/libCEGUIBase-0.so
 lib/libCEGUIBase-0.so.2
-lib/libCEGUIBase-0.so.2.3.0
+lib/libCEGUIBase-0.so.2.4.2
 lib/libCEGUICommonDialogs-0.so
 lib/libCEGUICommonDialogs-0.so.2
-lib/libCEGUICommonDialogs-0.so.2.3.0
+lib/libCEGUICommonDialogs-0.so.2.4.2
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2
-%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.3.0
+%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.4.2
 %%LUA%%lib/libCEGUILuaScriptModule-0.so
 %%LUA%%lib/libCEGUILuaScriptModule-0.so.2
-%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.3.0
+%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.4.2
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so.2
-%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.3.0
+%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.4.2
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2
-%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.3.0
+%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.4.2
 %%IRRLICHT%%libdata/pkgconfig/CEGUI-0-IRRLICHT.pc
 %%LUA%%libdata/pkgconfig/CEGUI-0-LUA.pc
 %%OGRE%%libdata/pkgconfig/CEGUI-0-OGRE.pc
 %%OPENGL%%libdata/pkgconfig/CEGUI-0-OPENGL.pc
 %%OPENGL3%%libdata/pkgconfig/CEGUI-0-OPENGL3.pc
+%%SDL2%%%%LUA_LIBDIR%%/cegui-0.8/%%LUA_LIBDIR%%CEGUISDL2ImageCodec.so
 libdata/pkgconfig/CEGUI-0.pc
 share/cegui-0/animations/GameMenu.anims
 share/cegui-0/animations/example.anims
@@ -418,15 +421,17 @@
 share/cegui-0/layouts/TabPage.layout
 share/cegui-0/layouts/TabPage1.layout
 share/cegui-0/layouts/TabPage2.layout
+share/cegui-0/layouts/TaharezLookOverview.layout
 share/cegui-0/layouts/TextDemo.layout
 share/cegui-0/layouts/TreeDemoTaharez.layout
 share/cegui-0/layouts/VanillaConsole.layout
+share/cegui-0/layouts/VanillaLookOverview.layout
 share/cegui-0/layouts/VanillaWindows.layout
+share/cegui-0/layouts/application_templates.layout
 share/cegui-0/looknfeel/AlfiskoSkin.looknfeel
 share/cegui-0/looknfeel/GameMenu.looknfeel
 share/cegui-0/looknfeel/Generic.looknfeel
 share/cegui-0/looknfeel/HUDDemo.looknfeel
-share/cegui-0/looknfeel/Inherited.looknfeel
 share/cegui-0/looknfeel/InventoryComponents.looknfeel
 share/cegui-0/looknfeel/OgreTray.looknfeel
 share/cegui-0/looknfeel/SampleBrowser.looknfeel