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

5 files changed, 50 insertions, 29 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index 4d31605d3333..04b4a4f097f6 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ember
-PORTVERSION=	0.5.8
-PORTREVISION=	3
+PORTVERSION=	0.6.0
 CATEGORIES=	games
 MASTER_SITES=	SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -18,22 +17,27 @@ DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.5.so:${PORTSDIR}/graphics/ogre3d
-RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.6.5.so:${PORTSDIR}/graphics/ogre3d
+BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so.1.7.2:${PORTSDIR}/graphics/ogre3d
+RUN_DEPENDS=	${LOCALBASE}/lib/libOgreMain.so.1.7.2:${PORTSDIR}/graphics/ogre3d
 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 		eris-1.3:${PORTSDIR}/devel/eris \
 		varconf-1.0.6:${PORTSDIR}/devel/varconf \
 		mercator-0.2.8:${PORTSDIR}/devel/mercator \
 		wfut-0.2:${PORTSDIR}/devel/libwfut \
-		boost_thread.4:${PORTSDIR}/devel/boost-libs
+		boost_thread.4:${PORTSDIR}/devel/boost-libs \
+		CEGUIBase-0.7.5:${PORTSDIR}/graphics/cegui
 
-CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit --enable-debug
+CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc \
+		--program-transform-name= --disable-cppunit --enable-debug \
+		--with-toluaxx=${TOLUAXX_CMD}
 CONFIGURE_ENV+=	LUA_LIBS="-L${LUA_LIBDIR} -llua" \
-		LUA_CFLAGS="-I${LUA_INCDIR}"
+		LUA_CFLAGS="-I${LUA_INCDIR}" \
+		TOLUAXX="${TOLUAXX_CMD}"
 USE_SDL=	sdl
 GNU_CONFIGURE=	YES
 USE_LDCONFIG=	YES
 USE_LUA=	5.1
+LUA_COMPS=	toluaxx
 USE_OPENAL=	al alut
 USE_GNOME=	gnomehack
 USE_BZIP2=	YES
@@ -59,7 +63,7 @@ post-patch:
 		${WRKSRC}/ember.conf
 
 post-install:
-	(cd ${WRKDIR}/ember-media-${PORTVERSION}/media && ${FIND} . -type f -print | \
+	(cd ${WRKDIR}/media-${PORTVERSION}/media && ${FIND} . -type f -print | \
 		${CPIO} -pdmu -R${SHAREOWN}:${SHAREGRP} ${DATADIR}/media)
 	${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755
 	${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 0644
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 6debd2fafaad..ad18fa0b6ce6 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,6 +1,4 @@
-MD5 (ember-0.5.8.tar.bz2) = 8f5d9625cb9fb73d42c5d44a36617ce8
-SHA256 (ember-0.5.8.tar.bz2) = 9020d965800523c356e16f613e24b688cc9ff25ca7c5ea74020157ca2732385e
-SIZE (ember-0.5.8.tar.bz2) = 1724944
-MD5 (ember-media-0.5.8.tar.bz2) = 5a572b254316cfcd301c9a68293e03b9
-SHA256 (ember-media-0.5.8.tar.bz2) = 86b42c2341166d45ff555c7bba97691b4c45cc4405172ffc43f659555a16b4ca
-SIZE (ember-media-0.5.8.tar.bz2) = 280186318
+SHA256 (ember-0.6.0.tar.bz2) = ba817996c9cce03c71e520e1201a79f75df1aa0fc80d2b06fdcc2b9310c421d1
+SIZE (ember-0.6.0.tar.bz2) = 1881472
+SHA256 (ember-media-0.6.0.tar.bz2) = a1adb7b40635a8a46eef2af043a19405429b8c0bc3d6032d930fce57f95a04ea
+SIZE (ember-media-0.6.0.tar.bz2) = 280819120
diff --git a/games/ember/files/patch-lua_Eris.cpp b/games/ember/files/patch-lua_Eris.cpp
deleted file mode 100644
index 26dea6bf6a5d..000000000000
--- a/games/ember/files/patch-lua_Eris.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/framework/bindings/lua/eris/lua_Eris.cpp.orig	2009-04-05 12:00:12.000000000 +0200
-+++ src/framework/bindings/lua/eris/lua_Eris.cpp	2009-04-05 12:00:22.000000000 +0200
-@@ -14,6 +14,7 @@
- TOLUA_API int  tolua_Eris_open (lua_State* tolua_S);
- 
- #include "required.h"
-+#include <Atlas/Objects/Operation.h>
- #include <Eris/Types.h>
- #include <Eris/Entity.h>
- #include <Eris/ServerInfo.h>
diff --git a/games/ember/files/patch-tolua++.h b/games/ember/files/patch-tolua++.h
new file mode 100644
index 000000000000..d0b178625aaf
--- /dev/null
+++ b/games/ember/files/patch-tolua++.h
@@ -0,0 +1,15 @@
+--- src/components/lua/tolua++.h.orig	2011-01-19 15:51:08.000000000 +0100
++++ src/components/lua/tolua++.h	2011-01-19 15:51:58.000000000 +0100
+@@ -31,4 +31,12 @@
+ 
+ #include <tolua++.h>
+ 
++#ifndef Mtolua_new
++#define Mtolua_new(EXP) new EXP
++#endif
++
++#ifndef Mtolua_delete
++#define Mtolua_delete(EXP) delete EXP
++#endif
++
+ #endif /* EMBER_TOLUA_H_ */
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index b96fbeee63fb..881da13c3e8a 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -1371,7 +1371,6 @@ share/ember/media/shared/common/3d_skeletons/creatures/tubular/textures/pickerel
 share/ember/media/shared/common/3d_skeletons/creatures/tubular/textures/scaly_brown_white/D.png
 share/ember/media/shared/common/3d_skeletons/creatures/tubular/textures/scaly_brown_white/ogre.material
 share/ember/media/shared/common/3d_skeletons/insects/models/spider/animation/spider.skeleton
-share/ember/media/shared/common/3d_skeletons/insects/models/spider/spider.mesh
 share/ember/media/shared/common/3d_skeletons/insects/textures/carrion/D.png
 share/ember/media/shared/common/3d_skeletons/insects/textures/carrion/N.png
 share/ember/media/shared/common/3d_skeletons/insects/textures/carrion/S.png
@@ -1707,8 +1706,6 @@ share/ember/media/shared/gui/cegui/datafiles/layouts/TerrainEditor.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/EntityPicker.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/InspectWidget.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Debug.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Chat.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/Mover.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Status.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/ScriptEdit.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/AssetsManager.layout
@@ -1730,7 +1727,6 @@ share/ember/media/shared/gui/cegui/datafiles/layouts/MakeEntityWidget.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/Label.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/IngameChatWidget.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/TypeManager.layout
-share/ember/media/shared/gui/cegui/datafiles/layouts/ConsoleWidget.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/JesusEditFile.layout
 share/ember/media/shared/gui/cegui/datafiles/layouts/GUILayout.xsd
 share/ember/media/shared/gui/cegui/datafiles/configs/cegui.config
@@ -1773,7 +1769,6 @@ share/ember/media/shared/scripting/lua/Environment.lua
 share/ember/media/shared/scripting/lua/Debug.lua
 share/ember/media/shared/scripting/lua/ModelEdit.lua
 share/ember/media/shared/scripting/lua/Inventory.lua
-share/ember/media/shared/scripting/lua/Chat.lua
 share/ember/media/shared/scripting/lua/EntityEditor.lua
 share/ember/media/shared/scripting/lua/EntityCreator.lua
 share/ember/media/shared/scripting/lua/TerrainEditor.lua
@@ -1795,6 +1790,25 @@ share/ember/media/shared/core/ember_splash.png
 share/ember/media/user/COPYING.txt
 share/ember/media/user/LICENSING.txt
 share/ember/media/user/README
+share/ember/media/shared/entityrecipes/fish.entityrecipe
+share/ember/media/shared/entityrecipes/sieve.entityrecipe
+share/ember/media/shared/entityrecipes/shovel.entityrecipe
+share/ember/media/shared/entityrecipes/fishingrod.entityrecipe
+share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBar.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/QuickHelp.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/ActionBarCreator.layout
+share/ember/media/shared/gui/cegui/datafiles/layouts/Console.layout
+share/ember/media/shared/scripting/lua/ActionBarCreator.lua
+share/ember/media/shared/scripting/lua/ActionBar.lua
+share/ember/media/shared/scripting/lua/DefaultEntityActions.lua
+share/ember/media/shared/scripting/lua/MakeEntity.lua
+share/ember/media/shared/scripting/lua/Server.lua
+share/ember/media/shared/scripting/lua/QuickHelp.lua
+share/ember/media/shared/scripting/lua/Inspect.lua
+share/ember/media/shared/scripting/lua/ActionBarDefaultAction.lua
+share/ember/media/shared/scripting/lua/Console.lua
+share/ember/media/shared/common/3d_objects/environment/textures/smoke/smokecolors.png
+share/ember/media/shared/common/3d_objects/creatures/spider/spider.mesh
 @dirrm share/ember/media/shared/core
 @dirrm share/ember/media/shared/common/soundfx/items/saw
 @dirrm share/ember/media/shared/common/soundfx/items