From owner-svn-ports-all@FreeBSD.ORG Sun Feb 2 18:07:44 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00DD9FC8; Sun, 2 Feb 2014 18:07:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C547510B7; Sun, 2 Feb 2014 18:07:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12I7hv2065822; Sun, 2 Feb 2014 18:07:43 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12I7gJa065813; Sun, 2 Feb 2014 18:07:42 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201402021807.s12I7gJa065813@svn.freebsd.org> From: Dmitry Marakasov Date: Sun, 2 Feb 2014 18:07:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342352 - in head/games/motogt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2014 18:07:44 -0000 Author: amdmi3 Date: Sun Feb 2 18:07:42 2014 New Revision: 342352 URL: http://svnweb.freebsd.org/changeset/ports/342352 QAT: https://qat.redports.org/buildarchive/r342352/ Log: - Support staging - Fix crash on first start (e.g. when no config is found) - Fix crash when changing resolutions with no XRender extension (e.g. with nvidia blob) Added: head/games/motogt/files/patch-Makefile (contents, props changed) head/games/motogt/files/patch-src-Config.cpp (contents, props changed) head/games/motogt/files/patch-src-Makefile.common (contents, props changed) Modified: head/games/motogt/Makefile head/games/motogt/files/patch-src-Makefile.lnx Modified: head/games/motogt/Makefile ============================================================================== --- head/games/motogt/Makefile Sun Feb 2 17:54:46 2014 (r342351) +++ head/games/motogt/Makefile Sun Feb 2 18:07:42 2014 (r342352) @@ -3,7 +3,7 @@ PORTNAME= motogt PORTVERSION= 20110505 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/motogt/ DISTNAME= MotoGT-${PORTVERSION} @@ -11,12 +11,11 @@ DISTNAME= MotoGT-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= 2D top-viewed motorcycle racing game -LIB_DEPENDS= sfml-system:${PORTSDIR}/devel/sfml \ - png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= libsfml-system.so:${PORTSDIR}/devel/sfml \ + libpng.so:${PORTSDIR}/graphics/png LICENSE= GPLv2 CCbySA LICENSE_COMB= multi -LICENSE_FILE_GPLv2= ${WRKSRC}/doc/gpl.txt LICENSE_NAME_CCbySA= Creative Commons Attribution-ShareAlike LICENSE_PERMS_CCbySA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE_CCbySA= ${WRKSRC}/doc/cc-by-sa.txt @@ -28,19 +27,17 @@ MAKE_JOBS_UNSAFE= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" SUB_FILES= motogt +CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} PLIST_FILES= bin/${PORTNAME} libexec/MotoGT.bin PORTDATA= * WRKSRC= ${WRKDIR}/MotoGT -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/MotoGT.bin ${PREFIX}/libexec/ - ${INSTALL_SCRIPT} ${WRKDIR}/motogt ${PREFIX}/bin/ -.if !defined(NOPORTDATA) - ${MKDIR} ${DATADIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} data ${DATADIR}/ -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/MotoGT.bin ${STAGEDIR}${PREFIX}/libexec/ + ${INSTALL_SCRIPT} ${WRKDIR}/motogt ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}/ .include Added: head/games/motogt/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/motogt/files/patch-Makefile Sun Feb 2 18:07:42 2014 (r342352) @@ -0,0 +1,10 @@ +--- Makefile.orig 2011-01-10 20:25:23.000000000 +0300 ++++ Makefile 2011-09-27 08:44:25.000000000 +0400 +@@ -1,5 +1,5 @@ + all: +- make -C src -f Makefile.lnx ++ ${MAKE} -C src -f Makefile.lnx + + clean: +- make -C src -f Makefile.lnx clean ++ ${MAKE} -C src -f Makefile.lnx clean Added: head/games/motogt/files/patch-src-Config.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/motogt/files/patch-src-Config.cpp Sun Feb 2 18:07:42 2014 (r342352) @@ -0,0 +1,22 @@ +--- src/Config.cpp.orig 2011-01-18 06:52:35.000000000 +0300 ++++ src/Config.cpp 2014-02-02 21:13:04.124154052 +0400 +@@ -139,6 +139,9 @@ + } + + void Config::ChangeResolution(bool up) { ++ if (num_modes == 0) ++ return; ++ + if (cur_mode!=num_modes) cur_mode+=up?1:num_modes-1; + cur_mode=cur_mode%num_modes; + real_w=modes_w[cur_mode]; +@@ -226,7 +229,8 @@ + old_fullscreen=fullscreen; + changed=false; + ofstream fil((home_dir+"settings.lst").c_str(),ios::trunc); +- fil<<"version="<<(config->version=VERSION)<