Update to xmoto's newest release.
Switch MAINTAINER, requested by previous maintainer.
--
Antti Harri
diff --git games/xmoto/Makefile games/xmoto/Makefile
index a50e31a..e81c065 100644
--- games/xmoto/Makefile
+++ games/xmoto/Makefile
@@ -2,13 +2,12 @@
COMMENT = challenging 2D motocross platform game
-V =0.5.2
+V =0.5.9
DISTNAME = xmoto-${V}-src
PKGNAME = xmoto-${V}
-REVISION= 0
CATEGORIES = games
-MAINTAINER = Jonathan Armani d...@asystant.net
+MAINTAINER = Antti Harri i...@openbsd.fi
HOMEPAGE = http://xmoto.tuxfamily.org/
MASTER_SITES = http://download.tuxfamily.org/xmoto/xmoto/${V}/
@@ -19,32 +18,44 @@ 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 jpeg
+WANTLIB += lua m ode png pthread sqlite3 stdc++ xdg-basedir xml2 z
MODULES= devel/gettext
-
-LIB_DEPENDS = devel/sdl-mixer \
+BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+LIB_DEPENDS = archivers/bzip2 \
+ databases/sqlite3 \
+ devel/ode \
+ devel/sdl-mixer \
devel/sdl-net \
devel/sdl-ttf \
- archivers/bzip2 \
- net/curl \
graphics/jpeg \
- devel/ode \
- lang/lua \
graphics/png \
- databases/sqlite3
+ lang/lua \
+ net/curl \
+ textproc/libxml \
+ x11/libxdg-basedir
-USE_GMAKE =Yes
+SEPARATE_BUILD = Yes
USE_GROFF =Yes
+
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include
-I${X11BASE}/include \
- -I${LOCALBASE}/include/libpng \
- LDFLAGS=-L${LOCALBASE}/lib -L${X11BASE}/lib \
- LIBS=-lGL -lm -pthread
+CONFIGURE_ENV =CPPFLAGS=`pkg-config --cflags libpng sqlite3
sdl` -DSVN_REV='\${V}\' \
+ LDFLAGS=`pkg-config --libs libpng sdl` -lGL
+AUTOMAKE_VERSION = 1.11
+AUTOCONF_VERSION = 2.68
+
+NO_REGRESS = Yes
WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//}
+pre-configure:
+ cd ${WRKSRC} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ autoreconf -fi
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmoto/
${INSTALL_DATA} ${WRKSRC}/{COPYING,README} ${PREFIX}/share/doc/xmoto/
diff --git games/xmoto/distinfo games/xmoto/distinfo
index 869d5ea..0043f9f 100644
--- games/xmoto/distinfo
+++ games/xmoto/distinfo
@@ -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.9-src.tar.gz) = 2Na3pAUTlTBlC4qa4upt8w==
+RMD160 (xmoto-0.5.9-src.tar.gz) = NP29PnsmxnjrTA5aR3tF3gIWd4Y=
+SHA1 (xmoto-0.5.9-src.tar.gz) = B3V6zM54FR3IhzvvgnDfDlYZZ3I=
+SHA256 (xmoto-0.5.9-src.tar.gz) = dNdXRHatMhxD22wN9tN4lUBo4lFOP0rK4cwyLfigM+Q=
+SIZE (xmoto-0.5.9-src.tar.gz) = 40385328
diff --git games/xmoto/patches/patch-bin_Makefile_am
games/xmoto/patches/patch-bin_Makefile_am
new file mode 100644
index 000..841b507
--- /dev/null
+++ games/xmoto/patches/patch-bin_Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- bin/Makefile.am.orig Tue Oct 11 23:19:23 2011
bin/Makefile.amSat Mar 10 13:06:51 2012
+@@ -14,7 +14,7 @@ else
+ if WIN32
+ echo Windows, cannot build xmoto.bin in the src directory ; build it
from the exec directory.
+ else
+- if test -e $; then ../src/xmoto --pack $@ `dirname $`; fi
++ if test -e $@; then ../src/xmoto --pack $@ `dirname $@`; fi
+ endif
+ endif
+
diff --git games/xmoto/patches/patch-configure_in
games/xmoto/patches/patch-configure_in
new file mode 100644
index 000..f658e35
--- /dev/null
+++ games/xmoto/patches/patch-configure_in
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.in.orig Sun Nov 13 22:04:13 2011
configure.in Sat Mar 10 12:53:53 2012
+@@ -32,7 +32,7 @@ AM_PATH_XML2([],
+ [AC_MSG_ERROR([*** cannot find the libxml2 library ])])
+ CPPFLAGS=$CPPFLAGS $XML_CPPFLAGS
+ CFLAGS=$CFLAGS $XML_CPPFLAGS
+-LIBS=$LIBS$XML_LIBS
++LIBS=$LIBS $XML_LIBS
+ fi
+
+ dnl bz2
diff --git games/xmoto/patches/patch-m4_gettext_m4
games/xmoto/patches/patch-m4_gettext_m4
new file mode 100644
index 000..6b3032e
--- /dev/null
+++ games/xmoto/patches/patch-m4_gettext_m4
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/gettext.m4.orig Sat Mar 10 14:06:51 2012
