From owner-svn-ports-all@freebsd.org Fri Jun 22 21:29:23 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1675E1000021; Fri, 22 Jun 2018 21:29:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B4CE4833B5; Fri, 22 Jun 2018 21:29:22 +0000 (UTC) (envelope-from amdmi3@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 947EB262E1; Fri, 22 Jun 2018 21:29:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5MLTMUU007331; Fri, 22 Jun 2018 21:29:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5MLTLmQ007328; Fri, 22 Jun 2018 21:29:21 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806222129.w5MLTLmQ007328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 22 Jun 2018 21:29:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473081 - in head/games/linwarrior: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/linwarrior: . files X-SVN-Commit-Revision: 473081 X-SVN-Commit-Repository: ports 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.26 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: Fri, 22 Jun 2018 21:29:23 -0000 Author: amdmi3 Date: Fri Jun 22 21:29:21 2018 New Revision: 473081 URL: https://svnweb.freebsd.org/changeset/ports/473081 Log: - Fix build with clang 6 - Pet portlint - Regenerate patches Added: head/games/linwarrior/files/patch-source_cController.cpp (contents, props changed) Modified: head/games/linwarrior/Makefile head/games/linwarrior/files/patch-Makefile Modified: head/games/linwarrior/Makefile ============================================================================== --- head/games/linwarrior/Makefile Fri Jun 22 21:28:52 2018 (r473080) +++ head/games/linwarrior/Makefile Fri Jun 22 21:29:21 2018 (r473081) @@ -16,6 +16,8 @@ USES= gmake openal:al,alut USE_GL= gl glu USE_SDL= sdl +CFLAGS+= -Wno-c++11-narrowing + WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} @@ -29,8 +31,8 @@ DESKTOP_ENTRIES="LinWarrior 3D" \ false post-extract: - @${FIND} ${WRKSRC} -type d -exec chmod a+rx {} \; - @${FIND} ${WRKSRC} -type f -exec chmod a+r {} \; + @${FIND} ${WRKSRC} -type d -exec ${CHMOD} a+rx {} \; + @${FIND} ${WRKSRC} -type f -exec ${CHMOD} a+r {} \; post-patch: @${REINPLACE_CMD} -e '/hash_set/ d' ${WRKSRC}/source/cAlert.h Modified: head/games/linwarrior/files/patch-Makefile ============================================================================== --- head/games/linwarrior/files/patch-Makefile Fri Jun 22 21:28:52 2018 (r473080) +++ head/games/linwarrior/files/patch-Makefile Fri Jun 22 21:29:21 2018 (r473081) @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-02-05 22:50:30.000000000 +0300 -+++ Makefile 2010-04-04 06:18:24.000000000 +0400 +--- Makefile.orig 2010-02-05 19:50:30 UTC ++++ Makefile @@ -2,7 +2,7 @@ # Makefile with auto-dependency generation @@ -9,7 +9,7 @@ # Automatic searching for source files. # Objects to compile are all sources (cpp) and put the .o below build-dir. -@@ -20,18 +20,17 @@ +@@ -20,18 +20,17 @@ ifneq (,$(findstring Win,$(OS))) LIMITER=$(dir \file) CFLAGS+= -static-libgcc else @@ -30,7 +30,7 @@ # Print warnings when compiling. CFLAGS += -Wall -@@ -40,7 +39,6 @@ +@@ -40,7 +39,6 @@ CFLAGS += -Wall CFLAGS += $(INCLUDES) # Optimizations. Added: head/games/linwarrior/files/patch-source_cController.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/linwarrior/files/patch-source_cController.cpp Fri Jun 22 21:29:21 2018 (r473081) @@ -0,0 +1,22 @@ +--- source/cController.cpp.orig 2018-06-22 20:39:57 UTC ++++ source/cController.cpp +@@ -182,16 +182,16 @@ void cController::attackEnemy() { + + cObject* target = cWorld::instance->mIndex[entity]; + if (mDevice->inTargetRange() < 0.01) { +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + } + if (target == NULL) { // Target disappeared +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + } else if (target->hasRole(DEAD)) { +- mDevice->do_aimFor(NULL); ++ mDevice->do_aimFor(0); + pop(); + return; + }