Attachment 156903 Details for Bug 200303 – games_lordsawar.diff

[patch] games_lordsawar.diff

games_lordsawar.diff (text/plain), 3.09 KB, created by tkato432 on 2015-05-18 18:36:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-05-18 18:36:34 UTC

Size: 3.09 KB

patch

obsolete

>diff -urN /usr/ports/games/lordsawar/Makefile games/lordsawar/Makefile
>--- /usr/ports/games/lordsawar/Makefile	2014-12-21 14:25:30.000000000 +0900
>+++ games/lordsawar/Makefile	2015-05-19 00:00:00.000000000 +0900
>@@ -10,7 +10,6 @@
> 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
>@@ -29,10 +28,4 @@
> 
> PORTDATA=	*
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${OSVERSION} < 1000000
>-BROKEN=		does not build
>-.endif
>-
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/games/lordsawar/files/patch-create-lw-file games/lordsawar/files/patch-create-lw-file
>--- /usr/ports/games/lordsawar/files/patch-create-lw-file	2014-06-21 17:44:23.000000000 +0900
>+++ games/lordsawar/files/patch-create-lw-file	2015-05-19 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/games/lordsawar/files/patch-src__LocationList.h games/lordsawar/files/patch-src__LocationList.h
>--- /usr/ports/games/lordsawar/files/patch-src__LocationList.h	2014-06-21 17:44:23.000000000 +0900
>+++ games/lordsawar/files/patch-src__LocationList.h	2015-05-19 00:00:00.000000000 +0900
>@@ -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;
>      }
>diff -urN /usr/ports/games/lordsawar/files/patch-src__armyproto.cpp games/lordsawar/files/patch-src__armyproto.cpp
>--- /usr/ports/games/lordsawar/files/patch-src__armyproto.cpp	2014-06-21 17:44:23.000000000 +0900
>+++ games/lordsawar/files/patch-src__armyproto.cpp	2015-05-19 00:00:00.000000000 +0900
>@@ -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),

Actions: View | Diff

Attachments on bug 200303: 156903