From owner-svn-ports-head@freebsd.org Fri Dec 1 13:29:46 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 4C215E56095; Fri, 1 Dec 2017 13:29:46 +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 25DF42296; Fri, 1 Dec 2017 13:29:46 +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 vB1DTjC9058226; Fri, 1 Dec 2017 13:29:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB1DTihW058220; Fri, 1 Dec 2017 13:29:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712011329.vB1DTihW058220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 1 Dec 2017 13:29:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455290 - in head: . games games/lordsawar games/lordsawar/files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head: . games games/lordsawar games/lordsawar/files X-SVN-Commit-Revision: 455290 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.25 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: Fri, 01 Dec 2017 13:29:46 -0000 Author: amdmi3 Date: Fri Dec 1 13:29:44 2017 New Revision: 455290 URL: https://svnweb.freebsd.org/changeset/ports/455290 Log: - Resurrect games/lordsawar, unbreak, take maintainership A turn-based strategy game where up to 8 players strive for control of as many cities as possible. Produce new armies in cities to conquer nearby cities. Using the income from those cities, make more armies to take more cities. Send a hero to a temple to get a quest, or maybe search a nearby ruin instead. Play with others or against the computer. WWW: http://www.nongnu.org/lordsawar/ Added: head/games/lordsawar/ - copied from r453965, head/games/lordsawar/ head/games/lordsawar/files/patch-src_bigmap.cpp (contents, props changed) head/games/lordsawar/files/patch-src_game-parameters.h (contents, props changed) Modified: head/MOVED head/games/Makefile head/games/lordsawar/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Dec 1 13:18:37 2017 (r455289) +++ head/MOVED Fri Dec 1 13:29:44 2017 (r455290) @@ -9603,7 +9603,6 @@ net/libsocketcpp||2017-11-06|Has expired: Uses gets(3) security/py-btchip|security/py-btchip-python|2017-11-07|Rename to reflect official Python modules naming scheme devel/pear-PPW||2017-11-09|Has expired: Project is EoL lang/ats||2017-11-11|Has expired: Unmaintained, outdated, needs lots of refreshment -games/lordsawar||2017-11-11|Has expired: Broken for more than 6 months databases/elixir-ecto_migrate||2017-11-11|Has expired: Broken for more than 6 months audio/gspeakers||2017-11-11|Has expired: Broken for more than 6 months net/p5-Filesys-SmbClient||2017-11-11|Has expired: Broken for more than 6 months Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Fri Dec 1 13:18:37 2017 (r455289) +++ head/games/Makefile Fri Dec 1 13:29:44 2017 (r455290) @@ -573,6 +573,7 @@ SUBDIR += lmarbles SUBDIR += lmpc SUBDIR += lolcat + SUBDIR += lordsawar SUBDIR += lpairs SUBDIR += lskat SUBDIR += ltris Modified: head/games/lordsawar/Makefile ============================================================================== --- head/games/lordsawar/Makefile Sat Nov 11 09:24:00 2017 (r453965) +++ head/games/lordsawar/Makefile Fri Dec 1 13:29:44 2017 (r455290) @@ -6,15 +6,11 @@ PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SAVANNAH -MAINTAINER= ports@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= Warlords II clone LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= Doesn't build after cairomm was updated to 1.12. -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 USES= compiler:c++11-lib gettext gmake libarchive pkgconfig shebangfix USE_GNOME= gtkmm30 intltool libxslt Added: head/games/lordsawar/files/patch-src_bigmap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-src_bigmap.cpp Fri Dec 1 13:29:44 2017 (r455290) @@ -0,0 +1,42 @@ +--- src/bigmap.cpp.orig 2015-06-10 17:45:00 UTC ++++ src/bigmap.cpp +@@ -67,10 +67,10 @@ BigMap::BigMap() + + BigMap::~BigMap() + { +- if (buffer == true) ++ if (buffer) + buffer.clear(); + +- if (magnified_buffer == true) ++ if (magnified_buffer) + magnified_buffer.clear(); + + delete d_renderer; +@@ -112,7 +112,7 @@ void BigMap::set_view(Rectangle new_view + // this represents a 1 tile border around the outside of the picture. + // it gets rid of the black border. + +- if (buffer == true) ++ if (buffer) + buffer.clear(); + + buffer_view.dim = view.dim + Vector(2, 2); +@@ -122,7 +122,7 @@ void BigMap::set_view(Rectangle new_view + buffer_gc = Cairo::Context::create(buffer); + + //now create the part that will go out to the gtk::image +- if (outgoing == true) ++ if (outgoing) + outgoing.clear(); + outgoing = Cairo::Surface::create(buffer, Cairo::CONTENT_COLOR_ALPHA, image.get_width(), image.get_height()); + +@@ -174,7 +174,7 @@ void BigMap::draw(Player *player, bool r + //Glib::RefPtr outgoing; + if (magnification_factor != 1.0) + { +- if (magnified_buffer == true) ++ if (magnified_buffer) + magnified_buffer.clear(); + magnified_buffer = magnify(buffer); + clip_viewable_buffer(magnified_buffer, p, outgoing); Added: head/games/lordsawar/files/patch-src_game-parameters.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lordsawar/files/patch-src_game-parameters.h Fri Dec 1 13:29:44 2017 (r455290) @@ -0,0 +1,10 @@ +--- src/game-parameters.h.orig 2015-06-10 17:55:57 UTC ++++ src/game-parameters.h +@@ -117,6 +117,7 @@ public: + return 8; + else if (param == GameParameters::Player::OFF) + return 0; //no equiv. ++ return 0; + } + static GameParameters::Player::Type player_param_string_to_player_param(Glib::ustring s) + {