graphics/cegui: update to 0.7.5

graphics/ogre3d:        update to 1.7.2
games/ember:            update to 0.6.0
games/freeorion:        update to 0.3.13.3795
games/vegastrike:       Bump PORTREVISION
x11-toolkits/gigi:      Bump PORTREVISION

PR:             153817, 153818

6 files changed, 536 insertions, 176 deletions

diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index 8009e1c442f5..fb5bb48e58b6 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cegui
-PORTVERSION=	0.6.2b
-PORTREVISION=	2
+PORTVERSION=	0.7.5
 CATEGORIES=	graphics devel
-MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.6.2
+MASTER_SITES=	SF/crayzedsgui/CEGUI%20Mk-2/0.7.5
 DISTNAME=	${PORTNAME:U}-${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -18,11 +17,13 @@ COMMENT=	A library providing windowing and widgets for graphics APIs
 LIB_DEPENDS=	IL.2:${PORTSDIR}/graphics/devil \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		freetype.9:${PORTSDIR}/print/freetype2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so.1.7.2:${PORTSDIR}/graphics/ogre3d
+RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so.1.7.2:${PORTSDIR}/graphics/ogre3d
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/2b/2/}
-CONFIGURE_ARGS=	--enable-toluacegui --disable-irrlicht-renderer \
+CONFIGURE_ARGS=	--disable-toluacegui --disable-irrlicht-renderer \
 		--disable-corona --enable-devil --disable-freeimage --disable-silly \
-		--disable-libxml --disable-xerces-c --disable-expat
+		--disable-libxml --disable-xerces-c --disable-expat --disable-samples
 
 CONFIGURE_ENV+=	Lua_LIBS="-L${LUA_LIBDIR} -llua -lm" \
 		Lua_CFLAGS="-I${LUA_INCDIR}" \
@@ -32,10 +33,13 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GL=		yes
 USE_LUA=	5.1
+LUA_COMPS=	toluaxx
+USE_PYTHON=	2.6+
 USE_GNOME=	gnomehack
+PLIST_SUB+=	WITH_OGRE=""
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	README COPYING AUTHORS ChangeLog TODO
+PORTDOCS=	README COPYING
 .endif
 
 post-patch:
@@ -43,22 +47,17 @@ post-patch:
 		s|"-lILU.*"|"-lm -L${LOCALBASE}/lib -lILU -lIL $$LIBS"|g; \
 		s|-lpthread|${PTHREAD_LIBS}|g; \
 		s|CEGUI_LUA_VER=..|CEGUI_LUA_VER=${USE_LUA:S/.//}|g; \
-		s|DevIL_CFLAGS=.*|DevIL_CFLAGS="-DUSE_DEVIL_LIBRARY -I${LOCALBASE}/include"|g' \
+		s|DevIL_CFLAGS=.*|DevIL_CFLAGS="-DUSE_DEVIL_LIBRARY -I${LOCALBASE}/include"|g; \
+		s|-release $$cegui_lib_version_suffix|-release ${PORTVERSION:C/\.[0-9]$//g} -version-number ${PORTVERSION:C/^[0-9]\.[0-9]\.//g}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/SUBDIRS/ s| Samples||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|__linux__)|& \|\| defined(__FreeBSD__)|g' \
-		${WRKSRC}/include/CEGUIDynamicModule.h \
-		${WRKSRC}/src/CEGUIDynamicModule.cpp \
-		${WRKSRC}/Samples/common/src/CEGuiSample.cpp \
-		${WRKSRC}/src/CEGUISystem.cpp
-	@${REINPLACE_CMD} -e 's|ILvoid|void|g' \
-		${WRKSRC}/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = tolua\+\+|SUBDIRS =|g' \
+		${WRKSRC}/cegui/include/ScriptingModules/LuaScriptModule/support/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for docfile in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/graphics/cegui/distinfo b/graphics/cegui/distinfo
index 7ef70305cb54..177977cdb766 100644
--- a/graphics/cegui/distinfo
+++ b/graphics/cegui/distinfo
@@ -1,3 +1,2 @@
-MD5 (CEGUI-0.6.2b.tar.gz) = 4fbd95e5a2ac1c7acf2a8f5df3ac6b93
-SHA256 (CEGUI-0.6.2b.tar.gz) = eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f
-SIZE (CEGUI-0.6.2b.tar.gz) = 2628081
+SHA256 (CEGUI-0.7.5.tar.gz) = 21049e31a03fcd4807729c7271756e6d2de834247ece603bb5b5087fae624cb2
+SIZE (CEGUI-0.7.5.tar.gz) = 9058788
diff --git a/graphics/cegui/pkg-plist b/graphics/cegui/pkg-plist
index 7b7a72f52776..875dcb1f90eb 100644
--- a/graphics/cegui/pkg-plist
+++ b/graphics/cegui/pkg-plist
@@ -1,13 +1,24 @@
-bin/tolua++cegui
+@comment bin/tolua++cegui
 include/CEGUI/CEGUI.h
+include/CEGUI/CEGUIAffector.h
+include/CEGUI/CEGUIAnimation.h
+include/CEGUI/CEGUIAnimationInstance.h
+include/CEGUI/CEGUIAnimationManager.h
+include/CEGUI/CEGUIAnimation_xmlHandler.h
 include/CEGUI/CEGUIBase.h
+include/CEGUI/CEGUIBasicInterpolators.h
+include/CEGUI/CEGUIBasicRenderedStringParser.h
+include/CEGUI/CEGUIBiDiVisualMapping.h
 include/CEGUI/CEGUIBoundSlot.h
+include/CEGUI/CEGUICentredRenderedString.h
+include/CEGUI/CEGUIChainedXMLHandler.h
 include/CEGUI/CEGUIColourRect.h
 include/CEGUI/CEGUIConfig.h
 include/CEGUI/CEGUIConfig_xmlHandler.h
 include/CEGUI/CEGUICoordConverter.h
 include/CEGUI/CEGUIDataContainer.h
 include/CEGUI/CEGUIDefaultLogger.h
+include/CEGUI/CEGUIDefaultRenderedStringParser.h
 include/CEGUI/CEGUIDefaultResourceProvider.h
 include/CEGUI/CEGUIDynamicModule.h
 include/CEGUI/CEGUIEvent.h
@@ -16,8 +27,10 @@ include/CEGUI/CEGUIEventSet.h
 include/CEGUI/CEGUIExceptions.h
 include/CEGUI/CEGUIFactoryModule.h
 include/CEGUI/CEGUIFont.h
+include/CEGUI/CEGUIFontGlyph.h
 include/CEGUI/CEGUIFontManager.h
 include/CEGUI/CEGUIFont_xmlHandler.h
+include/CEGUI/CEGUIFormattedRenderedString.h
 include/CEGUI/CEGUIForwardRefs.h
 include/CEGUI/CEGUIFreeFunctionSlot.h
 include/CEGUI/CEGUIFreeTypeFont.h
@@ -26,6 +39,7 @@ include/CEGUI/CEGUIFunctorPointerSlot.h
 include/CEGUI/CEGUIFunctorReferenceBinder.h
 include/CEGUI/CEGUIFunctorReferenceSlot.h
 include/CEGUI/CEGUIGUILayout_xmlHandler.h
+include/CEGUI/CEGUIGeometryBuffer.h
 include/CEGUI/CEGUIGlobalEventSet.h
 include/CEGUI/CEGUIImage.h
 include/CEGUI/CEGUIImageCodec.h
@@ -33,38 +47,63 @@ include/CEGUI/CEGUIImageset.h
 include/CEGUI/CEGUIImagesetManager.h
 include/CEGUI/CEGUIImageset_xmlHandler.h
 include/CEGUI/CEGUIInputEvent.h
+include/CEGUI/CEGUIInterpolator.h
 include/CEGUI/CEGUIIteratorBase.h
+include/CEGUI/CEGUIJustifiedRenderedString.h
+include/CEGUI/CEGUIKeyFrame.h
+include/CEGUI/CEGUILeftAlignedRenderedString.h
 include/CEGUI/CEGUILogger.h
-include/CEGUI/CEGUILua.h
-include/CEGUI/CEGUILuaFunctor.h
 include/CEGUI/CEGUIMemberFunctionSlot.h
+include/CEGUI/CEGUIMinizipResourceProvider.h
 include/CEGUI/CEGUIMouseCursor.h
+include/CEGUI/CEGUINamedXMLResourceManager.h
 include/CEGUI/CEGUIPixmapFont.h
 include/CEGUI/CEGUIProperty.h
 include/CEGUI/CEGUIPropertyHelper.h
 include/CEGUI/CEGUIPropertySet.h
 include/CEGUI/CEGUIRect.h
 include/CEGUI/CEGUIRefCounted.h
-include/CEGUI/CEGUIRenderCache.h
+include/CEGUI/CEGUIRegexMatcher.h
+include/CEGUI/CEGUIRenderEffect.h
+include/CEGUI/CEGUIRenderEffectFactory.h
+include/CEGUI/CEGUIRenderEffectManager.h
+include/CEGUI/CEGUIRenderQueue.h
+include/CEGUI/CEGUIRenderTarget.h
+include/CEGUI/CEGUIRenderedString.h
+include/CEGUI/CEGUIRenderedStringComponent.h
+include/CEGUI/CEGUIRenderedStringImageComponent.h
+include/CEGUI/CEGUIRenderedStringParser.h
+include/CEGUI/CEGUIRenderedStringTextComponent.h
+include/CEGUI/CEGUIRenderedStringWidgetComponent.h
+include/CEGUI/CEGUIRenderedStringWordWrapper.h
 include/CEGUI/CEGUIRenderer.h
+include/CEGUI/CEGUIRenderingContext.h
+include/CEGUI/CEGUIRenderingRoot.h
+include/CEGUI/CEGUIRenderingSurface.h
+include/CEGUI/CEGUIRenderingWindow.h
 include/CEGUI/CEGUIResourceProvider.h
+include/CEGUI/CEGUIRightAlignedRenderedString.h
 include/CEGUI/CEGUIScheme.h
 include/CEGUI/CEGUISchemeManager.h
 include/CEGUI/CEGUIScheme_xmlHandler.h
 include/CEGUI/CEGUIScriptModule.h
-include/CEGUI/CEGUIScriptWindowHelper.h
 include/CEGUI/CEGUISingleton.h
 include/CEGUI/CEGUISize.h
 include/CEGUI/CEGUISlotFunctorBase.h
 include/CEGUI/CEGUIString.h
 include/CEGUI/CEGUISubscriberSlot.h
 include/CEGUI/CEGUISystem.h
-include/CEGUI/CEGUITask.h
 include/CEGUI/CEGUITextUtils.h
 include/CEGUI/CEGUITexture.h
+include/CEGUI/CEGUITextureTarget.h
+include/CEGUI/CEGUITplWRFactoryRegisterer.h
+include/CEGUI/CEGUITplWindowFactory.h
+include/CEGUI/CEGUITplWindowRendererFactory.h
 include/CEGUI/CEGUIUDim.h
 include/CEGUI/CEGUIVector.h
 include/CEGUI/CEGUIVersion.h
+include/CEGUI/CEGUIVertex.h
+include/CEGUI/CEGUIWRFactoryRegisterer.h
 include/CEGUI/CEGUIWidgetModule.h
 include/CEGUI/CEGUIWindow.h
 include/CEGUI/CEGUIWindowFactory.h
@@ -81,13 +120,72 @@ include/CEGUI/CEGUIXMLSerializer.h
 include/CEGUI/CEGUIcolour.h
 include/CEGUI/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.h
 include/CEGUI/ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodecModule.h
+include/CEGUI/ImageCodecModules/STBImageCodec/CEGUISTBImageCodec.h
+include/CEGUI/ImageCodecModules/STBImageCodec/CEGUISTBImageCodecModule.h
 include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodec.h
 include/CEGUI/ImageCodecModules/TGAImageCodec/CEGUITGAImageCodecModule.h
-include/CEGUI/RendererModules/OpenGLGUIRenderer/openglrenderer.h
-include/CEGUI/RendererModules/OpenGLGUIRenderer/opengltexture.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreGeometryBuffer.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreImageCodec.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreRenderTarget.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreRenderer.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreResourceProvider.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreTexture.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreTextureTarget.h
+%%WITH_OGRE%%include/CEGUI/RendererModules/Ogre/CEGUIOgreWindowTarget.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGL.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLFBOTextureTarget.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLGLXPBTextureTarget.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLGeometryBuffer.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLRenderTarget.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLTexture.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLTextureTarget.h
+include/CEGUI/RendererModules/OpenGL/CEGUIOpenGLViewportTarget.h
+include/CEGUI/ScriptingModules/LuaScriptModule/CEGUILua.h
+include/CEGUI/ScriptingModules/LuaScriptModule/CEGUILuaFunctor.h
+@comment include/CEGUI/ScriptingModules/LuaScriptModule/support/tolua++/tolua++.h
+include/CEGUI/WindowRendererSets/Falagard/FalButton.h
+include/CEGUI/WindowRendererSets/Falagard/FalDefault.h
+include/CEGUI/WindowRendererSets/Falagard/FalEditbox.h
+include/CEGUI/WindowRendererSets/Falagard/FalEditboxProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalFrameWindow.h
+include/CEGUI/WindowRendererSets/Falagard/FalItemEntry.h
+include/CEGUI/WindowRendererSets/Falagard/FalItemListbox.h
+include/CEGUI/WindowRendererSets/Falagard/FalListHeader.h
+include/CEGUI/WindowRendererSets/Falagard/FalListHeaderProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalListHeaderSegment.h
+include/CEGUI/WindowRendererSets/Falagard/FalListbox.h
+include/CEGUI/WindowRendererSets/Falagard/FalMenuItem.h
+include/CEGUI/WindowRendererSets/Falagard/FalMenubar.h
+include/CEGUI/WindowRendererSets/Falagard/FalModule.h
+include/CEGUI/WindowRendererSets/Falagard/FalMultiColumnList.h
+include/CEGUI/WindowRendererSets/Falagard/FalMultiLineEditbox.h
+include/CEGUI/WindowRendererSets/Falagard/FalMultiLineEditboxProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalPopupMenu.h
+include/CEGUI/WindowRendererSets/Falagard/FalProgressBar.h
+include/CEGUI/WindowRendererSets/Falagard/FalProgressBarProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalScrollablePane.h
+include/CEGUI/WindowRendererSets/Falagard/FalScrollbar.h
+include/CEGUI/WindowRendererSets/Falagard/FalScrollbarProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalSlider.h
+include/CEGUI/WindowRendererSets/Falagard/FalSliderProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalStatic.h
+include/CEGUI/WindowRendererSets/Falagard/FalStaticImage.h
+include/CEGUI/WindowRendererSets/Falagard/FalStaticImageProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalStaticProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalStaticText.h
+include/CEGUI/WindowRendererSets/Falagard/FalStaticTextProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalSystemButton.h
+include/CEGUI/WindowRendererSets/Falagard/FalTabButton.h
+include/CEGUI/WindowRendererSets/Falagard/FalTabControl.h
+include/CEGUI/WindowRendererSets/Falagard/FalTabControlProperties.h
+include/CEGUI/WindowRendererSets/Falagard/FalTitlebar.h
+include/CEGUI/WindowRendererSets/Falagard/FalToggleButton.h
+include/CEGUI/WindowRendererSets/Falagard/FalTooltip.h
+include/CEGUI/WindowRendererSets/Falagard/FalTree.h
 include/CEGUI/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.h
 include/CEGUI/XMLParserModules/TinyXMLParser/CEGUITinyXMLParserModule.h
-include/CEGUI/elements/CEGUIBaseFactories.h
+include/CEGUI/elements/CEGUIAll.h
 include/CEGUI/elements/CEGUIButtonBase.h
 include/CEGUI/elements/CEGUICheckbox.h
 include/CEGUI/elements/CEGUICheckboxProperties.h
@@ -102,13 +200,17 @@ include/CEGUI/elements/CEGUIEditboxProperties.h
 include/CEGUI/elements/CEGUIFrameWindow.h
 include/CEGUI/elements/CEGUIFrameWindowProperties.h
 include/CEGUI/elements/CEGUIGUISheet.h
+include/CEGUI/elements/CEGUIGridLayoutContainer.h
+include/CEGUI/elements/CEGUIGridLayoutContainerProperties.h
 include/CEGUI/elements/CEGUIGroupBox.h
+include/CEGUI/elements/CEGUIHorizontalLayoutContainer.h
 include/CEGUI/elements/CEGUIItemEntry.h
 include/CEGUI/elements/CEGUIItemEntryProperties.h
 include/CEGUI/elements/CEGUIItemListBase.h
 include/CEGUI/elements/CEGUIItemListBaseProperties.h
 include/CEGUI/elements/CEGUIItemListbox.h
 include/CEGUI/elements/CEGUIItemListboxProperties.h
+include/CEGUI/elements/CEGUILayoutContainer.h
 include/CEGUI/elements/CEGUIListHeader.h
 include/CEGUI/elements/CEGUIListHeaderProperties.h
 include/CEGUI/elements/CEGUIListHeaderSegment.h
@@ -120,6 +222,7 @@ include/CEGUI/elements/CEGUIListboxTextItem.h
 include/CEGUI/elements/CEGUIMenuBase.h
 include/CEGUI/elements/CEGUIMenuBaseProperties.h
 include/CEGUI/elements/CEGUIMenuItem.h
+include/CEGUI/elements/CEGUIMenuItemProperties.h
 include/CEGUI/elements/CEGUIMenubar.h
 include/CEGUI/elements/CEGUIMultiColumnList.h
 include/CEGUI/elements/CEGUIMultiColumnListProperties.h
@@ -140,6 +243,7 @@ include/CEGUI/elements/CEGUIScrolledContainer.h
 include/CEGUI/elements/CEGUIScrolledContainerProperties.h
 include/CEGUI/elements/CEGUIScrolledItemListBase.h
 include/CEGUI/elements/CEGUIScrolledItemListBaseProperties.h
+include/CEGUI/elements/CEGUISequentialLayoutContainer.h
 include/CEGUI/elements/CEGUISlider.h
 include/CEGUI/elements/CEGUISliderProperties.h
 include/CEGUI/elements/CEGUISpinner.h
@@ -156,6 +260,7 @@ include/CEGUI/elements/CEGUITooltipProperties.h
 include/CEGUI/elements/CEGUITree.h
 include/CEGUI/elements/CEGUITreeItem.h
 include/CEGUI/elements/CEGUITreeProperties.h
+include/CEGUI/elements/CEGUIVerticalLayoutContainer.h
 include/CEGUI/falagard/CEGUIFalComponentBase.h
 include/CEGUI/falagard/CEGUIFalDimensions.h
 include/CEGUI/falagard/CEGUIFalEnums.h
@@ -175,49 +280,131 @@ include/CEGUI/falagard/CEGUIFalWidgetComponent.h
 include/CEGUI/falagard/CEGUIFalWidgetLookFeel.h
 include/CEGUI/falagard/CEGUIFalWidgetLookManager.h
 include/CEGUI/falagard/CEGUIFalXMLEnumHelper.h
-include/CEGUI/tolua++.h
+lib/libCEGUIBase-0.7.so.5
+lib/libCEGUIBase-0.7.so
 lib/libCEGUIBase.la
 lib/libCEGUIBase.so
-lib/libCEGUIBase.so.3
+lib/libCEGUIDevILImageCodec-0.7.so.5
+lib/libCEGUIDevILImageCodec-0.7.so
 lib/libCEGUIDevILImageCodec.la
 lib/libCEGUIDevILImageCodec.so
-lib/libCEGUIDevILImageCodec.so.0
+lib/libCEGUIFalagardWRBase-0.7.so.5
+lib/libCEGUIFalagardWRBase-0.7.so
 lib/libCEGUIFalagardWRBase.la
 lib/libCEGUIFalagardWRBase.so
-lib/libCEGUIFalagardWRBase.so.3
+lib/libCEGUILuaScriptModule-0.7.so.5
+lib/libCEGUILuaScriptModule-0.7.so
 lib/libCEGUILuaScriptModule.la
 lib/libCEGUILuaScriptModule.so
-lib/libCEGUILuaScriptModule.so.3
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.so.5
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer-0.7.so
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer.la
+%%WITH_OGRE%%lib/libCEGUIOgreRenderer.so
+lib/libCEGUIOpenGLRenderer-0.7.so.5
+lib/libCEGUIOpenGLRenderer-0.7.so
 lib/libCEGUIOpenGLRenderer.la
 lib/libCEGUIOpenGLRenderer.so
-lib/libCEGUIOpenGLRenderer.so.1
+lib/libCEGUISTBImageCodec-0.7.so.5
+lib/libCEGUISTBImageCodec-0.7.so
+lib/libCEGUISTBImageCodec.la
+lib/libCEGUISTBImageCodec.so
+lib/libCEGUITGAImageCodec-0.7.so.5
+lib/libCEGUITGAImageCodec-0.7.so
 lib/libCEGUITGAImageCodec.la
 lib/libCEGUITGAImageCodec.so
-lib/libCEGUITGAImageCodec.so.0
+lib/libCEGUITinyXMLParser-0.7.so.5
+lib/libCEGUITinyXMLParser-0.7.so
 lib/libCEGUITinyXMLParser.la
 lib/libCEGUITinyXMLParser.so
-lib/libCEGUITinyXMLParser.so.0
-lib/libCEGUItoluapp.la
-lib/libCEGUItoluapp.so
-lib/libCEGUItoluapp.so.3
+@comment lib/libCEGUItoluapp-0.7.so.5
+@comment lib/libCEGUItoluapp-0.7.so
+@comment lib/libCEGUItoluapp.la
+@comment lib/libCEGUItoluapp.so
+%%WITH_OGRE%%libdata/pkgconfig/CEGUI-OGRE.pc
 libdata/pkgconfig/CEGUI-OPENGL.pc
 libdata/pkgconfig/CEGUI.pc
-share/CEGUI/XMLRefSchema/CEGUIConfig.xsd
-share/CEGUI/XMLRefSchema/Falagard.xsd
-share/CEGUI/XMLRefSchema/Font.xsd
-share/CEGUI/XMLRefSchema/GUILayout.xsd
-share/CEGUI/XMLRefSchema/GUIScheme.xsd
-share/CEGUI/XMLRefSchema/Imageset.xsd
-share/CEGUI/XMLRefSchema/Readme.txt
+share/CEGUI/animations/example.xml
+share/CEGUI/fonts/Batang-26.font
+share/CEGUI/fonts/DejaVuSans-10.font
+share/CEGUI/fonts/DejaVuSans.ttf
+share/CEGUI/fonts/FairChar-30.font
+share/CEGUI/fonts/Legal.txt
+share/CEGUI/fonts/baemuk.txt
+share/CEGUI/fonts/batang.ttf
+share/CEGUI/fonts/fkp-16.font
+share/CEGUI/fonts/fkp.de.pcf
+share/CEGUI/imagesets/DriveIcons.imageset
+share/CEGUI/imagesets/DriveIcons.png
+share/CEGUI/imagesets/FairChar.imageset
+share/CEGUI/imagesets/FairChar.tga
+share/CEGUI/imagesets/GPN-2000-001437.tga
+share/CEGUI/imagesets/OgreTray.imageset
+share/CEGUI/imagesets/OgreTrayImages.png
+share/CEGUI/imagesets/ReadMe.txt
+share/CEGUI/imagesets/TaharezLook.imageset
+share/CEGUI/imagesets/TaharezLook.tga
+share/CEGUI/imagesets/Vanilla.imageset
+share/CEGUI/imagesets/WindowsLook.imageset
+share/CEGUI/imagesets/WindowsLook.tga
+share/CEGUI/imagesets/logo.png
+share/CEGUI/imagesets/vanilla.tga
+share/CEGUI/layouts/Console.wnd
+share/CEGUI/layouts/Demo7Windows.layout
+share/CEGUI/layouts/Demo8.layout
+share/CEGUI/layouts/DragDropDemo.layout
+share/CEGUI/layouts/FontDemo.layout
+share/CEGUI/layouts/TabControlDemo.layout
+share/CEGUI/layouts/TabPage.layout
+share/CEGUI/layouts/TabPage1.layout
+share/CEGUI/layouts/TabPage2.layout
+share/CEGUI/layouts/TextDemo.layout
+share/CEGUI/layouts/TreeDemoTaharez.layout
+share/CEGUI/layouts/VanillaConsole.layout
+share/CEGUI/layouts/VanillaWindows.layout
+share/CEGUI/looknfeel/OgreTray.looknfeel
+share/CEGUI/looknfeel/TaharezLook.looknfeel
+share/CEGUI/looknfeel/Vanilla.looknfeel
+share/CEGUI/looknfeel/WindowsLook.looknfeel
+share/CEGUI/lua_scripts/demo8.lua
+share/CEGUI/schemes/Demo8.scheme
+share/CEGUI/schemes/OgreTray.scheme
+share/CEGUI/schemes/TaharezLook.scheme
+share/CEGUI/schemes/TaharezLookWidgetAliases.scheme
+share/CEGUI/schemes/TaharezLookWidgets.scheme
+share/CEGUI/schemes/VanillaSkin.scheme
+share/CEGUI/schemes/WindowsLook.scheme
+share/CEGUI/schemes/WindowsLookWidgets.scheme
+share/CEGUI/xml_schemas/Animation.xsd
+share/CEGUI/xml_schemas/CEGUIConfig.xsd
+share/CEGUI/xml_schemas/Falagard.xsd
+share/CEGUI/xml_schemas/Font.xsd
+share/CEGUI/xml_schemas/GUILayout.xsd
+share/CEGUI/xml_schemas/GUIScheme.xsd
+share/CEGUI/xml_schemas/Imageset.xsd
 @dirrm include/CEGUI/falagard
 @dirrm include/CEGUI/elements
-@dirrm include/CEGUI/XMLParserModules/TinyXMLParser
-@dirrm include/CEGUI/XMLParserModules
-@dirrm include/CEGUI/RendererModules/OpenGLGUIRenderer
-@dirrm include/CEGUI/RendererModules
 @dirrm include/CEGUI/ImageCodecModules/TGAImageCodec
 @dirrm include/CEGUI/ImageCodecModules/DevILImageCodec
+@dirrm include/CEGUI/ImageCodecModules/STBImageCodec
 @dirrm include/CEGUI/ImageCodecModules
+%%WITH_OGRE%%@dirrm include/CEGUI/RendererModules/Ogre
+@dirrm include/CEGUI/RendererModules/OpenGL
+@dirrm include/CEGUI/RendererModules
+@comment @dirrm include/CEGUI/ScriptingModules/LuaScriptModule/support/tolua++
+@dirrm include/CEGUI/ScriptingModules/LuaScriptModule/support
+@dirrm include/CEGUI/ScriptingModules/LuaScriptModule
+@dirrm include/CEGUI/ScriptingModules
+@dirrm include/CEGUI/WindowRendererSets/Falagard
+@dirrm include/CEGUI/WindowRendererSets
+@dirrm include/CEGUI/XMLParserModules/TinyXMLParser
+@dirrm include/CEGUI/XMLParserModules
 @dirrm include/CEGUI
-@dirrm share/CEGUI/XMLRefSchema
+@dirrm share/CEGUI/animations
+@dirrm share/CEGUI/fonts
+@dirrm share/CEGUI/imagesets
+@dirrm share/CEGUI/layouts
+@dirrm share/CEGUI/looknfeel
+@dirrm share/CEGUI/lua_scripts
+@dirrm share/CEGUI/schemes
+@dirrm share/CEGUI/xml_schemas
 @dirrm share/CEGUI
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 36a798755d60..1dd41ef21b32 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -6,35 +6,21 @@
 #
 
 PORTNAME=	ogre3d
-PORTVERSION=	1.6.5
-PORTREVISION=	2
+PORTVERSION=	1.7.2
 CATEGORIES=	graphics devel
-MASTER_SITES=	SF/ogre/ogre/${PORTVERSION}
-DISTNAME=	ogre-v${PORTVERSION:S/./-/g:S/-r1/RC1/g}
+MASTER_SITES=	SF/ogre/ogre/${PORTVERSION:C/.[0-9]$//g}
+DISTNAME=	ogre_src_v${PORTVERSION:S/./-/g}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A scene-oriented, flexible 3D engine written in C++
 
 LIB_DEPENDS=	zzip.13:${PORTSDIR}/devel/zziplib \
-		CEGUIBase.3:${PORTSDIR}/graphics/cegui \
-		IL.2:${PORTSDIR}/graphics/devil
+		IL.2:${PORTSDIR}/graphics/devil \
+		freetype.9:${PORTSDIR}/print/freetype2
 
-WRKSRC=		${WRKDIR}/ogre
-CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static \
-		--with-cppunit-prefix=/nonexistent --disable-freeimage
-CONFIGURE_ENV+=	ZZIPLIB_CFLAGS="-I${LOCALBASE}/include" \
-		ZZIPLIB_LIBS="-L${LOCALBASE}/lib -lzzip"
-
-OPTIONS=	GTK	"Use GTK instead of Xt gui"	off \
-		DEBUG	"Enable debug mode"		off \
-		DEMOS	"Build OGRE demos"		off
-
-GNU_CONFIGURE=	YES
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	YES
 USE_BZIP2=	YES
-USE_GNOME=	gnomehack
-USE_GMAKE=	YES
+USE_CMAKE=	YES
 USE_SDL=	sdl
 USE_XORG=	xaw
 MAKE_JOBS_SAFE=	yes
@@ -45,45 +31,7 @@ MAKE_JOBS_SAFE=	yes
 BROKEN=		Does not compile
 .endif
 
-.if !defined(WITH_DEBUG)
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -DNDEBUG"
-.else
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include"
-.endif
-
-.if defined(WITH_DEMOS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois
-RUN_DEPENDS+=	${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois
-.else
-CONGIGURE_ARGS+=--disable-ogre-demos
-.endif
-
-.if defined(WITH_GTK)
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=--with-gui=gtk
-PLIST_SUB+=	WITH_GTK=""
-.else
-CONFIGURE_ARGS+=--with-gui=Xt
-PLIST_SUB+=	WITH_GTK="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e '\
-		s|-pthread|${PTHREAD_LIBS}|g; \
-		s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
-		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
-		s|" == "x|" = "x|g; \
-		s|-lfreeimage|-L${LOCALBASE}/lib &|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's| -Wl,-z,defs||' \
-		${WRKSRC}/PlugIns/BSPSceneManager/src/Makefile.in \
-		${WRKSRC}/PlugIns/CgProgramManager/src/Makefile.in \
-		${WRKSRC}/PlugIns/EXRCodec/src/Makefile.in \
-		${WRKSRC}/PlugIns/OctreeSceneManager/src/Makefile.in \
-		${WRKSRC}/PlugIns/ParticleFX/src/Makefile.in \
-		${WRKSRC}/RenderSystems/GL/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/Samples/Terrain/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|(CEGUI::uint)|(size_t)|' \
 		${WRKSRC}/Samples/OceanDemo/src/OceanDemo.cpp
 	@${REINPLACE_CMD} -e '\
diff --git a/graphics/ogre3d/distinfo b/graphics/ogre3d/distinfo
index 9d16a5c87b45..bc1ead77d7fb 100644
--- a/graphics/ogre3d/distinfo
+++ b/graphics/ogre3d/distinfo
@@ -1,3 +1,2 @@
-MD5 (ogre-v1-6-5.tar.bz2) = 9e863029f3befe013adefa7f66dbb13c
-SHA256 (ogre-v1-6-5.tar.bz2) = 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
-SIZE (ogre-v1-6-5.tar.bz2) = 41785065
+SHA256 (ogre_src_v1-7-2.tar.bz2) = 054a8486234b5a551195a4bcbd4ba4bbc046563e061b7f93e68a684150970883
+SIZE (ogre_src_v1-7-2.tar.bz2) = 63654208
diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist
index baa45ba377e3..12ef8cf90f61 100644
--- a/graphics/ogre3d/pkg-plist
+++ b/graphics/ogre3d/pkg-plist
@@ -1,47 +1,14 @@
-bin/OgreMaterialUpgrade
-bin/OgreMeshUpgrade
+bin/OgreMeshUpgrader
 bin/OgreXMLConverter
-bin/rcapsdump
-%%WITH_GTK%%include/OGRE/gtk/OgreConfigDialogImp.h
-%%WITH_GTK%%include/OGRE/gtk/OgreErrorDialogImp.h
+include/OGRE/ExampleApplication.h
+include/OGRE/ExampleFrameListener.h
+include/OGRE/ExampleLoadingBar.h
+include/OGRE/FileSystemLayer.h
 include/OGRE/GLX/OgreConfigDialogImp.h
 include/OGRE/GLX/OgreErrorDialogImp.h
 include/OGRE/GLX/OgreTimerImp.h
-include/OGRE/OgreAtomicWrappers.h
-include/OGRE/OgreMemoryAllocatedObject.h
-include/OGRE/OgreMemoryAllocatorConfig.h
-include/OGRE/OgreMemoryNedAlloc.h
-include/OGRE/OgreMemoryStdAlloc.h
-include/OGRE/OgreMemorySTLAllocator.h
-include/OGRE/OgreMemoryTracker.h
-include/OGRE/OgreRenderSystemCapabilitiesManager.h
-include/OGRE/OgreRenderSystemCapabilitiesSerializer.h
-include/OGRE/OgreRenderToVertexBuffer.h
-include/OGRE/OgreScriptCompiler.h
-include/OGRE/OgreScriptLexer.h
-include/OGRE/OgreScriptParser.h
-include/OGRE/OgreScriptTranslator.h
-include/OGRE/OgreShadowCameraSetupPSSM.h
-include/OGRE/OgreTangentSpaceCalc.h
-include/OGRE/OgreAlignedAllocator.h
-include/OGRE/OgreConvexBody.h
-include/OGRE/OgreDDSCodec.h
-include/OGRE/OgreFreeImageCodec.h
-include/OGRE/OgreILUtil.h
-include/OGRE/OgreInstancedGeometry.h
-include/OGRE/OgreNumerics.h
-include/OGRE/OgrePlugin.h
-include/OGRE/OgrePolygon.h
-include/OGRE/OgrePrefabFactory.h
-include/OGRE/OgreShadowCameraSetup.h
-include/OGRE/OgreShadowCameraSetupFocused.h
-include/OGRE/OgreShadowCameraSetupLiSPSM.h
-include/OGRE/OgreShadowCameraSetupPlaneOptimal.h
-include/OGRE/OgreShadowTextureManager.h
-include/OGRE/OgreUnifiedHighLevelGpuProgram.h
-include/OGRE/OgreUTFString.h
-include/OGRE/OgreWindowEventUtilities.h
 include/OGRE/Ogre.h
+include/OGRE/OgreAlignedAllocator.h
 include/OGRE/OgreAnimable.h
 include/OGRE/OgreAnimation.h
 include/OGRE/OgreAnimationState.h
@@ -50,6 +17,7 @@ include/OGRE/OgreAny.h
 include/OGRE/OgreArchive.h
 include/OGRE/OgreArchiveFactory.h
 include/OGRE/OgreArchiveManager.h
+include/OGRE/OgreAtomicWrappers.h
 include/OGRE/OgreAutoParamDataSource.h
 include/OGRE/OgreAxisAlignedBox.h
 include/OGRE/OgreBillboard.h
@@ -60,31 +28,31 @@ include/OGRE/OgreBitwise.h
 include/OGRE/OgreBlendMode.h
 include/OGRE/OgreBone.h
 include/OGRE/OgreBorderPanelOverlayElement.h
-include/OGRE/OgreCEGUIRenderer.h
-include/OGRE/OgreCEGUIResourceProvider.h
-include/OGRE/OgreCEGUITexture.h
+include/OGRE/OgreBuildSettings.h
 include/OGRE/OgreCamera.h
 include/OGRE/OgreCodec.h
 include/OGRE/OgreColourValue.h
 include/OGRE/OgreCommon.h
-include/OGRE/OgreCompiler2Pass.h
 include/OGRE/OgreCompositionPass.h
 include/OGRE/OgreCompositionTargetPass.h
 include/OGRE/OgreCompositionTechnique.h
 include/OGRE/OgreCompositor.h
 include/OGRE/OgreCompositorChain.h
 include/OGRE/OgreCompositorInstance.h
+include/OGRE/OgreCompositorLogic.h
 include/OGRE/OgreCompositorManager.h
-include/OGRE/OgreCompositorScriptCompiler.h
-include/OGRE/OgreCompositorSerializer.h
 include/OGRE/OgreConfig.h
 include/OGRE/OgreConfigDialog.h
 include/OGRE/OgreConfigFile.h
 include/OGRE/OgreConfigOptionMap.h
 include/OGRE/OgreController.h
 include/OGRE/OgreControllerManager.h
+include/OGRE/OgreConvexBody.h
+include/OGRE/OgreCustomCompositionPass.h
+include/OGRE/OgreDDSCodec.h
 include/OGRE/OgreDataStream.h
 include/OGRE/OgreDefaultHardwareBufferManager.h
+include/OGRE/OgreDistanceLodStrategy.h
 include/OGRE/OgreDynLib.h
 include/OGRE/OgreDynLibManager.h
 include/OGRE/OgreEdgeListBuilder.h
@@ -101,6 +69,7 @@ include/OGRE/OgreFrameListener.h
 include/OGRE/OgreFrustum.h
 include/OGRE/OgreGpuProgram.h
 include/OGRE/OgreGpuProgramManager.h
+include/OGRE/OgreGpuProgramParams.h
 include/OGRE/OgreGpuProgramUsage.h
 include/OGRE/OgreHardwareBuffer.h
 include/OGRE/OgreHardwareBufferManager.h
@@ -108,15 +77,21 @@ include/OGRE/OgreHardwareIndexBuffer.h
 include/OGRE/OgreHardwareOcclusionQuery.h
 include/OGRE/OgreHardwarePixelBuffer.h
 include/OGRE/OgreHardwareVertexBuffer.h
+include/OGRE/OgreHeaderPrefix.h
+include/OGRE/OgreHeaderSuffix.h
 include/OGRE/OgreHighLevelGpuProgram.h
 include/OGRE/OgreHighLevelGpuProgramManager.h
-include/OGRE/OgreILCodecs.h
-include/OGRE/OgreILImageCodec.h
 include/OGRE/OgreImage.h
 include/OGRE/OgreImageCodec.h
+include/OGRE/OgreInstancedGeometry.h
+include/OGRE/OgreIteratorRange.h
+include/OGRE/OgreIteratorWrapper.h
 include/OGRE/OgreIteratorWrappers.h
 include/OGRE/OgreKeyFrame.h
 include/OGRE/OgreLight.h
+include/OGRE/OgreLodListener.h
+include/OGRE/OgreLodStrategy.h
+include/OGRE/OgreLodStrategyManager.h
 include/OGRE/OgreLog.h
 include/OGRE/OgreLogManager.h
 include/OGRE/OgreManualObject.h
@@ -126,6 +101,13 @@ include/OGRE/OgreMaterialSerializer.h
 include/OGRE/OgreMath.h
 include/OGRE/OgreMatrix3.h
 include/OGRE/OgreMatrix4.h
+include/OGRE/OgreMemoryAllocatedObject.h
+include/OGRE/OgreMemoryAllocatorConfig.h
+include/OGRE/OgreMemoryNedAlloc.h
+include/OGRE/OgreMemoryNedPooling.h
+include/OGRE/OgreMemorySTLAllocator.h
+include/OGRE/OgreMemoryStdAlloc.h
+include/OGRE/OgreMemoryTracker.h
 include/OGRE/OgreMesh.h
 include/OGRE/OgreMeshFileFormat.h
 include/OGRE/OgreMeshManager.h
@@ -134,6 +116,7 @@ include/OGRE/OgreMeshSerializerImpl.h
 include/OGRE/OgreMovableObject.h
 include/OGRE/OgreMovablePlane.h
 include/OGRE/OgreNode.h
+include/OGRE/OgreNumerics.h
 include/OGRE/OgreOptimisedUtil.h
 include/OGRE/OgreOverlay.h
 include/OGRE/OgreOverlayContainer.h
@@ -149,19 +132,24 @@ include/OGRE/OgreParticleEmitter.h
 include/OGRE/OgreParticleEmitterCommands.h
 include/OGRE/OgreParticleEmitterFactory.h
 include/OGRE/OgreParticleIterator.h
+include/OGRE/OgreParticleScriptCompiler.h
 include/OGRE/OgreParticleSystem.h
 include/OGRE/OgreParticleSystemManager.h
 include/OGRE/OgreParticleSystemRenderer.h
 include/OGRE/OgrePass.h
 include/OGRE/OgrePatchMesh.h
 include/OGRE/OgrePatchSurface.h
+include/OGRE/OgrePixelCountLodStrategy.h
 include/OGRE/OgrePixelFormat.h
 include/OGRE/OgrePlane.h
 include/OGRE/OgrePlaneBoundedVolume.h
 include/OGRE/OgrePlatform.h
 include/OGRE/OgrePlatformInformation.h
+include/OGRE/OgrePlugin.h
+include/OGRE/OgrePolygon.h
 include/OGRE/OgrePose.h
 include/OGRE/OgrePredefinedControllers.h
+include/OGRE/OgrePrefabFactory.h
 include/OGRE/OgrePrerequisites.h
 include/OGRE/OgreProfiler.h
 include/OGRE/OgreProgressiveMesh.h
@@ -170,6 +158,7 @@ include/OGRE/OgreRadixSort.h
 include/OGRE/OgreRay.h
 include/OGRE/OgreRectangle.h
 include/OGRE/OgreRectangle2D.h
+include/OGRE/OgreRenderObjectListener.h
 include/OGRE/OgreRenderOperation.h
 include/OGRE/OgreRenderQueue.h
 include/OGRE/OgreRenderQueueInvocation.h
@@ -177,9 +166,12 @@ include/OGRE/OgreRenderQueueListener.h
 include/OGRE/OgreRenderQueueSortingGrouping.h
 include/OGRE/OgreRenderSystem.h
 include/OGRE/OgreRenderSystemCapabilities.h
+include/OGRE/OgreRenderSystemCapabilitiesManager.h
+include/OGRE/OgreRenderSystemCapabilitiesSerializer.h
 include/OGRE/OgreRenderTarget.h
 include/OGRE/OgreRenderTargetListener.h
 include/OGRE/OgreRenderTexture.h
+include/OGRE/OgreRenderToVertexBuffer.h
 include/OGRE/OgreRenderWindow.h
 include/OGRE/OgreRenderable.h
 include/OGRE/OgreResource.h
@@ -193,10 +185,20 @@ include/OGRE/OgreSceneManager.h
 include/OGRE/OgreSceneManagerEnumerator.h
 include/OGRE/OgreSceneNode.h
 include/OGRE/OgreSceneQuery.h
+include/OGRE/OgreScriptCompiler.h
+include/OGRE/OgreScriptLexer.h
 include/OGRE/OgreScriptLoader.h
+include/OGRE/OgreScriptParser.h
+include/OGRE/OgreScriptTranslator.h
 include/OGRE/OgreSearchOps.h
 include/OGRE/OgreSerializer.h
+include/OGRE/OgreShadowCameraSetup.h
+include/OGRE/OgreShadowCameraSetupFocused.h
+include/OGRE/OgreShadowCameraSetupLiSPSM.h
+include/OGRE/OgreShadowCameraSetupPSSM.h
+include/OGRE/OgreShadowCameraSetupPlaneOptimal.h
 include/OGRE/OgreShadowCaster.h
+include/OGRE/OgreShadowTextureManager.h
 include/OGRE/OgreShadowVolumeExtrudeProgram.h
 include/OGRE/OgreSharedPtr.h
 include/OGRE/OgreSimpleRenderable.h
@@ -212,7 +214,9 @@ include/OGRE/OgreSpotShadowFadePng.h
 include/OGRE/OgreStableHeaders.h
 include/OGRE/OgreStaticFaceGroup.h
 include/OGRE/OgreStaticGeometry.h
+include/OGRE/OgreStaticPluginLoader.h
 include/OGRE/OgreStdHeaders.h
+include/OGRE/OgreStreamSerialiser.h
 include/OGRE/OgreString.h
 include/OGRE/OgreStringConverter.h
 include/OGRE/OgreStringInterface.h
@@ -220,48 +224,272 @@ include/OGRE/OgreStringVector.h
 include/OGRE/OgreSubEntity.h
 include/OGRE/OgreSubMesh.h
 include/OGRE/OgreTagPoint.h
+include/OGRE/OgreTangentSpaceCalc.h
 include/OGRE/OgreTechnique.h
 include/OGRE/OgreTextAreaOverlayElement.h
 include/OGRE/OgreTexture.h
 include/OGRE/OgreTextureManager.h
 include/OGRE/OgreTextureUnitState.h
 include/OGRE/OgreTimer.h
-include/OGRE/OgreUserDefinedObject.h
+include/OGRE/OgreUTFString.h
+include/OGRE/OgreUnifiedHighLevelGpuProgram.h
+include/OGRE/OgreUserObjectBindings.h
 include/OGRE/OgreVector2.h
 include/OGRE/OgreVector3.h
 include/OGRE/OgreVector4.h
 include/OGRE/OgreVertexBoneAssignment.h
 include/OGRE/OgreVertexIndexData.h
 include/OGRE/OgreViewport.h
+include/OGRE/OgreWindowEventUtilities.h
 include/OGRE/OgreWireBoundingBox.h
+include/OGRE/OgreWorkQueue.h
 include/OGRE/OgreZip.h
+include/OGRE/Paging/OgreGrid2DPageStrategy.h
+include/OGRE/Paging/OgrePage.h
+include/OGRE/Paging/OgrePageConnection.h
+include/OGRE/Paging/OgrePageContent.h
+include/OGRE/Paging/OgrePageContentCollection.h
+include/OGRE/Paging/OgrePageContentCollectionFactory.h
+include/OGRE/Paging/OgrePageContentFactory.h
+include/OGRE/Paging/OgrePageFileFormats.h
+include/OGRE/Paging/OgrePageManager.h
+include/OGRE/Paging/OgrePageStrategy.h
+include/OGRE/Paging/OgrePagedWorld.h
+include/OGRE/Paging/OgrePagedWorldSection.h
+include/OGRE/Paging/OgrePaging.h
+include/OGRE/Paging/OgrePagingPrerequisites.h
+include/OGRE/Paging/OgreSimplePageContentCollection.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspLevel.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspNode.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspPrerequisites.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspResourceManager.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspSceneManager.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspSceneManagerPlugin.h
+include/OGRE/Plugins/BSPSceneManager/OgreBspSceneNode.h
+include/OGRE/Plugins/BSPSceneManager/OgreQuake3Level.h
+include/OGRE/Plugins/BSPSceneManager/OgreQuake3Shader.h
+include/OGRE/Plugins/BSPSceneManager/OgreQuake3ShaderManager.h
+include/OGRE/Plugins/BSPSceneManager/OgreQuake3Types.h
+include/OGRE/Plugins/OctreeSceneManager/OgreHeightmapTerrainPageSource.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctree.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctreeCamera.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctreeNode.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctreePlugin.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctreeSceneManager.h
+include/OGRE/Plugins/OctreeSceneManager/OgreOctreeSceneQuery.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainPage.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainPageSource.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainPrerequisites.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainRenderable.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainSceneManager.h
+include/OGRE/Plugins/OctreeSceneManager/OgreTerrainVertexProgram.h
+include/OGRE/Plugins/OctreeZone/OgreHeightmapTerrainZonePageSource.h
+include/OGRE/Plugins/OctreeZone/OgreOctreeZone.h
+include/OGRE/Plugins/OctreeZone/OgreOctreeZoneOctree.h
+include/OGRE/Plugins/OctreeZone/OgreOctreeZonePlugin.h
+include/OGRE/Plugins/OctreeZone/OgreOctreeZonePrerequisites.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainVertexProgram.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainZone.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainZonePage.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainZonePageSource.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainZonePrerequisites.h
+include/OGRE/Plugins/OctreeZone/OgreTerrainZoneRenderable.h
+include/OGRE/Plugins/PCZSceneManager/OgreAntiPortal.h
+include/OGRE/Plugins/PCZSceneManager/OgreCapsule.h
+include/OGRE/Plugins/PCZSceneManager/OgreDefaultZone.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCPlane.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZCamera.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZFrustum.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZLight.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZPlugin.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZPrerequisites.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZSceneManager.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZSceneNode.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZSceneQuery.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZone.h
+include/OGRE/Plugins/PCZSceneManager/OgrePCZoneFactory.h
+include/OGRE/Plugins/PCZSceneManager/OgrePortal.h
+include/OGRE/Plugins/PCZSceneManager/OgrePortalBase.h
+include/OGRE/Plugins/PCZSceneManager/OgreSegment.h
+include/OGRE/Plugins/ParticleFX/OgreAreaEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreBoxEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreBoxEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreColourFaderAffector.h
+include/OGRE/Plugins/ParticleFX/OgreColourFaderAffector2.h
+include/OGRE/Plugins/ParticleFX/OgreColourFaderAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreColourFaderAffectorFactory2.h
+include/OGRE/Plugins/ParticleFX/OgreColourImageAffector.h
+include/OGRE/Plugins/ParticleFX/OgreColourImageAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreColourInterpolatorAffector.h
+include/OGRE/Plugins/ParticleFX/OgreColourInterpolatorAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreCylinderEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreCylinderEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreDeflectorPlaneAffector.h
+include/OGRE/Plugins/ParticleFX/OgreDeflectorPlaneAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreDirectionRandomiserAffector.h
+include/OGRE/Plugins/ParticleFX/OgreDirectionRandomiserAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreEllipsoidEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreEllipsoidEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreHollowEllipsoidEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreHollowEllipsoidEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreLinearForceAffector.h
+include/OGRE/Plugins/ParticleFX/OgreLinearForceAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreParticleFXPlugin.h
+include/OGRE/Plugins/ParticleFX/OgreParticleFXPrerequisites.h
+include/OGRE/Plugins/ParticleFX/OgrePointEmitter.h
+include/OGRE/Plugins/ParticleFX/OgrePointEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreRingEmitter.h
+include/OGRE/Plugins/ParticleFX/OgreRingEmitterFactory.h
+include/OGRE/Plugins/ParticleFX/OgreRotationAffector.h
+include/OGRE/Plugins/ParticleFX/OgreRotationAffectorFactory.h
+include/OGRE/Plugins/ParticleFX/OgreScaleAffector.h
+include/OGRE/Plugins/ParticleFX/OgreScaleAffectorFactory.h
+include/OGRE/RTShaderSystem/OgreRTShaderSystem.h
+include/OGRE/RTShaderSystem/OgreShaderCGProgramProcessor.h
+include/OGRE/RTShaderSystem/OgreShaderCGProgramWriter.h
+include/OGRE/RTShaderSystem/OgreShaderExIntegratedPSSM3.h
+include/OGRE/RTShaderSystem/OgreShaderExNormalMapLighting.h
+include/OGRE/RTShaderSystem/OgreShaderExPerPixelLighting.h
+include/OGRE/RTShaderSystem/OgreShaderFFPColour.h
+include/OGRE/RTShaderSystem/OgreShaderFFPFog.h
+include/OGRE/RTShaderSystem/OgreShaderFFPLighting.h
+include/OGRE/RTShaderSystem/OgreShaderFFPRenderState.h
+include/OGRE/RTShaderSystem/OgreShaderFFPRenderStateBuilder.h
+include/OGRE/RTShaderSystem/OgreShaderFFPTexturing.h
+include/OGRE/RTShaderSystem/OgreShaderFFPTransform.h
+include/OGRE/RTShaderSystem/OgreShaderFunction.h
+include/OGRE/RTShaderSystem/OgreShaderFunctionAtom.h
+include/OGRE/RTShaderSystem/OgreShaderGLSLProgramProcessor.h
+include/OGRE/RTShaderSystem/OgreShaderGLSLProgramWriter.h
+include/OGRE/RTShaderSystem/OgreShaderGenerator.h
+include/OGRE/RTShaderSystem/OgreShaderHLSLProgramProcessor.h
+include/OGRE/RTShaderSystem/OgreShaderHLSLProgramWriter.h
+include/OGRE/RTShaderSystem/OgreShaderMaterialSerializerListener.h
+include/OGRE/RTShaderSystem/OgreShaderParameter.h
+include/OGRE/RTShaderSystem/OgreShaderPrerequisites.h
+include/OGRE/RTShaderSystem/OgreShaderProgram.h
+include/OGRE/RTShaderSystem/OgreShaderProgramManager.h
+include/OGRE/RTShaderSystem/OgreShaderProgramProcessor.h
+include/OGRE/RTShaderSystem/OgreShaderProgramSet.h
+include/OGRE/RTShaderSystem/OgreShaderProgramWriter.h
+include/OGRE/RTShaderSystem/OgreShaderProgramWriterManager.h
+include/OGRE/RTShaderSystem/OgreShaderRenderState.h
+include/OGRE/RTShaderSystem/OgreShaderScriptTranslator.h
+include/OGRE/RTShaderSystem/OgreShaderSubRenderState.h
+include/OGRE/RenderSystems/GL/GL/gl.h
+include/OGRE/RenderSystems/GL/GL/glew.h
+include/OGRE/RenderSystems/GL/GL/glext.h
+include/OGRE/RenderSystems/GL/GL/glxew.h
+include/OGRE/RenderSystems/GL/GL/glxext.h
+include/OGRE/RenderSystems/GL/GL/glxtokens.h
+include/OGRE/RenderSystems/GL/GL/wglew.h
+include/OGRE/RenderSystems/GL/GL/wglext.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLUtil.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLXContext.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLXGLSupport.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLXRenderTexture.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLXUtils.h
+include/OGRE/RenderSystems/GL/GLX/OgreGLXWindow.h
+include/OGRE/RenderSystems/GL/OgreGLATIFSInit.h
+include/OGRE/RenderSystems/GL/OgreGLContext.h
+include/OGRE/RenderSystems/GL/OgreGLDefaultHardwareBufferManager.h
+include/OGRE/RenderSystems/GL/OgreGLFBOMultiRenderTarget.h
+include/OGRE/RenderSystems/GL/OgreGLFBORenderTexture.h
+include/OGRE/RenderSystems/GL/OgreGLFrameBufferObject.h
+include/OGRE/RenderSystems/GL/OgreGLGpuNvparseProgram.h
+include/OGRE/RenderSystems/GL/OgreGLGpuProgram.h
+include/OGRE/RenderSystems/GL/OgreGLGpuProgramManager.h
+include/OGRE/RenderSystems/GL/OgreGLHardwareBufferManager.h
+include/OGRE/RenderSystems/GL/OgreGLHardwareIndexBuffer.h
+include/OGRE/RenderSystems/GL/OgreGLHardwareOcclusionQuery.h
+include/OGRE/RenderSystems/GL/OgreGLHardwarePixelBuffer.h
+include/OGRE/RenderSystems/GL/OgreGLHardwareVertexBuffer.h
+include/OGRE/RenderSystems/GL/OgreGLPBRenderTexture.h
+include/OGRE/RenderSystems/GL/OgreGLPBuffer.h
+include/OGRE/RenderSystems/GL/OgreGLPixelFormat.h
+include/OGRE/RenderSystems/GL/OgreGLPlugin.h
+include/OGRE/RenderSystems/GL/OgreGLPrerequisites.h
+include/OGRE/RenderSystems/GL/OgreGLRenderSystem.h
+include/OGRE/RenderSystems/GL/OgreGLRenderTexture.h
+include/OGRE/RenderSystems/GL/OgreGLRenderToVertexBuffer.h
+include/OGRE/RenderSystems/GL/OgreGLSLExtSupport.h
+include/OGRE/RenderSystems/GL/OgreGLSLGpuProgram.h
+include/OGRE/RenderSystems/GL/OgreGLSLLinkProgram.h
+include/OGRE/RenderSystems/GL/OgreGLSLLinkProgramManager.h
+include/OGRE/RenderSystems/GL/OgreGLSLPreprocessor.h
+include/OGRE/RenderSystems/GL/OgreGLSLProgram.h
+include/OGRE/RenderSystems/GL/OgreGLSLProgramFactory.h
+include/OGRE/RenderSystems/GL/OgreGLSupport.h
+include/OGRE/RenderSystems/GL/OgreGLTexture.h
+include/OGRE/RenderSystems/GL/OgreGLTextureManager.h
+include/OGRE/Sample.h
+include/OGRE/SampleContext.h
+include/OGRE/SamplePlugin.h
+include/OGRE/SdkCameraMan.h
+include/OGRE/SdkSample.h
+include/OGRE/SdkTrays.h
+include/OGRE/Terrain/OgreTerrain.h
+include/OGRE/Terrain/OgreTerrainGroup.h
+include/OGRE/Terrain/OgreTerrainLayerBlendMap.h
+include/OGRE/Terrain/OgreTerrainMaterialGenerator.h
+include/OGRE/Terrain/OgreTerrainMaterialGeneratorA.h
+include/OGRE/Terrain/OgreTerrainPagedWorldSection.h
+include/OGRE/Terrain/OgreTerrainPaging.h
+include/OGRE/Terrain/OgreTerrainPrerequisites.h
+include/OGRE/Terrain/OgreTerrainQuadTreeNode.h
+include/OGRE/Threading/OgreDefaultWorkQueue.h
+include/OGRE/Threading/OgreDefaultWorkQueueStandard.h
+include/OGRE/Threading/OgreThreadDefines.h
+include/OGRE/Threading/OgreThreadDefinesNone.h
+include/OGRE/Threading/OgreThreadHeaders.h
 include/OGRE/asm_math.h
-lib/OGRE/Plugin_BSPSceneManager.la
 lib/OGRE/Plugin_BSPSceneManager.so
-lib/OGRE/Plugin_OctreeSceneManager.la
 lib/OGRE/Plugin_OctreeSceneManager.so
-lib/OGRE/Plugin_OctreeZone.la
 lib/OGRE/Plugin_OctreeZone.so
-lib/OGRE/Plugin_ParticleFX.la
+lib/OGRE/Plugin_PCZSceneManager.so
 lib/OGRE/Plugin_ParticleFX.so
-lib/OGRE/RenderSystem_GL.la
 lib/OGRE/RenderSystem_GL.so
-lib/OGRE/libPlugin_PCZSceneManager.la
-lib/OGRE/libPlugin_PCZSceneManager.so
-lib/libCEGUIOgreRenderer.a
-lib/libCEGUIOgreRenderer.la
-lib/libCEGUIOgreRenderer.so
-lib/libCEGUIOgreRenderer-1.6.5.so
-lib/libOgreMain.la
+lib/OGRE/cmake/FindOGRE.cmake
+lib/OGRE/cmake/FindOIS.cmake
+lib/OGRE/cmake/FindPkgMacros.cmake
+lib/OGRE/cmake/MacroLogFeature.cmake
+lib/OGRE/cmake/OgreConfigTargets.cmake
+lib/OGRE/cmake/OgreFindFrameworks.cmake
+lib/OGRE/cmake/OgreGetVersion.cmake
+lib/OGRE/cmake/PreprocessorUtils.cmake
 lib/libOgreMain.so
-lib/libOgreMain-1.6.5.so
-libdata/pkgconfig/CEGUI-OGRE.pc
-libdata/pkgconfig/OGRE.pc
+lib/libOgreMain.so.1.7.2
+lib/libOgrePaging.so
+lib/libOgrePaging.so.1.7.2
+lib/libOgreRTShaderSystem.so
+lib/libOgreRTShaderSystem.so.1.7.2
+lib/libOgreTerrain.so
+lib/libOgreTerrain.so.1.7.2
+lib/pkgconfig/OGRE-PCZ.pc
+lib/pkgconfig/OGRE-Paging.pc
+lib/pkgconfig/OGRE-RTShaderSystem.pc
+lib/pkgconfig/OGRE-Terrain.pc
+lib/pkgconfig/OGRE.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm include/OGRE/GLX
-%%WITH_GTK%%@dirrm include/OGRE/gtk
+@dirrm include/OGRE/Plugins/OctreeSceneManager
+@dirrm include/OGRE/Plugins/BSPSceneManager
+@dirrm include/OGRE/Plugins/ParticleFX
+@dirrm include/OGRE/Plugins/PCZSceneManager
+@dirrm include/OGRE/Plugins/OctreeZone
+@dirrm include/OGRE/Plugins
+@dirrm include/OGRE/Paging
+@dirrm include/OGRE/RTShaderSystem
+@dirrm include/OGRE/RenderSystems/GL/GLX
+@dirrm include/OGRE/RenderSystems/GL/GL
+@dirrm include/OGRE/RenderSystems/GL
+@dirrm include/OGRE/RenderSystems
+@dirrm include/OGRE/Terrain
+@dirrm include/OGRE/Threading
 @dirrm include/OGRE
+@dirrm lib/OGRE/cmake
 @dirrm lib/OGRE
+@dirrm lib/pkgconfig
 %%PORTDOCS%%@dirrm %%DOCSDIR%%