<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/538ca95948b624f3fcbbb315cfb0722f9133e9a5">https://github.com/macports/macports-ports/commit/538ca95948b624f3fcbbb315cfb0722f9133e9a5</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 538ca95 nethack: update to 3.6.6
</span>538ca95 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 538ca95948b624f3fcbbb315cfb0722f9133e9a5
</span>Author: Justin Flude <jflude@users.noreply.github.com>
AuthorDate: Sun Apr 26 11:18:11 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> nethack: update to 3.6.6
</span>---
games/nethack/Portfile | 12 +++++------
games/nethack/files/patch-gamestate-dir.diff | 10 ++++-----
games/nethack/files/patch-manpage-dir.diff | 6 +++---
games/nethack/files/x11/patch-x11-interface.diff | 26 +++++++++++++++---------
4 files changed, 30 insertions(+), 24 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 39da13b..cde0b5f 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;'>@@ -3,12 +3,12 @@
</span> PortSystem 1.0
name nethack
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.6.6
</span> categories games
platforms darwin
license Copyleft
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers @Nax \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {@jflude hotmail.com:justin_flude} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@jflude hotmail.com:justin_flude} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @Nax \
</span> openmaintainer
description Classic dungeon adventure game.
long_description NetHack is a single-player, display-oriented Dungeons & \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ master_sites sourceforge \
</span> ${homepage}download/${version}/
distname ${name}-[string map {{.} {}} ${version}]-src
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 4b8cbf1cc3ad9f6b9bae892d44a9c63106d44782a210906162a7c3be65040ab6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6f7a0fbcf5754e8df8d3257c711d72d4abb5f673 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4640769
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 de937e31c2046900ef8c6f2eb0da0da09f8e136f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5577633
</span>
depends_lib port:ncurses
worksrcdir ${name}-${version}
<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><span style='display:block; white-space:pre;color:#808080;'>index 26c4716..a10b6e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/files/patch-gamestate-dir.diff
</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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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:#ffe0e0;'>-@@ -50,8 +50,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- NetHack-NetHack-3.6.6_Released.ORIG/sys/unix/hints/macosx10.10 2020-03-08 12:29:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ NetHack-NetHack-3.6.6_Released/sys/unix/hints/macosx10.10 2020-04-25 22:55:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,8 +52,8 @@
</span> # administered this may not be what you (or your admin) want.
# Consider a non-shared install (WANT_SHARE_INSTALL=0) instead.
# - 'make install' must be run as "sudo make install"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> GAMEGRP = games
# build to run in the source tree - primarily for development. Build with "make all"
#WANT_SOURCE_INSTALL=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span> #CFLAGS+=-Wunreachable-code
# XXX -g vs -O should go here, -I../include goes in the makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> # older binaries use NOCLIPPING, but that disables SIGWINCH
#CFLAGS+=-DNOCLIPPING
CFLAGS+= -DNOMAIL -DNOTPARMDECL -DHACKDIR=\"$(HACKDIR)\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,9 +139,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,9 +157,9 @@
</span> # if $GAMEUID is root, we install into roughly proper Mac locations, otherwise
# we install into ~/nethackdir
ifeq ($(GAMEUID),root)
<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><span style='display:block; white-space:pre;color:#808080;'>index 2068458..c92e692 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/files/patch-manpage-dir.diff
</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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- NetHack-NetHack-3.6.6_Released.ORIG/sys/unix/Makefile.doc 2020-03-08 12:29:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ NetHack-NetHack-3.6.6_Released/sys/unix/Makefile.doc 2020-04-25 22:58:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,7 +67,7 @@
</span>
GAME = nethack
<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><span style='display:block; white-space:pre;color:#808080;'>index 44de611..18a7fe4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/nethack/files/x11/patch-x11-interface.diff
</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;'>@@ -1,28 +1,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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:#ffe0e0;'>-@@ -19,9 +19,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- NetHack-NetHack-3.6.6_Released.ORIG/sys/unix/hints/macosx10.10 2020-03-08 12:29:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ NetHack-NetHack-3.6.6_Released/sys/unix/hints/macosx10.10 2020-04-25 23:10:10.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,10 +19,12 @@
</span>
# 1. Which window system(s) should be included in this binary?
WANT_WIN_TTY=1
-#WANT_WIN_X11=1
+WANT_WIN_X11=1
#WANT_WIN_QT=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #WANT_WIN_CURSES=1
</span>
+PREFIX:=$(DESTDIR)__PREFIX__
+
# 1a. What is the default window system?
WANT_DEFAULT=tty
#WANT_DEFAULT=x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,10 +102,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +113,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # separate from CFLAGS so that we don't pass it to every file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-X11CFLAGS = -I/opt/X11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++X11CFLAGS = -I$(PREFIX)/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -DX11_GRAPHICS
</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;'>+ X11CFLAGS += -Wno-variadic-macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,5 +125,5 @@
</span> WINSRC += $(WINX11SRC)
WINOBJ += $(WINX11OBJ)
WINLIB += $(WINX11LIB)
-LFLAGS=-L/opt/X11/lib
+LFLAGS=-L$(PREFIX)/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS += -DX11_GRAPHICS -I/opt/X11/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS += -DX11_GRAPHICS -I$(PREFIX)/include/X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS += -Wno-variadic-macros
</span> endif # WANT_WIN_X11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef WANT_WIN_QT
</span></pre><pre style='margin:0'>
</pre>