<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bbf98e78a24995a662b98fe623ea41fd9aae3da6">https://github.com/macports/macports-ports/commit/bbf98e78a24995a662b98fe623ea41fd9aae3da6</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 bbf98e7 nethack: update to 3.6.1, keep 3.4.3 as coexisting subport
</span>bbf98e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bbf98e78a24995a662b98fe623ea41fd9aae3da6
</span>Author: Justin Flude <jflude@users.noreply.github.com>
AuthorDate: Sun Mar 3 17:15:54 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> nethack: update to 3.6.1, keep 3.4.3 as coexisting subport
</span>---
games/nethack/Portfile | 241 ++++++++++++++-------
games/nethack/files/patch-doc__nethack.6.diff | 25 +++
games/nethack/files/patch-gamestate-dir.diff | 35 +++
games/nethack/files/patch-manpage-dir.diff | 11 +
.../files/patch-sys__unix__Makefile.doc.diff | 21 +-
.../files/patch-sys__unix__Makefile.top.diff | 14 +-
games/nethack/files/x11/patch-x11-interface.diff | 28 +++
7 files changed, 285 insertions(+), 90 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/Portfile b/games/nethack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f31366b..f40b9af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,110 +1,185 @@
</span> # -*- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name nethack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories games
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers @Nax
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Classic dungeon adventure game.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://nethack.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license Copyleft
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}-343-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distfiles} md5 21479c95990eefe7650df582426457f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distfiles} sha1 c26537093c38152bc0fbcec20468d975b35f59fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distfiles} rmd160 42f600d24715a0b7e631b357c135761410b3ca95
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-sys__unix__Makefile.doc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sys__unix__Makefile.src.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sys__unix__Makefile.top.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-win__tty__termcap.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Copyleft
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers @Nax
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Classic dungeon adventure game.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description NetHack is a single-player, display-oriented Dungeons & \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Dragons(tm)-like game, in development since 1987. It runs on a wide \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variety of computer systems and graphical interfaces, although the text \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ interface is the most popular. Your goal is to grab as much treasure as \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ you can, retrieve the Amulet of Yendor, and escape the Mazes of Menace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alive.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.nethack.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${homepage}download/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-[string map {{.} {}} ${version}]-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 4b8cbf1cc3ad9f6b9bae892d44a9c63106d44782a210906162a7c3be65040ab6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6f7a0fbcf5754e8df8d3257c711d72d4abb5f673 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4640769
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gamestate-dir.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-manpage-dir.diff
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${worksrcpath}/sys/unix/Makefile.doc" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${worksrcpath}/sys/unix/Makefile.top"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "nethack"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__PREFIX__|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${worksrcpath}/sys/unix/Makefile.doc" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${worksrcpath}/sys/unix/hints/macosx10.10"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/sys/unix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd /bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.dir ${worksrcpath}/sys/unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args hints/macosx10.10
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-O2 -I../include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp}
</span>
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir "${destroot}${prefix}/share/man/man6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir "${destroot}${prefix}/share/nethackdir/save"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d "${destroot}${prefix}/share/man/man6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "nethack"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d "${destroot}${prefix}/share/nethackdir/save"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install manpages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs "${destroot}${prefix}/share/nethackdir/save/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target all install manpages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs "${destroot}${prefix}/var/games/nethack/save/"
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|${destroot}||" "${destroot}${prefix}/bin/nethack"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "nethack"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${destroot}||" "${destroot}${prefix}/bin/nethack"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't overwrite existing preference files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { logfile record } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/nethackdir/${f} ${destroot}${prefix}/share/nethackdir/${f}.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Prevent existing preferences files being overwritten.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { logfile record sysconf } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${prefix}/var/games/nethack/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/games/nethack/${f}.dist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure initial preference files exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { logfile record } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/share/nethackdir/${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${prefix}/share/nethackdir/${f}.dist ${prefix}/share/nethackdir/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "nethack"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make initially-missing preferences files from earlier versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { logfile record sysconf } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/var/games/nethack/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/var/games/nethack/${f}.dist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/var/games/nethack/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
variant x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x11/patch-include__config.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x11/patch-sys__unix__Makefile.src.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x11/patch-sys__unix__Makefile.top.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "nethack"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append x11/patch-x11-interface.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11/patch-include__config.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11/patch-sys__unix__Makefile.src.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11/patch-sys__unix__Makefile.top.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> depends_lib-append port:xorg-libXaw
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant autopickup_exceptions description { Automatically pick up things onto which you move } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-include__config.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport nethack343 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description Classic dungeon adventure game (previous version).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites sourceforge:nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distname nethack-343-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 42f600d24715a0b7e631b357c135761410b3ca95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3497458
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ worksrcdir nethack-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-doc__nethack.6.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sys__unix__Makefile.doc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sys__unix__Makefile.src.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sys__unix__Makefile.top.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-win__tty__termcap.c.diff
</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 "s|__PREFIX__|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${worksrcpath}/sys/unix/Makefile.doc" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${worksrcpath}/sys/unix/Makefile.top"
</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;'>+ configure.dir ${worksrcpath}/sys/unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cmd /bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args setup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="-O2 -I../include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install manpages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.keepdirs "${destroot}${prefix}/share/nethackdir/save/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|${destroot}||" "${destroot}${prefix}/bin/nethack343"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't overwrite existing preference files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { logfile record } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${destroot}${prefix}/share/nethackdir/${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/nethackdir/${f}.dist
</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;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure initial preference files exist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f { logfile record } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/share/nethackdir/${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${prefix}/share/nethackdir/${f}.dist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/share/nethackdir/${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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant autopickup_exceptions description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { Automatically pick up things onto which you move } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-include__config.h.diff
</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;'>+ variant menucolors description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { Allows the user to define in what color menus are shown } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch_sites-append http://bilious.alt.org/~paxed/nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append nh343-menucolor.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append nh343-menucolor.diff md5 ade00f9cb51f1b0140557d329d56844c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete CFLAGS="-O2 -I../include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CFLAGS="-O2 -I../include -DMENU_COLOR_REGEX_POSIX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#variant paranoid {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append paranoid-343.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# checksums-append paranoid-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</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;'>-#variant deathexplore {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append dthexp-343.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# checksums-append dthexp-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</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;'>-#variant sortloot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patchfiles-append sortloot-343.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# checksums-append sortloot-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</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;'>-variant menucolors description { Allows the user to define in what color menus are shown } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch_sites-append http://bilious.alt.org/~paxed/nethack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append nh343-menucolor.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append nh343-menucolor.diff md5 ade00f9cb51f1b0140557d329d56844c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete CFLAGS="-O2 -I../include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CFLAGS="-O2 -I../include -DMENU_COLOR_REGEX_POSIX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #variant paranoid {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles-append paranoid-343.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # checksums-append paranoid-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</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;'>+ #variant deathexplore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles-append dthexp-343.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # checksums-append dthexp-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</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;'>+ #variant sortloot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch_sites-append http://www.netsonic.fi/~walker/nh/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles-append sortloot-343.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # checksums-append sortloot-343.diff md5 ade00f9cb51f1b0140557d329d56844c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/patch-doc__nethack.6.diff b/games/nethack/files/patch-doc__nethack.6.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9fe81a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/patch-doc__nethack.6.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.4.3/doc/nethack.6.orig 2003-12-07 17:39:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.4.3/doc/nethack.6 2019-03-03 16:27:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.TH NETHACK 6 "9 August 2002"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.TH NETHACK343 6 "9 August 2002"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .UC 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH NAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nethack \- Exploring The Mazes of Menace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH SYNOPSIS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .na
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .hy 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B nethack343
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B \-d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .I directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B \-ibm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.B nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.B nethack343
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B \-d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .I directory
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/patch-gamestate-dir.diff b/games/nethack/files/patch-gamestate-dir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..26c4716
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/patch-gamestate-dir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.6.1/sys/unix/hints/macosx10.10.orig 2019-02-28 15:12:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.6.1/sys/unix/hints/macosx10.10 2019-02-28 15:13:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,8 +50,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # administered this may not be what you (or your admin) want.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Consider a non-shared install (WANT_SHARE_INSTALL=0) instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # - 'make install' must be run as "sudo make install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#WANT_SHARE_INSTALL=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GAMEUID = $(USER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WANT_SHARE_INSTALL=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GAMEUID = root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GAMEGRP = games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build to run in the source tree - primarily for development. Build with "make all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #WANT_SOURCE_INSTALL=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CFLAGS+=-Wunreachable-code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # XXX -g vs -O should go here, -I../include goes in the makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS+=-g -I../include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS+=-O2 -I../include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # older binaries use NOCLIPPING, but that disables SIGWINCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CFLAGS+=-DNOCLIPPING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,9 +139,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if $GAMEUID is root, we install into roughly proper Mac locations, otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we install into ~/nethackdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(GAMEUID),root)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PREFIX:=/Library/NetHack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SHELLDIR=/usr/local/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-HACKDIR=$(PREFIX)/nethackdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX:=$(DESTDIR)__PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SHELLDIR=$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++HACKDIR=$(PREFIX)/var/games/nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHOWN=chown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHGRP=chgrp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We run sgid so the game has access to both HACKDIR and user preferences.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/patch-manpage-dir.diff b/games/nethack/files/patch-manpage-dir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2068458
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/patch-manpage-dir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.6.1.OLD/sys/unix/Makefile.doc 2018-04-27 12:07:22.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.6.1/sys/unix/Makefile.doc 2019-02-22 17:38:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,7 +62,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;'>+ GAME = nethack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MANDIR = /usr/man/man6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MANDIR = $(DESTDIR)__PREFIX__/share/man/man6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANEXT = 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # manual installation for most BSD-style systems
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/patch-sys__unix__Makefile.doc.diff b/games/nethack/files/patch-sys__unix__Makefile.doc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a374c2..c4ddc35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/files/patch-sys__unix__Makefile.doc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/patch-sys__unix__Makefile.doc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nethack-3.4.3/sys/unix/Makefile.doc.orig 2005-09-02 13:49:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nethack-3.4.3/sys/unix/Makefile.doc 2005-09-02 13:49:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.4.3/sys/unix/Makefile.doc.orig 2003-12-07 17:39:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.4.3/sys/unix/Makefile.doc 2019-03-03 15:56:26.000000000 -0600
</span> @@ -41,7 +41,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,20 @@
</span> MANEXT = 6
# manual installation for most BSD-style systems
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,11 +58,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # DLBMANCREATE = nroff -man dlb.6 >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manpages:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -$(GAMEMANCREATE) $(MANDIR)/$(GAME)343.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -$(LEVMANCREATE) $(MANDIR)/lev_comp343.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -$(DGNMANCREATE) $(MANDIR)/dgn_comp343.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -$(RCVRMANCREATE) $(MANDIR)/recover343.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -$(DLBMANCREATE) $(MANDIR)/dlb343.$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # manual creation for distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/patch-sys__unix__Makefile.top.diff b/games/nethack/files/patch-sys__unix__Makefile.top.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 43eebfd..26e69f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/files/patch-sys__unix__Makefile.top.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/patch-sys__unix__Makefile.top.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- nethack-3.4.3/sys/unix/Makefile.top.orig 2003-12-07 15:39:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ nethack-3.4.3/sys/unix/Makefile.top 2005-09-02 13:59:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.4.3/sys/unix/Makefile.top.orig 2003-12-07 17:39:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.4.3/sys/unix/Makefile.top 2019-03-03 15:52:44.000000000 -0600
</span> @@ -14,7 +14,7 @@
# MAKE = make
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,12 @@
</span>
# per discussion in Install.X11 and Install.Qt
VARDATND =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,27 +191,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -189,29 +189,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
</span> < sys/unix/nethack.sh \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- > $(SHELLDIR)/$(GAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- > $(SHELLDIR)/$(GAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ > $(SHELLDIR)/$(GAME)343
</span> # set up their permissions
- -( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
- $(CHGRP) $(GAMEGRP) $(GAME) recover )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +34,8 @@
</span> chmod $(EXEPERM) $(GAMEDIR)/recover
- -$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ chmod $(EXEPERM) $(SHELLDIR)/$(GAME)343
</span>
dofiles-dlb: check-dlb
( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/nethack/files/x11/patch-x11-interface.diff b/games/nethack/files/x11/patch-x11-interface.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..44de611
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/nethack/files/x11/patch-x11-interface.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nethack-3.6.1/sys/unix/hints/macosx10.10.orig 2019-03-07 14:49:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nethack-3.6.1/sys/unix/hints/macosx10.10 2019-03-07 14:55:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,9 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1. Which window system(s) should be included in this binary?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WANT_WIN_TTY=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#WANT_WIN_X11=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++WANT_WIN_X11=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #WANT_WIN_QT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX:=$(DESTDIR)__PREFIX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1a. What is the default window system?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WANT_DEFAULT=tty
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #WANT_DEFAULT=x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,10 +102,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINSRC += $(WINX11SRC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINOBJ += $(WINX11OBJ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINLIB += $(WINX11LIB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LFLAGS=-L/opt/X11/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LFLAGS=-L$(PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -DX11_GRAPHICS -I/opt/X11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -DX11_GRAPHICS -I$(PREFIX)/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wno-variadic-macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif # WANT_WIN_X11
</span></pre><pre style='margin:0'>
</pre>