5 files changed, 30 insertions, 72 deletions

diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 05d143da21cc..83e2c629a19d 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmoto
-PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	games
 MASTER_SITES=	http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \
 		http://www.amdmi3.ru/distfiles/
@@ -25,8 +24,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LUA=	5.1
-USE_SQLITE=	yes
-USE_SDL=	sdl mixer ttf
+USE_SQLITE=	3
+USE_SDL=	sdl mixer ttf net
+USE_GL=		gl glu
 USE_DOS2UNIX=	src/*.cpp src/*.h
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -37,25 +37,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	README ChangeLog
 
-OPTIONS=	ZOOM	"Enable zooming"	on \
-		SDL_GFX	"Use sdl_gfx rendering instead of OpenGL (broken)"	off
+OPTIONS=	ASIAN_TTF "Use asian TTF font" off
 
 MAN6=		xmoto.6
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ZOOM)
-CONFIGURE_ARGS+=	--with-enable-zoom=1
+.if defined(WITH_ASIAN_TTF)
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/TrueType/bkai00mp.ttf:${PORTSDIR}/chinese/arphicttf
+CONFIGURE_ARGS+=--with-asian-ttf-file=${LOCALBASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf
 .else
-CONFIGURE_ARGS+=	--with-enable-zoom=0
-.endif
-
-.if defined(WITH_SDL_GFX)
-USE_SDL+=	gfx
-CONFIGURE_ARGS+=--with-renderer-sdlGfx=1 --with-renderer-openGl=0
-.else
-USE_GL=		yes
-CONFIGURE_ARGS+=--with-renderer-sdlGfx=0 --with-renderer-openGl=1
+CONFIGURE_ARGS+=--without-asian-ttf-file
 .endif
 
 .if !defined(WITHOUT_NLS)
@@ -67,11 +59,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '/LIBS/ s|-lSDL_mixer|`${SDL_CONFIG} --libs` &|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/mang|/man6|' ${WRKSRC}/Makefile.in
-
 .if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${DOCSDIR}
diff --git a/games/xmoto/distinfo b/games/xmoto/distinfo
index 859c5c9ca9d7..b2f8b965c51a 100644
--- a/games/xmoto/distinfo
+++ b/games/xmoto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmoto-0.4.2-src.tar.gz) = 15368b282641a225b71c279fe4dc0dc4
-SHA256 (xmoto-0.4.2-src.tar.gz) = c8eea0a8c19f466cfd550ae06bccb1ccd1c8e45726edadd10b14ee89a4b64b60
-SIZE (xmoto-0.4.2-src.tar.gz) = 21518240
+MD5 (xmoto-0.5.0-src.tar.gz) = e693ec0f949e44fb78187b8e82650869
+SHA256 (xmoto-0.5.0-src.tar.gz) = 705a70c3cda8300179e049c5b1fb8d5d241ede0a3bc1961d5e93682babccc93f
+SIZE (xmoto-0.5.0-src.tar.gz) = 21913971
diff --git a/games/xmoto/files/patch-configure b/games/xmoto/files/patch-configure
deleted file mode 100644
index 847ae82508a1..000000000000
--- a/games/xmoto/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	2008-04-06 23:15:13.000000000 -0300
-+++ configure	2008-04-06 23:16:55.000000000 -0300
-@@ -5101,7 +5101,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- SQLITE_LIBS=-lsqlite3
-+ SQLITE_LIBS=`pkg-config --static --libs sqlite3`
- else
-   { { echo "$as_me:$LINENO: error: \"sqlite3 required\"" >&5
- echo "$as_me: error: \"sqlite3 required\"" >&2;}
-@@ -5117,7 +5117,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsqlite3  $LIBS"
-+LIBS="`pkg-config --static --libs sqlite3`  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -5171,7 +5171,7 @@
- #define HAVE_LIBSQLITE3 1
- _ACEOF
- 
--  LIBS="-lsqlite3 $LIBS"
-+  LIBS="`pkg-config --static --libs sqlite3` $LIBS"
- 
- else
-   { { echo "$as_me:$LINENO: error: \"Linking against sqlite3 failed.\"" >&5
diff --git a/games/xmoto/files/patch-src-xmscene-BikeController.cpp b/games/xmoto/files/patch-src-xmscene-BikeController.cpp
deleted file mode 100644
index 1154fd0f6bb5..000000000000
--- a/games/xmoto/files/patch-src-xmscene-BikeController.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/xmscene/BikeController.cpp.orig	2008-01-06 12:56:21.000000000 +0300
-+++ src/xmscene/BikeController.cpp	2008-02-05 14:49:40.000000000 +0300
-@@ -77,11 +77,7 @@
-     m_drive = -m_break;
-   }
-   else if(m_break == 0.0f){
--    if(m_throttle != 0.0f){
--      m_drive = m_throttle;
--    } else {
--      m_drive = 0.0f;
--    }
-+    m_drive = m_throttle;
-   }
- }
- 
diff --git a/games/xmoto/pkg-plist b/games/xmoto/pkg-plist
index f9f17797ed82..62a003d230c1 100644
--- a/games/xmoto/pkg-plist
+++ b/games/xmoto/pkg-plist
@@ -1,16 +1,21 @@
 bin/xmoto
+%%NLS%%share/locale/ca_AD/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/ca_ES/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/ca_FR/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/ca_IT/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/cs_CZ/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/da_DK/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/de_DE/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/es_ES/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/fi_FI/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/fr_FR/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/hu_HU/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/it_IT/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/lt_LT/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/lv_LV/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/nb_NO/LC_MESSAGES/xmoto.mo
+%%NLS%%share/locale/nl_NL/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/nn_NO/LC_MESSAGES/xmoto.mo
-%%NLS%%share/locale/no_NO/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/pl_PL/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/pt_PT/LC_MESSAGES/xmoto.mo
@@ -38,16 +43,20 @@ bin/xmoto
 %%NLS%%@dirrmtry share/locale/ru_RU
 %%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/pl_PL
-%%NLS%%@dirrmtry share/locale/no_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/no_NO
 %%NLS%%@dirrmtry share/locale/nn_NO/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/nn_NO
+%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl_NL
 %%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/nb_NO
 %%NLS%%@dirrmtry share/locale/lv_LV/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lv_LV
+%%NLS%%@dirrmtry share/locale/lt_LT/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lt_LT
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT
+%%NLS%%@dirrmtry share/locale/hu_HU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hu_HU
 %%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fi_FI
 %%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
@@ -56,5 +65,11 @@ bin/xmoto
 %%NLS%%@dirrmtry share/locale/da_DK
 %%NLS%%@dirrmtry share/locale/cs_CZ/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/cs_CZ
+%%NLS%%@dirrmtry share/locale/ca_IT/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca_IT
+%%NLS%%@dirrmtry share/locale/ca_FR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca_FR
 %%NLS%%@dirrmtry share/locale/ca_ES/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ca_ES
+%%NLS%%@dirrmtry share/locale/ca_AD/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ca_AD