Attachment #156903 for bug #200303

View | Details | Raw Unified | Return to bug 200303
Collapse All | Expand All




COMMENT=	Warlords II clone

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs


PORTDATA=	*

.include <bsd.port.mk>

.if ${OSVERSION} < 1000000
BROKEN=		does not build
.endif

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)games/lordsawar/files/patch-create-lw-file (+2 lines)
1	Index: create-lw-file	1	Index: create-lw-file
		2	--- create-lw-file.orig 2010-06-29 09:37:07 UTC
		3	+++ create-lw-file
2	@@ -1,8 +1,8 @@	4	@@ -1,8 +1,8 @@
3	-#!/bin/bash	5	-#!/bin/bash
4	+#!/bin/sh	6	+#!/bin/sh




--- 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)
     {

       d_id[t->getId()] = t;
       int size = t->getSize();
       for (int i = 0; i < size; i++)
@@ -74,8 +74,14 @@
 	for (int j = 0; j < size; j++)
 	  {
 	    Vector<int> pos = t->getPos() + Vector<int>(i,j);
+#if defined(_LIBCPP_VERSION)
-              d_object.erase(d_object.find(pos));
+            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;
     }

Lines 1-7 Link Here

(-)games/lordsawar/files/patch-src__armyproto.cpp (-4 / +3 lines)
1	Clang fix; initializer is not needed anyway, array is copied in ctor body	1	--- src/armyproto.cpp.orig 2011-02-12 19:13:14 UTC
2	--- src/armyproto.cpp.orig 2011-02-12 22:13:14.000000000 +0300	2	+++ src/armyproto.cpp
3	+++ src/armyproto.cpp 2014-05-16 19:24:16.982231310 +0400	3	@@ -36,7 +36,7 @@ std::string ArmyProto::d_tag = "armyprot
4	@@ -36,7 +36,7 @@
5	ArmyProto::ArmyProto(const ArmyProto& a)	4	ArmyProto::ArmyProto(const ArmyProto& a)
6	:ArmyProtoBase(a),	5	:ArmyProtoBase(a),
7	d_defends_ruins(a.d_defends_ruins),	6	d_defends_ruins(a.d_defends_ruins),

Return to bug 200303

Lines 10-16 Link Here

(-)games/lordsawar/Makefile (-8 / +1 lines)
10	COMMENT= Warlords II clone	10	COMMENT= Warlords II clone
11		11
12	LICENSE= GPLv3	12	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \	14	BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam \
16	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs	15	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
Lines 29-38 Link Here
29		28
30	PORTDATA= *	29	PORTDATA= *
31		30
32	.include <bsd.port.pre.mk>	31	.include <bsd.port.mk>
33
34	.if ${OSVERSION} < 1000000
35	BROKEN= does not build
36	.endif
37
38	.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)games/lordsawar/files/patch-src__LocationList.h (-6 / +9 lines)
1	--- src/LocationList.h.orig 2010-05-11 12:50:34.000000000 +0400	1	--- src/LocationList.h.orig 2010-05-11 08:50:34 UTC
2	+++ src/LocationList.h 2014-05-21 17:17:08.650652359 +0400	2	+++ src/LocationList.h
3	@@ -55,7 +55,7 @@	3	@@ -55,7 +55,7 @@ template<class T> class LocationList : p
4		4
5	void add(T t)	5	void add(T t)
6	{	6	{
Lines 9-23 Link Here
9	d_id[t->getId()] = t;	9	d_id[t->getId()] = t;
10	int size = t->getSize();	10	int size = t->getSize();
11	for (int i = 0; i < size; i++)	11	for (int i = 0; i < size; i++)
12	@@ -74,8 +74,9 @@	12	@@ -74,8 +74,14 @@
13	for (int j = 0; j < size; j++)	13	for (int j = 0; j < size; j++)
14	{	14	{
15	Vector<int> pos = t->getPos() + Vector<int>(i,j);	15	Vector<int> pos = t->getPos() + Vector<int>(i,j);
16	- if (d_object.find(pos) != d_object.end())	16	+#if defined(_LIBCPP_VERSION)
17	- d_object.erase(d_object.find(pos));
18	+ typename PositionMap::const_iterator it = d_object.find(pos);	17	+ typename PositionMap::const_iterator it = d_object.find(pos);
19	+ if (it != d_object.end())	18	+ if (it != d_object.end())
20	+ d_object.erase(it);	19	+ d_object.erase(it);
		20	+#else
		21	if (d_object.find(pos) != d_object.end())
		22	d_object.erase(d_object.find(pos));
		23	+#endif
21	}	24	}
22	delete t;	25	delete t;
23	}	26	}