NetBSD Problem Report #51232

From yorickhardy@gmail.com  Fri Jun 10 20:12:33 2016
Return-Path: <yorickhardy@gmail.com>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id BA47A7A215
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 10 Jun 2016 20:12:33 +0000 (UTC)
Message-Id: <575b1f29.cf981c0a.ede76.3e45@mx.google.com>
Date: Fri, 10 Jun 2016 22:11:19 +0200
From: yorickhardy@gmail.com
Reply-To: yorickhardy@gmail.com
To: gnats-bugs@NetBSD.org
Subject: update games/nethack-lib to nethack-3.6.0
X-Send-Pr-Version: 3.95

>Number:         51232
>Category:       pkg
>Synopsis:       update games/nethack-{lib,tty,x11} to nethack-3.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bsiegert
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 10 20:15:00 +0000 2016
>Closed-Date:    Fri Oct 25 19:54:00 +0000 2019
>Last-Modified:  Tue Dec 03 12:55:00 +0000 2019
>Originator:     Yorick Hardy
>Release:        NetBSD 7.0_STABLE
>Organization:
>Environment:


System: NetBSD HOME 7.0_STABLE NetBSD 7.0_STABLE (YORICK.amd64) #0: Thu Apr 21 18:47:08 SAST 2016 root@HOME:/root/build.amd64.netbsd7/obj/sys/arch/amd64/compile/YORICK.amd64 amd64
Architecture: x86_64
Machine: amd64
>Description:
games/nethack-* can be updated to nethack-3.6.0
>How-To-Repeat:
>Fix:

The following patch updates games/nethack-{lib,tty,x11} to nethack-3.6.0.
nethack-3.6.0 uses a new build system (hints), but still supports the old 
way of compiling. I kept to the old way of compiling and I did not try to update
nethack-qt.

A better approach may be to dynamically create hint files for the new build
system, a hint file for every UI.

Index: games/nethack-lib/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- games/nethack-lib/Makefile	25 Feb 2016 13:19:47 -0000	1.30
+++ games/nethack-lib/Makefile	10 Jun 2016 19:37:58 -0000
@@ -4,7 +4,6 @@
 .include		"../../games/nethack-lib/Makefile.common"

 PKGNAME=		nethack-lib-${NETHACK_VERSION}
-PKGREVISION=		4

 COMMENT=		Data files for Nethack

@@ -34,6 +33,8 @@
 			${NETHACK_USER} ${NETHACK_GROUP} 664
 CONF_FILES_PERMS+=	/dev/null ${VARDIR}/record \
 			${NETHACK_USER} ${NETHACK_GROUP} 664
+CONF_FILES_PERMS+=	/dev/null ${VARDIR}/xlogfile \
+			${NETHACK_USER} ${NETHACK_GROUP} 664

 REQD_DIRS_PERMS+=	${VARDIR}					\
 			${NETHACK_USER} ${NETHACK_GROUP} 775
Index: games/nethack-lib/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/Makefile.common,v
retrieving revision 1.30
diff -u -r1.30 Makefile.common
--- games/nethack-lib/Makefile.common	25 Feb 2016 13:19:47 -0000	1.30
+++ games/nethack-lib/Makefile.common	10 Jun 2016 19:37:58 -0000
@@ -6,10 +6,10 @@
 # used by games/nethack-tty/Makefile
 # used by games/nethack-qt/Makefile

-NETHACK_BASEVER=	3.4.3
+NETHACK_BASEVER=	3.6.0
 NETHACK_VERSION=	${NETHACK_BASEVER}
 NETHACK_DISTVER=	${NETHACK_BASEVER:S/.//g}
-NETHACK_DIR=		nethackdir340
+NETHACK_DIR=		nethackdir360

 DISTNAME=		nethack-${NETHACK_DISTVER}-src
 CATEGORIES=		games
@@ -31,19 +31,17 @@

 .include "../../mk/bsd.prefs.mk"

-SUBST_CLASSES.Darwin+=	ttylib
-SUBST_CLASSES.Linux+=	ttylib
-SUBST_MESSAGE.ttylib=	Configuring to use ncurses
-SUBST_STAGE.ttylib=	post-patch
-SUBST_FILES.ttylib=	sys/unix/Makefile.src
-SUBST_SED.ttylib=	-e 's,^WINTTYLIB = -ltermlib,WINTTYLIB = -lncurses,'
-
 .include "../../mk/curses.buildlink3.mk"

 OPSYSVARS+=		NETHACK_OS
 NETHACK_OS.Linux=	SYSV
 NETHACK_OS.*=		BSD

+OPSYSVARS+=		WINTTYLIB
+WINTTYLIB.Darwin=	-lncurses
+WINTTYLIB.Linux=	-lncurses
+WINTTYLIB.*+=		-ltermlib
+
 SUBST_CLASSES+=		os
 SUBST_MESSAGE.os=	Configuring for ${NETHACK_OS}
 SUBST_STAGE.os=		post-patch
@@ -57,9 +55,13 @@
 GAMEPERM=		${NETHACK_USER} ${NETHACK_GROUP} 2555

 GAMEDIR=		${PREFIX}/share/${NETHACK_DIR}
-VARDIR=			/var/games/nethack340
+VARDIR=			/var/games/nethack360
+MAKE_ENV+=		CHGRP=${CHGRP:Q}
+MAKE_ENV+=		CHOWN=${CHOWN:Q}
 MAKE_ENV+=		GAMEDIR=${GAMEDIR:Q}
+MAKE_ENV+=		HACKDIR=${GAMEDIR:Q}
 MAKE_ENV+=		VARDIR=${VARDIR:Q}
+MAKE_ENV+=		WINTTYLIB=${WINTTYLIB}

 pre-configure:
 	@${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
Index: games/nethack-lib/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- games/nethack-lib/PLIST	1 Jun 2011 11:20:29 -0000	1.8
+++ games/nethack-lib/PLIST	10 Jun 2016 19:37:59 -0000
@@ -1,137 +1,151 @@
 @comment $NetBSD: PLIST,v 1.8 2011/06/01 11:20:29 wiz Exp $
 bin/nethack
 bin/recover
+bin/symbols
 man/man6/dgn_comp.6
 man/man6/dlb.6
 man/man6/lev_comp.6
+man/man6/makedefs.6
 man/man6/nethack.6
 man/man6/recover.6
 share/doc/nethack/Guidebook
-share/nethackdir340/Arc-fila.lev
-share/nethackdir340/Arc-filb.lev
-share/nethackdir340/Arc-goal.lev
-share/nethackdir340/Arc-loca.lev
-share/nethackdir340/Arc-strt.lev
-share/nethackdir340/Bar-fila.lev
-share/nethackdir340/Bar-filb.lev
-share/nethackdir340/Bar-goal.lev
-share/nethackdir340/Bar-loca.lev
-share/nethackdir340/Bar-strt.lev
-share/nethackdir340/Cav-fila.lev
-share/nethackdir340/Cav-filb.lev
-share/nethackdir340/Cav-goal.lev
-share/nethackdir340/Cav-loca.lev
-share/nethackdir340/Cav-strt.lev
-share/nethackdir340/Hea-fila.lev
-share/nethackdir340/Hea-filb.lev
-share/nethackdir340/Hea-goal.lev
-share/nethackdir340/Hea-loca.lev
-share/nethackdir340/Hea-strt.lev
-share/nethackdir340/Kni-fila.lev
-share/nethackdir340/Kni-filb.lev
-share/nethackdir340/Kni-goal.lev
-share/nethackdir340/Kni-loca.lev
-share/nethackdir340/Kni-strt.lev
-share/nethackdir340/Mon-fila.lev
-share/nethackdir340/Mon-filb.lev
-share/nethackdir340/Mon-goal.lev
-share/nethackdir340/Mon-loca.lev
-share/nethackdir340/Mon-strt.lev
-share/nethackdir340/Pri-fila.lev
-share/nethackdir340/Pri-filb.lev
-share/nethackdir340/Pri-goal.lev
-share/nethackdir340/Pri-loca.lev
-share/nethackdir340/Pri-strt.lev
-share/nethackdir340/Ran-fila.lev
-share/nethackdir340/Ran-filb.lev
-share/nethackdir340/Ran-goal.lev
-share/nethackdir340/Ran-loca.lev
-share/nethackdir340/Ran-strt.lev
-share/nethackdir340/Rog-fila.lev
-share/nethackdir340/Rog-filb.lev
-share/nethackdir340/Rog-goal.lev
-share/nethackdir340/Rog-loca.lev
-share/nethackdir340/Rog-strt.lev
-share/nethackdir340/Sam-fila.lev
-share/nethackdir340/Sam-filb.lev
-share/nethackdir340/Sam-goal.lev
-share/nethackdir340/Sam-loca.lev
-share/nethackdir340/Sam-strt.lev
-share/nethackdir340/Tou-fila.lev
-share/nethackdir340/Tou-filb.lev
-share/nethackdir340/Tou-goal.lev
-share/nethackdir340/Tou-loca.lev
-share/nethackdir340/Tou-strt.lev
-share/nethackdir340/Val-fila.lev
-share/nethackdir340/Val-filb.lev
-share/nethackdir340/Val-goal.lev
-share/nethackdir340/Val-loca.lev
-share/nethackdir340/Val-strt.lev
-share/nethackdir340/Wiz-fila.lev
-share/nethackdir340/Wiz-filb.lev
-share/nethackdir340/Wiz-goal.lev
-share/nethackdir340/Wiz-loca.lev
-share/nethackdir340/Wiz-strt.lev
-share/nethackdir340/air.lev
-share/nethackdir340/asmodeus.lev
-share/nethackdir340/astral.lev
-share/nethackdir340/baalz.lev
-share/nethackdir340/bigrm-1.lev
-share/nethackdir340/bigrm-2.lev
-share/nethackdir340/bigrm-3.lev
-share/nethackdir340/bigrm-4.lev
-share/nethackdir340/bigrm-5.lev
-share/nethackdir340/castle.lev
-share/nethackdir340/cmdhelp
-share/nethackdir340/data
-share/nethackdir340/dungeon
-share/nethackdir340/earth.lev
-share/nethackdir340/fakewiz1.lev
-share/nethackdir340/fakewiz2.lev
-share/nethackdir340/fire.lev
-share/nethackdir340/help
-share/nethackdir340/hh
-share/nethackdir340/history
-share/nethackdir340/juiblex.lev
-share/nethackdir340/knox.lev
-share/nethackdir340/license
-share/nethackdir340/medusa-1.lev
-share/nethackdir340/medusa-2.lev
-share/nethackdir340/minefill.lev
-share/nethackdir340/minend-1.lev
-share/nethackdir340/minend-2.lev
-share/nethackdir340/minend-3.lev
-share/nethackdir340/minetn-1.lev
-share/nethackdir340/minetn-2.lev
-share/nethackdir340/minetn-3.lev
-share/nethackdir340/minetn-4.lev
-share/nethackdir340/minetn-5.lev
-share/nethackdir340/minetn-6.lev
-share/nethackdir340/minetn-7.lev
-share/nethackdir340/opthelp
-share/nethackdir340/options
-share/nethackdir340/oracle.lev
-share/nethackdir340/oracles
-share/nethackdir340/orcus.lev
-share/nethackdir340/pet_mark.xbm
-share/nethackdir340/quest.dat
-share/nethackdir340/rip.xpm
-share/nethackdir340/rumors
-share/nethackdir340/sanctum.lev
-share/nethackdir340/soko1-1.lev
-share/nethackdir340/soko1-2.lev
-share/nethackdir340/soko2-1.lev
-share/nethackdir340/soko2-2.lev
-share/nethackdir340/soko3-1.lev
-share/nethackdir340/soko3-2.lev
-share/nethackdir340/soko4-1.lev
-share/nethackdir340/soko4-2.lev
-share/nethackdir340/tower1.lev
-share/nethackdir340/tower2.lev
-share/nethackdir340/tower3.lev
-share/nethackdir340/valley.lev
-share/nethackdir340/water.lev
-share/nethackdir340/wizard1.lev
-share/nethackdir340/wizard2.lev
-share/nethackdir340/wizard3.lev
-share/nethackdir340/wizhelp
+share/nethackdir360/Arc-fila.lev
+share/nethackdir360/Arc-filb.lev
+share/nethackdir360/Arc-goal.lev
+share/nethackdir360/Arc-loca.lev
+share/nethackdir360/Arc-strt.lev
+share/nethackdir360/Bar-fila.lev
+share/nethackdir360/Bar-filb.lev
+share/nethackdir360/Bar-goal.lev
+share/nethackdir360/Bar-loca.lev
+share/nethackdir360/Bar-strt.lev
+share/nethackdir360/Cav-fila.lev
+share/nethackdir360/Cav-filb.lev
+share/nethackdir360/Cav-goal.lev
+share/nethackdir360/Cav-loca.lev
+share/nethackdir360/Cav-strt.lev
+share/nethackdir360/Hea-fila.lev
+share/nethackdir360/Hea-filb.lev
+share/nethackdir360/Hea-goal.lev
+share/nethackdir360/Hea-loca.lev
+share/nethackdir360/Hea-strt.lev
+share/nethackdir360/Kni-fila.lev
+share/nethackdir360/Kni-filb.lev
+share/nethackdir360/Kni-goal.lev
+share/nethackdir360/Kni-loca.lev
+share/nethackdir360/Kni-strt.lev
+share/nethackdir360/Mon-fila.lev
+share/nethackdir360/Mon-filb.lev
+share/nethackdir360/Mon-goal.lev
+share/nethackdir360/Mon-loca.lev
+share/nethackdir360/Mon-strt.lev
+share/nethackdir360/Pri-fila.lev
+share/nethackdir360/Pri-filb.lev
+share/nethackdir360/Pri-goal.lev
+share/nethackdir360/Pri-loca.lev
+share/nethackdir360/Pri-strt.lev
+share/nethackdir360/Ran-fila.lev
+share/nethackdir360/Ran-filb.lev
+share/nethackdir360/Ran-goal.lev
+share/nethackdir360/Ran-loca.lev
+share/nethackdir360/Ran-strt.lev
+share/nethackdir360/Rog-fila.lev
+share/nethackdir360/Rog-filb.lev
+share/nethackdir360/Rog-goal.lev
+share/nethackdir360/Rog-loca.lev
+share/nethackdir360/Rog-strt.lev
+share/nethackdir360/Sam-fila.lev
+share/nethackdir360/Sam-filb.lev
+share/nethackdir360/Sam-goal.lev
+share/nethackdir360/Sam-loca.lev
+share/nethackdir360/Sam-strt.lev
+share/nethackdir360/Tou-fila.lev
+share/nethackdir360/Tou-filb.lev
+share/nethackdir360/Tou-goal.lev
+share/nethackdir360/Tou-loca.lev
+share/nethackdir360/Tou-strt.lev
+share/nethackdir360/Val-fila.lev
+share/nethackdir360/Val-filb.lev
+share/nethackdir360/Val-goal.lev
+share/nethackdir360/Val-loca.lev
+share/nethackdir360/Val-strt.lev
+share/nethackdir360/Wiz-fila.lev
+share/nethackdir360/Wiz-filb.lev
+share/nethackdir360/Wiz-goal.lev
+share/nethackdir360/Wiz-loca.lev
+share/nethackdir360/Wiz-strt.lev
+share/nethackdir360/air.lev
+share/nethackdir360/asmodeus.lev
+share/nethackdir360/astral.lev
+share/nethackdir360/baalz.lev
+share/nethackdir360/bigrm-1.lev
+share/nethackdir360/bigrm-10.lev
+share/nethackdir360/bigrm-2.lev
+share/nethackdir360/bigrm-3.lev
+share/nethackdir360/bigrm-4.lev
+share/nethackdir360/bigrm-5.lev
+share/nethackdir360/bigrm-6.lev
+share/nethackdir360/bigrm-7.lev
+share/nethackdir360/bigrm-8.lev
+share/nethackdir360/bigrm-9.lev
+share/nethackdir360/bogusmon
+share/nethackdir360/castle.lev
+share/nethackdir360/cmdhelp
+share/nethackdir360/data
+share/nethackdir360/dungeon
+share/nethackdir360/earth.lev
+share/nethackdir360/engrave
+share/nethackdir360/epitaph
+share/nethackdir360/fakewiz1.lev
+share/nethackdir360/fakewiz2.lev
+share/nethackdir360/fire.lev
+share/nethackdir360/help
+share/nethackdir360/hh
+share/nethackdir360/history
+share/nethackdir360/juiblex.lev
+share/nethackdir360/knox.lev
+share/nethackdir360/license
+share/nethackdir360/medusa-1.lev
+share/nethackdir360/medusa-2.lev
+share/nethackdir360/medusa-3.lev
+share/nethackdir360/medusa-4.lev
+share/nethackdir360/minefill.lev
+share/nethackdir360/minend-1.lev
+share/nethackdir360/minend-2.lev
+share/nethackdir360/minend-3.lev
+share/nethackdir360/minetn-1.lev
+share/nethackdir360/minetn-2.lev
+share/nethackdir360/minetn-3.lev
+share/nethackdir360/minetn-4.lev
+share/nethackdir360/minetn-5.lev
+share/nethackdir360/minetn-6.lev
+share/nethackdir360/minetn-7.lev
+share/nethackdir360/opthelp
+share/nethackdir360/options
+share/nethackdir360/oracle.lev
+share/nethackdir360/oracles
+share/nethackdir360/orcus.lev
+share/nethackdir360/pet_mark.xbm
+share/nethackdir360/pilemark.xbm
+share/nethackdir360/quest.dat
+share/nethackdir360/rip.xpm
+share/nethackdir360/rumors
+share/nethackdir360/sanctum.lev
+share/nethackdir360/soko1-1.lev
+share/nethackdir360/soko1-2.lev
+share/nethackdir360/soko2-1.lev
+share/nethackdir360/soko2-2.lev
+share/nethackdir360/soko3-1.lev
+share/nethackdir360/soko3-2.lev
+share/nethackdir360/soko4-1.lev
+share/nethackdir360/soko4-2.lev
+share/nethackdir360/tower1.lev
+share/nethackdir360/tower2.lev
+share/nethackdir360/tower3.lev
+share/nethackdir360/tribute
+share/nethackdir360/valley.lev
+share/nethackdir360/water.lev
+share/nethackdir360/wizard1.lev
+share/nethackdir360/wizard2.lev
+share/nethackdir360/wizard3.lev
+share/nethackdir360/wizhelp
Index: games/nethack-lib/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- games/nethack-lib/distinfo	3 Nov 2015 20:56:59 -0000	1.19
+++ games/nethack-lib/distinfo	10 Jun 2016 19:37:59 -0000
@@ -1,17 +1,17 @@
 $NetBSD: distinfo,v 1.19 2015/11/03 20:56:59 agc Exp $

-SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
-RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
-SHA512 (nethack-343-src.tgz) = 052342c19619219f291571d48cf7799f962eb6ec6f8a276427225c0abbd833eada18abeff9fbd647919f2a9e3bb097d7f154675e283fe48abc4752f24c192d8f
-Size (nethack-343-src.tgz) = 3497458 bytes
-SHA1 (patch-aa) = 31d89b27e52189de9a51fbb04f1ed390c5377b2b
-SHA1 (patch-ab) = 49947b960f2b7871fc798398d1c1ceab8d462ec9
-SHA1 (patch-ac) = 50cac811281c629edf2a72e523b62b51f8c3c840
-SHA1 (patch-ad) = be56ef8459f3273a0b316bb94e0ae7397a53c37f
-SHA1 (patch-ae) = 8530c1e033f2522e05b699db36d84f77ecf886be
-SHA1 (patch-af) = a567c4c664f135ad24f3f0069ddc29bf5b950b21
-SHA1 (patch-ag) = 5bf322fb92a3cd9df9559e56265f0477d9e92487
+SHA1 (nethack-360-src.tgz) = a94aebcca367954595747ac468d095f12fbf993a
+RMD160 (nethack-360-src.tgz) = 2500e4d53682757b39883789281e4ae3395acb91
+SHA512 (nethack-360-src.tgz) = 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813
+Size (nethack-360-src.tgz) = 4261282 bytes
+SHA1 (patch-aa) = 8fbe8e748f80d3066f2cfbf4aa7a7aa5c471a363
+SHA1 (patch-ab) = 90b4f2adc15aedeb9b554c149dcc4e4eb5a9c587
+SHA1 (patch-ac) = bd09a83171477c7ef073b666651f8278c1bbf8df
+SHA1 (patch-ad) = 31bd0e2f5d96a519dbcfc02c4a486fd0c9d62103
+SHA1 (patch-ae) = 5ec7b4c02743e3c83218905e568a85da56212a80
+SHA1 (patch-af) = 7527d42fb11bd2e252e3c476f1eea35bd0f92ccb
+SHA1 (patch-ag) = 753a5862acbeda2f7b16c7eb18741546a1a704a5
 SHA1 (patch-ai) = 73c5b2ea1227531089474705f2f18bc411366365
-SHA1 (patch-sys_unix_Makefile.src) = 003f16fba997ac61efc92adecc13b883135a86bc
-SHA1 (patch-sys_unix_Makefile.utl) = 409e1f8b58c7e2709d224f42c19fdfd162d9cea7
-SHA1 (patch-util_makedefs.c) = 63faf92a7f511fcf73317789a3008350cdd404d9
+SHA1 (patch-sys_unix_Makefile.src) = 7438885fc458c5247dff94585c972a10bf9c908b
+SHA1 (patch-sys_unix_Makefile.utl) = a97ecc6c72c0d60456f4f35a454d719fb1185d15
+SHA1 (patch-util_makedefs.c) = 9eb0b94896474eaa33cb5a73eea122b209538dd0
Index: games/nethack-lib/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- games/nethack-lib/patches/patch-aa	1 Jun 2011 11:20:29 -0000	1.10
+++ games/nethack-lib/patches/patch-aa	10 Jun 2016 19:37:59 -0000
@@ -2,74 +2,78 @@

 Make configurable.

---- include/config.h.orig	2003-12-07 23:39:13.000000000 +0000
+--- include/config.h.orig	2015-11-17 05:58:34.000000000 +0000
 +++ include/config.h
-@@ -42,6 +42,16 @@
-  * Define all of those you want supported in your binary.
-  * Some combinations make no sense.  See the installation document.
-  */
+@@ -116,6 +116,16 @@
+ #define DEFAULT_WINDOW_SYS "tty"
+ #endif
+ 
 +#if   defined(GTYPE_TTY)
 +#  define DEFAULT_WINDOW_SYS "tty"
 +#elif defined(GTYPE_X11)
 +#  define X11_GRAPHICS
-+#  define DEFAULT_WINDOW_SYS "x11"
++#  define DEFAULT_WINDOW_SYS "X11"
 +#elif defined(GTYPE_QT)
 +#  define QT_GRAPHICS
 +#  define DEFAULT_WINDOW_SYS "Qt"
 +#endif
 +
- #define TTY_GRAPHICS	/* good old tty based graphics */
- /* #define X11_GRAPHICS */	/* X11 interface */
- /* #define QT_GRAPHICS */	/* Qt interface */
-@@ -86,7 +96,7 @@
- # define DEFAULT_WC_TILED_MAP   /* Default to tiles if users doesn't say wc_ascii_map */
- # define USER_SOUNDS		/* Use sounds */
- # ifndef __APPLE__
--#  define USER_SOUNDS_REGEX
-+/*#  define USER_SOUNDS_REGEX */
- # endif
- # define USE_XPM		/* Use XPM format for images (required) */
- # define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.ppm) */
-@@ -126,7 +136,7 @@
+ #ifdef X11_GRAPHICS
+ /*
+  * There are two ways that X11 tiles may be defined.  (1) using a custom
+@@ -125,7 +135,7 @@
   * would allow:
   *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
   */
--/* # define USE_XPM */		/* Disable if you do not have the XPM library */
-+# define USE_XPM		/* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -169,11 +179,11 @@
+-/* # define USE_XPM */ /* Disable if you do not have the XPM library */
++# define USE_XPM /* Disable if you do not have the XPM library */
+ #ifdef USE_XPM
+ #define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
+ #endif
+@@ -187,10 +197,12 @@
+ #define WIZARD_NAME "wizard" /* value is ignored if SYSCF is enabled */
+ #endif

- #ifdef UNIX
++#if 0
+ #ifndef SYSCF
+ #define SYSCF                /* use a global configuration */
+ #define SYSCF_FILE "sysconf" /* global configuration is in a file */
+ #endif
++#endif
+ 
+ #ifndef GDBPATH
+ #define GDBPATH "/usr/bin/gdb"
+@@ -250,11 +262,11 @@
+ 
+ #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
  /* path and file name extension for compression program */
--#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
--#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
-+/* #define COMPRESS "/usr/bin/compress"*/	/* Lempel-Ziv compression */
-+/* #define COMPRESS_EXTENSION ".Z"*/		/* compress's extension */
+-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"      /* compress's extension */
++/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
++/* #define COMPRESS_EXTENSION ".Z" */      /* compress's extension */
  /* An example of one alternative you might want to use: */
--/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
--/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
-+#define COMPRESS "@GZIP_PROGRAM@"		/* FSF gzip compression */
-+#define COMPRESS_EXTENSION ".gz"		/* normal gzip extension */
+-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */       /* normal gzip extension */
++#define COMPRESS "/usr/bin/gzip"          /* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz"           /* normal gzip extension */
  #endif

  #ifndef COMPRESS
-@@ -204,7 +214,7 @@
+@@ -317,7 +329,7 @@
   * otherwise it will be the current directory.
   */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"
-+#  define HACKDIR "@PREFIX@/share/nethackdir340"
- # endif
+ #ifndef HACKDIR
+-#define HACKDIR "/usr/games/lib/nethackdir"
++#define HACKDIR "/usr/pkg/share/nethackdir360"
+ #endif

  /*
-@@ -300,7 +310,7 @@ typedef unsigned char	uchar;
+@@ -412,7 +424,7 @@ typedef unsigned char uchar;
   * functions that have been macroized.
   */

 -/* #define VISION_TABLES */ /* use vision tables generated at compile time */
 +#define VISION_TABLES /* use vision tables generated at compile time */
  #ifndef VISION_TABLES
- # ifndef NO_MACRO_CPATH
- #  define MACRO_CPATH	/* use clear_path macros instead of functions */
+ #ifndef NO_MACRO_CPATH
+ #define MACRO_CPATH /* use clear_path macros instead of functions */
Index: games/nethack-lib/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-ab,v
retrieving revision 1.12
diff -u -r1.12 patch-ab
--- games/nethack-lib/patches/patch-ab	1 Jun 2011 11:20:29 -0000	1.12
+++ games/nethack-lib/patches/patch-ab	10 Jun 2016 19:37:59 -0000
@@ -2,75 +2,62 @@

 Make configurable.

---- sys/unix/Makefile.top.orig	2003-12-07 23:39:13.000000000 +0000
-+++ sys/unix/Makefile.top
-@@ -14,18 +14,18 @@
- # MAKE = make
- 
- # make NetHack
--PREFIX	 = /usr
- GAME     = nethack
+--- ./sys/unix/Makefile.top.orig	2015-11-18 20:54:59.000000000 +0000
++++ ./sys/unix/Makefile.top
+@@ -22,6 +22,8 @@ GAME     = nethack
  # GAME     = nethack.prg
--GAMEUID  = games
--GAMEGRP  = bin
+ #GAMEUID  = games
+ #GAMEGRP  = bin
 +GAMEUID  = root
 +GAMEGRP  = games

  # Permissions - some places use setgid instead of setuid, for instance
  # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
-+GAMEPERM = 2755
+@@ -29,8 +31,8 @@ GAME     = nethack
  FILEPERM = 0644
-+VARFILEPERM = 0664
+ # VARFILEPERM = 0644
  EXEPERM  = 0755
 -DIRPERM  = 0755
+-# VARDIRPERM = 0755
 +DIRPERM  = 0775
++VARDIRPERM = 0755

- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,12 +35,12 @@ DIRPERM  = 0755
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
--VARDIR  = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+GAMEDIR  ?= $(PREFIX)/share/$(GAME)dir340
-+VARDIR  ?= /var/games/nethack340
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
+ #
+@@ -43,6 +45,9 @@ DIRPERM  = 0755
+ #VARDIR  = $(HACKDIR)
+ # Where nethack.sh in installed.  If this is not defined, the wrapper is not used.
+ #SHELLDIR = $(PREFIX)/games
++GAMEDIR  ?= $(PREFIX)/share/$(GAME)dir360
++VARDIR  ?= /var/games/nethack360
 +SHELLDIR = $(PREFIX)/bin

  # per discussion in Install.X11 and Install.Qt
--VARDATND = 
-+VARDATND =  pet_mark.xbm rip.xpm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
-@@ -64,8 +64,8 @@ VARDAT = $(VARDATD) $(VARDATND)
- # other permission-related reasons.  If that happens, you may want to set the
- # command to "true", which is a no-op. Note that disabling chown or chgrp
- # will only work if setuid (or setgid) behavior is not desired or required.
--CHOWN = chown
--CHGRP = chgrp
-+CHOWN = : # chown
-+CHGRP = : # chgrp
- 
- #
- # end of configuration
-@@ -87,9 +87,12 @@ DAT = $(DATNODLB) $(DATDLB)
+ #VARDATND = 
+@@ -54,6 +59,7 @@ DIRPERM  = 0755
+ # VARDATND = beostiles
+ # for Gnome
+ # VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
++VARDATND =  pet_mark.xbm pilemark.xbm rip.xpm
+ 
+ VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
+ VARDAT = $(VARDATD) $(VARDATND)
+@@ -92,9 +98,13 @@ DAT = $(DATNODLB) $(DATDLB)
  $(GAME):
  	( cd src ; $(MAKE) )

 -all:	$(GAME) recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
 +all:	$(GAME) datastuff
+ 	true; $(MOREALL)
  	@echo "Done."
- 
++ 
 +datastuff: recover Guidebook $(VARDAT) dungeon spec_levs check-dlb
 +	@echo "Data Sets Built."
 +
+ 
  # Note: many of the dependencies below are here to allow parallel make
  # to generate valid output
- 
-@@ -99,20 +102,20 @@ Guidebook:
+@@ -105,29 +115,29 @@ Guidebook:
  manpages:
  	( cd doc ; $(MAKE) manpages )

@@ -78,6 +65,18 @@
 +data: # $(GAME)
  	( cd dat ; $(MAKE) data )

+-engrave: $(GAME)
++engrave: # $(GAME)
+ 	( cd dat ; $(MAKE) engrave )
+ 
+-bogusmon: $(GAME)
++bogusmon: # $(GAME)
+ 	( cd dat ; $(MAKE) bogusmon )
+ 
+-epitaph: $(GAME)
++epitaph: # $(GAME)
+ 	( cd dat ; $(MAKE) epitaph )
+ 
 -rumors: $(GAME)
 +rumors: # $(GAME)
  	( cd dat ; $(MAKE) rumors )
@@ -96,7 +95,7 @@
  	( cd dat ; $(MAKE) quest.dat )

  spec_levs: dungeon
-@@ -120,22 +123,22 @@ spec_levs: dungeon
+@@ -135,22 +145,22 @@ spec_levs: dungeon
  	( cd dat ; $(MAKE) spec_levs )
  	( cd dat ; $(MAKE) quest_levs )

@@ -124,7 +123,7 @@
  	( cd dat ; $(MAKE) NetHack.ad )

  pet_mark.xbm:
-@@ -150,7 +153,7 @@ mapbg.xpm:
+@@ -168,7 +178,7 @@ mapbg.xpm:
  nhsplash.xpm:
  	( cd dat ; $(MAKE) nhsplash.xpm )

@@ -133,7 +132,7 @@
  	( cd util ; $(MAKE) tile2img.ttp )
  	( cd dat ; $(MAKE) nh16.img )

-@@ -172,7 +175,7 @@ dlb:
+@@ -190,7 +200,7 @@ dlb:

  # recover can be used when INSURANCE is defined in include/config.h
  # and the checkpoint option is true
@@ -142,91 +141,107 @@
  	( cd util ; $(MAKE) recover )

  dofiles:
-@@ -183,34 +186,31 @@ dofiles:
+@@ -201,41 +211,36 @@ dofiles:
  		-e '}' 					\
  	  	-e '$$s/.*/nodlb/p' < dat/options` ;	\
  	$(MAKE) dofiles-$${target-nodlb}
--	cp src/$(GAME) $(GAMEDIR)
--	cp util/recover $(GAMEDIR)
--	-rm -f $(SHELLDIR)/$(GAME)
--	sed -e 's;/usr/games/lib/nethackdir;$(GAMEDIR);' \
+-	(cd dat ; cp symbols $(INSTDIR) )
+-	cp src/$(GAME) $(INSTDIR)
+-	cp util/recover $(INSTDIR)
+-	-if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
+-	if test -n '$(SHELLDIR)'; then \
+-		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
++	cp dat/symbols $(DESTDIR)$(PREFIX)/bin
 +	cp util/recover $(DESTDIR)$(PREFIX)/bin
-+	-rm -f $(DESTDIR)$(SHELLDIR)/$(GAME)
-+	sed -e 's;@GAMEDIR@;$(GAMEDIR);' \
++	-if test -n '$(DESTDIR)$(SHELLDIR)'; then rm -f $(DESTDIR)$(SHELLDIR)/$(GAME); fi
++	if test -n '$(DESTDIR)$(SHELLDIR)'; then \
++		sed -e 's;@GAMEDIR@;$(HACKDIR);' \
  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
 +		-e 's;@PREFIX@;$(PREFIX);' \
  		< sys/unix/nethack.sh \
--		> $(SHELLDIR)/$(GAME)
-+		> $(DESTDIR)$(SHELLDIR)/$(GAME)
+-		> $(SHELLDIR)/$(GAME) ; fi
++		> $(DESTDIR)$(SHELLDIR)/$(GAME) ; fi
  # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
 -			$(CHGRP) $(GAMEGRP) $(GAME) recover )
--	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
--	chmod $(EXEPERM) $(GAMEDIR)/recover
--	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
--	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
--	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
+-	chmod $(GAMEPERM) $(INSTDIR)/$(GAME)
+-	chmod $(EXEPERM) $(INSTDIR)/recover
+-	-if test -n '$(SHELLDIR)'; then \
+-		$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME); fi
+-	if test -n '$(SHELLDIR)'; then \
+-		$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
+-		chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
+-			$(CHGRP) $(GAMEGRP) symbols ; \
+-			chmod $(FILEPERM) symbols )
 +	chmod $(EXEPERM) $(DESTDIR)$(PREFIX)/bin/recover
 +	-$(CHOWN) $(GAMEUID) $(DESTDIR)$(SHELLDIR)/$(GAME)
-+	$(CHGRP) $(GAMEGRP) $(DESTDIR)$(SHELLDIR)/$(GAME)
++	-$(CHGRP) $(GAMEGRP) $(DESTDIR)$(SHELLDIR)/$(GAME)
 +	chmod $(EXEPERM) $(DESTDIR)$(SHELLDIR)/$(GAME)
++	-$(CHOWN) $(GAMEUID) $(DESTDIR)$(PREFIX)/bin/symbols
++	-$(CHGRP) $(GAMEGRP) $(DESTDIR)$(PREFIX)/bin/symbols
++	chmod $(FILEPERM) $(DESTDIR)$(PREFIX)/bin/symbols

  dofiles-dlb: check-dlb
--	( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
+-	( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
 +	( cd dat ; cp nhdat $(DATNODLB) $(DESTDIR)$(GAMEDIR) )
  # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
 +	-( cd $(DESTDIR)$(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
  			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
  			chmod $(FILEPERM) nhdat $(DATNODLB) )

  dofiles-nodlb:
  # copy over the game files
--	( cd dat ; cp $(DAT) $(GAMEDIR) )
+-	( cd dat ; cp $(DAT) $(INSTDIR) )
 +	( cd dat ; cp $(DAT) $(DESTDIR)$(GAMEDIR) )
  # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
+-	-( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
 +	-( cd $(DESTDIR)$(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
  			$(CHGRP) $(GAMEGRP) $(DAT) ; \
  			chmod $(FILEPERM) $(DAT) )

-@@ -230,26 +230,39 @@ update: $(GAME) recover $(VARDAT) dungeo
- # and a reminder
- 	@echo You may also want to install the man pages via the doc Makefile.
+@@ -258,31 +263,42 @@ update: $(GAME) recover $(VARDAT) dungeo
+ rootcheck:
+ 	@true; $(ROOTCHECK)

--install: $(GAME) recover $(VARDAT) dungeon spec_levs
+-install: rootcheck $(GAME) recover $(VARDAT) dungeon spec_levs
 +install-dat: recover $(VARDAT) dungeon spec_levs
+ 	true; $(PREINSTALL)
  # set up the directories
  # not all mkdirs have -p; those that don't will create a -p directory
--	-mkdir -p $(SHELLDIR)
--	-rm -rf $(GAMEDIR) $(VARDIR)
--	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+-	-if test -n '$(SHELLDIR)'; then \
+-		mkdir -p $(SHELLDIR); fi
+-	rm -rf $(INSTDIR) $(VARDIR)
+-	-mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save
+-	if test -d ./-p; then rmdir ./-p; fi
+-	-$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save
+-	$(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save
 +	-mkdir -p $(DESTDIR)$(SHELLDIR)
 +	-mkdir -p $(DESTDIR)$(GAMEDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
- 	-rmdir ./-p
--	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
--	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
--	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
-+	-$(CHOWN) $(GAMEUID) $(DESTDIR)$(GAMEDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
-+	$(CHGRP) $(DESTDIR)$(GAMEGRP) $(DESTDIR)$(GAMEDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
-+	chmod $(DIRPERM) $(DESTDIR)$(GAMEDIR) $(DESTDIR)$(VARDIR)
-+	chmod 770 $(DESTDIR)$(VARDIR)/save
++	-$(CHOWN) $(GAMEUID) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
++	-$(CHGRP) $(GAMEGRP) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
+ # order counts here:
+-	chmod $(DIRPERM) $(INSTDIR)
+-	chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save
++#	chmod $(DIRPERM) $(INSTDIR)
++	chmod $(VARDIRPERM) $(DESTDIR)$(VARDIR) $(DESTDIR)$(VARDIR)/save
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
--	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
--	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
-+	touch $(DESTDIR)$(VARDIR)/perm $(DESTDIR)$(VARDIR)/record $(DESTDIR)$(VARDIR)/logfile
-+	-( cd $(DESTDIR)$(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
- 			$(CHGRP) $(GAMEGRP) perm record logfile ; \
--			chmod $(FILEPERM) perm record logfile )
-+			chmod $(VARFILEPERM) perm record logfile )
+-	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile
+-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile ; \
++	touch $(DESTDIR)$(VARDIR)/perm $(DESTDIR)$(VARDIR)/record $(DESTDIR)$(VARDIR)/logfile $(DESTDIR)$(VARDIR)/xlogfile
++	-( cd $(DESTDIR)$(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile ; \
+ 			$(CHGRP) $(GAMEGRP) perm record logfile xlogfile ; \
+ 			chmod $(VARFILEPERM) perm record logfile xlogfile )
 +	-touch -c $(DESTDIR)$(VARDIR)/bones* $(DESTDIR)$(VARDIR)/?lock* $(DESTDIR)$(VARDIR)/wizard*
 +	-touch -c $(DESTDIR)$(VARDIR)/save/*
 +	-mkdir -p $(DESTDIR)$(PREFIX)/share/doc/nethack
 +	cp doc/Guidebook $(DESTDIR)$(PREFIX)/share/doc/nethack
-+	$(CHOWN) $(GAMEUID):$(GAMEGRP) $(DESTDIR)$(PREFIX)/share/doc/nethack/Guidebook
++	-$(CHOWN) $(GAMEUID):$(GAMEGRP) $(DESTDIR)$(PREFIX)/share/doc/nethack/Guidebook
 +	chmod $(FILEPERM) $(DESTDIR)$(PREFIX)/share/doc/nethack/Guidebook
+ 	true; $(POSTINSTALL)
  # and a reminder
  	@echo You may also want to reinstall the man pages via the doc Makefile.

@@ -237,6 +252,7 @@
 +	-( cd $(DESTDIR)$(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DESTDIR)$(SHELLDIR)/$(GAME)$(GTYPE) ; \
 +		$(CHGRP) $(GAMEGRP) $(DESTDIR)$(SHELLDIR)/$(GAME)$(GTYPE) )
 +	 #chmod $(GAMEPERM) $(DESTDIR)$(SHELLDIR)/$(GAME)$(GTYPE)
++

  # 'make clean' removes all the .o files, but leaves around all the executables
  # and compiled data files
Index: games/nethack-lib/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-ac,v
retrieving revision 1.10
diff -u -r1.10 patch-ac
--- games/nethack-lib/patches/patch-ac	1 Jun 2011 11:20:29 -0000	1.10
+++ games/nethack-lib/patches/patch-ac	10 Jun 2016 19:37:59 -0000
@@ -2,45 +2,46 @@

 Fix for NetBSD.

---- include/system.h.orig	2003-12-07 15:39:13.000000000 -0800
+--- include/system.h.orig	2015-12-07 08:26:01.000000000 +0000
 +++ include/system.h
-@@ -79,10 +79,10 @@ typedef long	off_t;
- # if !defined(__SC__) && !defined(LINUX)
- E  long NDECL(random);
- # endif
--# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
-+# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)) || defined(RANDOM)
+@@ -81,11 +81,11 @@ typedef long off_t;
+ #if !defined(__SC__) && !defined(LINUX)
+ E long NDECL(random);
+ #endif
+-#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) \
++#if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)) \
+     || defined(RANDOM)
  E void FDECL(srandom, (unsigned int));
- # else
--#  if !defined(bsdi) && !defined(__FreeBSD__)
+ #else
+-#if !defined(bsdi) && !defined(__FreeBSD__)
 +#  if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
  E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
-@@ -132,7 +132,7 @@ E void FDECL(perror, (const char *));
- E void FDECL(qsort, (genericptr_t,size_t,size_t,
- 		     int(*)(const genericptr,const genericptr)));
+ #endif
+ #endif
+@@ -135,7 +135,7 @@ E void FDECL(perror, (const char *));
+ E void FDECL(qsort, (genericptr_t, size_t, size_t,
+                      int (*)(const genericptr, const genericptr)));
  #else
--# if defined(BSD) || defined(ULTRIX)
+-#if defined(BSD) || defined(ULTRIX)
 +# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__)
- E  int qsort();
- # else
- #  if !defined(LATTICE) && !defined(AZTEC_50)
-@@ -421,7 +421,7 @@ E size_t FDECL(strlen, (const char *));
- # ifdef HPUX
- E unsigned int	FDECL(strlen, (char *));
- #  else
--#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
+ E int qsort();
+ #else
+ #if !defined(LATTICE) && !defined(AZTEC_50)
+@@ -427,7 +427,7 @@ E size_t FDECL(strlen, (const char *));
+ #ifdef HPUX
+ E unsigned int FDECL(strlen, (char *));
+ #else
+-#if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
 +#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__)
- E int	FDECL(strlen, (const char *));
- #   endif
- #  endif /* HPUX */
-@@ -521,7 +521,7 @@ E struct tm *FDECL(localtime, (const tim
- #  endif
- # endif
+ E int FDECL(strlen, (const char *));
+ #endif
+ #endif /* HPUX */
+@@ -529,7 +529,7 @@ E struct tm *FDECL(localtime, (const tim

--# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE))
-+# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__)
+ #if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES))          \
+     || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) \
+-    || (defined(HPUX) && defined(_POSIX_SOURCE))
++    || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__)
  E time_t FDECL(time, (time_t *));
- # else
+ #else
  E long FDECL(time, (time_t *));
Index: games/nethack-lib/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-ad,v
retrieving revision 1.8
diff -u -r1.8 patch-ad
--- games/nethack-lib/patches/patch-ad	1 Jun 2011 11:20:29 -0000	1.8
+++ games/nethack-lib/patches/patch-ad	10 Jun 2016 19:37:59 -0000
@@ -2,11 +2,11 @@

 Make configurable.

---- sys/unix/nethack.sh.orig	2003-12-07 23:39:13.000000000 +0000
+--- sys/unix/nethack.sh.orig	2015-06-12 06:32:45.000000000 +0000
 +++ sys/unix/nethack.sh
 @@ -1,9 +1,31 @@
  #!/bin/sh
- #	SCCS Id: @(#)nethack.sh	3.4	1990/02/26
+ # NetHack 3.6  nethack.sh	$NHDT-Date: 1432512789 2015/05/25 00:13:09 $  $NHDT-Branch: master $:$NHDT-Revision: 1.17 $

 -HACKDIR=/usr/games/lib/nethackdir
 +UILIST="tty x11 qt" 
@@ -35,6 +35,6 @@
  export HACKDIR
 -HACK=$HACKDIR/nethack
 +HACK=@PREFIX@/bin/nethack-$TTY
+ # NB: MAXNROFPLAYERS is deprecated in favor of MAXPLAYERS in SYSCF.
  MAXNROFPLAYERS=4

- # Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH
Index: games/nethack-lib/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-ae,v
retrieving revision 1.6
diff -u -r1.6 patch-ae
--- games/nethack-lib/patches/patch-ae	1 Jun 2011 11:20:29 -0000	1.6
+++ games/nethack-lib/patches/patch-ae	10 Jun 2016 19:37:59 -0000
@@ -2,9 +2,9 @@

 Make configurable.

---- sys/unix/Makefile.doc.orig	2003-12-07 23:39:13.000000000 +0000
+--- sys/unix/Makefile.doc.orig	2015-06-12 06:32:45.000000000 +0000
 +++ sys/unix/Makefile.doc
-@@ -41,7 +41,7 @@ Guidebook.dvi:	Guidebook.tex
+@@ -58,7 +58,7 @@ Guidebook.dvi:	Guidebook.tex


  GAME	= nethack
@@ -13,8 +13,8 @@
  MANEXT	= 6

  # manual installation for most BSD-style systems
-@@ -58,11 +58,11 @@ DLBMANCREATE = cp dlb.6
- # DLBMANCREATE = nroff -man dlb.6 >
+@@ -77,12 +77,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP)
+ # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >

  manpages:
 -	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
@@ -22,11 +22,13 @@
 -	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
 -	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
 -	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
+-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
 +	-$(GAMEMANCREATE) $(DESTDIR)$(MANDIR)/$(GAME).$(MANEXT)
 +	-$(LEVMANCREATE) $(DESTDIR)$(MANDIR)/lev_comp.$(MANEXT)
 +	-$(DGNMANCREATE) $(DESTDIR)$(MANDIR)/dgn_comp.$(MANEXT)
 +	-$(RCVRMANCREATE) $(DESTDIR)$(MANDIR)/recover.$(MANEXT)
 +	-$(DLBMANCREATE) $(DESTDIR)$(MANDIR)/dlb.$(MANEXT)
++	-$(MDMANCREATE) $(DESTDIR)$(MANDIR)/makedefs.$(MANEXT)

  # manual creation for distribution
- DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt \
Index: games/nethack-lib/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-af,v
retrieving revision 1.7
diff -u -r1.7 patch-af
--- games/nethack-lib/patches/patch-af	1 Jun 2011 11:20:29 -0000	1.7
+++ games/nethack-lib/patches/patch-af	10 Jun 2016 19:37:59 -0000
@@ -3,65 +3,64 @@
 Make configurable.
 Fix for BSD.

---- include/unixconf.h.orig	2003-12-07 23:39:13.000000000 +0000
+--- include/unixconf.h.orig	2015-11-17 10:54:25.000000000 +0000
 +++ include/unixconf.h
-@@ -19,20 +19,21 @@
+@@ -19,19 +19,20 @@
   */

  /* define exactly one of the following four choices */
--/* #define BSD 1 */	/* define for 4.n/Free/Open/Net BSD  */
 +#define __NETHACK_OS__ 1
-+/* #define BSD */	/* define for 4.n/Free/Open/Net BSD  */
- 			/* also for relatives like SunOS 4.x, DG/UX, and */
- 			/* older versions of Linux */
- /* #define ULTRIX */	/* define for Ultrix v3.0 or higher (but not lower) */
- 			/* Use BSD for < v3.0 */
- 			/* "ULTRIX" not to be confused with "ultrix" */
--#define SYSV		/* define for System V, Solaris 2.x, newer versions */
-+/* #define SYSV	*/	/* define for System V, Solaris 2.x, newer versions */
- 			/* of Linux */
- /* #define HPUX */	/* Hewlett-Packard's Unix, version 6.5 or higher */
- 			/* use SYSV for < v6.5 */
- 
+ /* #define BSD 1 */  /* define for 4.n/Free/Open/Net BSD  */
+                      /* also for relatives like SunOS 4.x, DG/UX, and */
+                      /* older versions of Linux */
+ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
+                      /* Use BSD for < v3.0 */
+                      /* "ULTRIX" not to be confused with "ultrix" */
+-#define SYSV         /* define for System V, Solaris 2.x, newer versions */
++/* #define SYSV      /* define for System V, Solaris 2.x, newer versions */
+                      /* of Linux */
+ /* #define HPUX */   /* Hewlett-Packard's Unix, version 6.5 or higher */
+                      /* use SYSV for < v6.5 */

  /* define any of the following that are appropriate */
--#define SVR4		/* use in addition to SYSV for System V Release 4 */
-+/* #define SVR4	*/	/* use in addition to SYSV for System V Release 4 */
- 			/* including Solaris 2+ */
- #define NETWORK		/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
-@@ -47,7 +48,7 @@
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
- 
--#define TERMINFO	/* uses terminfo rather than termcap */
-+/* #define TERMINFO	/* uses terminfo rather than termcap */
- 			/* Should be defined for most SYSV, SVR4 (including
- 			 * Solaris 2+), HPUX, and Linux systems.  In
- 			 * particular, it should NOT be defined for the UNIXPC
-@@ -103,6 +104,7 @@
+-#define SVR4           /* use in addition to SYSV for System V Release 4 */
++/* #define SVR4        /* use in addition to SYSV for System V Release 4 */
+                        /* including Solaris 2+ */
+ #define NETWORK        /* if running on a networked system */
+                        /* e.g. Suns sharing a playground through NFS */
+@@ -46,7 +47,7 @@
+                         * job control (note that AIX is SYSV otherwise)
+                         * Also define this for AIX 3.2 */
+ 
+-#define TERMINFO       /* uses terminfo rather than termcap */
++/* #define TERMINFO    /* uses terminfo rather than termcap */
+                        /* Should be defined for most SYSV, SVR4 (including
+                         * Solaris 2+), HPUX, and Linux systems.  In
+                         * particular, it should NOT be defined for the UNIXPC
+@@ -101,7 +102,7 @@
+  * If you want the static parts of your playground on a read-only file
   * system, define VAR_PLAYGROUND to be where the variable parts are kept.
   */
- /* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
-+#define VAR_PLAYGROUND "/var/games/nethack340"
- 
+-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
++ #define VAR_PLAYGROUND "/var/games/nethack360"

  /*
-@@ -171,7 +173,7 @@
- #  ifdef AMS
- #define AMS_MAILBOX	"/Mailbox"
- #  else
--#   if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#   if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define DEF_MAILREADER	"/usr/bin/mail"
- #   else
- #define DEF_MAILREADER	"/usr/ucb/Mail"
-@@ -284,7 +286,7 @@
+  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
+@@ -166,7 +167,7 @@
+ #ifdef AMS
+ #define AMS_MAILBOX "/Mailbox"
+ #else
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #define DEF_MAILREADER "/usr/bin/mail"
+ #else
+ #define DEF_MAILREADER "/usr/ucb/Mail"
+@@ -297,7 +298,7 @@
  #endif

  #if defined(BSD) || defined(ULTRIX)
--# if !defined(DGUX) && !defined(SUNOS4)
-+# if !defined(DGUX) && !defined(SUNOS4) && !defined(BSD)
- #define memcpy(d, s, n)		bcopy(s, d, n)
- #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
- # endif
+-#if !defined(DGUX) && !defined(SUNOS4)
++#if !defined(DGUX) && !defined(SUNOS4) && !defined(BSD)
+ #define memcpy(d, s, n) bcopy(s, d, n)
+ #define memcmp(s1, s2, n) bcmp(s2, s1, n)
+ #endif
Index: games/nethack-lib/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-ag,v
retrieving revision 1.3
diff -u -r1.3 patch-ag
--- games/nethack-lib/patches/patch-ag	1 Jun 2011 11:20:29 -0000	1.3
+++ games/nethack-lib/patches/patch-ag	10 Jun 2016 19:37:59 -0000
@@ -2,14 +2,14 @@

 Fix for NetBSD.

---- src/mail.c.orig	Wed Aug  9 21:02:04 2000
-+++ src/mail.c	Thu Aug 10 18:32:30 2000
-@@ -71,7 +71,7 @@
- # if !defined(MAILPATH) && (defined(LINUX) || defined(__osf__))
- #  define MAILPATH "/var/spool/mail/"
- # endif
--# if !defined(MAILPATH) && defined(__FreeBSD__)
-+# if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(__NetBSD__))
- #  define MAILPATH "/var/mail/"
- # endif
- # if !defined(MAILPATH) && (defined(BSD) || defined(ULTRIX))
+--- src/mail.c.orig	2015-10-17 19:42:25.000000000 +0000
++++ src/mail.c
+@@ -67,7 +67,7 @@ static long laststattime;
+ #if !defined(MAILPATH) && (defined(LINUX) || defined(__osf__))
+ #define MAILPATH "/var/spool/mail/"
+ #endif
+-#if !defined(MAILPATH) && defined(__FreeBSD__)
++#if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(__NetBSD__))
+ #define MAILPATH "/var/mail/"
+ #endif
+ #if !defined(MAILPATH) && (defined(BSD) || defined(ULTRIX))
Index: games/nethack-lib/patches/patch-sys_unix_Makefile.src
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src,v
retrieving revision 1.1
diff -u -r1.1 patch-sys_unix_Makefile.src
--- games/nethack-lib/patches/patch-sys_unix_Makefile.src	1 Jun 2011 11:20:29 -0000	1.1
+++ games/nethack-lib/patches/patch-sys_unix_Makefile.src	10 Jun 2016 19:38:00 -0000
@@ -2,24 +2,27 @@

 Make configurable.

---- sys/unix/Makefile.src.orig	2003-12-07 23:39:13.000000000 +0000
+--- sys/unix/Makefile.src.orig	2015-11-12 07:51:56.000000000 +0000
 +++ sys/unix/Makefile.src
-@@ -36,7 +36,11 @@ SHELL=/bin/sh
+@@ -39,7 +39,10 @@ SHELL=/bin/sh
  # SHELL=E:/GEMINI2/MUPFEL.TTP

- # Normally, the C compiler driver is used for linking:
+ # Usually, the C compiler driver is used for linking:
+-#LINK=$(CC)
++LINK=$(CC)
 +.if "${GTYPE}" == "-qt"
 +LINK=$(CXX)
-+.else
- LINK=$(CC)
 +.endif

  # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating
  # system.
-@@ -154,12 +158,24 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
- CFLAGS = -O -I../include
- LFLAGS = 
+@@ -157,11 +160,27 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
+ #CFLAGS = -O -I../include
+ #LFLAGS = 

++CFLAGS = -O -I../include
++LFLAGS = -L${PREFIX}/lib
++
 +.if "${GTYPE}" == "-x11" || "${GTYPE}" == "-qt"
 +CFLAGS += -I${X11BASE}/include
 +LFLAGS += ${LDFLAGS}
@@ -38,15 +41,17 @@
  # the C++ libraries linked in.
  CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
 -CXX=g++
--#LINK=g++
 +#CXX=g++
+ #LINK=g++
  #	For cross-compiling, eg. with gcc on Linux (see also CC further up):
  #CXX=arm-linux-g++
- #LINK=arm-linux-gcc
-@@ -217,6 +233,15 @@ WINBEOBJ =
- WINSRC = $(WINTTYSRC)
- WINOBJ = $(WINTTYOBJ)
+@@ -225,6 +244,18 @@ WINBEOBJ =
+ #WINSRC = $(WINTTYSRC)
+ #WINOBJ = $(WINTTYOBJ)

++WINSRC = $(WINTTYSRC)
++WINOBJ = $(WINTTYOBJ)
++
 +.if "${GTYPE}" == "-tty"
 +.elif "${GTYPE}" == "-x11"
 +WINSRC += $(WINX11SRC)
@@ -59,7 +64,7 @@
  # on some systems the termcap library is in -ltermcap or -lcurses
  # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
  # Sysatt uses shared library in lieu of this option
-@@ -235,13 +260,13 @@ WINTTYLIB = -ltermlib
+@@ -243,13 +274,13 @@ WINBEOBJ =
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
@@ -75,10 +80,12 @@
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -257,6 +282,13 @@ WINBELIB = -lbe
+@@ -265,6 +296,15 @@ WINBELIB = -lbe

- WINLIB = $(WINTTYLIB)
+ #WINLIB = $(WINTTYLIB)

++WINLIB = $(WINTTYLIB)
++
 +.if "${GTYPE}" == "-tty"
 +.elif "${GTYPE}" == "-x11"
 +WINLIB += $(WINX11LIB)
Index: games/nethack-lib/patches/patch-sys_unix_Makefile.utl
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl,v
retrieving revision 1.1
diff -u -r1.1 patch-sys_unix_Makefile.utl
--- games/nethack-lib/patches/patch-sys_unix_Makefile.utl	1 Jun 2011 11:20:29 -0000	1.1
+++ games/nethack-lib/patches/patch-sys_unix_Makefile.utl	10 Jun 2016 19:38:00 -0000
@@ -2,12 +2,15 @@

 Make configurable.

---- sys/unix/Makefile.utl.orig	2011-05-27 15:13:59.000000000 +0000
+--- sys/unix/Makefile.utl.orig	2015-12-07 08:26:01.000000000 +0000
 +++ sys/unix/Makefile.utl
-@@ -94,6 +94,14 @@ LFLAGS =
+@@ -95,8 +95,17 @@ NHSROOT=..
+ #CFLAGS = -O -I../include
+ #LFLAGS =

++CFLAGS = -O -I../include
  LIBS =
-  
+ 
 +.if "${GTYPE}" == "-tty"
 +CFLAGS += -DGTYPE_TTY
 +.elif "${GTYPE}" == "-x11"
Index: games/nethack-lib/patches/patch-util_makedefs.c
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-lib/patches/patch-util_makedefs.c,v
retrieving revision 1.1
diff -u -r1.1 patch-util_makedefs.c
--- games/nethack-lib/patches/patch-util_makedefs.c	16 Dec 2012 20:34:08 -0000	1.1
+++ games/nethack-lib/patches/patch-util_makedefs.c	10 Jun 2016 19:38:00 -0000
@@ -1,39 +1,23 @@
 $NetBSD: patch-util_makedefs.c,v 1.1 2012/12/16 20:34:08 dholland Exp $

+Only use time_t.
+
+Original patch reason:
+
 Remove illegal casts, avoiding undefined behavior and resulting
 SIGSEGV during build.

---- util/makedefs.c~	2003-12-07 23:39:13.000000000 +0000
+--- util/makedefs.c.orig	2015-11-09 10:13:10.000000000 +0000
 +++ util/makedefs.c
-@@ -543,7 +543,7 @@ const char *build_date;
+@@ -1217,11 +1217,7 @@ const char *build_date;
  void
  do_date()
  {
--	long clocktim = 0;
-+	time_t clocktim = 0;
- 	char *c, cbuf[60], buf[BUFSZ];
- 	const char *ul_sfx;
- 
-@@ -559,13 +559,8 @@ do_date()
- 	Fprintf(ofp,"/*\tSCCS Id: @(#)date.h\t3.4\t2002/02/03 */\n\n");
- 	Fprintf(ofp,Dont_Edit_Code);
- 
 -#ifdef KR1ED
- 	(void) time(&clocktim);
- 	Strcpy(cbuf, ctime(&clocktim));
+-    long clocktim = 0;
 -#else
--	(void) time((time_t *)&clocktim);
--	Strcpy(cbuf, ctime((time_t *)&clocktim));
+     time_t clocktim = 0;
 -#endif
- 	for (c = cbuf; *c; c++) if (*c == '\n') break;
- 	*c = '\0';	/* strip off the '\n' */
- 	Fprintf(ofp,"#define BUILD_DATE \"%s\"\n", cbuf);
-@@ -595,7 +590,7 @@ do_date()
- 	Fprintf(ofp,"\n");
- #ifdef AMIGA
- 	{
--	struct tm *tm = localtime((time_t *) &clocktim);
-+	struct tm *tm = localtime(&clocktim);
- 	Fprintf(ofp,"#define AMIGA_VERSION_STRING ");
- 	Fprintf(ofp,"\"\\0$VER: NetHack %d.%d.%d (%d.%d.%d)\"\n",
- 		VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
+     char *c, cbuf[60], buf[BUFSZ];
+     const char *ul_sfx;
+ 
Index: games/nethack-tty/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-tty/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- games/nethack-tty/Makefile	1 Jun 2011 11:20:30 -0000	1.20
+++ games/nethack-tty/Makefile	10 Jun 2016 19:38:00 -0000
@@ -4,7 +4,6 @@
 .include "../../games/nethack-lib/Makefile.common"

 PKGNAME=		nethack-tty-${NETHACK_VERSION}
-PKGREVISION=		2

 COMMENT=		The tty/console based version of NetHack

Index: games/nethack-x11/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-x11/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- games/nethack-x11/Makefile	1 Jun 2014 16:52:08 -0000	1.39
+++ games/nethack-x11/Makefile	10 Jun 2016 19:38:00 -0000
@@ -3,7 +3,6 @@
 .include "../../games/nethack-lib/Makefile.common"

 PKGNAME=		nethack-x11-${NETHACK_VERSION}
-PKGREVISION=		5
 COMMENT=		The X11+tty version of NetHack

 CATEGORIES+=		x11
Index: games/nethack-x11/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/nethack-x11/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- games/nethack-x11/PLIST	1 Jun 2014 16:52:08 -0000	1.5
+++ games/nethack-x11/PLIST	10 Jun 2016 19:38:00 -0000
@@ -3,5 +3,5 @@
 lib/X11/app-defaults/NetHack
 share/fonts/X11/misc/ibm.bdf
 share/fonts/X11/misc/nh10.bdf
-share/nethackdir340/nethack.x11.rc
-share/nethackdir340/x11tiles
+share/nethackdir360/nethack.x11.rc
+share/nethackdir360/x11tiles

>Release-Note:

>Audit-Trail:

Responsible-Changed-From-To: pkg-manager->pooka
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Fri, 10 Jun 2016 23:32:22 +0000
Responsible-Changed-Why:
Over to the master of ascension.


From: Antti Kantee <pooka@iki.fi>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: re: pkg/51232
Date: Sat, 11 Jun 2016 16:42:37 +0000

 I was planning to move to the new build system.  It seems much better. 
 Probably need to move to it anyway when the next version of nethack is 
 released in 2028.  But, I guess if the old one still works, this PR 
 should be merged.

Responsible-Changed-From-To: pooka->pkg-manager
Responsible-Changed-By: dholland@NetBSD.org
Responsible-Changed-When: Tue, 27 Mar 2018 09:10:13 +0000
Responsible-Changed-Why:
pooka resigned; someone please merge this


Responsible-Changed-From-To: pkg-manager->bsiegert
Responsible-Changed-By: bsiegert@NetBSD.org
Responsible-Changed-When: Wed, 28 Mar 2018 13:52:53 +0000
Responsible-Changed-Why:
I'll commit this once the freeze ends.


From: Yorick Hardy <yorickhardy@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: bsiegert@NetBSD.org, pkg-manager@netbsd.org, pkgsrc-bugs@netbsd.org,
	gnats-admin@netbsd.org
Subject: Re: pkg/51232 (update games/nethack-{lib,tty,x11} to nethack-3.6.0)
Date: Mon, 2 Apr 2018 21:41:41 +0200

 pooka requested that I redo the update using the new nethack makefile
 system, but I did not get around to it yet!

 Is it better to do the update as is and change over to the new system
 later? Or should I try to put something together over the next two weeks?

 -- 
 Kind regards,

 Yorick Hardy

From: Benny Siegert <bsiegert@netbsd.org>
To: yorickhardy@gmail.com
Cc: gnats-bugs@netbsd.org, pkg-manager@netbsd.org, pkgsrc-bugs@netbsd.org, 
	gnats-admin@netbsd.org
Subject: Re: pkg/51232 (update games/nethack-{lib,tty,x11} to nethack-3.6.0)
Date: Tue, 03 Apr 2018 13:01:20 +0000

 On Mon, Apr 2, 2018 at 9:42 PM Yorick Hardy <yorickhardy@gmail.com> wrote:

 > pooka requested that I redo the update using the new nethack makefile
 > system, but I did not get around to it yet!

 > Is it better to do the update as is and change over to the new system
 > later? Or should I try to put something together over the next two weeks?

 Personally, I think it is not a big deal to commit the current state and do
 the overhaul after that.

 -- 
 Benny

From: David Holland <dholland-pbugs@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/51232 (update games/nethack-{lib,tty,x11} to nethack-3.6.0)
Date: Tue, 10 Apr 2018 14:50:48 +0000

 On Mon, Apr 02, 2018 at 07:45:01PM +0000, Yorick Hardy wrote:
  >  pooka requested that I redo the update using the new nethack makefile
  >  system, but I did not get around to it yet!
  >  
  >  Is it better to do the update as is and change over to the new system
  >  later? Or should I try to put something together over the next two weeks?

 Commit early and often...

 -- 
 David A. Holland
 dholland@netbsd.org

From: Yorick Hardy <yorickhardy@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: pkg/51232
Date: Thu, 24 Oct 2019 21:42:15 +0200

 I think this bug can be closed, pho@ has done the update (thanks!):

  cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/nethack/Makefile

 and I have briefly tested it here.

 (I can close the PR if there is no objection - I need the practice.)

 -- 
 Kind regards,

 Yorick Hardy

State-Changed-From-To: open->closed
State-Changed-By: yhardy@NetBSD.org
State-Changed-When: Fri, 25 Oct 2019 19:54:00 +0000
State-Changed-Why:
Package was updated by pho@ in revisions
 1.28 pkgsrc/games/nethack/Makefile
 1.40 pkgsrc/games/nethack-x11/Makefile
 1.21 pkgsrc/games/nethack-tty/Makefile
 1.32 pkgsrc/games/nethack-lib/Makefile
 1.36 pkgsrc/games/nethack-lib/Makefile.common
and some additional related changes.


From: Benny Siegert <bsiegert@netbsd.org>
To: gnats-bugs@netbsd.org
Cc: gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org, yorickhardy@gmail.com
Subject: Re: pkg/51232
Date: Tue, 3 Dec 2019 13:53:21 +0100

 >  (I can close the PR if there is no objection - I need the practice.)

 No objection, please do.

>Unformatted:
NetBSD Home
NetBSD PR Database Search
(Contact us) $NetBSD: query-full-pr,v 1.45 2018/12/21 14:23:33 maya Exp $
$NetBSD: gnats_config.sh,v 1.9 2014/08/02 14:16:04 spz Exp $
Copyright © 1994-2017 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.