cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r469877

Browse Source 
games/openbor: update to 6138

Changes:	0b077e46...5673214c
Approved by:	ports-secteam (feld, implicit for snapshots)
This commit is contained in:
Jan Beich 2018-05-14 12:09:24 +00:00
parent 86e58f6555
commit 22733eb78a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=469880
4 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
games/openbor/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= openbor
# Hint: svn revision is git rev-list --count ${GH_TAGNAME}
PORTVERSION?= 5137
PORTVERSION?= 6138
.ifndef PKGNAMESUFFIX
PORTREVISION= 0
.endif
@ -31,7 +31,7 @@ PORTSCOUT= ignore:1
USE_GITHUB= yes
GH_ACCOUNT= DCurrent
GH_TAGNAME?= 0b077e46
GH_TAGNAME?= 5673214c
USES+= gmake pkgconfig
.if ${PORTVERSION} < 4433

6
games/openbor/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1525902990
SHA256 (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 549538689d66d641410abb6a25457cadd13c04176f737b9e8b5f5ac52246ec17
SIZE (DCurrent-openbor-5137-0b077e46_GH0.tar.gz) = 74507480
TIMESTAMP = 1526285237
SHA256 (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = e07a3970ae1eb050ade6ea02ae21dd0dbc00c028b504a8fa8f3ee73379ba7fe3
SIZE (DCurrent-openbor-6138-5673214c_GH0.tar.gz) = 74511657

12
games/openbor/files/patch-source_utils.c
View File

@ -1,6 +1,14 @@
--- source/utils.c.bak 2017-04-22 14:20:08 UTC
source/utils.c:303:54: error: implicit declaration of function 'mallinfo' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena);
^
source/utils.c:303:64: error: member reference base type 'int' is not a structure or union
writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena);
~~~~~~~~~~^~~~~~
--- source/utils.c.orig 2017-04-22 14:20:08 UTC
+++ source/utils.c
@@ -295,7 +295,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f
@@ -299,7 +299,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f
"\n* Shutting Down *\n\n");
writeToLogFile("Out of memory!\n");
writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line);

19
games/openbor/files/patch-source_utils.h Normal file
View File

@ -0,0 +1,19 @@
In file included from openborscript.c:30:
In file included from source/openborscript/config.h:12:
In file included from source/scriptlib/Interpreter.h:11:
In file included from source/scriptlib/depends.h:13:
In file included from source/globals.h:24:
source/utils.h:65:59: error: unknown type name 'time_t'
void get_time_string(char buffer[], unsigned buffer_size, time_t timestamp, char* pattern); // ex. "%Y-%m-%d %H:%M:%S"
^
--- source/utils.h.orig 2018-05-13 22:01:54 UTC
+++ source/utils.h
@@ -10,6 +10,7 @@
#define UTILS_H
// *** INCLUDES ***
+#include <time.h>
#include "types.h"
#include "stringptr.h"