<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/55ea653aec8f07255a5609072140856ca00901a6">https://github.com/macports/macports-ports/commit/55ea653aec8f07255a5609072140856ca00901a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 55ea653aec8 frotz: update to 2.53
</span>55ea653aec8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 55ea653aec8f07255a5609072140856ca00901a6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 7 16:01:40 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> frotz: update to 2.53
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60094
</span>---
games/frotz/Portfile | 37 ++++++++---------
games/frotz/files/patch-Makefile | 61 +++++-----------------------
games/frotz/files/patch-src-common-main.c | 11 -----
games/frotz/files/patch-src-common-process.c | 21 ----------
4 files changed, 27 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/frotz/Portfile b/games/frotz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1dc3fef4267..e5475346974 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/frotz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/frotz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name frotz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.53
</span> categories games
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,33 +13,28 @@ description an interpreter for Infocom Z-Code games
</span> long_description Frotz provides a portable implementation of the zcode \
virtual machine used for all Infocom text adventures and many of those \
written by other authors.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://frotz.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/frotz/frotz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://davidgriffith.gitlab.io/frotz/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ebe822f89916762b086fe6ca1a8bcb7553bf3da1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 73ec20f034d2e91578c387cff3af249d52b8833e4271eb1053f6d335722fe3ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 275534
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 323e24a026b1418713c84ad170ad36f3680d0bb8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ed288b2ddad6c100f7ad7cb6ee8c867053d75144e96160b5ba00abb8969cdf30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 461585
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span> depends_lib port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-common-main.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-common-process.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${worksrcpath}/Makefile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile
</span>
use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCL="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB="${configure.ldflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SYSCONFDIR=${prefix}/etc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=[get_canonical_archflags cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOUND_TYPE=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target curses
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args {*}${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir PREFIX=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: sound and SDL variants or subports
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/frotz/files/patch-Makefile b/games/frotz/files/patch-Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33e3e2b2835..50f0a8189f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/frotz/files/patch-Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/frotz/files/patch-Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile 2002-10-27 19:21:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2008-08-21 20:23:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,9 +14,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-malign-jumps=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define where you want Frotz installed. Usually this is /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = @PREFIX@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MAN_PREFIX = $(PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MAN_PREFIX = $(PREFIX)/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #MAN_PREFIX = /usr/local/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG_DIR = $(PREFIX)/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define where you want Frotz to look for frotz.conf.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CONFIG_DIR = /usr/local/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CONFIG_DIR = /usr/local/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CONFIG_DIR = /etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CONFIG_DIR = /usr/pkg/etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CONFIG_DIR =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,6 +54,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If your vendor-supplied curses library won't work, uncomment the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # location where ncurses.h is.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCL = -I@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #INCL = -I/usr/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #INCL = -I/usr/pkg/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #INCL = -I/usr/freeware/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,6 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If your vendor-supplied curses library won't work, uncomment the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # location where the ncurses library is.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB = -L@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #LIB = -L/usr/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #LIB = -L/usr/pkg/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #LIB = -L/usr/freeware/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,8 +75,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # curses library won't work, comment out the first option and uncomment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the second.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CURSES = -lcurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#CURSES = -lncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CURSES = -lcurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CURSES = -lncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Uncomment this if your need to use ncurses instead of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # vendor-supplied curses library. This just tells the compile process
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2021-02-28 11:50:16.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-11-07 15:48:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are good for regular use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CFLAGS += -O2 -fomit-frame-pointer -falign-functions=2 -falign-loops=2 -falign-jumps=2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These are handy for debugging.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CFLAGS += -g
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define where you want Frotz installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX ?= /usr/local
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/frotz/files/patch-src-common-main.c b/games/frotz/files/patch-src-common-main.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28c83e0bab6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/frotz/files/patch-src-common-main.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/main.c.orig 2015-05-20 03:52:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/main.c 2018-10-06 21:05:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,7 +155,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_memory ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- init_process ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frotz_init_process ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_sound ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/frotz/files/patch-src-common-process.c b/games/frotz/files/patch-src-common-process.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab125c41faa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/frotz/files/patch-src-common-process.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/process.c.orig 2015-05-20 03:52:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/process.c 2018-10-06 21:06:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,15 +172,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * init_process
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * frotz_init_process
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Initialize process variables.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--void init_process (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void frotz_init_process (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- finished = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--} /* init_process */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+} /* frotz_init_process */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span></pre><pre style='margin:0'>
</pre>