From e871dbec76b9836bf2bebd73de7d0a6063dd52fb Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 8 Dec 2015 18:11:05 +0100
Subject: [PATCH] nethack: update to 3.6.0.

---
 srcpkgs/nethack/INSTALL  |  4 ++--
 srcpkgs/nethack/template | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/nethack/INSTALL b/srcpkgs/nethack/INSTALL
index 9ff2ba84406..c1b32c35262 100644
--- a/srcpkgs/nethack/INSTALL
+++ b/srcpkgs/nethack/INSTALL
@@ -2,9 +2,9 @@ case "${ACTION}" in
 post)
 	chown nethack:nethack usr/lib/nethack/nethack
 	chmod 02755 usr/lib/nethack/nethack
-	touch var/games/nethack/logfile var/games/nethack/perm var/games/nethack/record
+	touch var/games/nethack/logfile var/games/nethack/perm var/games/nethack/record var/games/nethack/xlogfile
 	chown nethack:nethack var/games/nethack var/games/nethack/*
 	chmod 0775 var/games/nethack
-	chmod 0664 var/games/nethack/logfile var/games/nethack/perm var/games/nethack/record
+	chmod 0664 var/games/nethack/logfile var/games/nethack/perm var/games/nethack/record var/games/nethack/xlogfile
 	;;
 esac
diff --git a/srcpkgs/nethack/template b/srcpkgs/nethack/template
index 9c7faccfacd..ab7628bd872 100644
--- a/srcpkgs/nethack/template
+++ b/srcpkgs/nethack/template
@@ -1,7 +1,7 @@
 # Template file for 'nethack'
 pkgname=nethack
-version=3.4.3
-revision=4
+version=3.6.0
+revision=1
 make_dirs="/var/games/nethack/save 0775 nethack nethack"
 system_accounts="$pkgname"
 hostmakedepends="ncurses-devel flex"
@@ -11,7 +11,7 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
 license="NetHack General Public License"
 homepage="http://www.nethack.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version//.}-src.tgz"
-checksum=bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
+checksum=1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a
 nocross=yes
 
 post_extract() {
@@ -20,14 +20,15 @@ post_extract() {
 }
 
 do_configure() {
-	sh sys/unix/setup.sh
+	sh sys/unix/setup.sh sys/unix/hints/linux
 }
 
 do_build() {
 	make all dungeon \
-		CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" \
+		CC="$CC" LINK="$CC" LDFLAGS="$LDFLAGS" \
 		LEX=flex WINTTYLIB=-lncurses \
 		CFLAGS="$CFLAGS -DLINUX -DTIMED_DELAY -DDLB \
+			-DSYSCF -DSYSCF_FILE='\"/usr/lib/nethack\"' \
 			-DHACKDIR='\"/var/games/nethack\"' -I../include"
 }
 
@@ -40,11 +41,16 @@ do_install() {
 		MANDIR=$DESTDIR/usr/share/man/man6 \
 		GAMEDIR=$DESTDIR/usr/lib/nethack \
 		VARDIR=$DESTDIR/var/games/nethack \
+		INSTDIR=$DESTDIR/usr/lib/nethack \
+		HACKDIR=$DESTDIR/usr/lib/nethack \
 		GAMEPERM=0755 \
+		DIRPERM=0775 \
+		VARDIRPERM=0775 \
 		CHOWN=: CHGRP=: FLEX=lex
 
 	mv $DESTDIR/usr/lib/nethack/nhdat $DESTDIR/var/games/nethack
-	rm $DESTDIR/var/games/nethack/{logfile,perm,record}
+	mv $DESTDIR/usr/lib/nethack/symbols $DESTDIR/var/games/nethack
+	rm $DESTDIR/var/games/nethack/{logfile,perm,record,xlogfile}
 
 	sed -i	-e 's,^HACKDIR=.*,HACKDIR=/var/games/nethack,' \
 		-e 's,^HACK=.*,HACK=/usr/lib/nethack/nethack,' \