From nobody Sat Apr 13 00:59:20 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VGZp05chKz5GWK6; Sat, 13 Apr 2024 00:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VGZp04rZxz56p9; Sat, 13 Apr 2024 00:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712969960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdW1aqbm/WgrZoBjlk9Q0DyRyHT0Dl59iGkeZKpj6mg=; b=GzZzdgDwr09ut2qXd8bK4flL9LwWKMYREAG6MQ1zyGfnCeJbzNsa5IQPXfS5I+DfWMEy3q 57wPfcC7nCjTQi8f2hF1q5QivUMixgWnsfRlPqMgAQoQ/DwH42n4WX/DrqV71YmIRW2mDm qYUjQUHtyYJBGOG2KhHiVsCsfahl4uGoJoZk9kMAMkstjYG4Je9FZVIjLBuCZh+nkVtJqe Kl/YzWba106ZewVdUcvBNkZ1c6i3+0KU638UF0wT59ovEiwI+8+Aoaecx1g4ZAfleoUNo/ +714gJXPDbCjWbT5SRop1yZVdP6v/4gPq1ODE1eoHXuXrzTi9QA8J653TAfSWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712969960; a=rsa-sha256; cv=none; b=JOZJLqctM2AuP+Aa6rJicTVicjXvXCEyIzkdBGxUqleYxptDKICvavj8bXPNiPLC17hlb6 bit4v7dSybhW5I1HiBbCawI8DLg4DI+HazZ3kTPg5JhEVZmENpRywhwgdKzG2BudB8/Y7N gRNhDQox8CR2Qn20Qt6i0amVY17UYAoNMKdILxckXQt2rz2FusCaEY6zD9aCPmtPoueTwD GzzRDGgMkdAGzmqu89D7XMS9g5gEBA9wqlChk12R4Fczx1+Hnnb+r1nibbkx/ex71SpR53 J5Y8zAfYBGDlj9POdUSDVN7QsNvxtjcUPlpNF+XiFFREzAGBNz6uCqweiX57RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712969960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdW1aqbm/WgrZoBjlk9Q0DyRyHT0Dl59iGkeZKpj6mg=; b=Lh6aBeBuZ3y/d8l6ePGhByjtKcXFJt0lJQB23wrN+WLl2n4+dy84L1gUKiDD1vmM5dg4vK wZzEvh5sCA5LGPrt3/EU8HVBqyaJv7uNEB1vJd41CwSnULGRR18cPjFF+KXM3FOJFcelVy ySFaD2x91cDQu/M1QJTl9w0C5hjniKHybKA/OH1wle22uonDxzvsTJMCwx5fQk4JvKF040 9ChMURtnstUk8sKOl5C2Zm4hY7IKLIe4ejZh4k4FLdsyBUC4A+hzF7bdkwDhpfLSWQsMHb cplCTBeAyF3bNWd7GEbHK3Z7LI0qpYID2j2XIXWdr+Y7MQkr3bRd1Kx2Kzulyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VGZp04RsBz1B7L; Sat, 13 Apr 2024 00:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43D0xKpQ056131; Sat, 13 Apr 2024 00:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43D0xK4s056128; Sat, 13 Apr 2024 00:59:20 GMT (envelope-from git) Date: Sat, 13 Apr 2024 00:59:20 GMT Message-Id: <202404130059.43D0xK4s056128@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 59f32124f9f6 - 2024Q2 - games/openbor: update to 7633 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 59f32124f9f61b776d4e72ca3af8dc13f294b099 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=59f32124f9f61b776d4e72ca3af8dc13f294b099 commit 59f32124f9f61b776d4e72ca3af8dc13f294b099 Author: Jan Beich AuthorDate: 2024-04-13 00:56:30 +0000 Commit: Jan Beich CommitDate: 2024-04-13 00:59:13 +0000 games/openbor: update to 7633 Changes: https://github.com/DCurrent/openbor/compare/f4510854...ec0f4446 (cherry picked from commit f4675059d0c86c43fb8c1dfd1141af845d627a0b) --- games/openbor/Makefile | 4 ++-- games/openbor/distinfo | 6 +++--- games/openbor/files/patch-source_utils.c | 12 +++++------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 1121f0c5f6e3..7c43372a2aff 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -1,6 +1,6 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 7610 +PORTVERSION?= 7633 PORTREVISION?= 0 CATEGORIES= games @@ -35,7 +35,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= f4510854 +GH_TAGNAME?= ec0f4446 USES+= cpe gmake pkgconfig sdl .if ${PORTVERSION} < 4433 diff --git a/games/openbor/distinfo b/games/openbor/distinfo index a803a4d63f53..100f97644623 100644 --- a/games/openbor/distinfo +++ b/games/openbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707519600 -SHA256 (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 0fe777b69a23e2913a37260dbf9c9c680a0376acfe0f2402a7b7fe6281bcfe0b -SIZE (DCurrent-openbor-7610-f4510854_GH0.tar.gz) = 212696672 +TIMESTAMP = 1712969790 +SHA256 (DCurrent-openbor-7633-ec0f4446_GH0.tar.gz) = bcf54a39e5c49e1f8cd2d677f35947c331cd15e2743953a49fc8a0f8c2412de5 +SIZE (DCurrent-openbor-7633-ec0f4446_GH0.tar.gz) = 212701948 diff --git a/games/openbor/files/patch-source_utils.c b/games/openbor/files/patch-source_utils.c index 8558a0074446..374b62fd35bf 100644 --- a/games/openbor/files/patch-source_utils.c +++ b/games/openbor/files/patch-source_utils.c @@ -9,7 +9,7 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); ~~~~~~~~~~^~~~~~ ---- source/utils.c.orig 2024-02-01 15:55:11 UTC +--- source/utils.c.orig 2024-04-11 18:46:01 UTC +++ source/utils.c @@ -14,7 +14,7 @@ #include @@ -20,14 +20,12 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur #include #endif -@@ -307,9 +307,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -307,7 +307,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); --#ifndef WIN -- writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); --#elif LINUX +-#if LINUX && !DARWIN +#if defined(__GLIBC__) || defined(ANDROID) || defined(VITA) writeToLogFile("Memory usage at exit: %u\n", mallinfo2().arena); - #endif - borExit(2); + #else + writeToLogFile("Memory usage at exit: %u\n", getUsedRam(BYTES));