svn commit: r334269 - in head/games/ivan: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Nov 18 22:49:33 UTC 2013
Author: amdmi3
Date: Mon Nov 18 22:49:32 2013
New Revision: 334269
URL: http://svnweb.freebsd.org/changeset/ports/334269
Log:
- Support staging
- Convert USE_GMAKE to USES
Added:
head/games/ivan/files/patch-FeLib-Include-festring.h (contents, props changed)
Modified:
head/games/ivan/Makefile
head/games/ivan/files/patch-FeLib-Source-festring.cpp
head/games/ivan/pkg-install
head/games/ivan/pkg-plist
Modified: head/games/ivan/Makefile
==============================================================================
--- head/games/ivan/Makefile Mon Nov 18 22:49:10 2013 (r334268)
+++ head/games/ivan/Makefile Mon Nov 18 22:49:32 2013 (r334269)
@@ -11,16 +11,15 @@ MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= A graphical roguelike game
USE_SDL= sdl
-USE_GMAKE= yes
+USES= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var/games
-STATEDIR= /var/games/ivan
-
PORTSCOUT= skipv:0.301,0.310,0.311,0.401,0.410,0.420,0.430
-NO_STAGE= yes
+PORTDATA= *
+
post-patch:
@${REINPLACE_CMD} -e 's|IvanSave|.IvanSave|g' ${WRKSRC}/Main/Source/game.cpp
@${REINPLACE_CMD} -Ee 's|(fearray<type>::~?fearray)<type>|\1|' \
@@ -34,15 +33,4 @@ post-patch:
${WRKSRC}/Main/Include/stack.h ${WRKSRC}/Main/Source/lsquare.cpp \
${WRKSRC}/Main/Source/lterras.cpp
-post-install:
- ${CHGRP} games ${PREFIX}/bin/ivan
- ${CHMOD} g+s ${PREFIX}/bin/ivan
-.if !exists(${STATEDIR})
- ${MKDIR} ${STATEDIR}
- ${TOUCH} ${STATEDIR}/ivan-highscore.scores
- ${MKDIR} ${STATEDIR}/Bones
- ${CHGRP} -R games ${STATEDIR}
- ${CHMOD} -R g+w ${STATEDIR}
-.endif
-
.include <bsd.port.mk>
Added: head/games/ivan/files/patch-FeLib-Include-festring.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/ivan/files/patch-FeLib-Include-festring.h Mon Nov 18 22:49:32 2013 (r334269)
@@ -0,0 +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 @@
+ 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 @@
+ 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);
Modified: head/games/ivan/files/patch-FeLib-Source-festring.cpp
==============================================================================
--- head/games/ivan/files/patch-FeLib-Source-festring.cpp Mon Nov 18 22:49:10 2013 (r334268)
+++ head/games/ivan/files/patch-FeLib-Source-festring.cpp Mon Nov 18 22:49:32 2013 (r334269)
@@ -1,5 +1,5 @@
--- FeLib/Source/festring.cpp.orig 2004-11-11 20:27:44.000000000 +0300
-+++ FeLib/Source/festring.cpp 2013-09-14 02:16:26.736227688 +0400
++++ FeLib/Source/festring.cpp 2013-11-08 16:54:46.925772448 +0400
@@ -11,6 +11,7 @@
*/
@@ -8,3 +8,84 @@
#include "festring.h"
#include "allocate.h"
+@@ -116,7 +117,7 @@
+ {
+ 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 @@
+ 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 @@
+ {
+ 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 @@
+ 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 @@
+ }
+
+ 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 @@
+ }
+
+ 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 @@
+ --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 @@
+ 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 @@
+ }
+
+ 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);
Modified: head/games/ivan/pkg-install
==============================================================================
--- head/games/ivan/pkg-install Mon Nov 18 22:49:10 2013 (r334268)
+++ head/games/ivan/pkg-install Mon Nov 18 22:49:32 2013 (r334269)
@@ -8,8 +8,8 @@ STATEDIR="/var/games/ivan"
echo "Creating state directory..."
-mkdir "$STATEDIR"
+mkdir -p "$STATEDIR"
touch "$STATEDIR/ivan-highscore.scores"
-mkdir "$STATEDIR/Bones"
+mkdir -p "$STATEDIR/Bones"
chgrp -R games "$STATEDIR"
chmod -R g+w "$STATEDIR"
Modified: head/games/ivan/pkg-plist
==============================================================================
--- head/games/ivan/pkg-plist Mon Nov 18 22:49:10 2013 (r334268)
+++ head/games/ivan/pkg-plist Mon Nov 18 22:49:32 2013 (r334269)
@@ -1,24 +1,5 @@
+ at group games
+ at mode 2555
bin/ivan
-%%DATADIR%%/Script/char.dat
-%%DATADIR%%/Script/define.dat
-%%DATADIR%%/Script/dungeon.dat
-%%DATADIR%%/Script/glterra.dat
-%%DATADIR%%/Script/item.dat
-%%DATADIR%%/Script/material.dat
-%%DATADIR%%/Script/olterra.dat
-%%DATADIR%%/Graphics/Char.pcx
-%%DATADIR%%/Graphics/Cursor.pcx
-%%DATADIR%%/Graphics/Effect.pcx
-%%DATADIR%%/Graphics/Font.pcx
-%%DATADIR%%/Graphics/FOW.pcx
-%%DATADIR%%/Graphics/GLTerra.pcx
-%%DATADIR%%/Graphics/Humanoid.pcx
-%%DATADIR%%/Graphics/Icon.bmp
-%%DATADIR%%/Graphics/Item.pcx
-%%DATADIR%%/Graphics/Menu.pcx
-%%DATADIR%%/Graphics/OLTerra.pcx
-%%DATADIR%%/Graphics/Symbol.pcx
-%%DATADIR%%/Graphics/WTerra.pcx
- at dirrm %%DATADIR%%/Graphics
- at dirrm %%DATADIR%%/Script
- at dirrm %%DATADIR%%
+ at mode
+ at group
More information about the svn-ports-all
mailing list