From owner-svn-ports-head@freebsd.org Wed Feb 1 05:26:52 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E21A6CCD635; Wed, 1 Feb 2017 05:26:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 96575FFF; Wed, 1 Feb 2017 05:26:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v115QpS1087643; Wed, 1 Feb 2017 05:26:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v115Qp2g087640; Wed, 1 Feb 2017 05:26:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702010526.v115Qp2g087640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 1 Feb 2017 05:26:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432976 - in head/games/edge: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 05:26:53 -0000 Author: jbeich Date: Wed Feb 1 05:26:51 2017 New Revision: 432976 URL: https://svnweb.freebsd.org/changeset/ports/432976 Log: games/edge: unbreak with clang 4.0 src/p_enemy.cc:531:26: error: ordered comparison between pointer and zero ('struct mobj_s **' and 'int') if (brain_spots.targets > 0) ~~~~~~~~~~~~~~~~~~~ ^ ~ src/w_sprite.cc:578:42: error: ordered comparison between pointer and zero ('spriteframe_c *' and 'int') if (sprites[states[i].sprite]->frames > 0) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ Reported by: antoine (via exp-run) Added: head/games/edge/files/patch-src_p__enemy.cc (contents, props changed) head/games/edge/files/patch-src_w__sprite.cc (contents, props changed) Modified: head/games/edge/Makefile (contents, props changed) Modified: head/games/edge/Makefile ============================================================================== --- head/games/edge/Makefile Wed Feb 1 05:26:37 2017 (r432975) +++ head/games/edge/Makefile Wed Feb 1 05:26:51 2017 (r432976) @@ -3,7 +3,7 @@ PORTNAME= edge PORTVERSION= 1.35 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION} \ SF/${PORTNAME}/EDGE%20Binaries/${PORTVERSION}:wad Added: head/games/edge/files/patch-src_p__enemy.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/edge/files/patch-src_p__enemy.cc Wed Feb 1 05:26:51 2017 (r432976) @@ -0,0 +1,11 @@ +--- src/p_enemy.cc.orig 2011-03-31 12:12:40 UTC ++++ src/p_enemy.cc +@@ -528,7 +528,7 @@ void P_FreeShootSpots(void) + if (brain_spots.number < 0) + return; + +- if (brain_spots.targets > 0) ++ if (brain_spots.targets) + { + SYS_ASSERT(brain_spots.targets); + Added: head/games/edge/files/patch-src_w__sprite.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/edge/files/patch-src_w__sprite.cc Wed Feb 1 05:26:51 2017 (r432976) @@ -0,0 +1,11 @@ +--- src/w_sprite.cc.orig 2010-12-31 04:28:14 UTC ++++ src/w_sprite.cc +@@ -575,7 +575,7 @@ bool W_CheckSpritesExist(const state_gro + if (states[i].sprite == SPR_NULL) + continue; + +- if (sprites[states[i].sprite]->frames > 0) ++ if (sprites[states[i].sprite]->numframes > 0) + return true; + + // -AJA- only check one per group. It _should_ check them all,