From nobody Sun Dec 12 07:57:58 2021 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 BEC8D18ED347; Sun, 12 Dec 2021 07:57:58 +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 4JBcSk3c78z3Kwh; Sun, 12 Dec 2021 07:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 588321D7E0; Sun, 12 Dec 2021 07:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BC7vwvc039114; Sun, 12 Dec 2021 07:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BC7vwhC039113; Sun, 12 Dec 2021 07:57:58 GMT (envelope-from git) Date: Sun, 12 Dec 2021 07:57:58 GMT Message-Id: <202112120757.1BC7vwhC039113@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: a34084d590bb - 2021Q4 - games/omega: Fix inventory display crash and take maintainership 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: Sender: owner-dev-commits-ports-branches@freebsd.org 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: a34084d590bbd0c46ca1509c17914d5865daaa81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639295878; 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=w91QSVdd1e1Ou0kjGx8k3S7UQhAWx5Z13et1drflQDg=; b=r67uGTzv+tUV/CEbDc0Ebq5GH3zhGb3CylKung3hmZDJopnkXXGr6qh0rTIaUzldXt6kQR DxDKs7skmIP+DOqxJIBLa2Y3ewoG730hwkk8cWwNLwZJag8zL0sIg75XytpMQS86ZsdI+a D7plFJPHtGbHVds1emJNDqQzRuRllXX9VodLh9+3YmxT+rE/D3e+Fxvi25byjfmLBv5ijG 60aakFeW3fACUm69eGSHipwdr7VxrCPJYFAemudb5T65jeH1MCwTUopvEQ64nhxjgZb9Fv r8OVyLUCxwjkRk7YBBPoDgSS0QjFdAi4ic9ERsLszUI0MdsYBGdqNRJBeXCOOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639295878; a=rsa-sha256; cv=none; b=hv4xRdEXIYJfyCvZl/Xv/+pCHeZsH/fL3dHBf8kefR0j8msv0+B2GLq5xxoqRHY3qrbhl3 vNyLgna243f0LnZ9cIFpOTBaPXZs8ayEINXiXz4WkM+29OQd8ptw5W1rzgZiE3sF+qIE8E QyUz1aVxOKivOHXf1woMP9AVDLMdXjJ++KCIu/dh06eLwHbjV1ELk90pCK0uLqbGEZYRH5 pjX1TB2xPTHZZrOdsLodgloBvyL2laOr1P2nZ69egbPEH5QwxbiOyWgKX5URXnExY6rffV Ov7j/iwXa1wziE2scHFI+2W7m7/EHFrz6H7p0nPq4y3s2e+yXgCV0DpHgOLcMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=a34084d590bbd0c46ca1509c17914d5865daaa81 commit a34084d590bbd0c46ca1509c17914d5865daaa81 Author: Alex AuthorDate: 2021-12-12 07:53:57 +0000 Commit: Hiroki Tagato CommitDate: 2021-12-12 07:57:45 +0000 games/omega: Fix inventory display crash and take maintainership PR: 259786 Reported by: Alex (new maintainer) Approved by: portmgr (blanket: bugfix, unmaintained port) MFH: 2021Q4 (cherry picked from commit dfc806ae70f1cd36860b6b90e4185d2198446f7a) --- games/omega/Makefile | 3 ++- games/omega/files/patch-inv.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/games/omega/Makefile b/games/omega/Makefile index a77f6a43b0e1..89c94899c7c2 100644 --- a/games/omega/Makefile +++ b/games/omega/Makefile @@ -2,11 +2,12 @@ PORTNAME= omega PORTVERSION= 0.90.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.alcyone.com/binaries/omega/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= r7st.guru@gmail.com COMMENT= Complex rogue-style game of dungeon exploration USES= gmake ncurses diff --git a/games/omega/files/patch-inv.c b/games/omega/files/patch-inv.c index 932cae631cd6..8403f5f9a264 100644 --- a/games/omega/files/patch-inv.c +++ b/games/omega/files/patch-inv.c @@ -1,5 +1,5 @@ ---- inv.c Fri Jan 1 03:08:33 1999 -+++ /home/andy/tmp/wrk/inv.c Fri May 14 20:28:52 1999 +--- inv.c.orig 2021-11-11 18:12:35.355855000 -0500 ++++ inv.c 2021-11-11 18:13:11.096005000 -0500 @@ -8,7 +8,11 @@ # ifdef AMIGA # include @@ -13,3 +13,13 @@ # endif #endif +@@ -840,8 +844,7 @@ + use_pack_item(response - 'a',slot); + } + } +- if ( optionp(TOPINV) ) +- display_possessions(); ++ display_possessions(); + return slot; + } +