aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--devel/eris/Makefile6
-rw-r--r--devel/eris/distinfo6
-rw-r--r--devel/eris/files/patch-Eris-TimedEventService.h10
-rw-r--r--devel/eris/pkg-plist4
-rw-r--r--games/ember/files/patch-ConnectedAdapter.cpp10
-rw-r--r--games/ember/files/patch-EntityMoveAdjuster.h10
-rw-r--r--games/ember/files/patch-InspectWidget.h10
-rw-r--r--games/ember/files/patch-lua_Eris.cpp10
8 files changed, 49 insertions, 17 deletions
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index ee945a8086a1..725595d6757c 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= eris
-PORTVERSION= 1.3.13
-PORTREVISION= 0
+PORTVERSION= 1.3.14
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= worldforge
@@ -18,7 +17,8 @@ COMMENT= WorldForge client entity library
LIB_DEPENDS= Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
skstream-0.3.4:${PORTSDIR}/net/skstream \
wfmath-0.3.4:${PORTSDIR}/math/wfmath \
- sigc-2.0:${PORTSDIR}/devel/libsigc++20
+ sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
+ mercator-0.2.6:${PORTSDIR}/devel/mercator
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/devel/eris/distinfo b/devel/eris/distinfo
index 8729dfcf53d9..00815891973e 100644
--- a/devel/eris/distinfo
+++ b/devel/eris/distinfo
@@ -1,3 +1,3 @@
-MD5 (eris-1.3.13.tar.gz) = f24b4e74f7dfa4f9a6d047fc7e015b90
-SHA256 (eris-1.3.13.tar.gz) = 3a30ea429d9599700f08a712fa92f81371c625dc874bba1f6eee43560ce95171
-SIZE (eris-1.3.13.tar.gz) = 538569
+MD5 (eris-1.3.14.tar.gz) = ac113b43b3c7fb714ede636c7fc80cdd
+SHA256 (eris-1.3.14.tar.gz) = eff9d26c153653089d16b68fd2122509d44bffa7e240921e606cad8d3c9ed723
+SIZE (eris-1.3.14.tar.gz) = 560929
diff --git a/devel/eris/files/patch-Eris-TimedEventService.h b/devel/eris/files/patch-Eris-TimedEventService.h
deleted file mode 100644
index e600ad33d303..000000000000
--- a/devel/eris/files/patch-Eris-TimedEventService.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- Eris/TimedEventService.h.orig 2009-02-11 20:40:26.000000000 +0100
-+++ Eris/TimedEventService.h 2009-02-11 20:40:38.000000000 +0100
-@@ -3,6 +3,7 @@
-
- #include <wfmath/timestamp.h>
- #include <Eris/Types.h>
-+#include <assert.h>
-
- namespace Eris
- {
diff --git a/devel/eris/pkg-plist b/devel/eris/pkg-plist
index 5ef905fd6f2a..31ef3dbc33d3 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.14
+lib/liberis-1.3.so.15
include/Eris-1.3/Eris/Account.h
include/Eris-1.3/Eris/Alarm.h
include/Eris-1.3/Eris/Avatar.h
@@ -32,6 +32,8 @@ include/Eris-1.3/Eris/Room.h
include/Eris-1.3/Eris/Router.h
include/Eris-1.3/Eris/ServerInfo.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/TimedEventService.h
include/Eris-1.3/Eris/Timeout.h
include/Eris-1.3/Eris/TypeBoundRedispatch.h
diff --git a/games/ember/files/patch-ConnectedAdapter.cpp b/games/ember/files/patch-ConnectedAdapter.cpp
new file mode 100644
index 000000000000..211420ec4c47
--- /dev/null
+++ b/games/ember/files/patch-ConnectedAdapter.cpp
@@ -0,0 +1,10 @@
+--- src/services/server/ConnectedAdapter.cpp.orig 2009-04-05 11:57:35.000000000 +0200
++++ src/services/server/ConnectedAdapter.cpp 2009-04-05 11:57:43.000000000 +0200
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include "ConnectedAdapter.h"
++#include <Atlas/Objects/Operation.h>
+ #include <Eris/Connection.h>
+ #include <Eris/Account.h>
+ #include <Eris/Lobby.h>
diff --git a/games/ember/files/patch-EntityMoveAdjuster.h b/games/ember/files/patch-EntityMoveAdjuster.h
new file mode 100644
index 000000000000..a1b8367eb7cd
--- /dev/null
+++ b/games/ember/files/patch-EntityMoveAdjuster.h
@@ -0,0 +1,10 @@
+--- src/components/ogre/manipulation/EntityMoveAdjuster.h.orig 2009-04-05 14:18:35.000000000 +0200
++++ src/components/ogre/manipulation/EntityMoveAdjuster.h 2009-04-05 14:18:58.000000000 +0200
+@@ -23,6 +23,7 @@
+ #ifndef EMBEROGREENTITYMOVEADJUSTER_H
+ #define EMBEROGREENTITYMOVEADJUSTER_H
+
++#include <Atlas/Objects/Operation.h>
+ #include <Eris/Timeout.h>
+
+ namespace EmberOgre {
diff --git a/games/ember/files/patch-InspectWidget.h b/games/ember/files/patch-InspectWidget.h
new file mode 100644
index 000000000000..1b5bfa9e7143
--- /dev/null
+++ b/games/ember/files/patch-InspectWidget.h
@@ -0,0 +1,10 @@
+--- src/components/ogre/widgets/InspectWidget.h.orig 2009-04-05 19:03:20.000000000 +0200
++++ src/components/ogre/widgets/InspectWidget.h 2009-04-05 19:03:25.000000000 +0200
+@@ -23,6 +23,7 @@
+ #ifndef EMBEROGREINSPECTWIDGET_H
+ #define EMBEROGREINSPECTWIDGET_H
+
++#include <Atlas/Objects/Operation.h>
+ #include <Eris/Entity.h>
+ #include "Widget.h"
+
diff --git a/games/ember/files/patch-lua_Eris.cpp b/games/ember/files/patch-lua_Eris.cpp
new file mode 100644
index 000000000000..26dea6bf6a5d
--- /dev/null
+++ b/games/ember/files/patch-lua_Eris.cpp
@@ -0,0 +1,10 @@
+--- 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>