From owner-svn-ports-all@freebsd.org Mon May 14 12:09:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 11A2CFEAAF1; Mon, 14 May 2018 12:09:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B872C69777; Mon, 14 May 2018 12:09:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 999AC1BE3A; Mon, 14 May 2018 12:09:25 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EC9Poq083072; Mon, 14 May 2018 12:09:25 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EC9O59083067; Mon, 14 May 2018 12:09:24 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805141209.w4EC9O59083067@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 14 May 2018 12:09:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469880 - in branches/2018Q2/games/openbor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q2/games/openbor: . files X-SVN-Commit-Revision: 469880 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 May 2018 12:09:26 -0000 Author: jbeich Date: Mon May 14 12:09:24 2018 New Revision: 469880 URL: https://svnweb.freebsd.org/changeset/ports/469880 Log: MFH: r469877 games/openbor: update to 6138 Changes: https://github.com/DCurrent/openbor/compare/0b077e46...5673214c Approved by: ports-secteam (feld, implicit for snapshots) Added: branches/2018Q2/games/openbor/files/patch-source_utils.h - copied unchanged from r469877, head/games/openbor/files/patch-source_utils.h Modified: branches/2018Q2/games/openbor/Makefile branches/2018Q2/games/openbor/distinfo branches/2018Q2/games/openbor/files/patch-source_utils.c Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/games/openbor/Makefile ============================================================================== --- branches/2018Q2/games/openbor/Makefile Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/Makefile Mon May 14 12:09:24 2018 (r469880) @@ -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 Modified: branches/2018Q2/games/openbor/distinfo ============================================================================== --- branches/2018Q2/games/openbor/distinfo Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/distinfo Mon May 14 12:09:24 2018 (r469880) @@ -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 Modified: branches/2018Q2/games/openbor/files/patch-source_utils.c ============================================================================== --- branches/2018Q2/games/openbor/files/patch-source_utils.c Mon May 14 12:08:36 2018 (r469879) +++ branches/2018Q2/games/openbor/files/patch-source_utils.c Mon May 14 12:09:24 2018 (r469880) @@ -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); Copied: branches/2018Q2/games/openbor/files/patch-source_utils.h (from r469877, head/games/openbor/files/patch-source_utils.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/games/openbor/files/patch-source_utils.h Mon May 14 12:09:24 2018 (r469880, copy of r469877, head/games/openbor/files/patch-source_utils.h) @@ -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 + #include "types.h" + #include "stringptr.h" +