9 files changed, 12 insertions, 62 deletions

diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 373e5509ce61..68d67b75222a 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmoto
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,6 +26,7 @@ USE_GL=		yes
 USE_LUA=	5.1
 USE_SDL=	sdl mixer
 USE_DOS2UNIX=	src/*.cpp src/*.h
+USE_GCC=	3.4+
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -42,7 +42,7 @@ PORTDOCS=	README ChangeLog
 OPTIONS=	WWW	"Online high-scores and new levels download support"	on \
 		ZOOM	"Enable zooming"	off
 
-MAN6=		xmoto.6 xmoto-edit.6
+MAN6=		xmoto.6
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/xmoto/distinfo b/games/xmoto/distinfo
index 0782442b2c47..7dc1b4309dea 100644
--- a/games/xmoto/distinfo
+++ b/games/xmoto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmoto-0.2.2-src.tar.gz) = bbf2f0c02ba2ffe1f65e4ca78b0a0bd3
-SHA256 (xmoto-0.2.2-src.tar.gz) = 478b9f54c79878f3ff384298b8679f6aece1069b8d41bcdd66dc1951fe803648
-SIZE (xmoto-0.2.2-src.tar.gz) = 5938064
+MD5 (xmoto-0.2.4-src.tar.gz) = 78f776695a664b855e3659df25cc6d82
+SHA256 (xmoto-0.2.4-src.tar.gz) = 67bd0dfb5442a290c1290b34461e1f7924e53c8282b7360c29d3f6c425457605
+SIZE (xmoto-0.2.4-src.tar.gz) = 5972103
diff --git a/games/xmoto/files/patch-src-Locales.h b/games/xmoto/files/patch-src-Locales.h
deleted file mode 100644
index 9603acd3cd94..000000000000
--- a/games/xmoto/files/patch-src-Locales.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Locales.h.orig	Tue Sep 19 05:51:55 2006
-+++ src/Locales.h	Tue Sep 19 05:55:02 2006
-@@ -22,6 +22,8 @@
- #ifndef __LOCALES_H__
- #define __LOCALES_H__
- 
-+#include "BuildConfig.h"
-+
- #ifndef USE_GETTEXT
- #define _(a) a
- #else
diff --git a/games/xmoto/files/patch-src-Replay.cpp b/games/xmoto/files/patch-src-Replay.cpp
deleted file mode 100644
index 595918fc6327..000000000000
--- a/games/xmoto/files/patch-src-Replay.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Replay.cpp.orig	Sun May 21 17:46:59 2006
-+++ src/Replay.cpp	Sun May 21 17:47:11 2006
-@@ -32,7 +32,6 @@
- #include <time.h> 
- #include <ctime>
- #include <iostream>
--#include <locale>
- 
- namespace vapp {
- 
diff --git a/games/xmoto/files/patch-src-VCommon.h b/games/xmoto/files/patch-src-VCommon.h
deleted file mode 100644
index 7efb2cdfd038..000000000000
--- a/games/xmoto/files/patch-src-VCommon.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/VCommon.h.orig	Tue Sep 12 22:29:01 2006
-+++ src/VCommon.h	Sat Sep 16 17:45:59 2006
-@@ -70,8 +70,7 @@
- #include <string>
- #include <vector>
- #include <queue>
--#include <ostream>
--#include <istream>
-+#include <iostream>
- #include <sstream>
- 
- #include <stdio.h>
diff --git a/games/xmoto/files/patch-src-WWW.h b/games/xmoto/files/patch-src-WWW.h
deleted file mode 100644
index f7d3936d0a17..000000000000
--- a/games/xmoto/files/patch-src-WWW.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/WWW.h.orig	Sun May 21 17:47:25 2006
-+++ src/WWW.h	Sun May 21 17:47:49 2006
-@@ -8,6 +8,7 @@
- 
- #include <string>
- #include <vector>
-+#include <stdio.h>
- 
- #if !defined(_MSC_VER)
-   #define USE_HASH_MAP
diff --git a/games/xmoto/files/patch-src-md5sum-md5file.h b/games/xmoto/files/patch-src-md5sum-md5file.h
deleted file mode 100644
index 3411dfa0b428..000000000000
--- a/games/xmoto/files/patch-src-md5sum-md5file.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/md5sum/md5file.h.orig	Sun May 21 17:45:47 2006
-+++ src/md5sum/md5file.h	Sun May 21 17:46:02 2006
-@@ -2,6 +2,7 @@
- #define MD5FILE
- 
- #include <string>
-+#include <stdio.h>
- 
- std::string md5file(std::string p_filename);
- 
diff --git a/games/xmoto/pkg-descr b/games/xmoto/pkg-descr
index 6c5cb0f5a7af..4750bd2f395b 100644
--- a/games/xmoto/pkg-descr
+++ b/games/xmoto/pkg-descr
@@ -3,5 +3,3 @@ important role in the gameplay. You need to control your bike to its limit, if
 you want to have a chance finishing the more difficult of the challenges.
 
 WWW: http://xmoto.sourceforge.net/
-
-- Dmitry Marakasov <amdmi3@mail.ru>
diff --git a/games/xmoto/pkg-plist b/games/xmoto/pkg-plist
index b14c6c00c9d6..ee5e220f7aa8 100644
--- a/games/xmoto/pkg-plist
+++ b/games/xmoto/pkg-plist
@@ -1,7 +1,8 @@
 bin/xmoto
-bin/xmoto-edit
 %%NLS%%share/locale/de/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xmoto.mo
 %%DATADIR%%/credits.rpl
 %%DATADIR%%/editor.dat
 %%DATADIR%%/fonts.dat
@@ -11,4 +12,8 @@ bin/xmoto-edit
 %%NLS%%@dirrmtry share/locale/de
 %%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca
 @dirrm %%DATADIR%%