From aae2692930dded120bc7d12fe8ba1fa9e5ff6b09 Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Fri, 29 Apr 2011 05:56:56 +0000 Subject: [PATCH] big WorldForge update: update eris to 1.3.18 update wfmath to 0.3.11 update skstream to 0.3.8 update mercator to 0.3.0 update ember to 0.6.1 update cyphesis to 0.5.26 --- devel/eris/Makefile | 9 +++--- devel/eris/distinfo | 5 ++-- devel/eris/pkg-plist | 9 +++--- devel/mercator/Makefile | 4 +-- devel/mercator/distinfo | 4 +-- devel/mercator/pkg-plist | 61 ++++++++++++++++++++-------------------- games/ember/Makefile | 4 +-- games/ember/distinfo | 8 +++--- games/ember/pkg-plist | 3 +- math/wfmath/Makefile | 2 +- math/wfmath/distinfo | 4 +-- math/wfmath/pkg-plist | 2 +- net/cyphesis/Makefile | 14 +++++---- net/cyphesis/distinfo | 4 +-- net/cyphesis/pkg-plist | 2 ++ net/skstream/Makefile | 2 +- net/skstream/distinfo | 4 +-- net/skstream/pkg-plist | 2 +- 18 files changed, 75 insertions(+), 68 deletions(-) diff --git a/devel/eris/Makefile b/devel/eris/Makefile index c0c82659bab2..9faca17e04f4 100644 --- a/devel/eris/Makefile +++ b/devel/eris/Makefile @@ -6,8 +6,7 @@ # PORTNAME= eris -PORTVERSION= 1.3.16 -PORTREVISION= 1 +PORTVERSION= 1.3.18 CATEGORIES= devel MASTER_SITES= SF/worldforge/Eris%201.4%20%28client%20lib%29/${PORTVERSION}/ @@ -15,10 +14,10 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= WorldForge client entity library LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \ - skstream-0.3.5:${PORTSDIR}/net/skstream \ - wfmath-0.3.4:${PORTSDIR}/math/wfmath \ + skstream-0.3.6:${PORTSDIR}/net/skstream \ + wfmath-0.3.5:${PORTSDIR}/math/wfmath \ sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ - mercator-0.2.8:${PORTSDIR}/devel/mercator + mercator-0.3.1:${PORTSDIR}/devel/mercator GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/eris/distinfo b/devel/eris/distinfo index 60768cba3187..4c7ffee27843 100644 --- a/devel/eris/distinfo +++ b/devel/eris/distinfo @@ -1,3 +1,2 @@ -MD5 (eris-1.3.16.tar.gz) = 05723cc5a597066c9f686daa05fca1a8 -SHA256 (eris-1.3.16.tar.gz) = 76abb833496d3723e95cb83e7ec17e4262bc37606cec591d22ff094c3b48d984 -SIZE (eris-1.3.16.tar.gz) = 563178 +SHA256 (eris-1.3.18.tar.gz) = 08e4ea33cb55a6b3e553e97191c2d9741a1ab4a5f4311819914699dc6a234472 +SIZE (eris-1.3.18.tar.gz) = 509539 diff --git a/devel/eris/pkg-plist b/devel/eris/pkg-plist index 6e7c3a49ecbb..cb10935fc4c8 100644 --- a/devel/eris/pkg-plist +++ b/devel/eris/pkg-plist @@ -1,6 +1,6 @@ lib/liberis-1.3.la lib/liberis-1.3.so -lib/liberis-1.3.so.16 +lib/liberis-1.3.so.18 include/Eris-1.3/Eris/Account.h include/Eris-1.3/Eris/Alarm.h include/Eris-1.3/Eris/Avatar.h @@ -27,6 +27,8 @@ include/Eris-1.3/Eris/PollDefault.h include/Eris-1.3/Eris/PollGlib.h include/Eris-1.3/Eris/PollGlibFD.h include/Eris-1.3/Eris/PollGlibSource.h +include/Eris-1.3/Eris/PollWinsock.h +include/Eris-1.3/Eris/PollWinsock_impl.h include/Eris-1.3/Eris/Redispatch.h include/Eris-1.3/Eris/Response.h include/Eris-1.3/Eris/Room.h @@ -34,8 +36,8 @@ include/Eris-1.3/Eris/Router.h include/Eris-1.3/Eris/ServerInfo.h include/Eris-1.3/Eris/SpawnPoint.h include/Eris-1.3/Eris/Task.h -include/Eris-1.3/Eris/TerrainMod.h -include/Eris-1.3/Eris/TerrainMod_impl.h +include/Eris-1.3/Eris/TerrainModTranslator.h +include/Eris-1.3/Eris/TerrainModObserver.h include/Eris-1.3/Eris/TimedEventService.h include/Eris-1.3/Eris/Timeout.h include/Eris-1.3/Eris/TypeBoundRedispatch.h @@ -45,7 +47,6 @@ include/Eris-1.3/Eris/Types.h include/Eris-1.3/Eris/UIFactory.h include/Eris-1.3/Eris/View.h include/Eris-1.3/Eris/ViewEntity.h -include/Eris-1.3/Eris/iround.h @dirrm include/Eris-1.3/Eris @dirrm include/Eris-1.3 libdata/pkgconfig/eris-1.3.pc diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile index 9f8d6920cbbf..d45221e42d31 100644 --- a/devel/mercator/Makefile +++ b/devel/mercator/Makefile @@ -6,14 +6,14 @@ # PORTNAME= mercator -PORTVERSION= 0.2.9 +PORTVERSION= 0.3.0 CATEGORIES= devel MASTER_SITES= SF/worldforge/Mercator%20%28terrain%20lib%29/${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= A procedural terrain library -LIB_DEPENDS= wfmath-0.3.4:${PORTSDIR}/math/wfmath +LIB_DEPENDS= wfmath-0.3.5:${PORTSDIR}/math/wfmath USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes diff --git a/devel/mercator/distinfo b/devel/mercator/distinfo index 079544e6781a..bbed981ce45f 100644 --- a/devel/mercator/distinfo +++ b/devel/mercator/distinfo @@ -1,2 +1,2 @@ -SHA256 (mercator-0.2.9.tar.gz) = 46cd266de30907ff94b67fc38461984937d105edba6eac1dbcfc636dbab7dc1a -SIZE (mercator-0.2.9.tar.gz) = 396917 +SHA256 (mercator-0.3.0.tar.gz) = 6b12acda4e86fad0987fcd4ec18b79faa01605ef5ef71b7d8261691d3f8835e9 +SIZE (mercator-0.3.0.tar.gz) = 410127 diff --git a/devel/mercator/pkg-plist b/devel/mercator/pkg-plist index c869e3d04309..6d2af627eb98 100644 --- a/devel/mercator/pkg-plist +++ b/devel/mercator/pkg-plist @@ -1,30 +1,31 @@ -lib/libmercator-0.2.la -lib/libmercator-0.2.so -lib/libmercator-0.2.so.8 -include/Mercator-0.2/Mercator/Mercator.h -include/Mercator-0.2/Mercator/Matrix.h -include/Mercator-0.2/Mercator/Terrain.h -include/Mercator-0.2/Mercator/TerrainMod.h -include/Mercator-0.2/Mercator/TerrainMod_impl.h -include/Mercator-0.2/Mercator/BasePoint.h -include/Mercator-0.2/Mercator/Segment.h -include/Mercator-0.2/Mercator/Buffer_impl.h -include/Mercator-0.2/Mercator/Buffer.h -include/Mercator-0.2/Mercator/Shader.h -include/Mercator-0.2/Mercator/FillShader.h -include/Mercator-0.2/Mercator/ThresholdShader.h -include/Mercator-0.2/Mercator/DepthShader.h -include/Mercator-0.2/Mercator/GrassShader.h -include/Mercator-0.2/Mercator/Intersect.h -include/Mercator-0.2/Mercator/Surface.h -include/Mercator-0.2/Mercator/Plant.h -include/Mercator-0.2/Mercator/Forest.h -include/Mercator-0.2/Mercator/RandCache.h -include/Mercator-0.2/Mercator/TileShader.h -include/Mercator-0.2/Mercator/ShaderFactory.h -include/Mercator-0.2/Mercator/ShaderFactory_impl.h -include/Mercator-0.2/Mercator/Area.h -include/Mercator-0.2/Mercator/AreaShader.h -@dirrm include/Mercator-0.2/Mercator -@dirrm include/Mercator-0.2 -libdata/pkgconfig/mercator-0.2.pc +lib/libmercator-0.3.la +lib/libmercator-0.3.so +lib/libmercator-0.3.so.1 +include/Mercator-0.3/Mercator/Effector.h +include/Mercator-0.3/Mercator/Mercator.h +include/Mercator-0.3/Mercator/Matrix.h +include/Mercator-0.3/Mercator/Terrain.h +include/Mercator-0.3/Mercator/TerrainMod.h +include/Mercator-0.3/Mercator/TerrainMod_impl.h +include/Mercator-0.3/Mercator/BasePoint.h +include/Mercator-0.3/Mercator/Segment.h +include/Mercator-0.3/Mercator/Buffer_impl.h +include/Mercator-0.3/Mercator/Buffer.h +include/Mercator-0.3/Mercator/Shader.h +include/Mercator-0.3/Mercator/FillShader.h +include/Mercator-0.3/Mercator/ThresholdShader.h +include/Mercator-0.3/Mercator/DepthShader.h +include/Mercator-0.3/Mercator/GrassShader.h +include/Mercator-0.3/Mercator/Intersect.h +include/Mercator-0.3/Mercator/Surface.h +include/Mercator-0.3/Mercator/Plant.h +include/Mercator-0.3/Mercator/Forest.h +include/Mercator-0.3/Mercator/RandCache.h +include/Mercator-0.3/Mercator/TileShader.h +include/Mercator-0.3/Mercator/ShaderFactory.h +include/Mercator-0.3/Mercator/ShaderFactory_impl.h +include/Mercator-0.3/Mercator/Area.h +include/Mercator-0.3/Mercator/AreaShader.h +@dirrm include/Mercator-0.3/Mercator +@dirrm include/Mercator-0.3 +libdata/pkgconfig/mercator-0.3.pc diff --git a/games/ember/Makefile b/games/ember/Makefile index 04b4a4f097f6..3549f4da1f32 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ember -PORTVERSION= 0.6.0 +PORTVERSION= 0.6.1 CATEGORIES= games MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \ http://amber.worldforge.org/ember/releases/stable/ @@ -22,7 +22,7 @@ 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 \ + mercator-0.3.1:${PORTSDIR}/devel/mercator \ wfut-0.2:${PORTSDIR}/devel/libwfut \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ CEGUIBase-0.7.5:${PORTSDIR}/graphics/cegui diff --git a/games/ember/distinfo b/games/ember/distinfo index ad18fa0b6ce6..1847e3bc7e39 100644 --- a/games/ember/distinfo +++ b/games/ember/distinfo @@ -1,4 +1,4 @@ -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 +SHA256 (ember-0.6.1.tar.bz2) = a25c0f634c49cab0213fb801f5194fc105e569b9b5ac2d55ab0fbdddc4c5ca3d +SIZE (ember-0.6.1.tar.bz2) = 1935197 +SHA256 (ember-media-0.6.1.tar.bz2) = efb9fddb23832d68a41e1d6e2ba2d8a3f889bf95329cad0734383b86a335a8f4 +SIZE (ember-media-0.6.1.tar.bz2) = 280787059 diff --git a/games/ember/pkg-plist b/games/ember/pkg-plist index 881da13c3e8a..588d76af02e6 100644 --- a/games/ember/pkg-plist +++ b/games/ember/pkg-plist @@ -292,6 +292,7 @@ share/ember/media/shared/common/3d_objects/environment/textures/slimy_moss/N.png share/ember/media/shared/common/3d_objects/environment/textures/slimy_moss/S.png share/ember/media/shared/common/3d_objects/environment/textures/slimy_moss/ogre.material share/ember/media/shared/common/3d_objects/environment/textures/smoke/D.png +share/ember/media/shared/common/3d_objects/environment/textures/smoke/colors/D.png share/ember/media/shared/common/3d_objects/environment/textures/smoke/ogre.material share/ember/media/shared/common/3d_objects/environment/textures/snow/D.png share/ember/media/shared/common/3d_objects/environment/textures/snow/ogre.material @@ -1807,7 +1808,6 @@ 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 @@ -1849,6 +1849,7 @@ share/ember/media/shared/common/3d_objects/creatures/spider/spider.mesh @dirrm share/ember/media/shared/common/3d_objects/environment/textures/ground_sand @dirrm share/ember/media/shared/common/3d_objects/environment/textures/moraf @dirrm share/ember/media/shared/common/3d_objects/environment/textures/ground_twisty_grass +@dirrm share/ember/media/shared/common/3d_objects/environment/textures/smoke/colors @dirrm share/ember/media/shared/common/3d_objects/environment/textures/smoke @dirrm share/ember/media/shared/common/3d_objects/environment/textures/stone_granite_rock @dirrm share/ember/media/shared/common/3d_objects/environment/textures/ground_dirt_demonic diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile index f3d0544dbd2e..eaad8d14208e 100644 --- a/math/wfmath/Makefile +++ b/math/wfmath/Makefile @@ -6,7 +6,7 @@ # PORTNAME= wfmath -PORTVERSION= 0.3.10 +PORTVERSION= 0.3.11 CATEGORIES= math MASTER_SITES= SF/worldforge/${PORTNAME}%20%28math%20lib%29/${PORTVERSION} diff --git a/math/wfmath/distinfo b/math/wfmath/distinfo index c37a64514248..fad8360e6bde 100644 --- a/math/wfmath/distinfo +++ b/math/wfmath/distinfo @@ -1,2 +1,2 @@ -SHA256 (wfmath-0.3.10.tar.gz) = 975246625654a4cf3d6f7c2d8fa9672a16ea5ea430a1db2de503ae53d37c3a17 -SIZE (wfmath-0.3.10.tar.gz) = 449723 +SHA256 (wfmath-0.3.11.tar.gz) = 0f94a706203dff4122f0445a9f29a23c641a79534414f47bc8f42e2491ce38d6 +SIZE (wfmath-0.3.11.tar.gz) = 464548 diff --git a/math/wfmath/pkg-plist b/math/wfmath/pkg-plist index 73ef7bc1eeab..77acaf3a2eaa 100644 --- a/math/wfmath/pkg-plist +++ b/math/wfmath/pkg-plist @@ -1,6 +1,6 @@ lib/libwfmath-0.3.la lib/libwfmath-0.3.so -lib/libwfmath-0.3.so.4 +lib/libwfmath-0.3.so.5 include/wfmath-0.3/wfmath/error.h include/wfmath-0.3/wfmath/const.h include/wfmath-0.3/wfmath/int_to_string.h diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile index ec84a32eb40b..0a1b96750a02 100644 --- a/net/cyphesis/Makefile +++ b/net/cyphesis/Makefile @@ -7,8 +7,7 @@ # PORTNAME= cyphesis -PORTVERSION= 0.5.21 -PORTREVISION= 6 +PORTVERSION= 0.5.26 CATEGORIES= net MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION} @@ -17,9 +16,9 @@ COMMENT= A server for WorldForge games LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \ varconf-1.0.6:${PORTSDIR}/devel/varconf \ - wfmath-0.3.4:${PORTSDIR}/math/wfmath \ - mercator-0.2.8:${PORTSDIR}/devel/mercator \ - skstream-0.3.5:${PORTSDIR}/net/skstream \ + wfmath-0.3.5:${PORTSDIR}/math/wfmath \ + mercator-0.3.1:${PORTSDIR}/devel/mercator \ + skstream-0.3.6:${PORTSDIR}/net/skstream \ gcrypt.17:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS= --with-python=${LOCALBASE} @@ -48,6 +47,11 @@ post-patch: ${REINPLACE_CMD} -e 's|$$(datadir)/cyphesis|${DATADIR}|g' @${REINPLACE_CMD} -e 's|/bash|/sh|' ${WRKSRC}/scripts/extract_revision.sh @${REINPLACE_CMD} -e '1s|python|${LOCALBASE}/bin/${PYTHON_VERSION}|' ${WRKSRC}/scripts/gen_buildid.py + @${REINPLACE_CMD} -e 's/#ifdef __APPLE__/#if defined(__APPLE__) || defined(__FreeBSD__)/g; \ + s/#ifndef __APPLE__/#if !defined(__APPLE__) \&\& !defined(__FreeBSD__)/g' \ + ${WRKSRC}/common/system.cpp \ + ${WRKSRC}/common/AtlasStreamClient.cpp \ + ${WRKSRC}/server/CommUnixListener.cpp post-install: .if !defined(NOPORTDOCS) diff --git a/net/cyphesis/distinfo b/net/cyphesis/distinfo index 0f7afb4c4d73..75bc11f4c982 100644 --- a/net/cyphesis/distinfo +++ b/net/cyphesis/distinfo @@ -1,2 +1,2 @@ -SHA256 (cyphesis-0.5.21.tar.bz2) = 55c64d7b291f50d89a2f4dd364cb562fd288fb550dcab3bd4fd3618dce323a73 -SIZE (cyphesis-0.5.21.tar.bz2) = 621623 +SHA256 (cyphesis-0.5.26.tar.bz2) = eff10beeafeea72a045a60caf1793270ee5406864ab22d086dc5fc902ad9b394 +SIZE (cyphesis-0.5.26.tar.bz2) = 755060 diff --git a/net/cyphesis/pkg-plist b/net/cyphesis/pkg-plist index 5be37da2e5f2..efb3bd315096 100644 --- a/net/cyphesis/pkg-plist +++ b/net/cyphesis/pkg-plist @@ -61,6 +61,7 @@ etc/cyphesis/mason.d/weapons.xml %%DATADIR%%/rulesets/mason/define_world_aglanor.py %%DATADIR%%/rulesets/mason/regression.py %%DATADIR%%/rulesets/mason/tests.py +%%DATADIR%%/rulesets/mason/terrain.py %%DATADIR%%/rulesets/mason/world/__init__.py %%DATADIR%%/rulesets/mason/world/objects/Pile.py %%DATADIR%%/rulesets/mason/world/objects/Weather.py @@ -109,6 +110,7 @@ etc/cyphesis/mason.d/weapons.xml %%DATADIR%%/rulesets/mason/world/tasks/Delve.py %%DATADIR%%/rulesets/mason/world/tasks/Dig.py %%DATADIR%%/rulesets/mason/world/tasks/Fishing.py +%%DATADIR%%/rulesets/mason/world/tasks/Heaping.py %%DATADIR%%/rulesets/mason/world/tasks/Logging.py %%DATADIR%%/rulesets/mason/world/tasks/Raise.py %%DATADIR%%/rulesets/mason/world/tasks/Ram.py diff --git a/net/skstream/Makefile b/net/skstream/Makefile index ebcd6a2f443c..295dff73cb4b 100644 --- a/net/skstream/Makefile +++ b/net/skstream/Makefile @@ -6,7 +6,7 @@ # PORTNAME= skstream -PORTVERSION= 0.3.7 +PORTVERSION= 0.3.8 CATEGORIES= net MASTER_SITES= SF/worldforge/${PORTNAME}%20%28network%20lib%29/${PORTVERSION} diff --git a/net/skstream/distinfo b/net/skstream/distinfo index c3978c72b002..64ad6bd5048a 100644 --- a/net/skstream/distinfo +++ b/net/skstream/distinfo @@ -1,2 +1,2 @@ -SHA256 (skstream-0.3.7.tar.gz) = fe272ad19927f8335d599f80240f59fab30fbbce20244a87fd4d454c0faa40f0 -SIZE (skstream-0.3.7.tar.gz) = 378336 +SHA256 (skstream-0.3.8.tar.gz) = a0ceb95b6a239a5a3b82afece3f2832d3eaf1f9254d2d6d9011ca0c139103390 +SIZE (skstream-0.3.8.tar.gz) = 387412 diff --git a/net/skstream/pkg-plist b/net/skstream/pkg-plist index 38765c1d7ef0..44c053fc9525 100644 --- a/net/skstream/pkg-plist +++ b/net/skstream/pkg-plist @@ -1,6 +1,6 @@ lib/libskstream-0.3.la lib/libskstream-0.3.so -lib/libskstream-0.3.so.5 +lib/libskstream-0.3.so.6 libdata/pkgconfig/skstream-0.3.pc libdata/pkgconfig/skstream-unix-0.3.pc lib/skstream-0.3/include/skstream/skstreamconfig.h