6 files changed, 93 insertions, 34 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 623559f385fc..add2475a4db1 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
index 474e3cd5e4d0..aab083ec9a35 100644
--- a/games-engines/frotz/Manifest
+++ b/games-engines/frotz/Manifest
@@ -1,4 +1,5 @@
-AUX frotz-stray-dollar.patch 857 BLAKE2B b2d4681f2fddc4ef836b263a5592e34255d44a8f280f3b1d93fcb0e3aa18c222545ab81364ee673ec22e23d68d93e7fbc50b8dd296dd13ebc7b3fe81e81cb5ca SHA512 7640b2e70ad5200867fba5dcac6ca3f6a338cbd4778ec933901276d3f1b5de48e3d1385ab399081924caa4e571ea58cff23fb8a67391b126edaeb0278c83e46e
-DIST frotz-2.55_pre20240518.tar.bz2 361873 BLAKE2B feffedec989adfda7e949ab4997dff6496e1d9fef4b55902cd8430556587e54996872107c70a1ecc6db4bc6e29357ec101df9f8f411043cddfbf03bc46d4fe4d SHA512 b18670d6360fff48c20e8d26cb5173784ea900128a8e08d39625297aeae6eb5ea5be7fe361785b3863f25667649d935f2b9edb9d92751388bfaaa00edf678ec2
-EBUILD frotz-2.55_pre20240518.ebuild 1877 BLAKE2B 60704545990e2c027c94a37bb9212fa60ccef9e79a665373175e5f050e19cead953aefaf01e6b4d3856379ca3dd8b105e091a765e8737cc48a891e456a5c4d7c SHA512 e389a38e992c895a74fef585eb979065fbd53e4587ce95975b881dab540e0bd06da77bf59079ac5dab091d8f1092bcbb004a36d4645017dc91a623479417ccdf
+AUX frotz-2.55-makefile-ordering.patch 755 BLAKE2B af7b23f066cd7e8ad67c07e8d2d3659cf1e9658441ad6cd285bf6f65ad782392743aa157d6cde94ca080630793a41db297d8e28a603ebb4641826892717e42e0 SHA512 362b9ef3ecb5774c61244a7bd0f9948927043cf1f04879e6da79c05e461a37d93f7409dce6787f20ecda65a5c3e95da36a049b17ba3303c2e38f14d81b1590ea
+AUX frotz-2.55-which.patch 1951 BLAKE2B f9f61ce16672fc871e1b115a09f91503223f6557f5878c24c77ef92d20ed05f027dd356bb33432697a7cadb21600bc87a5a5551e6b12879d0f68ff7e864a3bf6 SHA512 51167c6c8abef09253c893e446c1b4e6d08aba58cb8e30e879c2ae2498f2efa0b2b6f865566df62db74d180b5847da93f6b62a9107ec4aa8d398d5a9e66c6963
+DIST frotz-2.55.tar.bz2 363261 BLAKE2B c249a48d397a1dfa58bf4b6af01e1e3ed978ed370da252d11eb952781b604fd9485235b5772a0c2a3de656b649598331ff46a378965fba2dd88414de4d07c521 SHA512 a5a39ff16781b39aabe4b27f6acfa1303c025f0b5af5e4aa843f86f8208a6dd44a5f73e49ac0d8eced8e48571320d6b9eb1693e0ec54a199a5356f3ef8df0ef4
+EBUILD frotz-2.55.ebuild 1805 BLAKE2B b7097950894d869465613e0e14f7bc922cfd623c490dd4c3ee6fbb5a319a9b3d974ac51ee6d4b1f21672152e182a8d715e5afb28c2a8fe0321895690f016d9f0 SHA512 111fd3ad8899ba6432d8a8358f3212ec418bbd0cb270bc5aafd72abfa85c50a4eefd25d2017dcc49fe5c4e55bf77b233c4e8575c7df0790f1b44d8b0c272b548
 MISC metadata.xml 338 BLAKE2B 811899ad96ae5e5b023d3cfdf11dc19de37b336dd7903bb63ec14c83ea0c96955ec1803a9954cff560c89bfb083a8f614e61bbe199e66d053125d4642c8be2aa SHA512 b72ccc452bb2d200f0c3b5cd3e361dadc4d80b248e0c8bef50fb264c85b0e0dd04639014c3b4d3f590ebcbcdd9bfe41c61c540514a272ee7ebb406bfbb337546
diff --git a/games-engines/frotz/files/frotz-2.55-makefile-ordering.patch b/games-engines/frotz/files/frotz-2.55-makefile-ordering.patch
new file mode 100644
index 000000000000..8fa1f3bf42b4
--- /dev/null
+++ b/games-engines/frotz/files/frotz-2.55-makefile-ordering.patch
@@ -0,0 +1,27 @@
+https://gitlab.com/DavidGriffith/frotz/-/commit/52be64afc92a6ea0a982ff83205a67cbfb94b619
+From 52be64afc92a6ea0a982ff83205a67cbfb94b619 Mon Sep 17 00:00:00 2001
+From: David Griffith <dave@661.org>
+Date: Thu, 6 Feb 2025 19:16:11 -0800
+Subject: [PATCH] Fixed potential SDL interface build failure when using "make
+ -j".
+
+---
+ src/sdl/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sdl/Makefile b/src/sdl/Makefile
+index e21477e6..fd07089c 100644
+--- a/src/sdl/Makefile
++++ b/src/sdl/Makefile
+@@ -31,7 +31,7 @@ $(TARGET): $(DEFINES) $(OBJECTS) | $(DEFINES)
+ 	$(RANLIB) $@
+ 	@echo "** Done with SDL interface."
+ 
+-%.o: %.c
++%.o: %.c $(DEFINES)
+ 	$(CC) $(CFLAGS) $(SDL_CFLAGS) -fPIC -fpic -o $@ -c $<
+ 
+ $(DEFINES):
+-- 
+GitLab
+
diff --git a/games-engines/frotz/files/frotz-2.55-which.patch b/games-engines/frotz/files/frotz-2.55-which.patch
new file mode 100644
index 000000000000..d8252a13a1cf
--- /dev/null
+++ b/games-engines/frotz/files/frotz-2.55-which.patch
@@ -0,0 +1,57 @@
+Remove which from Makefile
+https://bugs.gentoo.org/949843
+--- a/Makefile	2025-02-26 12:50:58.083970908 +0400
++++ b/Makefile	2025-02-26 12:51:26.363195573 +0400
+@@ -146,8 +146,8 @@
+ endif
+ 
+ # Determine what system we are on.
+-RANLIB ?= $(shell which ranlib)
+-AR ?= $(shell which ar)
++RANLIB ?= $(shell command -v ranlib)
++AR ?= $(shell command -v ar)
+ # For now, assume !windows == unix.
+ OS_TYPE ?= unix
+ UNAME_S := $(shell uname -s)
+@@ -175,12 +175,12 @@
+ PKGCONF_BIN ?= pkgconf
+ PKG_CONFIG_BIN ?= pkg-config
+ # If we don't have pkgconf", check if pkg-config is available.
+-ifneq ($(shell which $(PKGCONF_BIN)),)
++ifneq ($(shell command -v $(PKGCONF_BIN)),)
+ PKGCONF = $(PKGCONF_BIN)
+ else
+ $(warning *** Could not find $(PKGCONF_BIN).  Is $(PKG_CONFIG_BIN) available?)
+ # Check if pkg-config is available.
+-ifneq ($(shell which $(PKG_CONFIG_BIN)),)
++ifneq ($(shell command -v $(PKG_CONFIG_BIN)),)
+ $(warning *** Found $(PKG_CONFIG_BIN)!  Now proceeding normally.)
+ PKGCONF = $(PKG_CONFIG_BIN)
+ else
+@@ -332,7 +332,7 @@
+ # If not, make it clear that we're working from a release.
+ #
+ GIT_DIR ?= .git
+-ifneq ($(and $(wildcard $(GIT_DIR)),$(shell which git)),)
++ifneq ($(and $(wildcard $(GIT_DIR)),$(shell command -v git)),)
+ GIT_HASH = $(shell git rev-parse HEAD)
+ GIT_HASH_SHORT = $(shell git rev-parse --short=8 HEAD)
+ GIT_DATE = $(shell git show -s --format=%ci)
+@@ -476,7 +476,7 @@
+ 
+ owdos: $(DOS_BIN)
+ $(DOS_BIN): $(COMMON_DEFINES) $(HASH)
+-ifneq ($(shell which wmake),)
++ifneq ($(shell command -v wmake),)
+ 	wmake -f Makefile.ow
+ else
+ 	$(error wmake command not found.  Cannot make the DOS version)
+@@ -786,7 +786,7 @@
+ 
+ dist: $(NAME)-$(VERSION).tar.gz
+ frotz-$(VERSION).tar.gz:
+-ifneq ($(and $(wildcard $(GIT_DIR)),$(shell which git)),)
++ifneq ($(and $(wildcard $(GIT_DIR)),$(shell command -v git)),)
+ 	git archive --format=tgz --prefix $(NAME)-$(VERSION)/ HEAD -o $(NAME)-$(VERSION).tar.gz
+ 	@echo $(NAME)-$(VERSION).tar.gz created.
+ else
diff --git a/games-engines/frotz/files/frotz-stray-dollar.patch b/games-engines/frotz/files/frotz-stray-dollar.patch
deleted file mode 100644
index 9cc2a4212741..000000000000
--- a/games-engines/frotz/files/frotz-stray-dollar.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c14d1bd6c129670869db0dc6c025c68f28944a4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 21 May 2024 22:53:33 +0100
-Subject: [PATCH] Fix stray $ that breaks the frotz filename when specifying
- LDFLAGS
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 8860297..35d8246 100644
---- a/Makefile
-+++ b/Makefile
-@@ -394,7 +394,7 @@ DOSVER = $(shell echo $(VERSION) | sed s/\\.//g)
- curses: $(FROTZ_BIN)
- ncurses: $(FROTZ_BIN)
- $(FROTZ_BIN): $(FROTZ_LIBS)
--	$(CC) $+ -o $@$ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS)
-+	$(CC) $+ -o $@ $(LDFLAGS) $(CURSES_LDFLAGS) $(CURSES_SOUND_LDFLAGS)
- 	@echo "** Done building Frotz with curses interface"
- 	@echo "** Audio support $(CURSES_SOUND) (type $(SOUND_TYPE))"
- 	@echo "** Blorb support $(BLORB_SUPPORT)"
--- 
-2.45.1
-
diff --git a/games-engines/frotz/frotz-2.55_pre20240518.ebuild b/games-engines/frotz/frotz-2.55.ebuild
index 23013101c44c..c420562555a0 100644
--- a/games-engines/frotz/frotz-2.55_pre20240518.ebuild
+++ b/games-engines/frotz/frotz-2.55.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs
 
-COMMIT="f96e6b33d8b13f80258af49b4bb567428870291c"
 DESCRIPTION="Interpreter for Z-code based text games"
 HOMEPAGE="https://661.org/proj/if/frotz/"
-SRC_URI="https://gitlab.com/DavidGriffith/frotz/-/archive/${COMMIT}/frotz-master.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${COMMIT}"
+SRC_URI="https://gitlab.com/DavidGriffith/frotz/-/archive/${PV}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~riscv ~x86"
@@ -40,7 +39,8 @@ RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-stray-dollar.patch
+	"${FILESDIR}/${P}-makefile-ordering.patch"
+	"${FILESDIR}/${P}-which.patch"
 )
 
 src_compile() {