Index: head/games/ivan/Makefile =================================================================== --- head/games/ivan/Makefile (revision 473079) +++ head/games/ivan/Makefile (revision 473080) @@ -1,46 +1,48 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= ivan PORTVERSION= 0.50 PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/IVAN/IVAN%20${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Graphical roguelike game LICENSE= GPLv2 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 PORTSCOUT= skipv:0.301,0.310,0.311,0.401,0.410,0.420,0.430 PORTDATA= * post-patch: @${REINPLACE_CMD} -e 's|IvanSave|.IvanSave|g' ${WRKSRC}/Main/Source/game.cpp @${REINPLACE_CMD} -Ee 's|(fearray::~?fearray)|\1|' \ ${WRKSRC}/FeLib/Include/fearray.h @${REINPLACE_CMD} -Ee 's|([a-z]+<[a-z ,]+>::~?[a-z]+)<[a-z ,]+>|\1|' \ ${WRKSRC}/Main/Source/script.cpp @${REINPLACE_CMD} -e 's|truth(|bool(|' ${WRKSRC}/Main/Source/fluid.cpp \ ${WRKSRC}/Main/Include/char.h ${WRKSRC}/Main/Include/lsquare.h \ ${WRKSRC}/FeLib/Include/save.h ${WRKSRC}/Main/Include/lsquare.h \ ${WRKSRC}/Main/Include/human.h ${WRKSRC}/Main/Source/command.cpp \ ${WRKSRC}/Main/Include/stack.h ${WRKSRC}/Main/Source/lsquare.cpp \ ${WRKSRC}/Main/Source/lterras.cpp post-install: ${MKDIR} ${STAGEDIR}/var/games/ivan/Bones ${TOUCH} ${STAGEDIR}/var/games/ivan/ivan-highscore.scores.sample .include Index: head/games/ivan/files/patch-configure =================================================================== --- head/games/ivan/files/patch-configure (revision 473079) +++ head/games/ivan/files/patch-configure (nonexistent) @@ -1,19 +0,0 @@ ---- Makefile.in.orig Thu Nov 3 04:38:15 2005 -+++ Makefile.in Thu Nov 3 04:38:57 2005 -@@ -338,16 +338,6 @@ - - - install-data-local: -- -./mkinstalldirs -p $(localstatedir) $(bindir) $(datadir)/ivan/Script/ $(datadir)/ivan/Graphics/ $(localstatedir)/ivan/Bones/ -- -touch $(localstatedir)/ivan/ivan-highscore.scores -- -chown games.games $(localstatedir)/ivan/ivan-highscore.scores -- -chmod 664 $(localstatedir)/ivan/ivan-highscore.scores -- -chown -R games.games $(localstatedir)/ivan/Bones/ -- -chmod -R u=rwx $(localstatedir)/ivan/Bones/ -- -chmod -R g=rwx $(localstatedir)/ivan/Bones/ -- -chmod -R o=r $(localstatedir)/ivan/Bones/ -- -chgrp games $(bindir)/ivan -- -chmod 2111 $(bindir)/ivan - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: head/games/ivan/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/ivan/files/patch-FeLib-Include-festring.h =================================================================== --- head/games/ivan/files/patch-FeLib-Include-festring.h (revision 473079) +++ head/games/ivan/files/patch-FeLib-Include-festring.h (revision 473080) @@ -1,20 +1,20 @@ ---- 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) { - char* Ptr = 4 + new char[Reserved + 5]; + char* Ptr = sizeof(ulong) + new char[Reserved + 5]; 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) { - char* Ptr = 4 + new char[Reserved + 5]; + char* Ptr = sizeof(ulong) + new char[Reserved + 5]; REFS(Ptr) = 0; Data = Ptr; memset(Ptr, C, N); Index: head/games/ivan/files/patch-FeLib-Source-bitmap.cpp =================================================================== --- head/games/ivan/files/patch-FeLib-Source-bitmap.cpp (revision 473079) +++ head/games/ivan/files/patch-FeLib-Source-bitmap.cpp (revision 473080) @@ -1,20 +1,20 @@ ---- 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; - for(int c = 0; c < Times; ++c) + for(int t = 0; t < Times; ++t) { - const int X1 = OrigFromX + PointX[c]; - const int Y1 = OrigFromY + PointY[c]; - const int X2 = OrigToX + PointX[c]; - const int Y2 = OrigToY + PointY[c]; + const int X1 = OrigFromX + PointX[t]; + const int Y1 = OrigFromY + PointY[t]; + const int X2 = OrigToX + PointX[t]; + const int Y2 = OrigToY + PointY[t]; const int DeltaX = abs(X2 - X1); const int DeltaY = abs(Y2 - Y1); int x, c; Index: head/games/ivan/files/patch-FeLib-Source-festring.cpp =================================================================== --- head/games/ivan/files/patch-FeLib-Source-festring.cpp (revision 473079) +++ head/games/ivan/files/patch-FeLib-Source-festring.cpp (revision 473080) @@ -1,91 +1,91 @@ ---- 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 @@ */ #include +#include #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; - char* Ptr = 4 + new char[Reserved + 5]; + char* Ptr = sizeof(ulong) + new char[Reserved + 5]; 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; - char* NewPtr = 4 + new char[Reserved + 5]; + char* NewPtr = sizeof(ulong) + new char[Reserved + 5]; 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; - char* Ptr = 4 + new char[FESTRING_PAGE + 5]; + char* Ptr = sizeof(ulong) + new char[FESTRING_PAGE + 5]; 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; - char* NewPtr = 4 + new char[Reserved + 5]; + char* NewPtr = sizeof(ulong) + new char[Reserved + 5]; 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; - Ptr = 4 + new char[Reserved + 5]; + Ptr = sizeof(ulong) + new char[Reserved + 5]; 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; - NewPtr = 4 + new char[Reserved + 5]; + NewPtr = sizeof(ulong) + new char[Reserved + 5]; 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; - NewPtr = 4 + new char[Reserved + 5]; + NewPtr = sizeof(ulong) + new char[Reserved + 5]; 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; - char* Ptr = 4 + new char[Reserved + 5]; + char* Ptr = sizeof(ulong) + new char[Reserved + 5]; 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; - char* NewPtr = 4 + new char[Reserved + 5]; + char* NewPtr = sizeof(ulong) + new char[Reserved + 5]; REFS(NewPtr) = 0; Data = NewPtr; memcpy(NewPtr, OldPtr, Pos); Index: head/games/ivan/files/patch-Makefile.in =================================================================== --- head/games/ivan/files/patch-Makefile.in (nonexistent) +++ head/games/ivan/files/patch-Makefile.in (revision 473080) @@ -0,0 +1,19 @@ +--- Makefile.in.orig 2004-12-10 21:34:29 UTC ++++ Makefile.in +@@ -338,16 +338,6 @@ maintainer-clean-generic clean mostlycle + + + install-data-local: +- -./mkinstalldirs -p $(localstatedir) $(bindir) $(datadir)/ivan/Script/ $(datadir)/ivan/Graphics/ $(localstatedir)/ivan/Bones/ +- -touch $(localstatedir)/ivan/ivan-highscore.scores +- -chown games.games $(localstatedir)/ivan/ivan-highscore.scores +- -chmod 664 $(localstatedir)/ivan/ivan-highscore.scores +- -chown -R games.games $(localstatedir)/ivan/Bones/ +- -chmod -R u=rwx $(localstatedir)/ivan/Bones/ +- -chmod -R g=rwx $(localstatedir)/ivan/Bones/ +- -chmod -R o=r $(localstatedir)/ivan/Bones/ +- -chgrp games $(bindir)/ivan +- -chmod 2111 $(bindir)/ivan + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Property changes on: head/games/ivan/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property