svn commit: r386938 - in head/games/lordsawar: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu May 21 15:55:54 UTC 2015
Author: amdmi3
Date: Thu May 21 15:55:52 2015
New Revision: 386938
URL: https://svnweb.freebsd.org/changeset/ports/386938
Log:
- Fix build on pre-10.x
PR: 200303
Submitted by: tkato432 at yahoo.com
Modified:
head/games/lordsawar/Makefile
head/games/lordsawar/files/patch-create-lw-file
head/games/lordsawar/files/patch-src__LocationList.h
head/games/lordsawar/files/patch-src__armyproto.cpp
Modified: head/games/lordsawar/Makefile
==============================================================================
--- head/games/lordsawar/Makefile Thu May 21 15:30:29 2015 (r386937)
+++ head/games/lordsawar/Makefile Thu May 21 15:55:52 2015 (r386938)
@@ -29,10 +29,4 @@ LDFLAGS+= -L${LOCALBASE}/lib
PORTDATA= *
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-BROKEN= does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/games/lordsawar/files/patch-create-lw-file
==============================================================================
--- head/games/lordsawar/files/patch-create-lw-file Thu May 21 15:30:29 2015 (r386937)
+++ head/games/lordsawar/files/patch-create-lw-file Thu May 21 15:55:52 2015 (r386938)
@@ -1,4 +1,6 @@
Index: create-lw-file
+--- create-lw-file.orig 2010-06-29 09:37:07 UTC
++++ create-lw-file
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
Modified: head/games/lordsawar/files/patch-src__LocationList.h
==============================================================================
--- head/games/lordsawar/files/patch-src__LocationList.h Thu May 21 15:30:29 2015 (r386937)
+++ head/games/lordsawar/files/patch-src__LocationList.h Thu May 21 15:55:52 2015 (r386938)
@@ -1,6 +1,6 @@
---- src/LocationList.h.orig 2010-05-11 12:50:34.000000000 +0400
-+++ src/LocationList.h 2014-05-21 17:17:08.650652359 +0400
-@@ -55,7 +55,7 @@
+--- src/LocationList.h.orig 2010-05-11 08:50:34 UTC
++++ src/LocationList.h
+@@ -55,7 +55,7 @@ template<class T> class LocationList : p
void add(T t)
{
@@ -9,15 +9,18 @@
d_id[t->getId()] = t;
int size = t->getSize();
for (int i = 0; i < size; i++)
-@@ -74,8 +74,9 @@
+@@ -74,8 +74,14 @@
for (int j = 0; j < size; j++)
{
Vector<int> pos = t->getPos() + Vector<int>(i,j);
-- if (d_object.find(pos) != d_object.end())
-- d_object.erase(d_object.find(pos));
++#if defined(_LIBCPP_VERSION)
+ typename PositionMap::const_iterator it = d_object.find(pos);
+ if (it != d_object.end())
+ d_object.erase(it);
++#else
+ if (d_object.find(pos) != d_object.end())
+ d_object.erase(d_object.find(pos));
++#endif
}
delete t;
}
Modified: head/games/lordsawar/files/patch-src__armyproto.cpp
==============================================================================
--- head/games/lordsawar/files/patch-src__armyproto.cpp Thu May 21 15:30:29 2015 (r386937)
+++ head/games/lordsawar/files/patch-src__armyproto.cpp Thu May 21 15:55:52 2015 (r386938)
@@ -1,7 +1,6 @@
-Clang fix; initializer is not needed anyway, array is copied in ctor body
---- src/armyproto.cpp.orig 2011-02-12 22:13:14.000000000 +0300
-+++ src/armyproto.cpp 2014-05-16 19:24:16.982231310 +0400
-@@ -36,7 +36,7 @@
+--- src/armyproto.cpp.orig 2011-02-12 19:13:14 UTC
++++ src/armyproto.cpp
+@@ -36,7 +36,7 @@ std::string ArmyProto::d_tag = "armyprot
ArmyProto::ArmyProto(const ArmyProto& a)
:ArmyProtoBase(a),
d_defends_ruins(a.d_defends_ruins),
More information about the svn-ports-head
mailing list