4 files changed, 33 insertions, 108 deletions

diff --git a/games/ember/Makefile b/games/ember/Makefile
index 01122880d758..5f2fe20b0647 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ember
-PORTVERSION=	0.3.3
+PORTVERSION=	0.3.4
 PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=worldforge
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 
+RUN_DEPENDS=	${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 		OgreMain.9:${PORTSDIR}/graphics/ogre3d \
 		eris-1.3:${PORTSDIR}/devel/eris \
@@ -22,16 +23,14 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 		mercator-0.2.4:${PORTSDIR}/devel/mercator \
 		openal.0:${PORTSDIR}/audio/openal
 
-RUN_DEPENDS=	${X11BASE}/bin/WFUT.jar:${PORTSDIR}/devel/wfut
-
-CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name=
-USE_LIBTOOL=	15
+CONFIGURE_ARGS=	--with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit
+USE_LIBTOOL_VER=15
 USE_SDL=	sdl image
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
 USE_GCC=	3.4
-USE_ZIP=	YES
+USE_BZIP2=	YES
 USE_X_PREFIX=	YES
 USE_GNOME=	gnomehack
 CPPFLAGS=	-DBR_NO_MACROS
@@ -41,29 +40,26 @@ CPPFLAGS=	-DBR_NO_MACROS
 post-patch:
 	@${REINPLACE_CMD} -e '\
 		s|sdl-config|${SDL_CONFIG}|g; \
-		s|"-lopenal|"-L${LOCALBASE}/lib -lopenal ${PTHREAD_LIBS}|g; \
 		s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
 		s|CEGUI-OGRE_\([A-Z]*=\)|CEGUI_OGRE_\1|g; \
 		s|\$$CEGUI-OGRE_\([A-Z]*\)|\$$CEGUI_OGRE_\1|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '\
+		s|^CFLAGS =.*|& $${SDL_CFLAGS} -I${X11BASE}/include|g' \
+		${WRKSRC}/src/framework/Makefile.in
+	@${REINPLACE_CMD} -e '\
 		s|<SDL/|<|g; \
 		s|libSDL_image-1\.2\.so\.0|libSDL_image\.so|g' \
 		${WRKSRC}/configure \
-		${WRKSRC}/src/components/ogre/EmberOgre.cpp
-	@${REINPLACE_CMD} -e 's|#include "framework/float_cast.h"||g' \
-		${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp
+		${WRKSRC}/src/components/ogre/EmberOgre.cpp \
+		${WRKSRC}/src/framework/scrap.c
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/filetutils.cpp
-	@${REINPLACE_CMD} -e 's|#include "OgrePagingLandScapeIntersectionSceneQuery.h"||' \
-		${WRKSRC}/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/OgrePagingLandScapeSceneManager.cpp
 	@${REINPLACE_CMD} -e 's|	install-dist_docDATA |	|g'  ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '\
 		 /Plugin=Plugin_CgProgramManager.so/d; \
 		s|/usr/lib/OGRE|${X11BASE}/lib/OGRE|' \
 		${WRKSRC}/src/components/ogre/plugins.cfg
-	@${REINPLACE_CMD} -e 's|(br_thread_local_store (br_prepend_prefix ((void \*) "", "\([^"]*\)")))|"${PREFIX}\1"|g' \
-		${WRKSRC}/src/framework/prefix.h
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's|lrintf|(long int)rintf|g' \
 		${WRKSRC}/src/components/ogre/environment/meshtree/TStem.cpp \
diff --git a/games/ember/distinfo b/games/ember/distinfo
index 77c7f6b9c40f..3e59136b513a 100644
--- a/games/ember/distinfo
+++ b/games/ember/distinfo
@@ -1,2 +1,2 @@
-MD5 (ember-0.3.3.zip) = 403206c2f34a1faa45b41c031f6e5059
-SIZE (ember-0.3.3.zip) = 1681887
+MD5 (ember-0.3.4.tar.bz2) = 0109fe1abd9407b8578c69b280ae66e4
+SIZE (ember-0.3.4.tar.bz2) = 1066617
diff --git a/games/ember/files/patch-src-framework-prefix.cpp b/games/ember/files/patch-src-framework-prefix.cpp
deleted file mode 100644
index 1d9500ea5cb1..000000000000
--- a/games/ember/files/patch-src-framework-prefix.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/framework/prefix.cpp.orig	Mon Oct  3 19:05:02 2005
-+++ src/framework/prefix.cpp	Mon Oct  3 19:19:25 2005
-@@ -32,7 +32,7 @@
- 
- #ifndef BR_PTHREADS
- 	/* Change 1 to 0 if you don't want pthread support */
--	#define BR_PTHREADS 1
-+	#define BR_PTHREADS 0
- #endif /* BR_PTHREADS */
- 
- #include <stdlib.h>
-@@ -105,14 +105,14 @@
- 	FILE *f;
- 	char *path;
- 
--	br_return_val_if_fail (symbol != NULL, NULL);
-+	br_return_val_if_fail (symbol != NULL, (char *)NULL);
- 
- 	f = fopen ("/proc/self/maps", "r");
- 	if (!f) {
- 		if (fallback_func)
- 			return fallback_func(symbol, fallback_data);
- 		else
--			return NULL;
-+			return (char *)NULL;
- 	}
- 
- 	while (!feof (f))
-@@ -151,7 +151,7 @@
- 	}
- 
- 	fclose (f);
--	return NULL;
-+	return (char *)NULL;
- }
- 
- 
-@@ -173,10 +173,10 @@
- {
- 	char *path, *prefix;
- 
--	br_return_val_if_fail (symbol != NULL, NULL);
-+	br_return_val_if_fail (symbol != NULL, (char *)NULL);
- 
- 	path = br_locate (symbol);
--	if (!path) return NULL;
-+	if (!path) return (char *)NULL;
- 
- 	prefix = br_extract_prefix (path);
- 	free (path);
-@@ -203,11 +203,11 @@
- {
- 	char *tmp, *newpath;
- 
--	br_return_val_if_fail (symbol != NULL, NULL);
--	br_return_val_if_fail (path != NULL, NULL);
-+	br_return_val_if_fail (symbol != NULL, (char *)NULL);
-+	br_return_val_if_fail (path != NULL, (char *)NULL);
- 
- 	tmp = br_locate_prefix (symbol);
--	if (!tmp) return NULL;
-+	if (!tmp) return (char *)NULL;
- 
- 	if (strcmp (tmp, "/") == 0)
- 		newpath = strdup (path);
-@@ -215,7 +215,7 @@
- 		newpath = br_strcat (tmp, path);
- 
- 	/* Get rid of compiler warning ("br_prepend_prefix never used") */
--	if (0) br_prepend_prefix (NULL, NULL);
-+	if (0) br_prepend_prefix (NULL, (char *)NULL);
- 
- 	free (tmp);
- 	return newpath;
diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist
index df6e101ed9ee..6c29139ddf5f 100644
--- a/games/ember/pkg-plist
+++ b/games/ember/pkg-plist
@@ -18,10 +18,12 @@ share/games/ember/carpenter/blueprints/house.blueprint.xml
 share/games/ember/carpenter/blueprints/sty.blueprint.xml
 share/games/ember/carpenter/modelblockspecs/general.modelblocks.xml
 share/games/ember/jesus/modelmappings/general.modelmapping.xml
+share/games/ember/media/gui/CEGUIConfig.xsd
 share/games/ember/media/gui/Font.xsd
 share/games/ember/media/gui/GUILayout.xsd
 share/games/ember/media/gui/GUIScheme.xsd
 share/games/ember/media/gui/Imageset.xsd
+share/games/ember/media/gui/cegui/datafiles/configs/cegui.config
 share/games/ember/media/gui/cegui/datafiles/fonts/Font.xsd
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml
 share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml
@@ -33,30 +35,30 @@ share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLookMouse.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset
 share/games/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset
+share/games/ember/media/gui/cegui/datafiles/layouts/ChatWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/DebugWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/GiveWidget.xml
 share/games/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd
+share/games/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/InspectWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/InventoryWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/JesusEdit.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditFile.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/Performance.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget
+share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowserWidget.xml
+share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml
 share/games/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd
 share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgets.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme
 share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookWidgets.scheme
-share/games/ember/media/gui/cegui/widgets/ChatWidget.xml
-share/games/ember/media/gui/cegui/widgets/ConsoleWidget.xml
-share/games/ember/media/gui/cegui/widgets/DebugWidget.xml
-share/games/ember/media/gui/cegui/widgets/GiveWidget.xml
-share/games/ember/media/gui/cegui/widgets/HelpWidget.xml
-share/games/ember/media/gui/cegui/widgets/IngameChatWidget.xml
-share/games/ember/media/gui/cegui/widgets/InspectWidget.xml
-share/games/ember/media/gui/cegui/widgets/InventoryWidget.xml
-share/games/ember/media/gui/cegui/widgets/JesusEdit.widget
-share/games/ember/media/gui/cegui/widgets/JesusEditFile.widget
-share/games/ember/media/gui/cegui/widgets/JesusEditPreview.widget
-share/games/ember/media/gui/cegui/widgets/MakeEntityWidget.xml
-share/games/ember/media/gui/cegui/widgets/MeshPreview.widget
-share/games/ember/media/gui/cegui/widgets/Performance.widget
-share/games/ember/media/gui/cegui/widgets/Quit.widget
-share/games/ember/media/gui/cegui/widgets/ServerBrowserWidget.xml
-share/games/ember/media/gui/cegui/widgets/ServerWidget.xml
 share/games/ember/media/modeldefinitions/buildingelements.modeldef.xml
 share/games/ember/media/modeldefinitions/characters.modeldef.xml
 share/games/ember/media/modeldefinitions/creatures.modeldef.xml
@@ -79,12 +81,13 @@ share/icons/worldforge/ember.png
 @dirrm share/games/ember/carpenter
 @dirrm share/games/ember/jesus/modelmappings
 @dirrm share/games/ember/jesus
+@dirrm share/games/ember/media/gui/cegui/datafiles/configs
 @dirrm share/games/ember/media/gui/cegui/datafiles/fonts
 @dirrm share/games/ember/media/gui/cegui/datafiles/imagesets
 @dirrm share/games/ember/media/gui/cegui/datafiles/layouts
+@dirrm share/games/ember/media/gui/cegui/datafiles/lua_scripts
 @dirrm share/games/ember/media/gui/cegui/datafiles/schemes
 @dirrm share/games/ember/media/gui/cegui/datafiles
-@dirrm share/games/ember/media/gui/cegui/widgets
 @dirrm share/games/ember/media/gui/cegui
 @dirrm share/games/ember/media/gui
 @dirrm share/games/ember/media/modeldefinitions/trees/dynamic