From owner-svn-ports-all@freebsd.org Mon Nov 14 16:10:59 2016 Return-Path: Delivered-To: svn-ports-all@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 4185EC406DF; Mon, 14 Nov 2016 16:10:59 +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 mx1.freebsd.org (Postfix) with ESMTPS id EF24F9A4; Mon, 14 Nov 2016 16:10:58 +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 uAEGAwwf058332; Mon, 14 Nov 2016 16:10:58 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAEGAvi1058329; Mon, 14 Nov 2016 16:10:57 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201611141610.uAEGAvi1058329@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 14 Nov 2016 16:10:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426117 - in head/games/lordsawar: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 14 Nov 2016 16:10:59 -0000 Author: amdmi3 Date: Mon Nov 14 16:10:57 2016 New Revision: 426117 URL: https://svnweb.freebsd.org/changeset/ports/426117 Log: - Fix build by using correct shell - Fix build on 9.x by properly using c++11 Added: head/games/lordsawar/files/patch-src_MapRenderer.cpp (contents, props changed) head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp (contents, props changed) Modified: head/games/lordsawar/Makefile Modified: head/games/lordsawar/Makefile ============================================================================== --- head/games/lordsawar/Makefile Mon Nov 14 15:52:18 2016 (r426116) +++ head/games/lordsawar/Makefile Mon Nov 14 16:10:57 2016 (r426117) @@ -14,8 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib gettext gmake libarchive pkgconfig shebangfix USE_GNOME= gtkmm30 intltool libxslt USE_GSTREAMER= mm +USE_CXXSTD= c++11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes SHEBANG_FILES= create-lw-file +bash_CMD= /bin/sh .include Added: head/games/lordsawar/files/patch-src_MapRenderer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-src_MapRenderer.cpp Mon Nov 14 16:10:57 2016 (r426117) @@ -0,0 +1,11 @@ +--- src/MapRenderer.cpp.orig 2015-06-10 18:06:19 UTC ++++ src/MapRenderer.cpp +@@ -72,7 +72,7 @@ void MapRenderer::render_tile(VectorgetImage() == false) ++ if (!style->getImage()) + { + printf ("pic for style %d for tile %d at %d,%d is null\n", + style->getType(), mtile->getType(), tile.x, tile.y); Added: head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-src_gui_stack-army-button.cpp Mon Nov 14 16:10:57 2016 (r426117) @@ -0,0 +1,11 @@ +--- src/gui/stack-army-button.cpp.orig 2015-06-20 22:48:43 UTC ++++ src/gui/stack-army-button.cpp +@@ -146,7 +146,7 @@ void StackArmyButton::fill_army_button() + { + bool greyed_out = false; + Stack *active_stack = p->getActivestack(); +- if (active_stack->getArmyById(d_army->getId()) == false) ++ if (!active_stack->getArmyById(d_army->getId())) + greyed_out = true; + army_image->property_pixbuf() = + gc->getCircledArmyPic(p->getArmyset(), d_army->getTypeId(),