Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Dec 2017 13:29:44 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
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
Message-ID:  <201712011329.vB1DTihW058220@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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<int>(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<Gdk::Pixmap> 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)
+     {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712011329.vB1DTihW058220>