From 4b24cb67b2ddcba744c58c2f2072baef2d3a1ffb Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Mon, 18 Feb 2019 13:09:44 +0100
Subject: [PATCH] NetHack: bump (#3619)

* NetHack: bump

* Cleanup
---
 ...hack-3.6.0.recipe => nethack-3.6.1.recipe} |  4 +--
 ...-3.6.0.patchset => nethack-3.6.1.patchset} | 25 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename games-roguelike/nethack/{nethack-3.6.0.recipe => nethack-3.6.1.recipe} (92%)
 rename games-roguelike/nethack/patches/{nethack-3.6.0.patchset => nethack-3.6.1.patchset} (82%)

diff --git a/games-roguelike/nethack/nethack-3.6.0.recipe b/games-roguelike/nethack/nethack-3.6.1.recipe
similarity index 92%
rename from games-roguelike/nethack/nethack-3.6.0.recipe
rename to games-roguelike/nethack/nethack-3.6.1.recipe
index 2754af010..922319fd9 100644
--- a/games-roguelike/nethack/nethack-3.6.0.recipe
+++ b/games-roguelike/nethack/nethack-3.6.1.recipe
@@ -6,8 +6,8 @@ HOMEPAGE="http://www.nethack.org/"
 COPYRIGHT="1985-2015 Stichting Mathematisch Centrum and M. Stephenson"
 LICENSE="nethack"
 REVISION="1"
-SOURCE_URI="http://sourceforge.net/projects/nethack/files/nethack/3.6.0/nethack-360-src.tgz"
-CHECKSUM_SHA256="1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a"
+SOURCE_URI="https://www.nethack.org/download/3.6.1/nethack-361-src.tgz"
+CHECKSUM_SHA256="4b8cbf1cc3ad9f6b9bae892d44a9c63106d44782a210906162a7c3be65040ab6"
 SOURCE_DIR="nethack-$portVersion"
 PATCHES="nethack-$portVersion.patchset"
 
diff --git a/games-roguelike/nethack/patches/nethack-3.6.0.patchset b/games-roguelike/nethack/patches/nethack-3.6.1.patchset
similarity index 82%
rename from games-roguelike/nethack/patches/nethack-3.6.0.patchset
rename to games-roguelike/nethack/patches/nethack-3.6.1.patchset
index 585c896ba..a1315924d 100644
--- a/games-roguelike/nethack/patches/nethack-3.6.0.patchset
+++ b/games-roguelike/nethack/patches/nethack-3.6.1.patchset
@@ -5,27 +5,28 @@ Subject: Added Haiku support
 
 
 diff --git a/sys/unix/Makefile.doc b/sys/unix/Makefile.doc
-index e2a8131..e9c838e 100644
+index dd3703b..5ee096e 100644
 --- a/sys/unix/Makefile.doc
 +++ b/sys/unix/Makefile.doc
-@@ -17,7 +17,6 @@ GUIDEBOOK = Guidebook		# regular ASCII file
+@@ -19,7 +19,7 @@ GUIDEBOOK = Guidebook		# regular ASCII file
  # Some versions of col need -x to keep them from converting spaces to tabs;
  # some versions of col don't do the conversion by default and don't
  # recognize the option.  Sigh.
 -COLCMD = col -bx
++#COLCMD = col -bx
  #COLCMD = col -b
  
  # The command to use to generate a PostScript file
-@@ -29,7 +28,7 @@ PSCMD = groff
- # GUIDECMD = cat Guidebook.txt
- # The following works better with groff-1.18, eg on Linux
- # GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD)
--GUIDECMD = $(GUIDE_PREFORMAT) | nroff | $(COLCMD)
-+GUIDECMD = $(GUIDE_PREFORMAT) | nroff 
+@@ -33,7 +33,7 @@ PSCMD = groff
+ # Single page. Might need adjustment to .pl value
+ # GUIDECMD= $(GUIDE_PREFORMAT) | perl -pe 's/^(.mt)$$/.pl 4720v\n.in 0\n.po 8\n.ll 64m\n$$1/' | nroff -c -Tascii | $(COLCMD)
+ #
+-GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii | $(COLCMD)
++GUIDECMD = $(GUIDE_PREFORMAT) | nroff -c -Tascii
  
  # Only generate output for the current configuration:
  NHGREP = $(MAKEDEFS) --grep --input - --output -
-@@ -93,7 +92,7 @@ distrib: $(DISTRIB)
+@@ -97,7 +97,7 @@ distrib: $(DISTRIB)
  
  Guidebook.txt	: Guidebook.mn tmac.n
  	$(GUIDECMD) > Guidebook.txt
@@ -35,10 +36,10 @@ index e2a8131..e9c838e 100644
  	cat nethack.6 | $(MAN2TXT) > nethack.txt
  lev_comp.txt	: lev_comp.6
 diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
-index d5d3042..b5b0b57 100644
+index 9119cef..7937199 100644
 --- a/sys/unix/Makefile.utl
 +++ b/sys/unix/Makefile.utl
-@@ -104,8 +104,8 @@ OBJDIR = ../src
+@@ -111,8 +111,8 @@ OBJDIR = ../src
  
  # yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
  # if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
@@ -100,5 +101,5 @@ index 0000000..83db3ae
 +VARFILEPERM = 0600
 +GAMEPERM = 0755
 -- 
-2.2.2
+2.19.1