svn commit: r473080 - in head/games/ivan: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Fri Jun 22 21:28:54 UTC 2018
Author: amdmi3
Date: Fri Jun 22 21:28:52 2018
New Revision: 473080
URL: https://svnweb.freebsd.org/changeset/ports/473080
Log:
- Pet portlint
- Fix build with clang 6
- Regenerate patches
Added:
head/games/ivan/files/patch-Makefile.in
- copied, changed from r473079, head/games/ivan/files/patch-configure
Deleted:
head/games/ivan/files/patch-configure
Modified:
head/games/ivan/Makefile
head/games/ivan/files/patch-FeLib-Include-festring.h
head/games/ivan/files/patch-FeLib-Source-bitmap.cpp
head/games/ivan/files/patch-FeLib-Source-festring.cpp
Modified: head/games/ivan/Makefile
==============================================================================
--- head/games/ivan/Makefile Fri Jun 22 21:24:25 2018 (r473079)
+++ head/games/ivan/Makefile Fri Jun 22 21:28:52 2018 (r473080)
@@ -16,9 +16,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_armv6= fails to compile: use of overloaded operator '<<' is ambiguous
BROKEN_armv7= fails to compile: use of overloaded operator '<<' is ambiguous
-USE_SDL= sdl
USES= gmake
+USE_SDL= sdl
GNU_CONFIGURE= yes
+
+CXXFLAGS+= -Wno-c++11-narrowing
CONFIGURE_ARGS= --localstatedir=/var/games
Modified: head/games/ivan/files/patch-FeLib-Include-festring.h
==============================================================================
--- head/games/ivan/files/patch-FeLib-Include-festring.h Fri Jun 22 21:24:25 2018 (r473079)
+++ head/games/ivan/files/patch-FeLib-Include-festring.h Fri Jun 22 21:28:52 2018 (r473080)
@@ -1,6 +1,6 @@
---- FeLib/Include/festring.h.orig 2004-10-26 23:35:44.000000000 +0400
-+++ FeLib/Include/festring.h 2013-11-08 16:54:09.080772415 +0400
-@@ -142,7 +142,7 @@
+--- FeLib/Include/festring.h.orig 2004-10-26 19:35:44 UTC
++++ FeLib/Include/festring.h
+@@ -142,7 +142,7 @@ inline festring::festring(const festring
inline festring::festring(sizetype N)
: Size(N), OwnsData(true), Reserved(N|FESTRING_PAGE)
{
@@ -9,7 +9,7 @@
REFS(Ptr) = 0;
Data = Ptr;
}
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ inline festring::festring(sizetype N)
inline festring::festring(sizetype N, char C)
: Size(N), OwnsData(true), Reserved(N|FESTRING_PAGE)
{
Modified: head/games/ivan/files/patch-FeLib-Source-bitmap.cpp
==============================================================================
--- head/games/ivan/files/patch-FeLib-Source-bitmap.cpp Fri Jun 22 21:24:25 2018 (r473079)
+++ head/games/ivan/files/patch-FeLib-Source-bitmap.cpp Fri Jun 22 21:28:52 2018 (r473080)
@@ -1,6 +1,6 @@
---- FeLib/Source/bitmap.cpp.orig 2004-10-26 23:35:47.000000000 +0400
-+++ FeLib/Source/bitmap.cpp 2013-05-30 22:23:14.349113259 +0400
-@@ -873,12 +873,12 @@
+--- FeLib/Source/bitmap.cpp.orig 2004-10-26 19:35:47 UTC
++++ FeLib/Source/bitmap.cpp
+@@ -873,12 +873,12 @@ void bitmap::DrawLine(int OrigFromX, int
static const int PointY[] = { 0, -1, 0, 0, 1 };
const int Times = Wide ? 5 : 1;
Modified: head/games/ivan/files/patch-FeLib-Source-festring.cpp
==============================================================================
--- head/games/ivan/files/patch-FeLib-Source-festring.cpp Fri Jun 22 21:24:25 2018 (r473079)
+++ head/games/ivan/files/patch-FeLib-Source-festring.cpp Fri Jun 22 21:28:52 2018 (r473080)
@@ -1,5 +1,5 @@
---- FeLib/Source/festring.cpp.orig 2004-11-11 20:27:44.000000000 +0300
-+++ FeLib/Source/festring.cpp 2013-11-08 16:54:46.925772448 +0400
+--- FeLib/Source/festring.cpp.orig 2004-11-11 17:27:44 UTC
++++ FeLib/Source/festring.cpp
@@ -11,6 +11,7 @@
*/
@@ -8,7 +8,7 @@
#include "festring.h"
#include "allocate.h"
-@@ -116,7 +117,7 @@
+@@ -116,7 +117,7 @@ void festring::CreateOwnData(const char*
{
Size = N;
Reserved = N|FESTRING_PAGE;
@@ -17,7 +17,7 @@
REFS(Ptr) = 0;
Data = Ptr;
memcpy(Ptr, CStr, N);
-@@ -137,7 +138,7 @@
+@@ -137,7 +138,7 @@ void festring::SlowAppend(char Char)
DeletePtr = &REFS(OldPtr);
Reserved = NewSize|FESTRING_PAGE;
@@ -26,7 +26,7 @@
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
-@@ -150,7 +151,7 @@
+@@ -150,7 +151,7 @@ void festring::SlowAppend(char Char)
{
Size = 1;
Reserved = FESTRING_PAGE;
@@ -35,7 +35,7 @@
REFS(Ptr) = 0;
Ptr[0] = Char;
Data = Ptr;
-@@ -174,7 +175,7 @@
+@@ -174,7 +175,7 @@ void festring::SlowAppend(const char* CS
DeletePtr = &REFS(OldPtr);
Reserved = NewSize|FESTRING_PAGE;
@@ -44,7 +44,7 @@
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
-@@ -205,7 +206,7 @@
+@@ -205,7 +206,7 @@ void festring::Assign(sizetype N, char C
}
Reserved = N|FESTRING_PAGE;
@@ -53,7 +53,7 @@
REFS(Ptr) = 0;
Data = Ptr;
memset(Ptr, C, N);
-@@ -240,7 +241,7 @@
+@@ -240,7 +241,7 @@ void festring::Resize(sizetype N, char C
}
Reserved = N|FESTRING_PAGE;
@@ -62,7 +62,7 @@
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
-@@ -259,7 +260,7 @@
+@@ -259,7 +260,7 @@ void festring::Resize(sizetype N, char C
--REFS(OldPtr);
Reserved = N|FESTRING_PAGE;
@@ -71,7 +71,7 @@
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, N);
-@@ -362,7 +363,7 @@
+@@ -362,7 +363,7 @@ void festring::Erase(sizetype Pos, sizet
sizetype NewSize = MoveReq ? OldSize - Length : Pos;
Size = NewSize;
Reserved = NewSize|FESTRING_PAGE;
@@ -80,7 +80,7 @@
REFS(Ptr) = 0;
Data = Ptr;
OwnsData = true;
-@@ -411,7 +412,7 @@
+@@ -411,7 +412,7 @@ void festring::Insert(sizetype Pos, cons
}
Reserved = NewSize|FESTRING_PAGE;
Copied and modified: head/games/ivan/files/patch-Makefile.in (from r473079, head/games/ivan/files/patch-configure)
==============================================================================
--- head/games/ivan/files/patch-configure Fri Jun 22 21:24:25 2018 (r473079, copy source)
+++ head/games/ivan/files/patch-Makefile.in Fri Jun 22 21:28:52 2018 (r473080)
@@ -1,6 +1,6 @@
---- Makefile.in.orig Thu Nov 3 04:38:15 2005
-+++ Makefile.in Thu Nov 3 04:38:57 2005
-@@ -338,16 +338,6 @@
+--- Makefile.in.orig 2004-12-10 21:34:29 UTC
++++ Makefile.in
+@@ -338,16 +338,6 @@ maintainer-clean-generic clean mostlycle
install-data-local:
More information about the svn-ports-all
mailing list