- Update to 3.3

* Now compiles fine WITHOUT_NLS
* Depend on sqlite via USE_SQLITE instead of LIB_DEPENDS (noted by sat)

PR:		116095
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru> (maintainer)

3 files changed, 16 insertions, 14 deletions

diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index b1aefd5bc857..4105e0c768df 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmoto
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	games
 MASTER_SITES=	http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \
 		http://www.amdmi3.ru/distfiles/
@@ -18,13 +18,13 @@ COMMENT=	Challenging 2D motocross platform game
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		curl.4:${PORTSDIR}/ftp/curl \
-		sqlite3:${PORTSDIR}/databases/sqlite3
+		curl.4:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LUA=	5.1
+USE_SQLITE=	yes
 USE_SDL=	sdl mixer ttf
 USE_DOS2UNIX=	src/*.cpp src/*.h
 
@@ -39,7 +39,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	README ChangeLog
 
 OPTIONS=	ZOOM	"Enable zooming"	on \
-		SDL_GFX	"Use sdl_gfx rendering instead of OpenGL"	off
+		SDL_GFX	"Use sdl_gfx rendering instead of OpenGL (broken)"	off
 
 MAN6=		xmoto.6
 
@@ -59,15 +59,14 @@ USE_GL=		yes
 CONFIGURE_ARGS+=--with-renderer-sdlGfx=0 --with-renderer-openGl=1
 .endif
 
-# won't compile WITHOUT_NLS ATM
-#.if !defined(WITHOUT_NLS)
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 CONFIGURE_ENV+=	LIBS="-lintl"
-#.else
-#CONFIGURE_ARGS+=	--disable-nls
-#PLIST_SUB+=	NLS="@comment "
-#.endif
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|SDL/||; s|endian.h|sys/endian.h|' \
@@ -76,7 +75,7 @@ post-patch:
 		${WRKSRC}/src/image/tim_memory_crt.cpp
 	@${REINPLACE_CMD} -e \
 		'/LIBS/ s|-lSDL_mixer|`${SDL_CONFIG} --libs` &|; \
-		 s|function displayRequirement|displayRequirement()|; \
+		 s|^function \([a-zA-Z]*\)|\1()|; \
 		 /Locales/ s|libc|libintl|; s|lua50|luaxx|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/mang|/man6|' ${WRKSRC}/Makefile.in
diff --git a/games/xmoto/distinfo b/games/xmoto/distinfo
index b31818bef7cb..ab53cf12cb66 100644
--- a/games/xmoto/distinfo
+++ b/games/xmoto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmoto-0.3.2-src.tar.gz) = 09f40a4cc189033ce0753eadb0a2213e
-SHA256 (xmoto-0.3.2-src.tar.gz) = dbe5143f2a6cf43d7b53f908b2c84891029be1d12df13fdfdc6ece7d11861432
-SIZE (xmoto-0.3.2-src.tar.gz) = 16954891
+MD5 (xmoto-0.3.3-src.tar.gz) = f1f7726a8856f9c9efa2ae8e3192bb7f
+SHA256 (xmoto-0.3.3-src.tar.gz) = c5fa955733f4ea785a3bc78002082507d7e9f99eab5ba1dd28710761893be9b4
+SIZE (xmoto-0.3.3-src.tar.gz) = 16958347
diff --git a/games/xmoto/pkg-plist b/games/xmoto/pkg-plist
index 51ff9eceb4d1..3fdab55f8f2d 100644
--- a/games/xmoto/pkg-plist
+++ b/games/xmoto/pkg-plist
@@ -12,6 +12,7 @@ bin/xmoto
 %%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
 %%NLS%%share/locale/ru_RU/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/sk_SK/LC_MESSAGES/xmoto.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/xmoto.mo
@@ -30,6 +31,8 @@ bin/xmoto
 %%NLS%%@dirrmtry share/locale/de_DE
 %%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fi_FI
+%%NLS%%@dirrmtry share/locale/fr_FR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr_FR
 %%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/it_IT
 %%NLS%%@dirrmtry share/locale/lv_LV/LC_MESSAGES