diff options
Diffstat (limited to 'games')
-rw-r--r-- | games/ember/Makefile | 20 | ||||
-rw-r--r-- | games/ember/distinfo | 10 | ||||
-rw-r--r-- | games/ember/files/patch-lua_Eris.cpp | 10 | ||||
-rw-r--r-- | games/ember/files/patch-tolua++.h | 15 | ||||
-rw-r--r-- | games/ember/pkg-plist | 24 | ||||
-rw-r--r-- | games/freeorion/Makefile | 20 | ||||
-rw-r--r-- | games/freeorion/distinfo | 6 | ||||
-rw-r--r-- | games/freeorion/files/patch-cmake-FindGraphviz.cmake | 39 | ||||
-rw-r--r-- | games/freeorion/files/patch-util-Serialize.c | 4 | ||||
-rw-r--r-- | games/vegastrike/Makefile | 2 |
10 files changed, 107 insertions, 43 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 diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index 981999d2e4fd..e461f698cfa7 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -6,8 +6,7 @@ # PORTNAME= freeorion -PORTVERSION= 0.3.13.3318 -PORTREVISION= 6 +PORTVERSION= 0.3.13.3795 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= oliver @@ -27,9 +26,10 @@ BROKEN= does not build USE_GCC= 4.4+ USE_BZIP2= yes USE_PYTHON= yes -USE_SCONS= yes -SCONS_ARGS= with_builtin_sdlnet=0 -SCONS_BUILDENV= PYTHON_LIB=${PYTHON_VERSION} LINKFLAGS=${LDFLAGS} +#USE_SCONS= yes +USE_CMAKE= yes +#SCONS_ARGS= with_builtin_sdlnet=0 +#SCONS_BUILDENV= PYTHON_LIB=${PYTHON_VERSION} LINKFLAGS=${LDFLAGS} USE_OPENAL= alut USE_SDL= sdl net WRKSRC= ${WRKDIR}/${PORTNAME}/FreeOrion @@ -44,9 +44,13 @@ post-patch: @${REINPLACE_CMD} -e 's|Plugin=Plugin_CgProgramManager|#&|g; \ s|\(PluginFolder=\)\.|\1${LOCALBASE}/lib/OGRE|g' \ ${WRKSRC}/ogre_plugins.cfg - @${REINPLACE_CMD} -e 's|\(prefix.*\)/usr/local|\1${PREFIX}|g; \ - s|/usr/local/lib/OGRE|${LOCALBASE}/lib/OGRE|g' \ - ${WRKSRC}/SConstruct +# @${REINPLACE_CMD} -e 's|\(prefix.*\)/usr/local|\1${PREFIX}|g; \ +# s|/usr/local/lib/OGRE|${LOCALBASE}/lib/OGRE|g' \ +# ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e 's|Linux|FreeBSD|g' \ + ${WRKSRC}/CMakeLists.txt +# @${REINPLACE_CMD} -e 's|libagraph ||g' \ +# ${WRKSRC}/cmake/FindGraphviz.cmake @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ ${WRKSRC}/util/Directories.cpp @${REINPLACE_CMD} -e 's|png_infopp_NULL|NULL|g' -e 's|int_p_NULL|NULL|g' \ diff --git a/games/freeorion/distinfo b/games/freeorion/distinfo index 7f119a22c433..35c0640dcbb9 100644 --- a/games/freeorion/distinfo +++ b/games/freeorion/distinfo @@ -1,3 +1,3 @@ -MD5 (freeorion-0.3.13.3318.tar.bz2) = 32fc6c8f97e7c67392855912c5a8bf55 -SHA256 (freeorion-0.3.13.3318.tar.bz2) = d6f3ca46917125742e97cf987035f5656243f627f756942982d69b4da6389b64 -SIZE (freeorion-0.3.13.3318.tar.bz2) = 145459884 +MD5 (freeorion-0.3.13.3795.tar.bz2) = 79d3a081cb94ddc3b69cabd71e73fea6 +SHA256 (freeorion-0.3.13.3795.tar.bz2) = a6a4c045c9826af7ccabf15eb211afc8be6552483e393c00f8b152b8377d1052 +SIZE (freeorion-0.3.13.3795.tar.bz2) = 151497009 diff --git a/games/freeorion/files/patch-cmake-FindGraphviz.cmake b/games/freeorion/files/patch-cmake-FindGraphviz.cmake new file mode 100644 index 000000000000..2bd73f82c52e --- /dev/null +++ b/games/freeorion/files/patch-cmake-FindGraphviz.cmake @@ -0,0 +1,39 @@ +--- cmake/FindGraphviz.cmake.orig 2010-09-14 10:12:19.000000000 +0200 ++++ cmake/FindGraphviz.cmake 2010-09-14 10:12:52.000000000 +0200 +@@ -10,7 +10,7 @@ + + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) +- pkg_check_modules(GRAPHVIZ libagraph libcdt libcgraph libgraph libgvc libpathplan) ++ pkg_check_modules(GRAPHVIZ libcdt libcgraph libgraph libgvc libpathplan) + if (GRAPHVIZ_FOUND) + set(GRAPHVIZ_INCLUDE_DIR ${GRAPHVIZ_INCLUDE_DIRS}) + endif () +@@ -26,11 +26,6 @@ + ) + + find_library( +- GRAPHVIZ_AGRAPH_LIBRARY +- NAMES agraph +- PATHS ${GRAPHVIZ_LIBRARY_DIRS} +-) +-find_library( + GRAPHVIZ_CDT_LIBRARY + NAMES cdt + PATHS ${GRAPHVIZ_LIBRARY_DIRS} +@@ -57,7 +52,6 @@ + ) + + if (GRAPHVIZ_INCLUDE_DIR AND +- GRAPHVIZ_AGRAPH_LIBRARY AND + GRAPHVIZ_CDT_LIBRARY AND + GRAPHVIZ_CGRAPH_LIBRARY AND + GRAPHVIZ_GRAPH_LIBRARY AND +@@ -65,7 +59,6 @@ + GRAPHVIZ_PATHPLAN_LIBRARY) + set(GRAPHVIZ_FOUND true) + set(GRAPHVIZ_LIBRARIES +- ${GRAPHVIZ_AGRAPH_LIBRARY} + ${GRAPHVIZ_CDT_LIBRARY} + ${GRAPHVIZ_CGRAPH_LIBRARY} + ${GRAPHVIZ_GRAPH_LIBRARY} diff --git a/games/freeorion/files/patch-util-Serialize.c b/games/freeorion/files/patch-util-Serialize.c index d3e80162d9a2..b0d8aa7fd6dd 100644 --- a/games/freeorion/files/patch-util-Serialize.c +++ b/games/freeorion/files/patch-util-Serialize.c @@ -1,5 +1,5 @@ ---- util/Serialize.cpp.orig 2009-04-13 08:56:38.000000000 +0200 -+++ util/Serialize.cpp 2009-04-13 08:56:56.000000000 +0200 +--- util/Serialize.ipp.orig 2009-04-13 08:56:38.000000000 +0200 ++++ util/Serialize.ipp 2009-04-13 08:56:56.000000000 +0200 @@ -65,7 +65,7 @@ // some endianness and size checks to ensure portability of binary save files; of one or more of these fails, it means // that FreeOrion is not supported on your platform/compiler pair, and must be modified to provide data of the diff --git a/games/vegastrike/Makefile b/games/vegastrike/Makefile index ec0b9278b4c2..4ece6b09dbd8 100644 --- a/games/vegastrike/Makefile +++ b/games/vegastrike/Makefile @@ -7,7 +7,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/OldFiles DISTNAME= vegastrike-source-${PORTVERSION} |