From owner-svn-ports-head@FreeBSD.ORG Thu Sep 12 00:18:04 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id CE361E4E; Thu, 12 Sep 2013 00:18:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 A2A232258; Thu, 12 Sep 2013 00:18:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8C0I47F059357; Thu, 12 Sep 2013 00:18:04 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8C0I4sU059353; Thu, 12 Sep 2013 00:18:04 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309120018.r8C0I4sU059353@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 12 Sep 2013 00:18:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327017 - in head/games/intensityengine: . 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.14 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: Thu, 12 Sep 2013 00:18:04 -0000 Author: amdmi3 Date: Thu Sep 12 00:18:03 2013 New Revision: 327017 URL: http://svnweb.freebsd.org/changeset/ports/327017 Log: - Fix build with clang Added: head/games/intensityengine/files/patch-src-engine-cubeloader.cpp (contents, props changed) Modified: head/games/intensityengine/Makefile Modified: head/games/intensityengine/Makefile ============================================================================== --- head/games/intensityengine/Makefile Wed Sep 11 22:46:00 2013 (r327016) +++ head/games/intensityengine/Makefile Thu Sep 12 00:18:03 2013 (r327017) @@ -18,7 +18,6 @@ USE_SDL= sdl mixer image USE_GL= gl glu USES= cmake SUB_FILES= intensity_client -USE_GCC= 4.2+ ONLY_FOR_ARCHS= i386 amd64 Added: head/games/intensityengine/files/patch-src-engine-cubeloader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/intensityengine/files/patch-src-engine-cubeloader.cpp Thu Sep 12 00:18:03 2013 (r327017) @@ -0,0 +1,28 @@ +diff --git src/engine/cubeloader.cpp src/engine/cubeloader.cpp +index b7a1504..939cc2c 100755 +--- src/engine/cubeloader.cpp ++++ src/engine/cubeloader.cpp +@@ -259,12 +259,12 @@ struct cubeloader + else + { + conoutf(CON_ERROR, "map %s has malformatted header", cgzname); +- gzclose(f); ++ delete f; + return; + } + } + else if(hdr.version>5) mod = true; +- if(hdr.version>5 && !mod) { conoutf(CON_ERROR, "map %s requires a newer version of the Cube 1 importer", cgzname); gzclose(f); return; } ++ if(hdr.version>5 && !mod) { conoutf(CON_ERROR, "map %s requires a newer version of the Cube 1 importer", cgzname); delete f; return; } + if(!haslocalclients()) game::forceedit(""); + emptymap(12, true, NULL); + freeocta(worldroot); +@@ -280,7 +280,7 @@ struct cubeloader + { + hdr.waterlevel = -100000; + } +- if(mod) gzseek(f, hdr.numents*sizeof(c_persistent_entity), SEEK_CUR); ++ if(mod) f->seek(hdr.numents*sizeof(c_persistent_entity), SEEK_CUR); + else loopi(hdr.numents) + { + c_persistent_entity e;