Update to 0.8.4.

Approved by:	oliver

9 files changed, 24 insertions, 162 deletions

diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index d53e32b049e6..e20713f14ef6 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cegui
-PORTVERSION=	0.8.3
-PORTREVISION=	7
+PORTVERSION=	0.8.4
 CATEGORIES=	graphics devel
-MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.8
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	crayzedsgui/CEGUI%20Mk-2/0.8
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Library providing windowing and widgets for graphics APIs
@@ -19,14 +19,14 @@ CMAKE_ENV+=	TOLUA_INC="${LUA_INCDIR}"
 CMAKE_ARGS=	-DCEGUI_SAMPLES_ENABLED:BOOL=OFF \
 		-DCEGUI_BUILD_TESTS=OFF
 USE_LDCONFIG=	yes
-USES=		cmake pathfix pkgconfig compiler:c++11-lib
+USES=		compiler:c++11-lib cmake pathfix pkgconfig tar:bzip2
 
 PORTDOCS=	*
 
 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 CORONA
+OPTIONS_GROUP_IMAGECODEC=	DEVIL FREEIMAGE
 OPTIONS_GROUP_RENDERER=	OPENGL OPENGL3 OGRE IRRLICHT
 
 OPTIONS_DEFAULT=	FREETYPE PCRE LUA FRIBIDI PYTHON
@@ -80,10 +80,6 @@ FREEIMAGE_DESC=		FreeImage based ImageCodec module
 FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:${PORTSDIR}/graphics/freeimage
 FREEIMAGE_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 FREEIMAGE_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
-CORONA_DESC=		Corona based ImageCodec module
-CORONA_LIB_DEPENDS=	libcorona.so:${PORTSDIR}/graphics/corona
-CORONA_CMAKE_ON=	-DCEGUI_BUILD_IMAGECODEC_CORONA=ON
-CORONA_CMAKE_OFF=	-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
 
 OGRE_DESC=		Ogre3D support
 OGRE_LIB_DEPENDS=	libOgreMain.so:${PORTSDIR}/graphics/ogre3d
@@ -105,6 +101,7 @@ OPENGL3_CMAKE_OFF=	-DCEGUI_BUILD_RENDERER_OPENGL3=OFF
 
 # not present in ports/unsupported, but may appear later
 CMAKE_ARGS+=		-DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \
+			-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF \
 			-DCEGUI_BUILD_IMAGECODEC_PVR=OFF \
 			-DCEGUI_BUILD_RENDERER_OPENGLES=OFF \
@@ -129,8 +126,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\$${CEGUI_LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|g' \
 		${WRKSRC}/CMakeLists.txt
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.post.mk>
diff --git a/graphics/cegui/distinfo b/graphics/cegui/distinfo
index e04f1734bcaa..9265cc58994e 100644
--- a/graphics/cegui/distinfo
+++ b/graphics/cegui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cegui-0.8.3.tar.gz) = b0db67c18183bc00c14e63eaa22c93ed2225a24f27bff3386a4127cb3880f11b
-SIZE (cegui-0.8.3.tar.gz) = 19585257
+SHA256 (cegui-0.8.4.tar.bz2) = b5fcbd548b83045e92c4da413928113be77ebee0117368925e1904b3b957a388
+SIZE (cegui-0.8.4.tar.bz2) = 17894771
diff --git a/graphics/cegui/files/patch-CMakeLists.txt b/graphics/cegui/files/patch-CMakeLists.txt
deleted file mode 100644
index a2666afdd6c7..000000000000
--- a/graphics/cegui/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-This is part of a changeset required for the port to build with CMake 3.0.
-See patch-cmake__CEGUIMacros.cmake as well.
-
-# HG changeset patch
-# User Danduk82 <danduk82@hotmail.com>
-# Date 1390065964 -3600
-# Branch v0-8
-# Node ID 320ecd58eb1b3d673eee62a913041f643c50d483
-# Parent  83954df05b3b1b94ada2137ef5d028de54d11818
-A) fixed new CMAKE policy CMP0045 issue in CMakeLists.txt. This feature was introduced recently in this commit: https://gitorious.org/cmake/cmake/commit/73e93400e2efab2096618ff58a5ad68236cd04aa ... Bb) fixed CMAKE problem with cmake/CEGUIMacros.cmake when including the project with ExternalProject_Add() CMAKE feature in a project. I had to escape the '[' and ']' characters because in this way CMAKE was not recognizing those characters. CMAKE version: 2.8.12.
---- ./CMakeLists.txt.orig	2013-12-07 11:37:07.000000000 +0200
-+++ ./CMakeLists.txt	2014-08-29 00:28:26.000000000 +0300
-@@ -6,6 +6,10 @@
-     cmake_policy(SET CMP0017 OLD)
- endif()
- 
-+if (POLICY CMP0045)
-+    cmake_policy(SET CMP0045 OLD)
-+endif()
-+
- set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- include(CEGUIMacros)
- include(CMakeDependentOption)
diff --git a/graphics/cegui/files/patch-cegui__src__CMakeLists.txt b/graphics/cegui/files/patch-cegui__src__CMakeLists.txt
index 1236efcec100..de36d8f4e4c0 100644
--- a/graphics/cegui/files/patch-cegui__src__CMakeLists.txt
+++ b/graphics/cegui/files/patch-cegui__src__CMakeLists.txt
@@ -1,7 +1,7 @@
---- cegui/src/CMakeLists.txt.orig	2013-12-07 13:37:08.000000000 +0400
-+++ cegui/src/CMakeLists.txt	2014-05-13 02:26:12.794972513 +0400
-@@ -91,6 +91,10 @@
-     target_link_libraries(${CEGUI_TARGET_NAME} ${CMAKE_DL_LIBS})
+--- cegui/src/CMakeLists.txt.orig	2014-07-07 07:06:18 UTC
++++ cegui/src/CMakeLists.txt
+@@ -93,6 +93,10 @@ elseif (MINGW)
+     cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CMAKE_DL_LIBS})
  endif()
  
 +if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
diff --git a/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake b/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake
deleted file mode 100644
index 8539a3150b4d..000000000000
--- a/graphics/cegui/files/patch-cmake__CEGUIMacros.cmake
+++ /dev/null
@@ -1,70 +0,0 @@
-These two commits are required for the port to build with CMake 3.0.
-See patch-CMakeLists.txt as well.
-
-# HG changeset patch
-# User Danduk82 <danduk82@hotmail.com>
-# Date 1390065964 -3600
-# Branch v0-8
-# Node ID 320ecd58eb1b3d673eee62a913041f643c50d483
-# Parent  83954df05b3b1b94ada2137ef5d028de54d11818
-A) fixed new CMAKE policy CMP0045 issue in CMakeLists.txt. This feature was introduced recently in this commit: https://gitorious.org/cmake/cmake/commit/73e93400e2efab2096618ff58a5ad68236cd04aa ... Bb) fixed CMAKE problem with cmake/CEGUIMacros.cmake when including the project with ExternalProject_Add() CMAKE feature in a project. I had to escape the '[' and ']' characters because in this way CMAKE was not recognizing those characters. CMAKE version: 2.8.12.
-
-# HG changeset patch
-# User Paul Turner <paul@cegui.org.uk>
-# Date 1402736843 -3600
-# Branch v0-8
-# Node ID 72b84028e58fc307cb2c9749d5cd17fc71059e6a
-# Parent  243fc257b6c94452c13cceb65452a665509669dc
-FIX: switch to 'if test' syntax from 'if [' for shell commands (cmake issues)
---- ./cmake/CEGUIMacros.cmake.orig	2014-08-29 00:28:26.000000000 +0300
-+++ ./cmake/CEGUIMacros.cmake	2014-08-29 00:28:30.000000000 +0300
-@@ -309,33 +309,33 @@
-     endif()
- 
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
-         COMMENT "Removing old Frameworks in ${_TARGET_NAME}.app")
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; rm -rf \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
-         COMMENT "Removing old Resources in ${_TARGET_NAME}.app")
- 
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks\"
-         COMMENT "Creating Frameworks directory ${_TARGET_NAME}.app")
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; mkdir -p \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources\"
-         COMMENT "Creating Resources directory ${_TARGET_NAME}.app")
- 
-     if (NOT ${_STATIC})
-         if (NOT CEGUI_BUILD_SHARED_LIBS_WITH_STATIC_DEPENDENCIES)
-             add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--                COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
-+                COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_PREFIX_PATH}/lib/dynamic/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
-                 COMMENT "Creating ${_ACTIONMSG} dependency libraries in ${_TARGET_NAME}.app")
-         endif()
- 
-         add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--            COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
-+            COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; ce_libglob=\"*${CEGUI_BUILD_SUFFIX}.dylib\"\; else ce_ext=\"\"\; shopt -s extglob\; ce_libglob=\"!\(*${CEGUI_BUILD_SUFFIX}\).dylib\"\; fi\; ${_ACTIONCMD} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$$ce_libglob \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Frameworks/\"
-             COMMENT "Creating ${_ACTIONMSG} built cegui libraries in ${_TARGET_NAME}.app")
-     endif()
- 
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_SOURCE_DIR}/datafiles \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/\"
-         COMMENT "Creating ${_ACTIONMSG} sample datafiles ${_TARGET_NAME}.app")
- 
-     # When CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS is TRUE, this
-@@ -345,7 +345,7 @@
-     # CEGUI_APPLE_SYMLINK_DEPENDENCIES_TO_SAMPLE_APPS to false and the thing
-     # will be copied to the output app bundle instead.
-     add_custom_command(TARGET ${_TARGET_NAME} POST_BUILD 
--        COMMAND if [ x${_CEGUI_BUILD_CONFIG} == xDebug ]\; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\"
-+        COMMAND if test x${_CEGUI_BUILD_CONFIG} == xDebug \; then ce_ext=\"${CEGUI_BUILD_SUFFIX}\"\; else ce_ext=\"\"\; fi\; ${_ACTIONCMD} ${CMAKE_BINARY_DIR}/datafiles/samples \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_TARGET_NAME}$$ce_ext.app/Contents/Resources/datafiles\"
-         COMMENT "Creating ${_ACTIONMSG} samples.xml ${_TARGET_NAME}.app")
- endmacro()
- 
diff --git a/graphics/cegui/files/patch-cmake__FindFreetype.cmake b/graphics/cegui/files/patch-cmake__FindFreetype.cmake
deleted file mode 100644
index 3f034f292d34..000000000000
--- a/graphics/cegui/files/patch-cmake__FindFreetype.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/FindFreetype.cmake.orig	2013-12-07 13:37:10.000000000 +0400
-+++ cmake/FindFreetype.cmake	2014-05-14 02:27:04.594193598 +0400
-@@ -3,8 +3,8 @@
- ################################################################################
- include(FindPackageHandleStandardArgs)
- 
--find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h)
--find_path(FREETYPE_H_PATH_ftconfig NAMES freetype/config/ftconfig.h PATH_SUFFIXES freetype2)
-+find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h PATH_SUFFIXES freetype2)
-+find_path(FREETYPE_H_PATH_ftconfig NAMES config/ftconfig.h PATH_SUFFIXES freetype2)
- find_library(FREETYPE_LIB NAMES freetype2 freetype libfreetype PATH_SUFFIXES dynamic)
- find_library(FREETYPE_LIB_DBG NAMES freetype_d libfreetype_d PATH_SUFFIXES dynamic)
- mark_as_advanced(FREETYPE_H_PATH_ft2build FREETYPE_H_PATH_ftconfig FREETYPE_LIB FREETYPE_LIB_DBG)
diff --git a/graphics/cegui/files/patch-cmake__FindLua51.cmake b/graphics/cegui/files/patch-cmake__FindLua51.cmake
deleted file mode 100644
index 88a712068825..000000000000
--- a/graphics/cegui/files/patch-cmake__FindLua51.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindLua51.cmake.orig	2014-03-11 21:24:37.000000000 +0100
-+++ cmake/FindLua51.cmake	2014-03-11 21:23:43.000000000 +0100
-@@ -4,7 +4,7 @@
- include(FindPackageHandleStandardArgs)
- 
- find_path(LUA_H_PATH NAMES lua.h PATH_SUFFIXES lua5.1 lua51 lua)
--find_library(LUA_LIB NAMES lua5.1 lua51 lua PATH_SUFFIXES dynamic)
-+find_library(LUA_LIB NAMES lua-5.1 lua51 lua PATH_SUFFIXES dynamic)
- find_library(LUA_LIB_DBG NAMES lua5.1_d lua51_d lua_d PATH_SUFFIXES dynamic)
- mark_as_advanced(LUA_H_PATH LUA_LIB LUA_LIB_DBG)
- 
diff --git a/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake b/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake
index 519980a5262c..bf1ef3b092c5 100644
--- a/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake
+++ b/graphics/cegui/files/patch-cmake__FindTOLUAPP.cmake
@@ -1,5 +1,5 @@
---- cmake/FindTOLUAPP.cmake.orig	2014-03-11 21:25:30.000000000 +0100
-+++ cmake/FindTOLUAPP.cmake	2014-03-11 21:28:03.000000000 +0100
+--- cmake/FindTOLUAPP.cmake.orig	2013-04-29 08:26:36 UTC
++++ cmake/FindTOLUAPP.cmake
 @@ -3,9 +3,9 @@
  ################################################################################
  include(FindPackageHandleStandardArgs)
diff --git a/graphics/cegui/pkg-plist b/graphics/cegui/pkg-plist
index ab13a3ca774c..ea9cec9e4c4a 100644
--- a/graphics/cegui/pkg-plist
+++ b/graphics/cegui/pkg-plist
@@ -56,16 +56,10 @@ include/cegui-0/CEGUI/GlobalEventSet.h
 include/cegui-0/CEGUI/IconvStringTranscoder.h
 include/cegui-0/CEGUI/Image.h
 include/cegui-0/CEGUI/ImageCodec.h
-%%CORONA%%include/cegui-0/CEGUI/ImageCodecModules/Corona/ImageCodec.h
-%%CORONA%%include/cegui-0/CEGUI/ImageCodecModules/Corona/ImageCodecModule.h
 %%DEVIL%%include/cegui-0/CEGUI/ImageCodecModules/DevIL/ImageCodec.h
 %%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
-include/cegui-0/CEGUI/ImageCodecModules/STB/ImageCodec.h
-include/cegui-0/CEGUI/ImageCodecModules/STB/ImageCodecModule.h
-include/cegui-0/CEGUI/ImageCodecModules/TGA/ImageCodec.h
-include/cegui-0/CEGUI/ImageCodecModules/TGA/ImageCodecModule.h
 include/cegui-0/CEGUI/ImageFactory.h
 include/cegui-0/CEGUI/ImageManager.h
 include/cegui-0/CEGUI/InjectedInputReceiver.h
@@ -116,20 +110,17 @@ include/cegui-0/CEGUI/Renderer.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/ImageCodec.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/MemoryFile.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RenderTarget.h
+%%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RenderTarget.inl
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/Renderer.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/RendererDef.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/ResourceProvider.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/Texture.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/TextureTarget.h
 %%IRRLICHT%%include/cegui-0/CEGUI/RendererModules/Irrlicht/WindowTarget.h
-include/cegui-0/CEGUI/RendererModules/Null/GeometryBuffer.h
-include/cegui-0/CEGUI/RendererModules/Null/RenderTarget.h
-include/cegui-0/CEGUI/RendererModules/Null/Renderer.h
-include/cegui-0/CEGUI/RendererModules/Null/Texture.h
-include/cegui-0/CEGUI/RendererModules/Null/TextureTarget.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/GeometryBuffer.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/ImageCodec.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/RenderTarget.h
+%%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/RenderTarget.inl
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/Renderer.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/ResourceProvider.h
 %%OGRE%%include/cegui-0/CEGUI/RendererModules/Ogre/Texture.h
@@ -147,6 +138,7 @@ include/cegui-0/CEGUI/RendererModules/Null/TextureTarget.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/GeometryBufferBase.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/GlmPimpl.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RenderTarget.h
+%%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RenderTarget.inl
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/RendererBase.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/Shader.h
 %%ANYOPENGL%%include/cegui-0/CEGUI/RendererModules/OpenGL/ShaderManager.h
@@ -316,40 +308,33 @@ include/cegui-0/CEGUI/widgets/Tree.h
 include/cegui-0/CEGUI/widgets/TreeItem.h
 include/cegui-0/CEGUI/widgets/VerticalLayoutContainer.h
 lib/cegui-0.8/libCEGUICoreWindowRendererSet.so
-%%CORONA%%lib/cegui-0.8/libCEGUICoronaImageCodec.so
 %%DEVIL%%lib/cegui-0.8/libCEGUIDevILImageCodec.so
 %%EXPAT%%lib/cegui-0.8/libCEGUIExpatParser.so
 %%FREEIMAGE%%lib/cegui-0.8/libCEGUIFreeImageImageCodec.so
 %%LIBXML2%%lib/cegui-0.8/libCEGUILibXMLParser.so
 %%RAPIDXML%%lib/cegui-0.8/libCEGUIRapidXMLParser.so
-lib/cegui-0.8/libCEGUISTBImageCodec.so
-lib/cegui-0.8/libCEGUITGAImageCodec.so
 %%TINYXML%%lib/cegui-0.8/libCEGUITinyXMLParser.so
 %%XERCES%%lib/cegui-0.8/libCEGUIXercesParser.so
 lib/libCEGUIBase-0.so
 lib/libCEGUIBase-0.so.2
-lib/libCEGUIBase-0.so.2.2.2
+lib/libCEGUIBase-0.so.2.3.0
 lib/libCEGUICommonDialogs-0.so
 lib/libCEGUICommonDialogs-0.so.2
-lib/libCEGUICommonDialogs-0.so.2.2.2
+lib/libCEGUICommonDialogs-0.so.2.3.0
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so
 %%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2
-%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.2.2
+%%IRRLICHT%%lib/libCEGUIIrrlichtRenderer-0.so.2.3.0
 %%LUA%%lib/libCEGUILuaScriptModule-0.so
 %%LUA%%lib/libCEGUILuaScriptModule-0.so.2
-%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.2.2
-lib/libCEGUINullRenderer-0.so
-lib/libCEGUINullRenderer-0.so.2
-lib/libCEGUINullRenderer-0.so.2.2.2
+%%LUA%%lib/libCEGUILuaScriptModule-0.so.2.3.0
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so
 %%OGRE%%lib/libCEGUIOgreRenderer-0.so.2
-%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.2.2
+%%OGRE%%lib/libCEGUIOgreRenderer-0.so.2.3.0
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so
 %%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2
-%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.2.2
+%%ANYOPENGL%%lib/libCEGUIOpenGLRenderer-0.so.2.3.0
 %%IRRLICHT%%libdata/pkgconfig/CEGUI-0-IRRLICHT.pc
 %%LUA%%libdata/pkgconfig/CEGUI-0-LUA.pc
-libdata/pkgconfig/CEGUI-0-NULL.pc
 %%OGRE%%libdata/pkgconfig/CEGUI-0-OGRE.pc
 %%OPENGL%%libdata/pkgconfig/CEGUI-0-OPENGL.pc
 %%OPENGL3%%libdata/pkgconfig/CEGUI-0-OPENGL3.pc
@@ -441,6 +426,7 @@ 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