>
> I will sent a corrected diff later.
>
> Thanks.
>
And the diff.
--
Jonathan Armani
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/xmoto/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile 8 Jul 2011 20:38:02 -0000 1.8
+++ Makefile 13 Sep 2011 20:17:21 -0000
@@ -2,12 +2,12 @@
COMMENT = challenging 2D motocross platform game
-V = 0.5.2
+V = 0.5.7
DISTNAME = xmoto-${V}-src
PKGNAME = xmoto-${V}
CATEGORIES = games
-MAINTAINER = Jonathan Armani <[email protected]>
+MAINTAINER = Antti Harri <[email protected]>
HOMEPAGE = http://xmoto.tuxfamily.org/
MASTER_SITES = http://download.tuxfamily.org/xmoto/xmoto/${V}/
@@ -18,8 +18,8 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
-WANTLIB += GL GLU SDL X11 c m pthread pthread-stubs stdc++ xcb z
-WANTLIB += SDL_mixer SDL_net SDL_ttf bz2 curl jpeg ode lua png sqlite3
+WANTLIB += GL GLU SDL SDL_mixer SDL_net SDL_ttf X11 bz2 c curl iconv jpeg lua
m
+WANTLIB += ode png pthread sqlite3 stdc++ xdg-basedir z
MODULES= devel/gettext
@@ -29,6 +29,7 @@ LIB_DEPENDS = devel/sdl-mixer \
archivers/bzip2 \
net/curl \
graphics/jpeg \
+ x11/libxdg-basedir \
devel/ode \
lang/lua \
graphics/png \
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/xmoto/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 27 Sep 2009 17:20:57 -0000 1.2
+++ distinfo 13 Sep 2011 20:17:21 -0000
@@ -1,5 +1,5 @@
-MD5 (xmoto-0.5.2-src.tar.gz) = HjZ4687KIdYYRO+1PBQCJw==
-RMD160 (xmoto-0.5.2-src.tar.gz) = qDIzNoFCYbDCuwrPE9XmWskukh0=
-SHA1 (xmoto-0.5.2-src.tar.gz) = qoGYcvBr6xFAJcSQzqjiKc2FE10=
-SHA256 (xmoto-0.5.2-src.tar.gz) = qMkTeO1Dm2QBVyZ5gbQj3O6jWEpDnSXuqKooGBRYBY8=
-SIZE (xmoto-0.5.2-src.tar.gz) = 38170502
+MD5 (xmoto-0.5.7-src.tar.gz) = xLhHdBJEXhFIQ7O2Fjk38w==
+RMD160 (xmoto-0.5.7-src.tar.gz) = eBWkTyAV0dVFcLudHcDjMEGtJDQ=
+SHA1 (xmoto-0.5.7-src.tar.gz) = 54G0JICpYYe1rKQSbRfs8GEMpaw=
+SHA256 (xmoto-0.5.7-src.tar.gz) = etYx3oMKdi9JXZJzplvUL7QzGGgZfT1ejWJLtZ/s/KY=
+SIZE (xmoto-0.5.7-src.tar.gz) = 40395855
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 13 Sep 2011 20:17:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Fri Apr 1 20:50:19 2011
++++ configure Sun Sep 11 21:26:53 2011
+@@ -12074,6 +12074,8 @@ $as_echo "$gt_source" >&6; }
+ fi
+
+ if test "$USE_NLS" = "yes"; then
++ LIBINTL=$LTLIBINTL
++ INTLLIBS=$LTLIBINTL
+
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" =
"yes"; }; then
Index: patches/patch-src_GameInit_cpp
===================================================================
RCS file: patches/patch-src_GameInit_cpp
diff -N patches/patch-src_GameInit_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_GameInit_cpp 13 Sep 2011 20:17:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/GameInit.cpp.orig Sat Sep 10 22:42:59 2011
++++ src/GameInit.cpp Sat Sep 10 22:43:49 2011
+@@ -260,7 +260,7 @@ void GameApp::run_load(int nNumArgs, char** ppcArgs) {
+ struct sigaction v_act;
+
+ v_act.sa_handler = xmexit_term;
+-#if !defined(__APPLE__)
++#if !defined(__APPLE__) && !defined(__OpenBSD__)
+ v_act.sa_restorer = NULL;
+ #endif
+ sigemptyset(&v_act.sa_mask);
Index: patches/patch-src_Replay_cpp
===================================================================
RCS file: patches/patch-src_Replay_cpp
diff -N patches/patch-src_Replay_cpp
--- patches/patch-src_Replay_cpp 27 Sep 2009 17:20:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Replay_cpp,v 1.1 2009/09/27 17:20:57 jasper Exp $
---- src/Replay.cpp.orig Wed Sep 23 03:51:02 2009
-+++ src/Replay.cpp Wed Sep 23 03:47:34 2009
-@@ -156,7 +156,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- v_replay.writeBuf(pcData, nDataSize);
-
- /* Chunks */
-- v_replay << m_Chunks.size();
-+ v_replay << (unsigned int)m_Chunks.size();
- for(unsigned int i=0;i<m_Chunks.size();i++) {
- v_replay << m_Chunks[i]->nNumStates;
- v_replay.writeBuf(m_Chunks[i]->pcChunkData, m_nStateSize *
m_Chunks[i]->nNumStates);
Index: patches/patch-src_helpers_System_cpp
===================================================================
RCS file: patches/patch-src_helpers_System_cpp
diff -N patches/patch-src_helpers_System_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_helpers_System_cpp 13 Sep 2011 20:17:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/helpers/System.cpp.orig Sat Sep 10 22:34:36 2011
++++ src/helpers/System.cpp Sat Sep 10 22:35:18 2011
+@@ -81,7 +81,7 @@ std::string System::getMemoryInfo() {
+ std::string v_res;
+
+ // note that apple don't know getline
+-#if defined(WIN32) || defined(__APPLE__)
++#if defined(WIN32) || defined(__APPLE__) || defined(__OpenBSD__)
+ return "No available information";
+ #else
+ // grep -E '^Vm' /proc/2532/status
Index: patches/patch-src_image_tim_png_cpp
===================================================================
RCS file: /cvs/ports/games/xmoto/patches/patch-src_image_tim_png_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_image_tim_png_cpp
--- patches/patch-src_image_tim_png_cpp 8 Jul 2011 20:38:02 -0000 1.2
+++ patches/patch-src_image_tim_png_cpp 13 Sep 2011 20:17:21 -0000
@@ -1,20 +1,11 @@
-$OpenBSD: patch-src_image_tim_png_cpp,v 1.2 2011/07/08 20:38:02 naddy Exp $
---- src/image/tim_png.cpp.orig Mon Jul 13 13:41:39 2009
-+++ src/image/tim_png.cpp Mon Jul 4 23:24:32 2011
-@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+$OpenBSD$
+--- src/image/tim_png.cpp.orig Sat Sep 10 22:36:28 2011
++++ src/image/tim_png.cpp Sat Sep 10 22:37:51 2011
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ */
+ #include <stdio.h>
#include <string.h>
++#include <zlib.h>
#include "tim.h"
#include "png.h"
-+#include <zlib.h>
-
-
/*==============================================================================
- Types
-@@ -166,7 +167,7 @@ int tim_png_load(tim_session_t *pSession,tim_image_t *
- png_set_palette_to_rgb(PngPtr);
-
- if(nColorType==PNG_COLOR_TYPE_GRAY && nBitDepth<8)
-- png_set_gray_1_2_4_to_8(PngPtr);
-+ png_set_expand_gray_1_2_4_to_8(PngPtr);
- if(png_get_valid(PngPtr,InfoPtr,PNG_INFO_tRNS))
- png_set_tRNS_to_alpha(PngPtr);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/xmoto/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 27 Sep 2009 17:20:57 -0000 1.2
+++ pkg/PLIST 13 Sep 2011 20:17:21 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/09/27 17:20:57 jasper Exp $
+@comment $OpenBSD$
@bin bin/xmoto
@man man/man6/xmoto.6
share/doc/xmoto/
@@ -34,6 +34,9 @@ share/locale/fi_FI/LC_MESSAGES/xmoto.mo
share/locale/fr_FR/
share/locale/fr_FR/LC_MESSAGES/
share/locale/fr_FR/LC_MESSAGES/xmoto.mo
+share/locale/gl_ES/
+share/locale/gl_ES/LC_MESSAGES/
+share/locale/gl_ES/LC_MESSAGES/xmoto.mo
share/locale/hu_HU/
share/locale/hu_HU/LC_MESSAGES/
share/locale/hu_HU/LC_MESSAGES/xmoto.mo
@@ -79,9 +82,11 @@ share/xmoto/
share/xmoto/Textures/
share/xmoto/Textures/Fonts/
share/xmoto/Textures/Fonts/DejaVuSans.ttf
+share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
share/xmoto/Textures/Musics/
share/xmoto/Textures/Musics/MadeiraStew.ogg
share/xmoto/Textures/Musics/batcave.ogg
+share/xmoto/Textures/Musics/foxrun.ogg
share/xmoto/Textures/Musics/legolodio.ogg
share/xmoto/Textures/Musics/menu.ogg
share/xmoto/Textures/Musics/ridealong.ogg