update mercator to 0.2.7

update cyphesis to 0.5.19
bump portrevision on ember

9 files changed, 18 insertions, 28 deletions

diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index 42a878709872..93b0a0ebf646 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercator
-PORTVERSION=	0.2.6
+PORTVERSION=	0.2.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	worldforge
diff --git a/devel/mercator/distinfo b/devel/mercator/distinfo
index 7f4a706f357b..394efb5e0b4a 100644
--- a/devel/mercator/distinfo
+++ b/devel/mercator/distinfo
@@ -1,3 +1,3 @@
-MD5 (mercator-0.2.6.tar.gz) = fd0dc1bdccd711358ab7f3c83eceadd8
-SHA256 (mercator-0.2.6.tar.gz) = d5af442b3448318a55e1f69c7e97058c3080d3520a480b98dcf87acf978dd34e
-SIZE (mercator-0.2.6.tar.gz) = 400463
+MD5 (mercator-0.2.7.tar.gz) = da5bda8a9e729b0d8d40b69c4b327319
+SHA256 (mercator-0.2.7.tar.gz) = 8d4b81c3edd60a287d6634a20500c81ca82f260c7008ebfc021400a1337556d2
+SIZE (mercator-0.2.7.tar.gz) = 403410
diff --git a/devel/mercator/files/patch-Merecator-iround.h b/devel/mercator/files/patch-Merecator-iround.h
index cd1a2cadbfec..1bac80e786a9 100644
--- a/devel/mercator/files/patch-Merecator-iround.h
+++ b/devel/mercator/files/patch-Merecator-iround.h
@@ -1,6 +1,6 @@
 --- Mercator/iround.h.orig	Tue Oct  4 01:25:06 2005
 +++ Mercator/iround.h	Tue Oct  4 01:31:36 2005
-@@ -9,6 +9,17 @@
+@@ -9,6 +9,16 @@
  #error iround.h must be included after config.h
  #endif
  
@@ -12,7 +12,6 @@
 +extern float rintf __P((float));
 +}
 +#endif
-+#include <cmath>
 +#endif
 +
  #ifdef HAVE_LRINTF
diff --git a/devel/mercator/pkg-plist b/devel/mercator/pkg-plist
index 8813e130e2a2..6e9ae97d07ce 100644
--- a/devel/mercator/pkg-plist
+++ b/devel/mercator/pkg-plist
@@ -1,6 +1,6 @@
 lib/libmercator-0.2.la
 lib/libmercator-0.2.so
-lib/libmercator-0.2.so.5
+lib/libmercator-0.2.so.6
 include/Mercator-0.2/Mercator/Mercator.h
 include/Mercator-0.2/Mercator/Matrix.h
 include/Mercator-0.2/Mercator/Terrain.h
diff --git a/games/ember/Makefile b/games/ember/Makefile
index a3459023c084..a73f173713ee 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ember
 PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		http://amber.worldforge.org/ember/releases/stable/
@@ -21,9 +21,9 @@ COMMENT=	Ember is a WorldForge 3d client using the OGRE 3d library
 BUILD_DEPENDS=	${LOCALBASE}/lib/libOgreMain-1.4.9.so:${PORTSDIR}/graphics/ogre3d
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
-		eris-1.3:${PORTSDIR}/devel/eris \
+		eris-1.3.15:${PORTSDIR}/devel/eris \
 		varconf-1.0.6:${PORTSDIR}/devel/varconf \
-		mercator-0.2.5:${PORTSDIR}/devel/mercator \
+		mercator-0.2.6:${PORTSDIR}/devel/mercator \
 		openal.0:${PORTSDIR}/audio/openal \
 		alut.1:${PORTSDIR}/audio/freealut \
 		wfut-0.2:${PORTSDIR}/devel/libwfut
diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 0b2032e6de87..d9d9e630696e 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cyphesis
-PORTVERSION=	0.5.18
-PORTREVISION=	1
+PORTVERSION=	0.5.19
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=worldforge
@@ -18,7 +17,7 @@ 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.5:${PORTSDIR}/devel/mercator \
+		mercator-0.2.6:${PORTSDIR}/devel/mercator \
 		skstream-0.3.4:${PORTSDIR}/net/skstream \
 		gcrypt.16:${PORTSDIR}/security/libgcrypt
 
diff --git a/net/cyphesis/distinfo b/net/cyphesis/distinfo
index 24c538cc0460..230d23b318fa 100644
--- a/net/cyphesis/distinfo
+++ b/net/cyphesis/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyphesis-0.5.18.tar.bz2) = 88fec32955e8d6806b7234d3aec3096b
-SHA256 (cyphesis-0.5.18.tar.bz2) = b4a0a0ae625f864fdc4d87797592b7cb33a5522988ecedf4e9f5018b06cc74bd
-SIZE (cyphesis-0.5.18.tar.bz2) = 582055
+MD5 (cyphesis-0.5.19.tar.bz2) = 363997a5c61f0607b34222a9cc72a86e
+SHA256 (cyphesis-0.5.19.tar.bz2) = 55ffec713c0e5c7060776babdb290a71347079d6b733f66e9a6c3506bad5a3cf
+SIZE (cyphesis-0.5.19.tar.bz2) = 587328
diff --git a/net/cyphesis/files/patch-physics-BBox.h b/net/cyphesis/files/patch-physics-BBox.h
deleted file mode 100644
index 5622e4ad8c3d..000000000000
--- a/net/cyphesis/files/patch-physics-BBox.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- physics/BBox.h.orig	2009-02-12 06:55:03.000000000 +0100
-+++ physics/BBox.h	2009-02-12 19:24:05.000000000 +0100
-@@ -20,7 +20,9 @@
- #ifndef PHYSICS_BBOX_H
- #define PHYSICS_BBOX_H
- 
-+#include <cmath>
- #include <wfmath/axisbox.h>
-+#include <wfmath/point.h>
- 
- typedef WFMath::AxisBox<3> BBox;
- 
diff --git a/net/cyphesis/pkg-plist b/net/cyphesis/pkg-plist
index d5dda71a3552..25fd91772afc 100644
--- a/net/cyphesis/pkg-plist
+++ b/net/cyphesis/pkg-plist
@@ -3,9 +3,11 @@ bin/cyclient
 bin/cycmd
 bin/cyconfig
 bin/cyconvertrules
+bin/cydb
 bin/cydumprules
 bin/cyloadrules
 bin/cypasswd
+bin/cypython
 bin/cyphesis
 etc/cyphesis/cyphesis.vconf
 etc/cyphesis/mason.d/animals.xml
@@ -54,8 +56,10 @@ etc/cyphesis/mason.d/weapons.xml
 %%DATADIR%%/rulesets/basic/mind/panlingua/ontology.py
 %%DATADIR%%/rulesets/basic/mind/panlingua/panlingua.py
 %%DATADIR%%/rulesets/basic/mind/panlingua/syntax.py
+%%DATADIR%%/rulesets/mason/benchmarks.py
 %%DATADIR%%/rulesets/mason/define_world.py
 %%DATADIR%%/rulesets/mason/define_world_aglanor.py
+%%DATADIR%%/rulesets/mason/tests.py
 %%DATADIR%%/rulesets/mason/world/__init__.py
 %%DATADIR%%/rulesets/mason/world/objects/Pile.py
 %%DATADIR%%/rulesets/mason/world/objects/Weather.py