diff options
| -rw-r--r-- | games/ember/Makefile | 18 | ||||
| -rw-r--r-- | games/ember/distinfo | 6 | ||||
| -rw-r--r-- | games/ember/files/patch-ember | 17 | ||||
| -rw-r--r-- | games/ember/pkg-plist | 208 |
4 files changed, 124 insertions, 125 deletions
diff --git a/games/ember/Makefile b/games/ember/Makefile index fa19acdb04d5..9dc2a1b43704 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -6,8 +6,7 @@ # PORTNAME= ember -PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTVERSION= 0.4.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://amber.worldforge.org/ember/releases/stable/ @@ -16,17 +15,16 @@ 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.10:${PORTSDIR}/graphics/ogre3d \ + OgreMain.11:${PORTSDIR}/graphics/ogre3d \ eris-1.3:${PORTSDIR}/devel/eris \ varconf-1.0.6:${PORTSDIR}/devel/varconf \ mercator-0.2.4:${PORTSDIR}/devel/mercator \ openal.0:${PORTSDIR}/audio/openal \ alut.1:${PORTSDIR}/audio/freealut -CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit -USE_SDL= sdl image +CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc --program-transform-name= --disable-cppunit --enable-debug +USE_SDL= sdl GNU_CONFIGURE= YES INSTALLS_SHLIB= YES USE_GCC= 3.4 @@ -37,6 +35,10 @@ CPPFLAGS= -DBR_NO_MACROS .include <bsd.port.pre.mk> +.if ${OSVERSION} < 600000 +IGNORE= Does not compile because of inlining error +.endif + post-patch: @${REINPLACE_CMD} -e '\ s|sdl-config|${SDL_CONFIG}|g; \ @@ -49,9 +51,11 @@ post-patch: ${WRKSRC}/src/framework/Makefile.in @${REINPLACE_CMD} -e '\ s|<SDL/|<|g; \ - s|libSDL_image-1\.2\.so\.0|libSDL_image\.so|g' \ + s|libSDL_image-1\.2\.so\.0|libSDL_image\.so|g; \ + s|"~/.ember"|(std::string(getenv("HOME")) + "/.ember/").c_str()|g' \ ${WRKSRC}/configure \ ${WRKSRC}/src/components/ogre/EmberOgre.cpp \ + ${WRKSRC}/src/components/ogre/OgreSetup.cpp \ ${WRKSRC}/src/framework/scrap.c @${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \ ${WRKSRC}/src/components/ogre/SceneManagers/EmberPagingSceneManager/src/filetutils.cpp diff --git a/games/ember/distinfo b/games/ember/distinfo index 911acac1b5e8..e4a48c1be4f5 100644 --- a/games/ember/distinfo +++ b/games/ember/distinfo @@ -1,3 +1,3 @@ -MD5 (ember-0.4.0.tar.bz2) = c60cfe1227e2f0f810e5fa9b24f2096e -SHA256 (ember-0.4.0.tar.bz2) = 17780eec446b5e3959d657a61a85533f5072e00b629a1755ce51d75509fedd6a -SIZE (ember-0.4.0.tar.bz2) = 2275373 +MD5 (ember-0.4.1.tar.bz2) = c0c51d549c37664e773c8a0b43233f0a +SHA256 (ember-0.4.1.tar.bz2) = 856ce44528f5a47c0635a62d39b1629c7ac7342ababcc0992bd2044f1cf33fb2 +SIZE (ember-0.4.1.tar.bz2) = 2409910 diff --git a/games/ember/files/patch-ember b/games/ember/files/patch-ember index 8d1b70f606fa..c925d827b3d0 100644 --- a/games/ember/files/patch-ember +++ b/games/ember/files/patch-ember @@ -1,5 +1,5 @@ ---- ember.orig Mon Feb 13 00:33:13 2006 -+++ ember Wed Mar 8 06:28:31 2006 +--- ember.in.orig Mon Jul 10 22:21:36 2006 ++++ ember.in Fri Jul 14 06:21:41 2006 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -18,20 +18,11 @@ #if [ "$fullpath" = "" ]; then if [ "$test" = "." ]; then path=${PWD} -@@ -56,7 +57,7 @@ - etcdir=${prefix}/etc/ember - homedata=$HOME/.ember - --WFUT_JAR=$datadir/WFUT.jar -+WFUT_JAR=$bindir/WFUT.jar - - # Create dir if required - if [ ! -d $homedata ] ; then -@@ -96,5 +97,6 @@ +@@ -99,5 +100,6 @@ # Execute real ember binary echo "Starting Ember...." #we have to do the LD_PRELOAD thing, because else at least I get an error: libnvidia-tls.so.1: cannot handle TLS data /ehj --LD_PRELOAD=libGL.so.1 $bindir/ember.bin --binrelocloading +-LD_PRELOAD=libGL.so.1 $bindir/ember.bin --binrelocloading --home $homedata - +[ ! -f $homedata/plugins.cfg ] && cp $etcdir/plugins.cfg $homedata/ +[ ! -f $homedata/resources.cfg ] && cp $etcdir/resources.cfg $homedata/ diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist index 14ba924de5cc..8b5256239e5a 100644 --- a/games/ember/pkg-plist +++ b/games/ember/pkg-plist @@ -1,120 +1,124 @@ bin/ember bin/ember.bin -etc/ember/configfile etc/ember/ember.conf etc/ember/ogre.cfg etc/ember/plugins.cfg etc/ember/resources.cfg etc/ember/terrain.cfg share/applications/ember.desktop -share/games/ember/carpenter/blockspec/adapters.blockspec.xml -share/games/ember/carpenter/blockspec/fences.blockspec.xml -share/games/ember/carpenter/blockspec/floors.blockspec.xml -share/games/ember/carpenter/blockspec/roofs.blockspec.xml -share/games/ember/carpenter/blockspec/slopewalls.blockspec.xml -share/games/ember/carpenter/blockspec/walls.blockspec.xml -share/games/ember/carpenter/blueprints/empty.blueprint.xml -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/Falagard.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/Vera.ttf -share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml -share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml -share/games/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml -share/games/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf -share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-14.xml -share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-10.xml -share/games/ember/media/gui/cegui/datafiles/fonts/vera-sans-8.xml -share/games/ember/media/gui/cegui/datafiles/fonts/ -share/games/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd -share/games/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.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/Chat.layout -share/games/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml -share/games/ember/media/gui/cegui/datafiles/layouts/Debug.layout -share/games/ember/media/gui/cegui/datafiles/layouts/Demo8.layout -share/games/ember/media/gui/cegui/datafiles/layouts/EntityEditWidget.xml -share/games/ember/media/gui/cegui/datafiles/layouts/EntityPicker.layout -share/games/ember/media/gui/cegui/datafiles/layouts/Give.layout -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/ModelEdit.layout -share/games/ember/media/gui/cegui/datafiles/layouts/Performance.layout -share/games/ember/media/gui/cegui/datafiles/layouts/Quit.widget -share/games/ember/media/gui/cegui/datafiles/layouts/ScriptEdit.layout -share/games/ember/media/gui/cegui/datafiles/layouts/ServerBrowser.layout -share/games/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml -share/games/ember/media/gui/cegui/datafiles/lua_scripts/Bootstrap.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/Chat.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/Debug.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/demo8.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/EntityPicker.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/Give.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/ModelEdit.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/Performance.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/ServerBrowser.lua -share/games/ember/media/gui/cegui/datafiles/lua_scripts/ScriptEdit.lua -share/games/ember/media/gui/cegui/datafiles/imagesets/EmberLook.imageset -share/games/ember/media/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel -share/games/ember/media/gui/cegui/datafiles/looknfeel/Vanilla.looknfeel -share/games/ember/media/gui/cegui/datafiles/looknfeel/WindowsLook.looknfeel -share/games/ember/media/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel -share/games/ember/media/gui/cegui/datafiles/schemes/EmberLookSkin.scheme -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/TaharezLookSkin.scheme -share/games/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme -share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme -share/games/ember/media/gui/cegui/datafiles/schemes/WindowsLookSkin.scheme -share/games/ember/media/packs/EmberCore.zip -share/games/ember/media/packs/OgreCore.zip +share/ember/WFUT.jar +share/ember/carpenter/blockspec/adapters.blockspec.xml +share/ember/carpenter/blockspec/fences.blockspec.xml +share/ember/carpenter/blockspec/floors.blockspec.xml +share/ember/carpenter/blockspec/roofs.blockspec.xml +share/ember/carpenter/blockspec/slopewalls.blockspec.xml +share/ember/carpenter/blockspec/walls.blockspec.xml +share/ember/carpenter/blueprints/empty.blueprint.xml +share/ember/carpenter/blueprints/house.blueprint.xml +share/ember/carpenter/blueprints/sty.blueprint.xml +share/ember/carpenter/modelblockspecs/general.modelblocks.xml +share/ember/jesus/modelmappings/general.modelmapping.xml +share/ember/media/gui/CEGUIConfig.xsd +share/ember/media/gui/Falagard.xsd +share/ember/media/gui/Font.xsd +share/ember/media/gui/GUILayout.xsd +share/ember/media/gui/GUIScheme.xsd +share/ember/media/gui/Imageset.xsd +share/ember/media/gui/cegui/datafiles/configs/cegui.config +share/ember/media/gui/cegui/datafiles/fonts/Font.xsd +share/ember/media/gui/cegui/datafiles/fonts/Vera.ttf +share/ember/media/gui/cegui/datafiles/fonts/tahoma-10.xml +share/ember/media/gui/cegui/datafiles/fonts/tahoma-14.xml +share/ember/media/gui/cegui/datafiles/fonts/tahoma-8.xml +share/ember/media/gui/cegui/datafiles/fonts/tahoma.ttf +share/ember/media/gui/cegui/datafiles/fonts/vera-sans-10.xml +share/ember/media/gui/cegui/datafiles/fonts/vera-sans-14.xml +share/ember/media/gui/cegui/datafiles/fonts/vera-sans-8.xml +share/ember/media/gui/cegui/datafiles/imagesets/EmberLook.imageset +share/ember/media/gui/cegui/datafiles/imagesets/Imageset.xsd +share/ember/media/gui/cegui/datafiles/imagesets/TaharezLook.imageset +share/ember/media/gui/cegui/datafiles/imagesets/WindowsLook.imageset +share/ember/media/gui/cegui/datafiles/imagesets/iconset_mason.imageset +share/ember/media/gui/cegui/datafiles/imagesets/iconset_standard.imageset +share/ember/media/gui/cegui/datafiles/layouts/Chat.layout +share/ember/media/gui/cegui/datafiles/layouts/ConsoleWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/Debug.layout +share/ember/media/gui/cegui/datafiles/layouts/Demo8.layout +share/ember/media/gui/cegui/datafiles/layouts/EntityEditWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/EntityPicker.layout +share/ember/media/gui/cegui/datafiles/layouts/GUILayout.xsd +share/ember/media/gui/cegui/datafiles/layouts/Give.layout +share/ember/media/gui/cegui/datafiles/layouts/HelpWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/IngameChatWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/InspectWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/InventoryWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/JesusEdit.widget +share/ember/media/gui/cegui/datafiles/layouts/JesusEditFile.widget +share/ember/media/gui/cegui/datafiles/layouts/JesusEditPreview.widget +share/ember/media/gui/cegui/datafiles/layouts/MakeEntityWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/MeshPreview.widget +share/ember/media/gui/cegui/datafiles/layouts/ModelEdit.layout +share/ember/media/gui/cegui/datafiles/layouts/Performance.layout +share/ember/media/gui/cegui/datafiles/layouts/Quit.widget +share/ember/media/gui/cegui/datafiles/layouts/ScriptEdit.layout +share/ember/media/gui/cegui/datafiles/layouts/ServerBrowser.layout +share/ember/media/gui/cegui/datafiles/layouts/ServerWidget.xml +share/ember/media/gui/cegui/datafiles/layouts/Tasks.layout +share/ember/media/gui/cegui/datafiles/layouts/TerrainEditor.layout +share/ember/media/gui/cegui/datafiles/layouts/CVS/TerrainEditor.layout +share/ember/media/gui/cegui/datafiles/looknfeel/EmberLook.looknfeel +share/ember/media/gui/cegui/datafiles/looknfeel/TaharezLook.looknfeel +share/ember/media/gui/cegui/datafiles/looknfeel/Vanilla.looknfeel +share/ember/media/gui/cegui/datafiles/looknfeel/WindowsLook.looknfeel +share/ember/media/gui/cegui/datafiles/lua_scripts/Bootstrap.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/Chat.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/Debug.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/EntityPicker.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/Give.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/ModelEdit.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/Performance.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/ScriptEdit.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/ServerBrowser.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/Tasks.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/TerrainEditor.lua +share/ember/media/gui/cegui/datafiles/lua_scripts/demo8.lua +share/ember/media/gui/cegui/datafiles/schemes/EmberLookSkin.scheme +share/ember/media/gui/cegui/datafiles/schemes/GUIScheme.xsd +share/ember/media/gui/cegui/datafiles/schemes/TaharezLook.scheme +share/ember/media/gui/cegui/datafiles/schemes/TaharezLookSkin.scheme +share/ember/media/gui/cegui/datafiles/schemes/TaharezLookWidgetAliases.scheme +share/ember/media/gui/cegui/datafiles/schemes/WindowsLook.scheme +share/ember/media/gui/cegui/datafiles/schemes/WindowsLookSkin.scheme +share/ember/media/packs/EmberCore.zip +share/ember/media/packs/OgreCore.zip share/icons/worldforge/ember.png %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/TODO -@dirrmtry share/applications @dirrm etc/ember -@dirrm share/games/ember/carpenter/blockspec -@dirrm share/games/ember/carpenter/blueprints -@dirrm share/games/ember/carpenter/modelblockspecs -@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/looknfeel -@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 -@dirrm share/games/ember/media/gui -@dirrm share/games/ember/media/packs -@dirrm share/games/ember/media -@dirrm share/games/ember -@dirrm share/games +@dirrmtry share/applications +@dirrm share/ember/carpenter/blockspec +@dirrm share/ember/carpenter/blueprints +@dirrm share/ember/carpenter/modelblockspecs +@dirrm share/ember/carpenter +@dirrm share/ember/jesus/modelmappings +@dirrm share/ember/jesus +@dirrm share/ember/media/gui/cegui/datafiles/configs +@dirrm share/ember/media/gui/cegui/datafiles/fonts +@dirrm share/ember/media/gui/cegui/datafiles/imagesets +@dirrm share/ember/media/gui/cegui/datafiles/layouts/CVS +@dirrm share/ember/media/gui/cegui/datafiles/layouts +@dirrm share/ember/media/gui/cegui/datafiles/looknfeel +@dirrm share/ember/media/gui/cegui/datafiles/lua_scripts +@dirrm share/ember/media/gui/cegui/datafiles/schemes +@dirrm share/ember/media/gui/cegui/datafiles +@dirrm share/ember/media/gui/cegui +@dirrm share/ember/media/gui +@dirrm share/ember/media/packs +@dirrm share/ember/media +@dirrm share/ember @dirrmtry share/icons/worldforge @dirrmtry share/icons %%PORTDOCS%%@dirrm %%DOCSDIR%% |