Date: Mon, 14 Nov 2016 15:13:31 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426113 - in head/games/xmoto: . files Message-ID: <201611141513.uAEFDVv8038205@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Nov 14 15:13:30 2016 New Revision: 426113 URL: https://svnweb.freebsd.org/changeset/ports/426113 Log: - Pet portlint - Switch to USES=localbase - Switch to options helpers - Regenerate patches Modified: head/games/xmoto/Makefile head/games/xmoto/files/patch-src-GameInit.cpp head/games/xmoto/files/patch-src-VTexture.h head/games/xmoto/files/patch-src-WWW.cpp head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp head/games/xmoto/files/patch-src-helpers-System.cpp head/games/xmoto/files/patch-src-include-xm__hashmap.h Modified: head/games/xmoto/Makefile ============================================================================== --- head/games/xmoto/Makefile Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/Makefile Mon Nov 14 15:13:30 2016 (r426113) @@ -12,29 +12,36 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Challenging 2D motocross platform game +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl \ libxdg-basedir.so:x11/libxdg-basedir BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:devel/ode -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - GNU_CONFIGURE= yes -USES= compiler:features dos2unix gmake jpeg lua:51 sqlite +USES= compiler:features dos2unix gmake jpeg localbase lua:51 sqlite USE_GNOME= libxml2 USE_SDL= sdl mixer ttf net USE_GL= gl glu DOS2UNIX_GLOB= *.cpp *.h -CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} -LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} +CPPFLAGS+= -isystem${LUA_INCDIR} +LDFLAGS+= -L${LUA_LIBDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= README ChangeLog PORTDATA= * +DESKTOP_ENTRIES="XMoto" \ + "Motorcross game" \ + "${DATADIR}/xmoto_icone_x.ico" \ + "xmoto" \ + "Game;SportsGame;ArcadeGame;" \ + false + OPTIONS_DEFINE= ASIAN_TTF DOCS NLS OPTIONS_SUB= yes @@ -47,13 +54,6 @@ ASIAN_TTF_CONFIGURE_OFF=--without-asian- NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -DESKTOP_ENTRIES="XMoto" \ - "Motorcross game" \ - "${DATADIR}/xmoto_icone_x.ico" \ - "xmoto" \ - "Game;SportsGame;ArcadeGame;" \ - false - .include <bsd.port.pre.mk> .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 @@ -66,8 +66,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "s/lua5.1/lua-${LUA_VER}/g" ${WRKSRC}/configure -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor Modified: head/games/xmoto/files/patch-src-GameInit.cpp ============================================================================== --- head/games/xmoto/files/patch-src-GameInit.cpp Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-GameInit.cpp Mon Nov 14 15:13:30 2016 (r426113) @@ -1,5 +1,5 @@ ---- src/GameInit.cpp.orig 2015-01-10 18:22:36.000000000 +0100 -+++ src/GameInit.cpp 2015-01-10 18:27:28.000000000 +0100 +--- src/GameInit.cpp.orig 2011-10-11 20:18:35 UTC ++++ src/GameInit.cpp @@ -248,7 +248,7 @@ void GameApp::run_load(int nNumArgs, cha Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */ Modified: head/games/xmoto/files/patch-src-VTexture.h ============================================================================== --- head/games/xmoto/files/patch-src-VTexture.h Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-VTexture.h Mon Nov 14 15:13:30 2016 (r426113) @@ -1,6 +1,6 @@ ---- src/VTexture.h.orig 2011-10-12 00:18:35.000000000 +0400 -+++ src/VTexture.h 2014-11-24 22:08:42.749026473 +0300 -@@ -135,7 +135,7 @@ +--- src/VTexture.h.orig 2011-10-11 20:18:35 UTC ++++ src/VTexture.h +@@ -135,7 +135,7 @@ private: void cleanUnregistredTextures(); Modified: head/games/xmoto/files/patch-src-WWW.cpp ============================================================================== --- head/games/xmoto/files/patch-src-WWW.cpp Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-WWW.cpp Mon Nov 14 15:13:30 2016 (r426113) @@ -1,5 +1,5 @@ ---- src/WWW.cpp.orig 2015-01-10 18:11:22.000000000 +0100 -+++ src/WWW.cpp 2015-01-10 18:21:32.000000000 +0100 +--- src/WWW.cpp.orig 2011-10-11 20:18:35 UTC ++++ src/WWW.cpp @@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri std::string v_www_agent = WWW_AGENT; Modified: head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp ============================================================================== --- head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-drawlib-DrawLibOpenGL.cpp Mon Nov 14 15:13:30 2016 (r426113) @@ -1,6 +1,6 @@ ---- src/drawlib/DrawLibOpenGL.cpp.orig 2011-10-12 00:18:26.000000000 +0400 -+++ src/drawlib/DrawLibOpenGL.cpp 2014-11-24 22:08:12.925973647 +0300 -@@ -80,7 +80,7 @@ +--- src/drawlib/DrawLibOpenGL.cpp.orig 2011-10-11 20:18:26 UTC ++++ src/drawlib/DrawLibOpenGL.cpp +@@ -80,7 +80,7 @@ public: /* a glyph from other glyphs */ /*kejo:why not just grrr create a copy contructor*/ GLFontGlyph(const std::string& i_value, @@ -9,7 +9,7 @@ virtual ~GLFontGlyph(); std::string Value() const; -@@ -132,11 +132,11 @@ +@@ -132,11 +132,11 @@ public: private: std::vector<std::string> m_glyphsKeys; std::vector<GLFontGlyph*> m_glyphsValues; @@ -23,7 +23,7 @@ unsigned int getLonguestLineSize(const std::string& i_value, unsigned int i_start = 0, unsigned int i_nbLinesToRead = -1); }; -@@ -825,7 +825,7 @@ +@@ -825,7 +825,7 @@ GLFontGlyph::GLFontGlyph(const std::stri } GLFontGlyph::GLFontGlyph(const std::string& i_value, Modified: head/games/xmoto/files/patch-src-helpers-System.cpp ============================================================================== --- head/games/xmoto/files/patch-src-helpers-System.cpp Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-helpers-System.cpp Mon Nov 14 15:13:30 2016 (r426113) @@ -1,8 +1,8 @@ ---- src/helpers/System.cpp.orig 2011-10-12 00:18:14.000000000 +0400 -+++ src/helpers/System.cpp 2013-09-13 22:36:38.029229232 +0400 -@@ -25,6 +25,8 @@ - #include "VExcept.h" - #include <sstream> +--- src/helpers/System.cpp.orig 2014-03-29 06:14:14 UTC ++++ src/helpers/System.cpp +@@ -31,6 +31,8 @@ Foundation, Inc., 59 Temple Place, Suite + #include <unistd.h> + #endif +#include <unistd.h> // for getpid() + Modified: head/games/xmoto/files/patch-src-include-xm__hashmap.h ============================================================================== --- head/games/xmoto/files/patch-src-include-xm__hashmap.h Mon Nov 14 15:11:24 2016 (r426112) +++ head/games/xmoto/files/patch-src-include-xm__hashmap.h Mon Nov 14 15:13:30 2016 (r426113) @@ -1,5 +1,5 @@ ---- src/include/xm_hashmap.h.orig 2015-01-12 23:04:54.000000000 +0100 -+++ src/include/xm_hashmap.h 2015-01-12 23:07:53.000000000 +0100 +--- src/include/xm_hashmap.h.orig 2011-10-11 20:18:17 UTC ++++ src/include/xm_hashmap.h @@ -13,13 +13,18 @@ #include <hash_map> namespace HashNamespace=std;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611141513.uAEFDVv8038205>