From nobody Sat Apr 13 00:58:55 2024 X-Original-To: dev-commits-ports-all@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 4VGZnW2TZcz5GWHS; Sat, 13 Apr 2024 00:58:55 +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 4VGZnW1wsqz56FC; Sat, 13 Apr 2024 00:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712969935; 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=VuhrfzwvV7spEsn2npfDzVK03qXMLY8WtEgITOkYOe0=; b=Sabvqz/xqwV2k9/bdBss3ByKVhDX1FZv4vHcHp46Rutoy1mDMMq7HVJWAyHArNta3EkJNb qLu6jGoSahYhUrGoQAHDtBUpNy6fUx8UjJSVayHa0uS6xMtqX4ddpa/kP3gF8b4Frr0D+q /nN7Zb1Gru0HAGrIaaFoEix84ua/Z8r8jopx6UxNB0kFLlBprDfhsVNeSgGgA3Zz27i0tI n11WZd4dDqbyVLWq1/NfflVqSOIfI036D90i6vpN8WbjQfQtvr8iYouoX3gLcKz8JQAK3A LMIOse7S+Rzi7urWtrZ8O4jb383Eo4b8rIfoBMLRsTdo7FsKYuChAgxXIr3+mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712969935; a=rsa-sha256; cv=none; b=BQg4isxNubYtPM/lQdXyQaDg6eQLifJDZkA+mqLriFoXdUHo1UKhz54Er75goa1H7Pi49/ aLPB55dduhqh5fLP+ZFijV9i4PW4MA+HCrd86yGH0iBSnAAILp7hbWwEmOG/KcfcZVEpEt kXTJC6WJ2EM6AuZ2Tjhik5Afm1emoUyq6dgtyY2QzGXVEupedpsuUDaaVRhVBuGxpy/bRs n82sWMbD+uCcs2AfSfnIDFe7GA8LZWH3GjakxFThGK6Z3chZdqb5QXNNDeZ7coNq4CclA1 npKZDFyYllUHuBIqHLWEIcUeiYglcg0a0f8ayINFlhjrdNGtlT28VY93ZHg5Lg== 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=1712969935; 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=VuhrfzwvV7spEsn2npfDzVK03qXMLY8WtEgITOkYOe0=; b=yFtGGI+x+JpDqUod22qMQiWXnQgONkn9wL5ClQgERZpn9XeOY5pODf+TA9YAAUqcic4Ne5 vAHKhvroPAakH8ImFUEeRfqFWf9anI6LILp1NmJldkLGve2E2bOHP4Zo7bpO0Il24Sop8i 1XJuKUDFGicaXgVwmgHWCcIUZAmRs4KbvtRHuXtZUW3o2pE18PXESXNKSDyiyiyIDW923E 2MU8O8/VEIQFAL+H9tVtfEPOs/RIsi78sk4oht5jwSpWg6kbCU/ETILPg7ZAJpddqk5fqE F8ni8NK/Y/E5A3b2SIdXBJvNixlqKOnmk7N5ssZ4S2eidONSNLPuhHc1y/3hiw== 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 4VGZnW1WJfz1BW1; Sat, 13 Apr 2024 00:58:55 +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 43D0wt0f055715; Sat, 13 Apr 2024 00:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43D0wttf055712; Sat, 13 Apr 2024 00:58:55 GMT (envelope-from git) Date: Sat, 13 Apr 2024 00:58:55 GMT Message-Id: <202404130058.43D0wttf055712@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f4675059d0c8 - main - games/openbor: update to 7633 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: f4675059d0c86c43fb8c1dfd1141af845d627a0b Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4675059d0c86c43fb8c1dfd1141af845d627a0b commit f4675059d0c86c43fb8c1dfd1141af845d627a0b Author: Jan Beich AuthorDate: 2024-04-13 00:56:30 +0000 Commit: Jan Beich CommitDate: 2024-04-13 00:57:37 +0000 games/openbor: update to 7633 Changes: https://github.com/DCurrent/openbor/compare/f4510854...ec0f4446 --- 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));