<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/41880d01973a47f73d9b0215a7fa44750057778f">https://github.com/macports/macports-ports/commit/41880d01973a47f73d9b0215a7fa44750057778f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41880d01973a47f73d9b0215a7fa44750057778f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 18 03:27:13 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> micropolis: New port, version 4.0-20180629
</span>---
games/micropolis/Portfile | 79 ++++++++++++++++++++++
games/micropolis/files/Makefile.patch | 28 ++++++++
games/micropolis/files/src-sim-makefile.patch | 20 ++++++
.../micropolis/files/src-tclx-src-tclxgdat.y.patch | 39 +++++++++++
.../files/src-tclx-tkucbsrc-makefile.patch | 34 ++++++++++
.../files/src-tclx-ucbsrc-makefile.patch | 15 ++++
.../files/src-tclx-ucbsrc-tclbasic.sed.patch | 13 ++++
.../files/src-tclx-ucbsrc-tclexpr.sed.patch | 12 ++++
games/micropolis/files/src-tk-makefile.patch | 20 ++++++
games/micropolis/files/src-tk-tkconfig.h.patch | 14 ++++
games/micropolis/files/src-tk-tkevent.c.patch | 21 ++++++
games/micropolis/files/src-tk-tkrawtcp.c.patch | 23 +++++++
12 files changed, 318 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/Portfile b/games/micropolis/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..75d052194aa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0-20180629
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git.branch cc31822e4ebe54c0109623ac0c5cdf0e3acad755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 34b86d9d5891473aa3eda1556bf9dde23b206b4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f55a1f3ee276e093fb56d0d1a4db5efb2a0cb925ee4e8af5eb7107e972854c77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7912528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description city building simulation game
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is the open-source descendant of the 1989 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ city building simulation game SimCity.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Originally from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.donhopkins.com/home/micropolis/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/SimHacker/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://git.zerfleddert.de/cgi-bin/gitweb.cgi/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${git.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-[string range ${git.branch} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libsdl_mixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [list tclx/config/linux] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/src/${f} ${worksrcpath}/src/${f}.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/src/${f}.orig ${worksrcpath}/src/${f}
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.post_args -b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-sim-makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tclx-src-tclxgdat.y.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tclx-tkucbsrc-makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tclx-ucbsrc-makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tclx-ucbsrc-tclbasic.sed.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tclx-ucbsrc-tclexpr.sed.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tk-makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tk-tkconfig.h.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tk-tkevent.c.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src-tk-tkrawtcp.c.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -E "s|/usr/include/X11|${prefix}/include|g;s|/usr/X11(R6)?/lib|${prefix}/lib|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tk/makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tclx/config/linux \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/sim/makefile
</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;'>+# To make sure the -I and -L flags in the makefiles are right.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.library_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override-append PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.version ${git.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {>log</a> \| <a href="[^"]+/commit/([0-9a-f]{40})}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/Makefile.patch b/games/micropolis/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d1ee1d6a6f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Hide the sim executable in an appropriately-named subdirectory of libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rather than directly in libexec.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In the micropolis wrapper script, use a shebang line, use exec so that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+shell doesn't stay around, and quote user-supplied arguments properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2022-05-16 22:16:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DATADIR=$(PREFIX)/share/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBEXECDIR=$(PREFIX)/libexec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBEXECDIR=$(PREFIX)/libexec/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINDIR=$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOCDIR=$(PREFIX)/share/doc/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PIXMAPDIR=$(PREFIX)/share/pixmaps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,9 +64,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-bin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 0755 res/sim $(DESTDIR)/$(LIBEXECDIR)/sim
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 0755 res/sounds/player $(DESTDIR)/$(DATADIR)/res/sounds/player
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "SIMHOME=$(DATADIR); export SIMHOME" >$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "#!/bin/sh" >$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "SIMHOME=$(DATADIR); export SIMHOME" >>$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "echo \"Starting Micropolis in \$${SIMHOME} ... \"" >>$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "cd $(DATADIR) && $(LIBEXECDIR)/sim \$$*" >>$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "cd $(DATADIR) && exec $(LIBEXECDIR)/sim \"\$$@\"" >>$(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod 755 $(DESTDIR)/$(BINDIR)/micropolis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-res: install-res-sounds install-res-dejavu-lgc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-sim-makefile.patch b/games/micropolis/files/src-sim-makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4c8b8c9f5ed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-sim-makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Evaluate SDLINCLUDE and SDLLIB just once, not for every compile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Remove use of undefined XPMHOME variable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sim/makefile.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sim/makefile 2022-05-16 21:58:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TKLIBRARY = /usr/local/lib/tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SDLINCLUDE = $$(/bin/sh ./sdl_helper cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SDLLIBS = $$(/bin/sh ./sdl_helper libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDLINCLUDE := $(shell /bin/sh sdl_helper cflags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SDLLIBS := $(shell /bin/sh sdl_helper libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,5 +32,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDES = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Iheaders \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I$(XPMHOME) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(XINCLUDE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I$(TCLHOME) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tclx-src-tclxgdat.y.patch b/games/micropolis/files/src-tclx-src-tclxgdat.y.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..840bbcb744c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tclx-src-tclxgdat.y.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+y.tab.c:1310:16: error: implicit declaration of function 'yylex' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yychar = YYLEX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+y.tab.c:1586:7: error: implicit declaration of function 'yyerror' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yyerror (YY_("syntax error"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+y.tab.c:1732:3: error: implicit declaration of function 'yyerror' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yyerror (YY_("memory exhausted"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/src/tclxgdat.y.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/src/tclxgdat.y 2022-05-16 20:59:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define DAYLIGHT 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define STANDARD 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define MAYBE 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int yylex(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void yyerror(const char *);
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -229,6 +232,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static char *lptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yylex()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef YYSTYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -580,7 +584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Error message are not used, so discard with dummy function.
</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;'>+-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yyerror(msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tclx-tkucbsrc-makefile.patch b/games/micropolis/files/src-tclx-tkucbsrc-makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7273f7fd5b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tclx-tkucbsrc-makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+../../tk/tkconfig.h:55:10: fatal error: 'X11/Xlib.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/config/linux.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/config/linux 2022-05-16 21:16:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,5 +9,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RANLIB_CMD=ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MCS_CMD=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCL_TK_LIBS= -L/usr/X11/lib -lX11 -lm -lXpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XINCLUDE=/usr/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCL_MAN_SEPARATOR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/config.mk.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/config.mk 2022-05-16 21:16:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCL_TK_DIR=../tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TK_LIBRARY=/usr/local/lib/tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XPM_LIBS=-L/usr/X11R6/lib -lXpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XINCLUDE=/usr/X11R6/include
</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;'>+ # Compiler debug/optimization/profiling flag to use. Not that if debugging or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/tkucbsrc/makefile.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/tkucbsrc/makefile 2022-05-16 21:18:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</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;'>+ CFLAGS= $(OPTIMIZE_FLAG) $(XCFLAGS) -I../src -I../$(TCL_TK_DIR) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -I../$(TCL_UCB_DIR) -I$(XHOME)/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I../$(TCL_UCB_DIR) -I$(XINCLUDE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MEM_DEBUG_FLAGS) $(SYS_DEP_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_VERSION=\"2.2/\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tclx-ucbsrc-makefile.patch b/games/micropolis/files/src-tclx-ucbsrc-makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d7bad8f887c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tclx-ucbsrc-makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tclbasic.c:23:10: fatal error: 'tclxtend.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "tclxtend.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/ucbsrc/makefile.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/ucbsrc/makefile 2022-05-16 21:01:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@ SHELL=/bin/sh
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS=$(OPTIMIZE_FLAG) $(XCFLAGS) -I../src -I../$(TCL_UCB_DIR) $(MEM_DEBUG_FLAGS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SYS_DEP_FLAGS)
</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;color:#808080;'>diff --git a/games/micropolis/files/src-tclx-ucbsrc-tclbasic.sed.patch b/games/micropolis/files/src-tclx-ucbsrc-tclbasic.sed.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1e6a3bffecb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tclx-ucbsrc-tclbasic.sed.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tclbasic.c:711:18: error: implicit declaration of function 'Tcl_CheckForSignal' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result = Tcl_CheckForSignal (interp, result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/ucbsrc/tclbasic.sed.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/ucbsrc/tclbasic.sed 2022-05-16 20:24:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/#include "tclint.h"/a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\#include "tclxtend.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /(\*cmdPtr->proc)/a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \ /*\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \ * Signal handling added for Extended Tcl.\
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tclx-ucbsrc-tclexpr.sed.patch b/games/micropolis/files/src-tclx-ucbsrc-tclexpr.sed.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a4494388db5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tclx-ucbsrc-tclexpr.sed.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tclexpr.c:1321:1: error: implicit declaration of function 'Tcl_ReturnDouble' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Tcl_ReturnDouble (interp, value.doubleValue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tclx/ucbsrc/tclexpr.sed.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tclx/ucbsrc/tclexpr.sed 2022-05-16 20:43:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,2 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/#include "tclint.h"/a\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\#include "tclxint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ / sprintf(interp->result, "%g", value.doubleValue);/c\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Tcl_ReturnDouble (interp, value.doubleValue);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tk-makefile.patch b/games/micropolis/files/src-tk-makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..50dee708a67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tk-makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkevent.c:24:10: fatal error: 'tclxtend.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#include "tclxtend.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tk/makefile.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tk/makefile 2022-05-16 21:45:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,10 +29,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -O3 -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#CFLAGS = -I. -I$(XINCLUDE) -I$(TCL_DIR) -I$(TCLX_DIR) -g -DTK_VERSION=\"2.3\" -DUSE_XPM3 -DIS_LINUX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TCL_DIR = ../tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TCLX_DIR = ../tclx/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XINCLUDE = /usr/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XLIB = -L/usr/X11R6/lib -lX11 -lXpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tk-tkconfig.h.patch b/games/micropolis/files/src-tk-tkconfig.h.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..692f62e9f5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tk-tkconfig.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkoption.c:875:9: error: implicit declaration of function 'read' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (read(fileId, buffer, (int) statBuf.st_size) != statBuf.st_size) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tk/tkconfig.h.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tk/tkconfig.h 2022-05-16 20:05:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,6 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/file.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef _TCL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <tcl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tk-tkevent.c.patch b/games/micropolis/files/src-tk-tkevent.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7111211e3e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tk-tkevent.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkevent.c:682:3: error: implicit declaration of function 'TkWmProtocolEventProc' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkWmProtocolEventProc(winPtr, eventPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkevent.c:1447:5: error: implicit declaration of function 'Tcl_CheckForSignal' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if (Tcl_CheckForSignal (tk_mainInterp, TCL_OK) == TCL_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkevent.c:1512:5: error: implicit declaration of function 'Tcl_CheckForSignal' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if (Tcl_CheckForSignal (tk_mainInterp, TCL_OK) == TCL_ERROR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tk/tkevent.c.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tk/tkevent.c 2022-05-16 21:32:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tkconfig.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tkint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "tclxtend.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "tkwm.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/micropolis/files/src-tk-tkrawtcp.c.patch b/games/micropolis/files/src-tk-tkrawtcp.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..88f95cf452a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/micropolis/files/src-tk-tkrawtcp.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkrawtcp.c:658:3: error: implicit declaration of function 'TkBindError' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBindError(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkrawtcp.c:665:3: error: implicit declaration of function 'TkBindError' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBindError(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkrawtcp.c:672:3: error: implicit declaration of function 'TkBindError' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBindError(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+tkrawtcp.c:680:3: error: implicit declaration of function 'TkBindError' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TkBindError(interp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tk/tkrawtcp.c.orig 2018-06-29 04:19:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tk/tkrawtcp.c 2022-05-16 20:17:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/un.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <tk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "tkint.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int inet_connect _ANSI_ARGS_((char *host, char *port,int server));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int unix_connect _ANSI_ARGS_((char *path, int server));
</span></pre><pre style='margin:0'>
</pre>