Re: [Update] Xmoto 0.5.7

2011-09-13 Thread Antti Harri 
On Tuesday 13 September 2011 23:18:04 Jonathan Armani wrote:
> > I will sent a corrected diff later.
> >
> > Thanks.
>
> And the diff.

Tested on amd64. Ok for me.

-- 
Antti Harri

Re: [Update] Xmoto 0.5.7

2011-09-13 Thread Jonathan Armani 

> 
> 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
--- Makefile8 Jul 2011 20:38:02 -   1.8
+++ Makefile13 Sep 2011 20:17:21 -
@@ -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 
+MAINTAINER =   Antti Harri 
 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
--- distinfo27 Sep 2009 17:20:57 -  1.2
+++ distinfo13 Sep 2011 20:17:21 -
@@ -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 -
+++ patches/patch-configure 13 Sep 2011 20:17:21 -
@@ -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 -
+++ patches/patch-src_GameInit_cpp  13 Sep 2011 20:17:21 -
@@ -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_cpp27 Sep 2009 17:20:57 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Replay_cpp,v 1.1 2009/09/27 17:20:57 jasper Exp $
 src/Replay.cpp.origWed 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;inNumStates;
-   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 -
+++ patches/patch-src_helpers_System_cpp13 Sep 2011 20:17:21 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/helpers/System.cpp.ori

Re: [Update] Xmoto 0.5.7

2011-09-11 Thread Jonathan Armani 
On Sun, 11 Sep 2011 21:59:17 +0200
Landry Breuil  wrote:

> On Sun, Sep 11, 2011 at 09:49:15PM +0200, Jonathan Armani wrote:
> > 
> > Updated diff, with cleaned / sorted wantlib and add a patch to make 
> > the configure script pick up the good library to link against (.so and not 
> > .a).
> > 
> > Tips from naddy, espie and fgs, thanks guys !
> > 
> > +   if test "$USE_NLS" = "yes"; then
> > ++   LIBINTL="-lintl -liconv"
> > ++   LTLIBINTL="-lint -liconv"
> 
> typo here :)
> 
> 

Right, and it comes from net/ap-utils/patches/patch-configure :

+LIBINTL="-lintl -liconv"
+LTLIBINTL="-lint -liconv"

I will sent a corrected diff later.

Thanks.

-- 
Jonathan Armani

Re: [Update] Xmoto 0.5.7

2011-09-11 Thread Landry Breuil 
On Sun, Sep 11, 2011 at 09:49:15PM +0200, Jonathan Armani wrote:
> 
> Updated diff, with cleaned / sorted wantlib and add a patch to make 
> the configure script pick up the good library to link against (.so and not 
> .a).
> 
> Tips from naddy, espie and fgs, thanks guys !
> 
> +   if test "$USE_NLS" = "yes"; then
> ++   LIBINTL="-lintl -liconv"
> ++   LTLIBINTL="-lint -liconv"

typo here :)

Re: [Update] Xmoto 0.5.7

2011-09-11 Thread Jonathan Armani 

Updated diff, with cleaned / sorted wantlib and add a patch to make 
the configure script pick up the good library to link against (.so and not .a).

Tips from naddy, espie and fgs, thanks guys !

-- 
Jonathan Armani 

Index: Makefile
===
RCS file: /cvs/ports/games/xmoto/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile8 Jul 2011 20:38:02 -   1.8
+++ Makefile11 Sep 2011 19:43:29 -
@@ -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 
+MAINTAINER =   Antti Harri 
 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 -r1.2 distinfo
--- distinfo27 Sep 2009 17:20:57 -  1.2
+++ distinfo11 Sep 2011 19:43:29 -
@@ -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 -
+++ patches/patch-configure 11 Sep 2011 19:43:29 -
@@ -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="-lintl -liconv"
++   LTLIBINTL="-lint -liconv"
+ 
+ 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 -
+++ patches/patch-src_GameInit_cpp  11 Sep 2011 19:43:29 -
@@ -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_cpp27 Sep 2009 17:20:57 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Replay_cpp,v 1.1 2009/09/27 17:20:57 jasper Exp $
 src/Replay.cpp.origWed 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;inNumStates;
-   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 -
+++ patch

[Update] Xmoto 0.5.7

2011-09-11 Thread Jonathan Armani 

Hi,

Update xmoto to 0.5.7 and gives maintainer to Antti Harri (thanks !).

Tested on amd64.

Ok ?

-- 
Jonathan Armani 

Index: Makefile
===
RCS file: /cvs/ports/games/xmoto/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile8 Jul 2011 20:38:02 -   1.8
+++ Makefile11 Sep 2011 08:06:42 -
@@ -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 
+MAINTAINER =   Antti Harri 
 HOMEPAGE = http://xmoto.tuxfamily.org/
 
 MASTER_SITES = http://download.tuxfamily.org/xmoto/xmoto/${V}/
@@ -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 -r1.2 distinfo
--- distinfo27 Sep 2009 17:20:57 -  1.2
+++ distinfo11 Sep 2011 08:06:42 -
@@ -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-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 -
+++ patches/patch-src_GameInit_cpp  11 Sep 2011 08:06:42 -
@@ -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_cpp27 Sep 2009 17:20:57 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Replay_cpp,v 1.1 2009/09/27 17:20:57 jasper Exp $
 src/Replay.cpp.origWed 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;inNumStates;
-   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 -
+++ patches/patch-src_helpers_System_cpp11 Sep 2011 08:06:42 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/helpers/System.cpp.origSat 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 -r1.2 patch-src_image_tim_png_cpp
--- patches/patch-src_image_tim_png_cpp 8 Jul 2011 20:38:02 -   1.2
+++ patches/patch-src_image_tim_png_cpp 11 Sep 2011 08:06:42 -
@@ -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$