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 0000000..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.am Sat 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 0000000..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 0000000..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 ++++ m4/gettext.m4 Sat Mar 10 14:06:53 2012 +@@ -294,6 +294,8 @@ return * gettext ("")$gt_expression_test_code + _nl_ms + if test "$USE_NLS" = "yes"; then + + if test "$gt_use_preinstalled_gnugettext" = "yes"; then ++ LIBINTL=$LTLIBINTL ++ INTLLIBS=$LTLIBINTL + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) diff --git games/xmoto/patches/patch-src_GameInit_cpp games/xmoto/patches/patch-src_GameInit_cpp new file mode 100644 index 0000000..ec8552d --- /dev/null +++ games/xmoto/patches/patch-src_GameInit_cpp @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/GameInit.cpp.orig Sat Sep 24 20:25:51 2011 ++++ src/GameInit.cpp Sun Oct 30 11:57:07 2011 +@@ -269,7 +269,7 @@ void GameApp::run_load(int nNumArgs, char** ppcArgs) { + struct sigaction v_act; + + v_act.sa_handler = xmexit_term; +-#if !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) + v_act.sa_restorer = NULL; + #endif + sigemptyset(&v_act.sa_mask); diff --git games/xmoto/patches/patch-src_Makefile_am games/xmoto/patches/patch-src_Makefile_am new file mode 100644 index 0000000..0079dcd --- /dev/null +++ games/xmoto/patches/patch-src_Makefile_am @@ -0,0 +1,13 @@ +$OpenBSD$ +--- src/Makefile.am.orig Sat Mar 10 13:07:50 2012 ++++ src/Makefile.am Sat Mar 10 13:07:58 2012 +@@ -1,8 +1,6 @@ + WANTED_WARNNING= -Wall + +-SVNDEF = -D'SVN_REV="$(shell if test -d $(srcdir)/.svn; then svnversion -n $(srcdir); fi)"' +- +-XM_FLAGS = -DHAVEDGETCONFIGURATION=$(HAVEDGETCONFIGURATION) -DNOMMGR $(WANTED_WARNNING) -DGAMEDATADIR=\"$(GAMEDATADIR)\" -DLOCALESDIR=\"$(LOCALESDIR)\" -DASIAN_TTF_FILE=\"$(ASIAN_TTF_FILE)\" -DALLOW_DEV=$(ALLOW_DEV) -DCONFIGURE_DEFAULT_THEME=\"$(CONFIGURE_DEFAULT_THEME)\" $(GL_CFLAGS) $(SDL_CFLAGS) -DUSE_OPENGL=$(USE_OPENGL) -DUSE_SDLGFX=$(USE_SDLGFX) $(SVNDEF) ++XM_FLAGS = -DHAVEDGETCONFIGURATION=$(HAVEDGETCONFIGURATION) -DNOMMGR $(WANTED_WARNNING) -DGAMEDATADIR=\"$(GAMEDATADIR)\" -DLOCALESDIR=\"$(LOCALESDIR)\" -DASIAN_TTF_FILE=\"$(ASIAN_TTF_FILE)\" -DALLOW_DEV=$(ALLOW_DEV) -DCONFIGURE_DEFAULT_THEME=\"$(CONFIGURE_DEFAULT_THEME)\" $(GL_CFLAGS) $(SDL_CFLAGS) -DUSE_OPENGL=$(USE_OPENGL) -DUSE_SDLGFX=$(USE_SDLGFX) + + AM_CFLAGS = $(CFLAGS) $(XM_FLAGS) + AM_CXXFLAGS = $(CXXFLAGS) $(XM_FLAGS) diff --git games/xmoto/patches/patch-src_Replay_cpp games/xmoto/patches/patch-src_Replay_cpp deleted file mode 100644 index 33bd63d..0000000 --- games/xmoto/patches/patch-src_Replay_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: ports/games/xmoto/patches/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); diff --git games/xmoto/patches/patch-src_helpers_System_cpp games/xmoto/patches/patch-src_helpers_System_cpp new file mode 100644 index 0000000..af1ee63 --- /dev/null +++ games/xmoto/patches/patch-src_helpers_System_cpp @@ -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 diff --git games/xmoto/patches/patch-src_image_tim_png_cpp games/xmoto/patches/patch-src_image_tim_png_cpp index 2529450..f979558 100644 --- games/xmoto/patches/patch-src_image_tim_png_cpp +++ games/xmoto/patches/patch-src_image_tim_png_cpp @@ -1,20 +1,11 @@ -$OpenBSD: ports/games/xmoto/patches/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); diff --git games/xmoto/pkg/PLIST games/xmoto/pkg/PLIST index 179fa6f..cdf93c1 100644 --- games/xmoto/pkg/PLIST +++ games/xmoto/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: ports/games/xmoto/pkg/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