From owner-svn-ports-head@freebsd.org Mon Jun 25 15:06:23 2018 Return-Path: Delivered-To: svn-ports-head@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 C3F6E1012BA1; Mon, 25 Jun 2018 15:06: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 7250F809DF; Mon, 25 Jun 2018 15:06:23 +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 4EF6C2EB28; Mon, 25 Jun 2018 15:06:23 +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 w5PF6NvJ037309; Mon, 25 Jun 2018 15:06:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5PF6MmZ037307; Mon, 25 Jun 2018 15:06:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806251506.w5PF6MmZ037307@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 25 Jun 2018 15:06:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473321 - in head/games/freera: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/freera: . files X-SVN-Commit-Revision: 473321 X-SVN-Commit-Repository: ports 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.26 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: Mon, 25 Jun 2018 15:06:23 -0000 Author: amdmi3 Date: Mon Jun 25 15:06:22 2018 New Revision: 473321 URL: https://svnweb.freebsd.org/changeset/ports/473321 Log: - Add LICENSE - Fix build with clang 6 Added: head/games/freera/files/patch-src_game_loadmap.cpp (contents, props changed) Modified: head/games/freera/Makefile Modified: head/games/freera/Makefile ============================================================================== --- head/games/freera/Makefile Mon Jun 25 15:02:26 2018 (r473320) +++ head/games/freera/Makefile Mon Jun 25 15:06:22 2018 (r473321) @@ -11,6 +11,9 @@ DISTNAME= ${PORTVERSION}_freera++_src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Westwood red alert game engine +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/doc/gpl.txt + USES= scons USE_SDL= sdl mixer @@ -33,6 +36,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/freera ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ + @cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Added: head/games/freera/files/patch-src_game_loadmap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/freera/files/patch-src_game_loadmap.cpp Mon Jun 25 15:06:22 2018 (r473321) @@ -0,0 +1,11 @@ +--- src/game/loadmap.cpp.orig 2008-01-30 22:37:44 UTC ++++ src/game/loadmap.cpp +@@ -63,7 +63,7 @@ std::ostringstream TempString; + throw LoadMapError(); + } + +- if (missionData.player != '\0') ++ if (missionData.player != nullptr) + printf ("%s line %i: Player = %s\n", __FILE__, __LINE__, missionData.player); + + if (gamemode == GAME_MODE_SINGLE_PLAYER){