From owner-svn-ports-head@freebsd.org Wed Feb 1 05:26:38 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 C38B8CCD486; Wed, 1 Feb 2017 05:26:38 +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 7A274F49; Wed, 1 Feb 2017 05:26:38 +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 v115QbsZ087497; Wed, 1 Feb 2017 05:26:37 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v115QbMd087495; Wed, 1 Feb 2017 05:26:37 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201702010526.v115QbMd087495@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:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432975 - in head/games/holotz-castle: . 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:38 -0000 Author: jbeich Date: Wed Feb 1 05:26:37 2017 New Revision: 432975 URL: https://svnweb.freebsd.org/changeset/ports/432975 Log: games/holotz-castle: unbreak with clang 4.0 JLib/Util/JTextFile.cpp:148:11: error: ordered comparison between pointer and zero ('s8 *' (aka 'char *') and 'int') if (tmp > 0) ~~~ ^ ~ JLib/Util/JTextFile.cpp:156:15: error: ordered comparison between pointer and zero ('s8 *' (aka 'char *') and 'int') if (tmp > 0) ~~~ ^ ~ JLib/Util/JTextFile.cpp:236:8: error: ordered comparison between pointer and zero ('int' and 's8 *' (aka 'char *')) if (0 >= (end = strstr(ptr, "\""))) ~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via exp-run) Added: head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp (contents, props changed) Modified: head/games/holotz-castle/Makefile (contents, props changed) Modified: head/games/holotz-castle/Makefile ============================================================================== --- head/games/holotz-castle/Makefile Wed Feb 1 05:26:22 2017 (r432974) +++ head/games/holotz-castle/Makefile Wed Feb 1 05:26:37 2017 (r432975) @@ -3,7 +3,7 @@ PORTNAME= holotz-castle PORTVERSION= 1.3.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/ DISTFILES= ${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} \ Added: head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/holotz-castle/files/patch-JLib_JLib_Util_JTextFile.cpp Wed Feb 1 05:26:37 2017 (r432975) @@ -0,0 +1,29 @@ +--- JLib/JLib/Util/JTextFile.cpp.orig 2009-05-02 09:17:15 UTC ++++ JLib/JLib/Util/JTextFile.cpp +@@ -145,7 +145,7 @@ bool JTextFile::FindNext(const s8 *str, + + tmp = strstr(ptr, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + { +@@ -153,7 +153,7 @@ bool JTextFile::FindNext(const s8 *str, + { + tmp = strstr(buff, str); + +- if (tmp > 0) ++ if (tmp) + ptr = tmp; + else + return false; +@@ -233,7 +233,7 @@ bool JTextFile::ReadQuotedWord(s8 *str) + ++ptr; + end = ptr; + +- if (0 >= (end = strstr(ptr, "\""))) ++ if ((end = strstr(ptr, "\""))) + { + // No hay comillas de cierre + ptr = org;