<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5d80ff3bf7cecc9968be376e9e8c01dda5dfad8e">https://github.com/macports/macports-ports/commit/5d80ff3bf7cecc9968be376e9e8c01dda5dfad8e</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 5d80ff3 frotz: Update to 2.44
</span>5d80ff3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5d80ff3bf7cecc9968be376e9e8c01dda5dfad8e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Oct 6 21:12:38 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> frotz: Update to 2.44
</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/57060
</span>---
games/frotz/Portfile | 21 +++++++++++---------
games/frotz/files/patch-getline.diff | 29 ----------------------------
games/frotz/files/patch-src-common-main.c | 6 +++---
games/frotz/files/patch-src-common-process.c | 13 ++++++++-----
4 files changed, 23 insertions(+), 46 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 a6f82cb..17f3088 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;'>@@ -1,8 +1,7 @@
</span> PortSystem 1.0
name frotz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.44
</span> categories games
platforms darwin
maintainers rattus.net:pack-darwinports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,12 +12,16 @@ long_description Frotz provides a portable implementation of the zcode \
</span> virtual machine used for all Infocom text adventures and \
many of those written by other authors.
homepage http://frotz.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 efe51879e012b92bb8d5f4a82e982677
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/frotz/frotz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ebe822f89916762b086fe6ca1a8bcb7553bf3da1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 73ec20f034d2e91578c387cff3af249d52b8833e4271eb1053f6d335722fe3ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 275534
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:ncurses
patchfiles patch-Makefile patch-src-common-main.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-common-process.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-getline.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-common-process.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|" \
"${worksrcpath}/Makefile"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +32,11 @@ use_configure no
</span> variant universal {}
build.args CC="${configure.cc} [get_canonical_archflags cc]" \
<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:#e0ffe0;'>+ INCL="${configure.cppflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB="${configure.ldflags}"
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-eval destroot.args ${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span>
destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/frotz/files/patch-getline.diff b/games/frotz/files/patch-getline.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 571ecfc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/frotz/files/patch-getline.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/dumb/dumb_input.c.orig 2002-10-26 20:44:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/dumb/dumb_input.c 2012-07-26 07:27:34.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Read one line, including the newline, into s. Safely avoids buffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * overruns (but that's kind of pointless because there are several
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * other places where I'm not so careful). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static void getline(char *s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void frotz_getline(char *s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *p = s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +203,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fputs(prompt, stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getline(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frotz_getline(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Is not a command line. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- translate_special_chars(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -265,7 +265,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!*current_page)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("HELP: Type <return> for more, or q <return> to stop: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getline(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ frotz_getline(s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!strcmp(s, "q\n"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</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-main.c b/games/frotz/files/patch-src-common-main.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ad691b3..28c83e0 100644
</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;'>+++ b/games/frotz/files/patch-src-common-main.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/main.c.orig Mon Jun 28 17:26:51 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/main.c Mon Jun 28 17:27:21 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,7 +176,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/main.c.orig 2015-05-20 03:52:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/main.c 2018-10-06 21:05:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,7 +155,7 @@
</span>
init_memory ();
<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><span style='display:block; white-space:pre;color:#808080;'>index 26e938e..ab125c4 100644
</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;'>+++ b/games/frotz/files/patch-src-common-process.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/common/process.c.orig Mon Jun 28 17:26:59 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/common/process.c Mon Jun 28 17:27:12 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,13 +172,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/process.c.orig 2015-05-20 03:52:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/process.c 2018-10-06 21:06:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,15 +172,15 @@
</span>
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,9 +10,12 @@
</span> * Initialize process variables.
*
*/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -void init_process (void)
+void frotz_init_process (void)
{
finished = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* init_process */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} /* init_process */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} /* frotz_init_process */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span></pre><pre style='margin:0'>
</pre>