CVS commit: pkgsrc/games/nethack-lib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/nethack-lib
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Thu, 24 Oct 2019 11:51:23 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Oct 24 11:51:23 UTC 2019

Modified Files:
        pkgsrc/games/nethack-lib: Makefile Makefile.common PLIST distinfo
        pkgsrc/games/nethack-lib/patches: patch-include_system.h
            patch-sys_unix_Makefile.src patch-sys_unix_Makefile.utl
Added Files:
        pkgsrc/games/nethack-lib/patches: patch-include_config.h
            patch-include_unixconf.h patch-src_mail.c
            patch-sys_unix_Makefile.doc patch-sys_unix_Makefile.top
            patch-sys_unix_nethack.sh
Removed Files:
        pkgsrc/games/nethack-lib/patches: patch-aa patch-ab patch-ad patch-ae
            patch-af patch-ag patch-util_makedefs.c

Log Message:
Update to NetHack 3.6.2

See release notes for the changes from 3.4.3:
* http://nethack.org/v360/release.html
* http://nethack.org/v361/release.html
* http://nethack.org/v362/release.html

IMPORTANT NOTICE:
  Old 3.4.x save files are *incompatible* with this version (which
  isn't my fault). Files are now saved in /var/games/nethack360.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/games/nethack-lib/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/nethack-lib/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/nethack-lib/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/games/nethack-lib/distinfo
cvs rdiff -u -r1.10 -r0 pkgsrc/games/nethack-lib/patches/patch-aa
cvs rdiff -u -r1.12 -r0 pkgsrc/games/nethack-lib/patches/patch-ab
cvs rdiff -u -r1.8 -r0 pkgsrc/games/nethack-lib/patches/patch-ad
cvs rdiff -u -r1.6 -r0 pkgsrc/games/nethack-lib/patches/patch-ae
cvs rdiff -u -r1.7 -r0 pkgsrc/games/nethack-lib/patches/patch-af
cvs rdiff -u -r1.3 -r0 pkgsrc/games/nethack-lib/patches/patch-ag
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/nethack-lib/patches/patch-include_config.h \
    pkgsrc/games/nethack-lib/patches/patch-include_unixconf.h \
    pkgsrc/games/nethack-lib/patches/patch-src_mail.c \
    pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.doc \
    pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.top \
    pkgsrc/games/nethack-lib/patches/patch-sys_unix_nethack.sh
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/games/nethack-lib/patches/patch-include_system.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src \
    pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl
cvs rdiff -u -r1.1 -r0 pkgsrc/games/nethack-lib/patches/patch-util_makedefs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/nethack-lib/Makefile
diff -u pkgsrc/games/nethack-lib/Makefile:1.31 pkgsrc/games/nethack-lib/Makefile:1.32
--- pkgsrc/games/nethack-lib/Makefile:1.31      Mon Dec 25 22:22:11 2017
+++ pkgsrc/games/nethack-lib/Makefile   Thu Oct 24 11:51:23 2019
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.31 2017/12/25 22:22:11 he Exp $
+# $NetBSD: Makefile,v 1.32 2019/10/24 11:51:23 pho Exp $
 #
 
 .include               "../../games/nethack-lib/Makefile.common"
 
 PKGNAME=               nethack-lib-${NETHACK_VERSION}
-PKGREVISION=           5
 
 COMMENT=               Data files for Nethack
 
 HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ./sys/unix/setup.sh
-BUILD_TARGET=          datastuff
-INSTALL_TARGET=                manpages install-dat
-INSTALLATION_DIRS=     ${PKGMANDIR}/man6
+INSTALL_TARGET=                manpages dofiles
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man6 ${HACKDIR} share/doc/nethack
 
 # Using 'nroff -Tascii' works better with groff and we don't want to use col
 # on linux as it removes the escape the the ansi color sequences.
@@ -34,6 +32,9 @@ CONF_FILES_PERMS+=    /dev/null ${VARDIR}/p
                        ${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
+CONF_FILES+=           /dev/null ${HACKDIR}/sysconf
 
 REQD_DIRS_PERMS+=      ${VARDIR}                                       \
                        ${NETHACK_USER} ${NETHACK_GROUP} 775
@@ -42,6 +43,8 @@ REQD_DIRS_PERMS+=     ${VARDIR}/save                                  \
 
 CHECK_FILES_SKIP+=     ${VARDIR}/logfile                               \
                        ${VARDIR}/perm                                  \
-                       ${VARDIR}/record
+                       ${VARDIR}/record                                \
+                       ${VARDIR}/xlogfile                              \
+                       ${HACKDIR}/sysconf
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/nethack-lib/Makefile.common
diff -u pkgsrc/games/nethack-lib/Makefile.common:1.35 pkgsrc/games/nethack-lib/Makefile.common:1.36
--- pkgsrc/games/nethack-lib/Makefile.common:1.35       Mon Apr  2 09:44:52 2018
+++ pkgsrc/games/nethack-lib/Makefile.common    Thu Oct 24 11:51:23 2019
@@ -1,14 +1,23 @@
-# $NetBSD: Makefile.common,v 1.35 2018/04/02 09:44:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2019/10/24 11:51:23 pho Exp $
 #
 # used by games/nethack/Makefile
 # used by games/nethack-lib/Makefile
 # used by games/nethack-x11/Makefile
 # used by games/nethack-tty/Makefile
+#
+# System-provided variables:
+#
+# GAMEPERM
+#      The desired owner and the file mode of game executables.
+#
 
-NETHACK_BASEVER=       3.4.3
+NETHACK_BASEVER=       3.6.2
 NETHACK_VERSION=       ${NETHACK_BASEVER}
 NETHACK_DISTVER=       ${NETHACK_BASEVER:S/.//g}
-NETHACK_DIR=           nethackdir340
+NETHACK_DIR=           nethackdir${NETHACK_SAVEVER:S/.//g}
+
+# The last compatible version of save files.
+NETHACK_SAVEVER=       3.6.0
 
 DISTNAME=              nethack-${NETHACK_DISTVER}-src
 CATEGORIES=            games
@@ -31,12 +40,6 @@ USE_TOOLS+=          gzip yacc lex awk
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 
-SUBST_CLASSES+=                ttylib
-SUBST_MESSAGE.ttylib=  Configuring to use correct termcap library
-SUBST_STAGE.ttylib=    pre-configure
-SUBST_FILES.ttylib=    sys/unix/Makefile.src
-SUBST_SED.ttylib=      -e 's!^WINTTYLIB = -ltermlib!WINTTYLIB = -L${BUILDLINK_PREFIX.termcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.termcap}/lib -l${BUILDLINK_LIBNAME.termcap}!'
-
 OPSYSVARS+=            NETHACK_OS
 NETHACK_OS.Linux=      SYSV
 NETHACK_OS.*=          BSD
@@ -45,12 +48,12 @@ SUBST_CLASSES+=             os
 SUBST_MESSAGE.os=      Configuring for ${NETHACK_OS}
 SUBST_STAGE.os=                pre-configure
 SUBST_FILES.os=                include/unixconf.h
-SUBST_SED.os=          -e 's,__NETHACK_OS__,${NETHACK_OS},'
+SUBST_VARS.os=         VARDIR NETHACK_OS
 
 SUBST_CLASSES+=                configh
 SUBST_STAGE.configh=   pre-configure
 SUBST_FILES.configh=   include/config.h
-SUBST_VARS.configh=    PREFIX
+SUBST_VARS.configh=    HACKDIR
 SUBST_SED.configh=     -e "s|@GZIP_PROGRAM@|${GZIP_CMD:[1]}|g"
 
 USE_GAMESGROUP=                yes
@@ -59,12 +62,26 @@ NETHACK_GROUP=              ${GAMES_GROUP}
 BUILD_DEFS+=           GAMES_USER GAMES_GROUP
 GAMEPERM=              ${NETHACK_USER} ${NETHACK_GROUP} 2555
 
-GAMEDIR=               ${PREFIX}/share/${NETHACK_DIR}
-VARDIR=                        /var/games/nethack340
-MAKE_ENV+=             GAMEDIR=${GAMEDIR}
+BUILD_DEFS+=           VARBASE
+HACKDIR=               ${PREFIX}/share/${NETHACK_DIR}
+VARDIR=                        ${VARBASE}/games/nethack${NETHACK_SAVEVER:S/.//g}
+
+MAKE_ENV+=             HACKDIR=${HACKDIR}
 MAKE_ENV+=             VARDIR=${VARDIR}
+MAKE_ENV+=             INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKE_ENV+=             INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
+
+WINTTYLIB=             -L${BUILDLINK_PREFIX.termcap}/lib \
+                       ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.termcap}/lib \
+                       -l${BUILDLINK_LIBNAME.termcap}
+MAKE_ENV+=             WINTTYLIB=${WINTTYLIB:Q}
 
 pre-configure:
-       @${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
+       ${RUN}${CHMOD} 755 ${WRKSRC}/sys/unix/setup.sh
+
+# Substitute NETHACK_DIR in PLIST.
+PLIST_SUBST+=          NETHACK_DIR=${NETHACK_DIR}
+PRINT_PLIST_AWK+=      { gsub(/${NETHACK_DIR}/, "$${NETHACK_DIR}"); }
 
-.endif # !NO_BUILD
+.endif # !defined(META_PACKAGE)

Index: pkgsrc/games/nethack-lib/PLIST
diff -u pkgsrc/games/nethack-lib/PLIST:1.8 pkgsrc/games/nethack-lib/PLIST:1.9
--- pkgsrc/games/nethack-lib/PLIST:1.8  Wed Jun  1 11:20:29 2011
+++ pkgsrc/games/nethack-lib/PLIST      Thu Oct 24 11:51:23 2019
@@ -1,137 +1,149 @@
-@comment $NetBSD: PLIST,v 1.8 2011/06/01 11:20:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/10/24 11:51:23 pho Exp $
 bin/nethack
 bin/recover
 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/${NETHACK_DIR}/Arc-fila.lev
+share/${NETHACK_DIR}/Arc-filb.lev
+share/${NETHACK_DIR}/Arc-goal.lev
+share/${NETHACK_DIR}/Arc-loca.lev
+share/${NETHACK_DIR}/Arc-strt.lev
+share/${NETHACK_DIR}/Bar-fila.lev
+share/${NETHACK_DIR}/Bar-filb.lev
+share/${NETHACK_DIR}/Bar-goal.lev
+share/${NETHACK_DIR}/Bar-loca.lev
+share/${NETHACK_DIR}/Bar-strt.lev
+share/${NETHACK_DIR}/Cav-fila.lev
+share/${NETHACK_DIR}/Cav-filb.lev
+share/${NETHACK_DIR}/Cav-goal.lev
+share/${NETHACK_DIR}/Cav-loca.lev
+share/${NETHACK_DIR}/Cav-strt.lev
+share/${NETHACK_DIR}/Hea-fila.lev
+share/${NETHACK_DIR}/Hea-filb.lev
+share/${NETHACK_DIR}/Hea-goal.lev
+share/${NETHACK_DIR}/Hea-loca.lev
+share/${NETHACK_DIR}/Hea-strt.lev
+share/${NETHACK_DIR}/Kni-fila.lev
+share/${NETHACK_DIR}/Kni-filb.lev
+share/${NETHACK_DIR}/Kni-goal.lev
+share/${NETHACK_DIR}/Kni-loca.lev
+share/${NETHACK_DIR}/Kni-strt.lev
+share/${NETHACK_DIR}/Mon-fila.lev
+share/${NETHACK_DIR}/Mon-filb.lev
+share/${NETHACK_DIR}/Mon-goal.lev
+share/${NETHACK_DIR}/Mon-loca.lev
+share/${NETHACK_DIR}/Mon-strt.lev
+share/${NETHACK_DIR}/Pri-fila.lev
+share/${NETHACK_DIR}/Pri-filb.lev
+share/${NETHACK_DIR}/Pri-goal.lev
+share/${NETHACK_DIR}/Pri-loca.lev
+share/${NETHACK_DIR}/Pri-strt.lev
+share/${NETHACK_DIR}/Ran-fila.lev
+share/${NETHACK_DIR}/Ran-filb.lev
+share/${NETHACK_DIR}/Ran-goal.lev
+share/${NETHACK_DIR}/Ran-loca.lev
+share/${NETHACK_DIR}/Ran-strt.lev
+share/${NETHACK_DIR}/Rog-fila.lev
+share/${NETHACK_DIR}/Rog-filb.lev
+share/${NETHACK_DIR}/Rog-goal.lev
+share/${NETHACK_DIR}/Rog-loca.lev
+share/${NETHACK_DIR}/Rog-strt.lev
+share/${NETHACK_DIR}/Sam-fila.lev
+share/${NETHACK_DIR}/Sam-filb.lev
+share/${NETHACK_DIR}/Sam-goal.lev
+share/${NETHACK_DIR}/Sam-loca.lev
+share/${NETHACK_DIR}/Sam-strt.lev
+share/${NETHACK_DIR}/Tou-fila.lev
+share/${NETHACK_DIR}/Tou-filb.lev
+share/${NETHACK_DIR}/Tou-goal.lev
+share/${NETHACK_DIR}/Tou-loca.lev
+share/${NETHACK_DIR}/Tou-strt.lev
+share/${NETHACK_DIR}/Val-fila.lev
+share/${NETHACK_DIR}/Val-filb.lev
+share/${NETHACK_DIR}/Val-goal.lev
+share/${NETHACK_DIR}/Val-loca.lev
+share/${NETHACK_DIR}/Val-strt.lev
+share/${NETHACK_DIR}/Wiz-fila.lev
+share/${NETHACK_DIR}/Wiz-filb.lev
+share/${NETHACK_DIR}/Wiz-goal.lev
+share/${NETHACK_DIR}/Wiz-loca.lev
+share/${NETHACK_DIR}/Wiz-strt.lev
+share/${NETHACK_DIR}/air.lev
+share/${NETHACK_DIR}/asmodeus.lev
+share/${NETHACK_DIR}/astral.lev
+share/${NETHACK_DIR}/baalz.lev
+share/${NETHACK_DIR}/bigrm-1.lev
+share/${NETHACK_DIR}/bigrm-10.lev
+share/${NETHACK_DIR}/bigrm-2.lev
+share/${NETHACK_DIR}/bigrm-3.lev
+share/${NETHACK_DIR}/bigrm-4.lev
+share/${NETHACK_DIR}/bigrm-5.lev
+share/${NETHACK_DIR}/bigrm-6.lev
+share/${NETHACK_DIR}/bigrm-7.lev
+share/${NETHACK_DIR}/bigrm-8.lev
+share/${NETHACK_DIR}/bigrm-9.lev
+share/${NETHACK_DIR}/bogusmon
+share/${NETHACK_DIR}/castle.lev
+share/${NETHACK_DIR}/cmdhelp
+share/${NETHACK_DIR}/data
+share/${NETHACK_DIR}/dungeon
+share/${NETHACK_DIR}/earth.lev
+share/${NETHACK_DIR}/engrave
+share/${NETHACK_DIR}/epitaph
+share/${NETHACK_DIR}/fakewiz1.lev
+share/${NETHACK_DIR}/fakewiz2.lev
+share/${NETHACK_DIR}/fire.lev
+share/${NETHACK_DIR}/help
+share/${NETHACK_DIR}/hh
+share/${NETHACK_DIR}/history
+share/${NETHACK_DIR}/juiblex.lev
+share/${NETHACK_DIR}/keyhelp
+share/${NETHACK_DIR}/knox.lev
+share/${NETHACK_DIR}/license
+share/${NETHACK_DIR}/medusa-1.lev
+share/${NETHACK_DIR}/medusa-2.lev
+share/${NETHACK_DIR}/medusa-3.lev
+share/${NETHACK_DIR}/medusa-4.lev
+share/${NETHACK_DIR}/minefill.lev
+share/${NETHACK_DIR}/minend-1.lev
+share/${NETHACK_DIR}/minend-2.lev
+share/${NETHACK_DIR}/minend-3.lev
+share/${NETHACK_DIR}/minetn-1.lev
+share/${NETHACK_DIR}/minetn-2.lev
+share/${NETHACK_DIR}/minetn-3.lev
+share/${NETHACK_DIR}/minetn-4.lev
+share/${NETHACK_DIR}/minetn-5.lev
+share/${NETHACK_DIR}/minetn-6.lev
+share/${NETHACK_DIR}/minetn-7.lev
+share/${NETHACK_DIR}/opthelp
+share/${NETHACK_DIR}/options
+share/${NETHACK_DIR}/oracle.lev
+share/${NETHACK_DIR}/oracles
+share/${NETHACK_DIR}/orcus.lev
+share/${NETHACK_DIR}/quest.dat
+share/${NETHACK_DIR}/rumors
+share/${NETHACK_DIR}/sanctum.lev
+share/${NETHACK_DIR}/soko1-1.lev
+share/${NETHACK_DIR}/soko1-2.lev
+share/${NETHACK_DIR}/soko2-1.lev
+share/${NETHACK_DIR}/soko2-2.lev
+share/${NETHACK_DIR}/soko3-1.lev
+share/${NETHACK_DIR}/soko3-2.lev
+share/${NETHACK_DIR}/soko4-1.lev
+share/${NETHACK_DIR}/soko4-2.lev
+share/${NETHACK_DIR}/symbols
+share/${NETHACK_DIR}/tower1.lev
+share/${NETHACK_DIR}/tower2.lev
+share/${NETHACK_DIR}/tower3.lev
+share/${NETHACK_DIR}/tribute
+share/${NETHACK_DIR}/valley.lev
+share/${NETHACK_DIR}/water.lev
+share/${NETHACK_DIR}/wizard1.lev
+share/${NETHACK_DIR}/wizard2.lev
+share/${NETHACK_DIR}/wizard3.lev
+share/${NETHACK_DIR}/wizhelp

Index: pkgsrc/games/nethack-lib/distinfo
diff -u pkgsrc/games/nethack-lib/distinfo:1.21 pkgsrc/games/nethack-lib/distinfo:1.22
--- pkgsrc/games/nethack-lib/distinfo:1.21      Mon Dec 25 22:22:11 2017
+++ pkgsrc/games/nethack-lib/distinfo   Thu Oct 24 11:51:23 2019
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.21 2017/12/25 22:22:11 he Exp $
+$NetBSD: distinfo,v 1.22 2019/10/24 11:51:23 pho 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-ad) = be56ef8459f3273a0b316bb94e0ae7397a53c37f
-SHA1 (patch-ae) = 8530c1e033f2522e05b699db36d84f77ecf886be
-SHA1 (patch-af) = a567c4c664f135ad24f3f0069ddc29bf5b950b21
-SHA1 (patch-ag) = 5bf322fb92a3cd9df9559e56265f0477d9e92487
+SHA1 (nethack-362-src.tgz) = 8f9b26265afe60c1a25c98abe2d767920df43b31
+RMD160 (nethack-362-src.tgz) = 5728f68dd4f1e7b007ed8dc4b53b6c206710a715
+SHA512 (nethack-362-src.tgz) = e865f21298ffdf67301b5b6ca91f2e762011cc35b55f80603fff014b48f9724d67671168a898abb2171879906a65564d8eb59d272bb5a9f8bf957f074e3c105e
+Size (nethack-362-src.tgz) = 4908750 bytes
 SHA1 (patch-ai) = 73c5b2ea1227531089474705f2f18bc411366365
-SHA1 (patch-include_system.h) = a352695aa31c9459ec5559ec5fb7fef7bfdcb9c8
-SHA1 (patch-sys_unix_Makefile.src) = d2d961ab9aec3d9f88d5b5340530f95181b0a92b
-SHA1 (patch-sys_unix_Makefile.utl) = 3bcec6ffab218370f132b4a850f7b35316487ec6
-SHA1 (patch-util_makedefs.c) = 63faf92a7f511fcf73317789a3008350cdd404d9
+SHA1 (patch-include_config.h) = d3e054a8b30d628513dcb445b10ce586685c7ea6
+SHA1 (patch-include_system.h) = b1b53f513c3f6983e0e56eace74c71875b5df3f2
+SHA1 (patch-include_unixconf.h) = 6846c72526f3bda7fe3eccbce641e5feee14d901
+SHA1 (patch-src_mail.c) = 5b2a67e0b4d0fc9c715573d1bad6bcafa67b469e
+SHA1 (patch-sys_unix_Makefile.doc) = 6219620c50dc7eac6601f87d4a295cb10f02e141
+SHA1 (patch-sys_unix_Makefile.src) = 35eabd1ca5577988e48daf10835dfa335f7e67ac
+SHA1 (patch-sys_unix_Makefile.top) = 0736aafda67dec45657f9f15338ce2f89add9747
+SHA1 (patch-sys_unix_Makefile.utl) = 142f267fdd9a94c212657b7242dea6a3716c738e
+SHA1 (patch-sys_unix_nethack.sh) = eec4b6619584d7e07ac5d9a086af9bc8f7e6285f

Index: pkgsrc/games/nethack-lib/patches/patch-include_system.h
diff -u pkgsrc/games/nethack-lib/patches/patch-include_system.h:1.1 pkgsrc/games/nethack-lib/patches/patch-include_system.h:1.2
--- pkgsrc/games/nethack-lib/patches/patch-include_system.h:1.1 Mon Dec 25 22:22:11 2017
+++ pkgsrc/games/nethack-lib/patches/patch-include_system.h     Thu Oct 24 11:51:23 2019
@@ -1,44 +1,45 @@
-$NetBSD: patch-include_system.h,v 1.1 2017/12/25 22:22:11 he Exp $
+$NetBSD: patch-include_system.h,v 1.2 2019/10/24 11:51:23 pho Exp $
 
 Fix for NetBSD.
 
---- include/system.h.orig      2003-12-07 23:39:13.000000000 +0000
+--- include/system.h.orig      2019-05-08 07:00:15.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)
+@@ -82,11 +82,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__)
-+#  if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
+ #else
+-#if !defined(bsdi) && !defined(__FreeBSD__)
++#if !defined(bsdi) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !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
+@@ -141,7 +141,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) && !defined(__NetBSD__)
+ E int qsort();
  #else
--# 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__))
-+#   if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__)
- E int FDECL(strlen, (const char *));
- #   endif
- #  endif /* HPUX */
-@@ -476,9 +476,14 @@ E  char *sprintf();
- #  if !defined(SVR4) && !defined(apollo)
- #   if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
- #    if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */
+ #if !defined(LATTICE) && !defined(AZTEC_50)
+@@ -431,7 +431,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 */
+@@ -486,9 +486,14 @@ E char *sprintf();
+ #if !defined(SVR4) && !defined(apollo)
+ #if !(defined(ULTRIX_PROTO) && defined(__GNUC__))
+ #if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */
 +#if 0
  E int FDECL(vsprintf, (char *, const char *, va_list));
  E int FDECL(vfprintf, (FILE *, const char *, va_list));
@@ -47,15 +48,15 @@ Fix for NetBSD.
 +#include <stdarg.h>
 +#include <stdio.h>
 +#endif
- #    endif
- #   endif
- #  endif
-@@ -521,7 +526,7 @@ E struct tm *FDECL(localtime, (const tim
- #  endif
- # endif
+ #endif
+ #endif
+ #endif
+@@ -542,7 +547,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: pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src
diff -u pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src:1.2 pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src:1.3
--- pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src:1.2    Thu Dec 14 16:13:31 2017
+++ pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.src        Thu Oct 24 11:51:23 2019
@@ -1,28 +1,29 @@
-$NetBSD: patch-sys_unix_Makefile.src,v 1.2 2017/12/14 16:13:31 jperkin Exp $
+$NetBSD: patch-sys_unix_Makefile.src,v 1.3 2019/10/24 11:51:23 pho Exp $
 
 Make configurable.
 
---- sys/unix/Makefile.src.orig 2003-12-07 23:39:13.000000000 +0000
+--- sys/unix/Makefile.src.orig 2019-05-08 07:00:16.000000000 +0000
 +++ sys/unix/Makefile.src
-@@ -36,7 +36,11 @@ SHELL=/bin/sh
+@@ -41,7 +41,11 @@ 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)
 +.if "${GTYPE}" == "-qt"
 +LINK=$(CXX)
 +.else
- LINK=$(CC)
++LINK=$(CC)
 +.endif
  
  # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating
  # system.
-@@ -151,15 +155,27 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
+@@ -170,9 +174,22 @@ GNOMEINC=-I/usr/lib/glib/include -I/usr/
  # flags for debugging:
  # CFLAGS = -g -I../include
  
--CFLAGS = -O -I../include
+-#CFLAGS = -O -I../include
 +CFLAGS += -I../include
- LFLAGS = 
+ #LFLAGS = 
  
 +.if "${GTYPE}" == "-x11" || "${GTYPE}" == "-qt"
 +CFLAGS += -I${X11BASE}/include
@@ -40,49 +41,60 @@ Make configurable.
  # The Qt and Be window systems are written in C++, while the rest of
  # NetHack is standard C.  If using Qt, uncomment the LINK line here to get
  # the C++ libraries linked in.
- CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
--CXX=g++
--#LINK=g++
-+#CXX=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)
- 
+@@ -267,13 +284,22 @@ WINBEOBJ =
+ #WINBEOBJ = winbe.o NHWindow.o NHMenuWindow.o NHMapWindow.o tile.o
+ #
+ #
+-#WINSRC = $(WINTTYSRC)
+-#WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC)
++WINOBJ = $(WINTTYOBJ)
+ #
+ # Curses - Karl Garrison, Tangles
+ #WINSRC = $(WINCURSESSRC)
+ #WINOBJ = $(WINCURSESOBJ)
+-#
++
 +.if "${GTYPE}" == "-tty"
 +.elif "${GTYPE}" == "-x11"
 +WINSRC += $(WINX11SRC)
 +WINOBJ += $(WINX11OBJ)
-+.elif "${GTYPE}" == "-qt"
-+WINSRC += $(WINQTSRC)
-+WINOBJ += $(WINQTOBJ)
++.elif "$(GTYPE)" == "-qt"
++WINSRC += $(WINQT4SRC)
++WINOBJ += $(WINQT4OBJ)
 +.endif
 +
  # 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
+@@ -292,14 +318,14 @@ WINBEOBJ =
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+-#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
 +WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
  # WINX11LIB = -lXaw -lXmu -lXt -lX11
  # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
  # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
  #
- # libraries for Qt
+ #
+ # libraries for Qt 3
 -WINQTLIB = -L$(QTDIR)/lib -lqt
 +WINQTLIB = -L$(QTDIR)/lib -lqt-mt -lXpm -lX11 -lICE -lSM -lz -lpng -lXext ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
  #
- # libraries for KDE (with Qt)
- WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -257,6 +282,13 @@ WINBELIB = -lbe
- 
- WINLIB = $(WINTTYLIB)
- 
+ # libraries for Qt 4
+ WINQT4LIB = `pkg-config QtGui --libs`
+@@ -327,11 +353,18 @@ WINCURSESLIB = -lncurses
+ # same as above, for XCurses
+ #WINCURSESLIB = -L/usr/local/lib/pdcurses -lXCurses -lXawM -lXmu -lXext -lXt -lX11
+ #
+-#WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB)
+ #
+ # For Curses
+ #WINLIB = $(WINCURSESLIB)
+-#
++
 +.if "${GTYPE}" == "-tty"
 +.elif "${GTYPE}" == "-x11"
 +WINLIB += $(WINX11LIB)
Index: pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl
diff -u pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl:1.2 pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl:1.3
--- pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl:1.2    Thu Dec 14 16:13:31 2017
+++ pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.utl        Thu Oct 24 11:51:23 2019
@@ -1,19 +1,22 @@
-$NetBSD: patch-sys_unix_Makefile.utl,v 1.2 2017/12/14 16:13:31 jperkin Exp $
+$NetBSD: patch-sys_unix_Makefile.utl,v 1.3 2019/10/24 11:51:23 pho Exp $
 
 Make configurable.
 
---- sys/unix/Makefile.utl.orig 2003-12-07 23:39:13.000000000 +0000
+--- sys/unix/Makefile.utl.orig 2019-05-08 07:00:16.000000000 +0000
 +++ sys/unix/Makefile.utl
-@@ -89,11 +89,19 @@
+@@ -94,7 +94,7 @@ NHSROOT=..
  # flags for debugging:
  # CFLAGS = -g -I../include
  
--CFLAGS = -O -I../include
-+CFLAGS += -I../include
- LFLAGS =
+-#CFLAGS = -O -I../include
++CFLAGS = -I../include
+ #LFLAGS =
+ 
+ # we specify C preprocessor flags via CFLAGS; files built with default rules
+@@ -104,6 +104,14 @@ CPPFLAGS =
  
  LIBS =
-  
+ 
 +.if "${GTYPE}" == "-tty"
 +CFLAGS += -DGTYPE_TTY
 +.elif "${GTYPE}" == "-x11"

Added files:

Index: pkgsrc/games/nethack-lib/patches/patch-include_config.h
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-include_config.h:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-include_config.h     Thu Oct 24 11:51:23 2019
@@ -0,0 +1,64 @@
+$NetBSD: patch-include_config.h,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+Make configurable.
+
+--- include/config.h.orig      2019-05-08 07:00:15.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.
+  */
++#if   defined(GTYPE_TTY)
++#  define DEFAULT_WINDOW_SYS "tty"
++#elif defined(GTYPE_X11)
++#  define X11_GRAPHICS
++#  define DEFAULT_WINDOW_SYS "X11"
++#elif defined(GTYPE_QT)
++#  define QT_GRAPHICS
++#  define DEFAULT_WINDOW_SYS "Qt"
++#endif
++
+ #if !defined(NOTTYGRAPHICS)
+ #define TTY_GRAPHICS /* good old tty based graphics */
+ #endif
+@@ -134,7 +144,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
+@@ -263,11 +273,8 @@
+ 
+ #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 */
+-/* 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 */
+ #endif
+ 
+ #ifndef COMPRESS
+@@ -352,7 +359,7 @@
+  * otherwise it will be the current directory.
+  */
+ #ifndef HACKDIR
+-#define HACKDIR "/usr/games/lib/nethackdir"
++#define HACKDIR "@HACKDIR@"
+ #endif
+ 
+ /*
+@@ -442,7 +449,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 */
Index: pkgsrc/games/nethack-lib/patches/patch-include_unixconf.h
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-include_unixconf.h:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-include_unixconf.h   Thu Oct 24 11:51:23 2019
@@ -0,0 +1,66 @@
+$NetBSD: patch-include_unixconf.h,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+Make configurable.
+Fix for BSD.
+
+--- include/unixconf.h.orig    2019-05-08 07:00:15.000000000 +0000
++++ include/unixconf.h
+@@ -20,19 +20,20 @@
+  */
+ 
+ /* define exactly one of the following four choices */
++#define @NETHACK_OS@ 1
+ /* #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 */
+@@ -49,7 +50,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
+@@ -106,7 +107,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 "@VARDIR@"
+ 
+ /*
+  * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more"
+@@ -176,7 +177,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"
+@@ -330,7 +331,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
Index: pkgsrc/games/nethack-lib/patches/patch-src_mail.c
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-src_mail.c:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-src_mail.c   Thu Oct 24 11:51:23 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mail.c,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+Fix for NetBSD.
+
+--- src/mail.c.orig    2019-05-08 07:00:15.000000000 +0000
++++ src/mail.c
+@@ -71,7 +71,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: pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.doc
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.doc:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.doc        Thu Oct 24 11:51:23 2019
@@ -0,0 +1,35 @@
+$NetBSD: patch-sys_unix_Makefile.doc,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+1. Don't hardcode the man path.
+2. Support DESTDIR.
+
+--- sys/unix/Makefile.doc.orig 2019-05-08 07:00:16.000000000 +0000
++++ sys/unix/Makefile.doc
+@@ -62,7 +62,7 @@ Guidebook.dvi:       Guidebook.tex
+ 
+ 
+ GAME  = nethack
+-MANDIR        = /usr/man/man6
++MANDIR        = $(PREFIX)/$(PKGMANDIR)/man6
+ MANEXT        = 6
+ 
+ # manual installation for most BSD-style systems
+@@ -81,12 +81,12 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP)
+ # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
+ 
+ manpages:
+-      -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+-      -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+-      -$(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 \
Index: pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.top
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.top:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-sys_unix_Makefile.top        Thu Oct 24 11:51:23 2019
@@ -0,0 +1,64 @@
+$NetBSD: patch-sys_unix_Makefile.top,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+1. Don't build or install bin/nethack.
+2. Use ${INSTALL_*} for installation.
+
+--- sys/unix/Makefile.top.orig 2019-05-08 07:00:16.000000000 +0000
++++ sys/unix/Makefile.top
+@@ -20,7 +20,7 @@ NHSROOT=.
+ 
+ # make NetHack
+ #PREFIX        = /usr
+-GAME     = nethack
++#GAME     = nethack
+ # GAME     = nethack.prg
+ #GAMEUID  = games
+ #GAMEGRP  = bin
+@@ -203,39 +203,20 @@ dofiles:
+               -e '}'                                  \
+               -e '$$s/.*/nodlb/p' < dat/options` ;    \
+       $(MAKE) dofiles-$${target-nodlb}
+-      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);' \
+-              -e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
++      sed -e 's;@HACKDIR@;$(HACKDIR);' \
++              -e 's;@PREFIX@;$(PREFIX);' \
+               < sys/unix/nethack.sh \
+-              > $(SHELLDIR)/$(GAME) ; fi
+-# set up their permissions
+-      -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+-                      $(CHGRP) $(GAMEGRP) $(GAME) recover )
+-      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
++              > nethack
++      $(INSTALL_SCRIPT) nethack $(DESTDIR)$(PREFIX)/bin
++      $(INSTALL_PROGRAM) util/recover $(DESTDIR)$(PREFIX)/bin
++      $(INSTALL_DATA) doc/Guidebook $(DESTDIR)$(PREFIX)/share/doc/nethack
+ 
+ dofiles-dlb: check-dlb
+-      ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
+-# set up their permissions
+-      -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
+-                      $(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
+-                      chmod $(FILEPERM) nhdat $(DATNODLB) )
++      ( cd dat ; $(INSTALL_DATA) nhdat $(DATNODLB) $(DESTDIR)$(HACKDIR) )
+ 
+ dofiles-nodlb:
+ # copy over the game files
+-      ( cd dat ; cp $(DAT) $(INSTDIR) )
+-# set up their permissions
+-      -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
+-                      $(CHGRP) $(GAMEGRP) $(DAT) ; \
+-                      chmod $(FILEPERM) $(DAT) )
++      ( cd dat ; $(INSTALL_DATA) $(DAT) $(DESTDIR)$(HACKDIR) )
+ 
+ update: $(GAME) recover $(VARDAT) dungeon spec_levs
+ #     (don't yank the old version out from under people who're playing it)
Index: pkgsrc/games/nethack-lib/patches/patch-sys_unix_nethack.sh
diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-sys_unix_nethack.sh:1.1
--- /dev/null   Thu Oct 24 11:51:23 2019
+++ pkgsrc/games/nethack-lib/patches/patch-sys_unix_nethack.sh  Thu Oct 24 11:51:23 2019
@@ -0,0 +1,44 @@
+$NetBSD: patch-sys_unix_nethack.sh,v 1.1 2019/10/24 11:51:23 pho Exp $
+
+Modify the wrapper script so users can choose the UI type on the
+command line.
+
+(Perhaps this should be handled by the pkg_alternatives framework.)
+
+--- sys/unix/nethack.sh.orig   2019-05-08 07:00:16.000000000 +0000
++++ sys/unix/nethack.sh
+@@ -3,9 +3,32 @@
+ # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland
+ # NetHack may be freely redistributed.  See license for details.
+ 
+-HACKDIR=/usr/games/lib/nethackdir
++HACKDIR="@HACKDIR@"
+ export HACKDIR
+-HACK=$HACKDIR/nethack
++
++UILIST="tty x11 qt" 
++findbin ()
++{
++      for x in $UILIST; do
++              if [ -x "@PREFIX@/bin/nethack-$x" ]; then
++                      echo $x
++                      return
++              fi
++      done
++}
++
++if [ -z "$1" -o -z "${1%%-*}" ]; then
++      UI=`findbin`
++else
++      UI=$1
++    shift
++fi
++
++if [ -z "$UI" ]; then
++      echo "No UI ($UILIST) found"
++      exit 1
++fi
++HACK="@PREFIX@/bin/nethack-${UI}"
+ 
+ # Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH
+ case "x$XUSERFILESEARCHPATH" in

Prev by Date: CVS commit: pkgsrc/lang
Next by Date: CVS commit: pkgsrc/games/nethack-tty
Previous by Thread: CVS commit: pkgsrc/lang
Next by Thread: CVS commit: pkgsrc/games/nethack-tty
Indexes:

Home | Main Index | Thread Index | Old Index