From owner-svn-ports-branches@FreeBSD.ORG Sat Nov 29 15:35:00 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8DA429C; Sat, 29 Nov 2014 15:35:00 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A46C23DE; Sat, 29 Nov 2014 15:35:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sATFZ0Fj052021; Sat, 29 Nov 2014 15:35:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sATFYxsf051987; Sat, 29 Nov 2014 15:34:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201411291534.sATFYxsf051987@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 29 Nov 2014 15:34:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r373631 - in branches/2014Q4/games/gillo: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Nov 2014 15:35:00 -0000 Author: amdmi3 Date: Sat Nov 29 15:34:58 2014 New Revision: 373631 URL: https://svnweb.freebsd.org/changeset/ports/373631 QAT: https://qat.redports.org/buildarchive/r373631/ Log: MFH: r373382 - Clarify LICENSE - Add LICENSE_FILE - Fix UB caused by absent return statements which leads to crashes on 10.0+ - Drop @dirrm* from plist Approved by: ports-secteam (rea) Added: branches/2014Q4/games/gillo/files/patch-src__context.cpp - copied unchanged from r373382, head/games/gillo/files/patch-src__context.cpp branches/2014Q4/games/gillo/files/patch-src__game.cpp - copied unchanged from r373382, head/games/gillo/files/patch-src__game.cpp branches/2014Q4/games/gillo/files/patch-src__menu.cpp - copied unchanged from r373382, head/games/gillo/files/patch-src__menu.cpp Modified: branches/2014Q4/games/gillo/Makefile branches/2014Q4/games/gillo/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/games/gillo/Makefile ============================================================================== --- branches/2014Q4/games/gillo/Makefile Sat Nov 29 15:33:05 2014 (r373630) +++ branches/2014Q4/games/gillo/Makefile Sat Nov 29 15:34:58 2014 (r373631) @@ -11,7 +11,8 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Players are cars throwing a magnetic fuzzy ball into a goal -LICENSE= GPLv2 +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \ ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \ Copied: branches/2014Q4/games/gillo/files/patch-src__context.cpp (from r373382, head/games/gillo/files/patch-src__context.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/gillo/files/patch-src__context.cpp Sat Nov 29 15:34:58 2014 (r373631, copy of r373382, head/games/gillo/files/patch-src__context.cpp) @@ -0,0 +1,11 @@ +--- src/context.cpp.orig 2005-07-19 03:25:16.000000000 +0400 ++++ src/context.cpp 2014-11-24 16:07:54.000000000 +0300 +@@ -247,7 +247,7 @@ + + ssgSimpleState* Context::getState(int stateid) + { +- this->states.getStep(stateid); ++ return this->states.getStep(stateid); + } + + void Context::addToPool(ssgEntity* obj) Copied: branches/2014Q4/games/gillo/files/patch-src__game.cpp (from r373382, head/games/gillo/files/patch-src__game.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/gillo/files/patch-src__game.cpp Sat Nov 29 15:34:58 2014 (r373631, copy of r373382, head/games/gillo/files/patch-src__game.cpp) @@ -0,0 +1,18 @@ +--- src/game.cpp.orig 2005-07-19 03:25:16.000000000 +0400 ++++ src/game.cpp 2014-11-24 16:13:27.000000000 +0300 +@@ -54,6 +54,8 @@ + attractionStautsP2(0.00, 0, 0.18, 0.08, TEX_ATTRACT), + attractionStautsP1(0.82, 0, 1.00, 0.08, TEX_ATTRACT) + { ++ dInitODE(); ++ + this->context.setGravity(0,0,ODE_WORLD_GRAVITY);// @fixme remove this + /* ODE setup */ + // dWorldSetERP (context.getWid(), 0.9); +@@ -990,5 +992,6 @@ + }else { + //@fixme throw something + } ++ return false; + } + }; Copied: branches/2014Q4/games/gillo/files/patch-src__menu.cpp (from r373382, head/games/gillo/files/patch-src__menu.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/games/gillo/files/patch-src__menu.cpp Sat Nov 29 15:34:58 2014 (r373631, copy of r373382, head/games/gillo/files/patch-src__menu.cpp) @@ -0,0 +1,10 @@ +--- src/menu.cpp.orig 2005-07-19 03:25:16.000000000 +0400 ++++ src/menu.cpp 2014-11-24 16:08:56.000000000 +0300 +@@ -341,6 +341,7 @@ + } else { + //@fixme throw something + } ++ return false; + } + + }; Modified: branches/2014Q4/games/gillo/pkg-plist ============================================================================== --- branches/2014Q4/games/gillo/pkg-plist Sat Nov 29 15:33:05 2014 (r373630) +++ branches/2014Q4/games/gillo/pkg-plist Sat Nov 29 15:34:58 2014 (r373631) @@ -75,4 +75,3 @@ bin/gillo3 %%DATADIR%%/training.mod %%DATADIR%%/wheelstripes.rgb %%DATADIR%%/zzap.wav -@dirrm %%DATADIR%%