From 8b347bce42f8fe0cac76413466dbd3c2f1ae532c Mon Sep 17 00:00:00 2001 From: oliver Date: Sun, 9 Oct 2005 22:38:25 +0000 Subject: update to 1.3.8 --- devel/eris/Makefile | 2 +- devel/eris/distinfo | 4 ++-- devel/eris/files/patch-Eris-BaseConnection.cpp | 20 -------------------- devel/eris/files/patch-Eris-TypeInfo.cpp | 23 ----------------------- 4 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 devel/eris/files/patch-Eris-BaseConnection.cpp delete mode 100644 devel/eris/files/patch-Eris-TypeInfo.cpp (limited to 'devel/eris') diff --git a/devel/eris/Makefile b/devel/eris/Makefile index e8f07f809ddf..07431faa0614 100644 --- a/devel/eris/Makefile +++ b/devel/eris/Makefile @@ -6,7 +6,7 @@ # PORTNAME= eris -PORTVERSION= 1.3.7 +PORTVERSION= 1.3.8 PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/devel/eris/distinfo b/devel/eris/distinfo index c79def4325cc..677c4d1c9423 100644 --- a/devel/eris/distinfo +++ b/devel/eris/distinfo @@ -1,2 +1,2 @@ -MD5 (eris-1.3.7.tar.gz) = 2f46b14c328390d505a250d6a75dd6ee -SIZE (eris-1.3.7.tar.gz) = 468195 +MD5 (eris-1.3.8.tar.gz) = 2def344e405a2a28216b602b43d84163 +SIZE (eris-1.3.8.tar.gz) = 486079 diff --git a/devel/eris/files/patch-Eris-BaseConnection.cpp b/devel/eris/files/patch-Eris-BaseConnection.cpp deleted file mode 100644 index ed8fa9c5cd2c..000000000000 --- a/devel/eris/files/patch-Eris-BaseConnection.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- Eris/BaseConnection.cpp.orig Mon Oct 3 18:14:51 2005 -+++ Eris/BaseConnection.cpp Mon Oct 3 18:15:28 2005 -@@ -156,7 +156,7 @@ - _timeout = new Timeout("negotiate_" + _id, this, 5000); - _timeout->Expired.connect(SigC::slot(*this, &BaseConnection::onNegotiateTimeout)); - -- _sc = new Atlas::Net::StreamConnect(_clientName, *_stream, *_bridge); -+ _sc = new Atlas::Net::StreamConnect(_clientName, *_stream); - setStatus(NEGOTIATE); - } - -@@ -174,7 +174,7 @@ - - if (_sc->getState() == Atlas::Net::StreamConnect::SUCCEEDED) - { -- m_codec = _sc->getCodec(); -+ m_codec = _sc->getCodec(*_bridge); - _encode = new Atlas::Objects::ObjectsEncoder(*m_codec); - m_codec->streamBegin(); - // clean up diff --git a/devel/eris/files/patch-Eris-TypeInfo.cpp b/devel/eris/files/patch-Eris-TypeInfo.cpp deleted file mode 100644 index f4007d7337ef..000000000000 --- a/devel/eris/files/patch-Eris-TypeInfo.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- Eris/TypeInfo.cpp.orig Mon Oct 3 18:22:17 2005 -+++ Eris/TypeInfo.cpp Mon Oct 3 18:22:20 2005 -@@ -172,17 +172,17 @@ - (*C)->addAncestor(tp); - } - --static Atlas::Objects::Root gameEntityFactory() -+static Atlas::Objects::Root gameEntityFactory(const std::string &, int) - { - return Atlas::Objects::Entity::GameEntity(); - } - --static Atlas::Objects::Root adminEntityFactory() -+static Atlas::Objects::Root adminEntityFactory(const std::string &, int) - { - return Atlas::Objects::Entity::AdminEntity(); - } - --static Atlas::Objects::Root actionFactory() -+static Atlas::Objects::Root actionFactory(const std::string &, int) - { - return Atlas::Objects::Operation::Action(); - } -- cgit