6 files changed, 88 insertions, 69 deletions

diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index 4678891ca911..968d99a5fe92 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eris
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.7
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,13 +15,14 @@ MASTER_SITE_SUBDIR=	worldforge
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	WorldForge client entity library
 
-LIB_DEPENDS=	Atlas-0.5.2:${PORTSDIR}/devel/atlas \
+LIB_DEPENDS=	Atlas-0.6.0:${PORTSDIR}/devel/atlas-devel \
 		skstream-0.3.3:${PORTSDIR}/net/skstream \
 		wfmath-0.3.3:${PORTSDIR}/math/wfmath \
-		sigc-1.2:${PORTSDIR}/devel/libsigc++12
+		sigc-2.0:${PORTSDIR}/devel/libsigc++20
 
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomehack
 
 CXXFLAGS+=	-include wchar.h
 CONFIGURE_ARGS+="CXXFLAGS=${CXXFLAGS}"
diff --git a/devel/eris/distinfo b/devel/eris/distinfo
index aa5ff9ad89f1..c79def4325cc 100644
--- a/devel/eris/distinfo
+++ b/devel/eris/distinfo
@@ -1,2 +1,2 @@
-MD5 (eris-1.2.2.tar.gz) = 8c4bdb088c0f560e6f75c4e05d540aec
-SIZE (eris-1.2.2.tar.gz) = 454856
+MD5 (eris-1.3.7.tar.gz) = 2f46b14c328390d505a250d6a75dd6ee
+SIZE (eris-1.3.7.tar.gz) = 468195
diff --git a/devel/eris/files/patch-Eris-BaseConnection.cpp b/devel/eris/files/patch-Eris-BaseConnection.cpp
new file mode 100644
index 000000000000..ed8fa9c5cd2c
--- /dev/null
+++ b/devel/eris/files/patch-Eris-BaseConnection.cpp
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 000000000000..f4007d7337ef
--- /dev/null
+++ b/devel/eris/files/patch-Eris-TypeInfo.cpp
@@ -0,0 +1,23 @@
+--- 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();
+ }
diff --git a/devel/eris/files/patch-Makefile.in b/devel/eris/files/patch-Makefile.in
deleted file mode 100644
index 04b3e6517bc7..000000000000
--- a/devel/eris/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Fri Feb  4 04:55:20 2005
---- Makefile.in	Fri Feb  4 04:55:31 2005
-***************
-*** 210,216 ****
-  target_vendor = @target_vendor@
-  SUBDIRS = Eris bindings test
-  EXTRA_DIST = autogen.sh Eris.pbproj/project.pbxproj eris.spec
-! pkgconfigdir = $(libdir)/pkgconfig
-  pkgconfig_DATA = eris-1.2.pc @ERIS_POLL_PKGCONFIGS@
-  all: config.h
-  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
---- 210,216 ----
-  target_vendor = @target_vendor@
-  SUBDIRS = Eris bindings test
-  EXTRA_DIST = autogen.sh Eris.pbproj/project.pbxproj eris.spec
-! pkgconfigdir = $(prefix)/libdata/pkgconfig
-  pkgconfig_DATA = eris-1.2.pc @ERIS_POLL_PKGCONFIGS@
-  all: config.h
-  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/devel/eris/pkg-plist b/devel/eris/pkg-plist
index 54d64a02fdd8..b594c42b1c9c 100644
--- a/devel/eris/pkg-plist
+++ b/devel/eris/pkg-plist
@@ -1,45 +1,39 @@
-lib/liberis-1.2.a
-lib/liberis-1.2.so
-lib/liberis-1.2.so.4
-include/Eris-1.2/Eris/Exceptions.h
-include/Eris-1.2/Eris/Lobby.h
-include/Eris-1.2/Eris/Factory.h
-include/Eris-1.2/Eris/Entity.h
-include/Eris-1.2/Eris/World.h
-include/Eris-1.2/Eris/Dispatcher.h
-include/Eris-1.2/Eris/Player.h
-include/Eris-1.2/Eris/Types.h
-include/Eris-1.2/Eris/Utils.h
-include/Eris-1.2/Eris/ClassDispatcher.h
-include/Eris-1.2/Eris/TypeDispatcher.h
-include/Eris-1.2/Eris/SignalDispatcher.h
-include/Eris-1.2/Eris/BaseConnection.h
-include/Eris-1.2/Eris/Connection.h
-include/Eris-1.2/Eris/DebugDispatcher.h
-include/Eris-1.2/Eris/EncapDispatcher.h
-include/Eris-1.2/Eris/OpDispatcher.h
-include/Eris-1.2/Eris/Room.h
-include/Eris-1.2/Eris/Person.h
-include/Eris-1.2/Eris/Metaserver.h
-include/Eris-1.2/Eris/ServerInfo.h
-include/Eris-1.2/Eris/IdDispatcher.h
-include/Eris-1.2/Eris/Timeout.h
-include/Eris-1.2/Eris/Timestamp.h
-include/Eris-1.2/Eris/ArgumentDispatcher.h
-include/Eris-1.2/Eris/TypeInfo.h
-include/Eris-1.2/Eris/Wait.h
-include/Eris-1.2/Eris/Property.h
-include/Eris-1.2/Eris/Poll.h
-include/Eris-1.2/Eris/PollDefault.h
-include/Eris-1.2/Eris/atlas_utils.h
-include/Eris-1.2/Eris/Log.h
-include/Eris-1.2/Eris/Avatar.h
-include/Eris-1.2/Eris/typeService.h
-include/Eris-1.2/Eris/PollGlib.h
-include/Eris-1.2/Eris/PollGlibFD.h
-include/Eris-1.2/Eris/PollGlibSource.h
-include/Eris-1.2/Eris/PollGlibVersion.h
-@dirrm include/Eris-1.2/Eris
-@dirrm include/Eris-1.2
-libdata/pkgconfig/eris-1.2.pc
-libdata/pkgconfig/eris-poll-glib-1.2.pc
+lib/liberis-1.3.a
+lib/liberis-1.3.so
+lib/liberis-1.3.so.8
+include/Eris-1.3/Eris/Account.h
+include/Eris-1.3/Eris/Avatar.h
+include/Eris-1.3/Eris/BaseConnection.h
+include/Eris-1.3/Eris/Connection.h
+include/Eris-1.3/Eris/DeleteLater.h
+include/Eris-1.3/Eris/Entity.h
+include/Eris-1.3/Eris/EntityRouter.h
+include/Eris-1.3/Eris/Exceptions.h
+include/Eris-1.3/Eris/Factory.h
+include/Eris-1.3/Eris/IGRouter.h
+include/Eris-1.3/Eris/Lobby.h
+include/Eris-1.3/Eris/Log.h
+include/Eris-1.3/Eris/LogStream.h
+include/Eris-1.3/Eris/MetaQuery.h
+include/Eris-1.3/Eris/Metaserver.h
+include/Eris-1.3/Eris/Person.h
+include/Eris-1.3/Eris/Poll.h
+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/Redispatch.h
+include/Eris-1.3/Eris/Response.h
+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/Timeout.h
+include/Eris-1.3/Eris/TypeBoundRedispatch.h
+include/Eris-1.3/Eris/TypeInfo.h
+include/Eris-1.3/Eris/TypeService.h
+include/Eris-1.3/Eris/Types.h
+include/Eris-1.3/Eris/UIFactory.h
+include/Eris-1.3/Eris/View.h
+@dirrm include/Eris-1.3/Eris
+@dirrm include/Eris-1.3
+libdata/pkgconfig/eris-1.3.pc