diff --git a/games/xnethack/Makefile b/games/xnethack/Makefile
index 990d6b994945..6051840d1e74 100644
--- a/games/xnethack/Makefile
+++ b/games/xnethack/Makefile
@@ -1,98 +1,95 @@
 PORTNAME=	xNetHack
 DISTVERSIONPREFIX=	xnh
-DISTVERSION=	8.0
-PORTREVISION=	1
+DISTVERSION=	9.0
 CATEGORIES=	games
 
 MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Experimental features and improvements applied to NetHack 3.7-dev
 WWW=		https://nethackwiki.com/wiki/XNetHack
 
 LICENSE=	nethack
 LICENSE_NAME=	NETHACK GENERAL PUBLIC LICENSE
 LICENSE_FILE=	${WRKSRC}/dat/license
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 FLAVORS=	x11 nox11 qt
 FLAVOR?=	${FLAVORS:[1]}
 nox11_PKGNAMESUFFIX=	-nox11
 qt_PKGNAMESUFFIX=	-qt
 
+BUILD_DEPENDS=	nroff:textproc/groff
+
 USES=		alias compiler:c11 gmake ncurses tar:tgz lua:54
 USE_GITHUB=	yes
 GH_ACCOUNT=	copperwater
 
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}"
 
 # Configure these variables as you want them to be.
 HACKNAME?=	${PORTNAME:tl}
 HACKDIR?=	share/${HACKNAME}
 
 DATADIR=	${PREFIX}/${HACKDIR}
 DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
 
 .if ${FLAVOR} == "x11"
 USES+=		xorg
 USE_XORG=	xaw xpm xmu xext xt x11 sm ice
 CFLAGS+=	-DUSE_TILES
 GRAPHICS=	X11_GRAPHICS
 .elif ${FLAVOR} == "nox11"
 GRAPHICS=	# none
 .elif ${FLAVOR} == "qt"
 USES+=		localbase pkgconfig qt:5
 USE_QT=		buildtools:build core gui multimedia network widgets
-MAKE_ENV+=	MOCPATH=${MOC} LINK=${CXX}
+MAKE_ENV+=	LINK=${CXX} QTDIR=${LOCALBASE}/${QT_ARCHDIR_REL}
 CFLAGS+=	-I${QT_INCDIR} -DSND_LIB_QTSOUND
 CXXFLAGS+=	-fpic -I${QT_INCDIR} -DQT_WIDGETS_LIB -DQT_MULTIMEDIA_LIB \
 		-DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DSND_LIB_QTSOUND
 GRAPHICS=	QT_GRAPHICS
 .endif
 
 CFLAGS+=	-DNOMAIL -DCURSES_GRAPHICS
 
 # nhlua.c has a (patched out) version check for lua when the sandbox
 # is used.  As I cannot ascertain whether using the system's different
 # lua version could cause problems, I'll leave the sandbox disabled by
 # default.
 OPTIONS_DEFINE=	DOCS SANDBOX
 SANDBOX_DESC=	Run lua in a sandbox (untested)
 SANDBOX_CFLAGS=	-DNHL_SANDBOX
 
 .include <bsd.port.pre.mk>
 
 pre-configure:
 .for f in include/config.h sys/unix/Makefile.top
 	@${REINPLACE_CMD} -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
 		${WRKSRC}/${f}
 .endfor
-.for f in nethack.6 recover.6
-	@${REINPLACE_CMD} -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
-		${WRKSRC}/doc/${f}
-.endfor
 .if defined(WITHOUT_SHELL)
-	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h
+	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL */|' ${WRKSRC}/include/unixconf.h
 .endif
 .if defined(WITH_MAIL)
 	@${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h
 .endif
 
 do-configure:
 	${TOUCH} ${WRKSRC}/dat/gitinfo.txt
 	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/${HACKNAME}
 	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
 	${MKDIR} ${STAGEDIR}${DATADIR}/save
 	${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf
 .for f in livelog logfile record sysconf xlogfile
 	${CP} ${STAGEDIR}/${DATADIR}/${f} ${STAGEDIR}/${DATADIR}/${f}.sample
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/xnethack/distinfo b/games/xnethack/distinfo
index 96757492af68..f8398db4ad95 100644
--- a/games/xnethack/distinfo
+++ b/games/xnethack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685888297
-SHA256 (copperwater-xNetHack-xnh8.0_GH0.tar.gz) = a9861ccec6274037ad95877a9b5c1c1ef6727bbc96f8a896ada672b4ad4c80bb
-SIZE (copperwater-xNetHack-xnh8.0_GH0.tar.gz) = 10779285
+TIMESTAMP = 1742211468
+SHA256 (copperwater-xNetHack-xnh9.0_GH0.tar.gz) = 10bda8996fe6d42d7e285a261a5dc442348cb677768562437c2d9612e324e4b5
+SIZE (copperwater-xNetHack-xnh9.0_GH0.tar.gz) = 10982131
diff --git a/games/xnethack/files/patch-doc_dlb.6 b/games/xnethack/files/patch-doc_dlb.6
index a6884527a5e2..9333c33abd0d 100644
--- a/games/xnethack/files/patch-doc_dlb.6
+++ b/games/xnethack/files/patch-doc_dlb.6
@@ -1,11 +1,11 @@
---- doc/dlb.6.orig	2022-03-07 23:57:15 UTC
+--- doc/dlb.6.orig	2025-03-17 12:07:52 UTC
 +++ doc/dlb.6
-@@ -95,7 +95,7 @@ List the contents of the archive 'foo':
+@@ -137,7 +137,7 @@ Kenneth Lorber
+ .SH AUTHOR
  Kenneth Lorber
  .SH "SEE ALSO"
- .PP
--nethack(6), tar(1)
-+xnethack(6), tar(1)
+-.IR nethack (6),
++.IR xnethack (6),
+ .IR tar (1)
  .SH BUGS
- .PP
- Not a good tar emulation; - does not mean stdin or stdout.
+ .IP \(bu 2n
diff --git a/games/xnethack/files/patch-doc_nethack.6 b/games/xnethack/files/patch-doc_nethack.6
deleted file mode 100644
index a8956220d95c..000000000000
--- a/games/xnethack/files/patch-doc_nethack.6
+++ /dev/null
@@ -1,47 +0,0 @@
---- doc/nethack.6.orig	2023-05-16 21:33:58 UTC
-+++ doc/nethack.6
-@@ -20,7 +20,7 @@ nethack \- Exploring The Mazes of Menace
- .\" have been arranged to fit within an 80-column page with nearly full
- .\" lines while avoiding splitting "[" and "-opt ]" or "[ -opt" and "]"
- .\" across line boundaries.  It would be better to do that with 'roff magic.
--.B nethack
-+.B xnethack
- [
- .BR \-d | \-\-directory
- .I directory
-@@ -92,7 +92,7 @@ Also
- .BR \-W | \-Wiz
- ]
- .PP
--.B nethack
-+.B xnethack
- [
- .BR \-d | \-\-directory
- .I directory
-@@ -114,7 +114,7 @@ Also
- .I playernames
- ]
- .PP
--.B nethack
-+.B xnethack
- [
- .B \-\-usage
- |
-@@ -310,7 +310,7 @@ option, which must be the first argument if it appears
- supplies a directory which is to serve as the playground.
- It overrides the value from NETHACKDIR, HACKDIR,
- or the directory specified by the game administrator during compilation
--(usually /usr/games/lib/nethackdir).
-+(usually %%HACKDIR%%).
- This option is usually only useful to the game administrator.
- The playground must contain several auxiliary files such as help files,
- the list of top scorers, and a subdirectory
-@@ -418,7 +418,7 @@ name is '.xnethackrc' in the user's home directory.
- 
- .br
- All other files are in the playground directory,
--normally /usr/games/lib/nethackdir.
-+normally %%HACKDIR%%.
- If DLB was defined during the compile, the data files and special levels
- will be inside a larger file, normally nhdat, instead of being separate
- files.
diff --git a/games/xnethack/files/patch-doc_recover.6 b/games/xnethack/files/patch-doc_recover.6
index 9273032901e3..2a1b9bdf0703 100644
--- a/games/xnethack/files/patch-doc_recover.6
+++ b/games/xnethack/files/patch-doc_recover.6
@@ -1,20 +1,11 @@
---- doc/recover.6.orig	2022-03-07 23:57:15 UTC
+--- doc/recover.6.orig	2025-03-17 12:08:19 UTC
 +++ doc/recover.6
-@@ -42,7 +42,7 @@ option, which must be the first argument if it appears
- supplies a directory which is the NetHack playground.
- It overrides the value from NETHACKDIR, HACKDIR, or the directory
- specified by the game administrator during compilation
--(usually /usr/games/lib/nethackdir).
-+(usually %%HACKDIR%%).
- .PP
- ^?ALLDOCS
- For recovery to be possible,
-@@ -129,7 +129,7 @@ but even a compression-using
+@@ -136,7 +136,7 @@ will find them in the uncompressed form.
  .I nethack
  will find them in the uncompressed form.
  .SH "SEE ALSO"
 -nethack(6)
 +xnethack(6)
  .SH BUGS
  .PP
  .I recover
diff --git a/games/xnethack/files/patch-doc_xnethack.6 b/games/xnethack/files/patch-doc_xnethack.6
new file mode 100644
index 000000000000..94912946aa34
--- /dev/null
+++ b/games/xnethack/files/patch-doc_xnethack.6
@@ -0,0 +1,20 @@
+--- doc/xnethack.6.orig	2025-03-17 11:59:42 UTC
++++ doc/xnethack.6
+@@ -317,7 +317,7 @@ or the directory specified by the game administrator d
+ supplies a directory which is to serve as the playground.
+ It overrides the value from NETHACKDIR, HACKDIR,
+ or the directory specified by the game administrator during compilation
+-(usually /usr/games/lib/nethackdir).
++(usually %%HACKDIR%%).
+ This option is usually only useful to the game administrator.
+ The playground must contain several auxiliary files such as help files,
+ the list of top scorers, and a subdirectory
+@@ -435,7 +435,7 @@ All other files are in the playground directory,
+ 
+ .br
+ All other files are in the playground directory,
+-normally /usr/games/lib/xnethackdir.
++normally %%HACKDIR%%.
+ If DLB was defined during the compile, the data files and special levels
+ will be inside a larger file, normally nhdat, instead of being separate
+ files.
diff --git a/games/xnethack/files/patch-include-config.h b/games/xnethack/files/patch-include-config.h
index 2eb810b63ba5..aeabd252b245 100644
--- a/games/xnethack/files/patch-include-config.h
+++ b/games/xnethack/files/patch-include-config.h
@@ -1,54 +1,54 @@
---- include/config.h.orig	2023-05-16 21:33:58 UTC
+--- include/config.h.orig	2025-03-17 12:13:32 UTC
 +++ include/config.h
-@@ -312,11 +312,11 @@
+@@ -386,11 +386,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 */
  /* 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 "/usr/bin/gzip" /* FSF gzip compression */
 +#define COMPRESS_EXTENSION ".gz"       /* normal gzip extension */
  #endif
  
  #ifndef COMPRESS
-@@ -401,7 +401,7 @@
+@@ -475,7 +475,7 @@
   * otherwise it will be the current directory.
   */
  #ifndef HACKDIR
 -#define HACKDIR "/usr/games/lib/xnethackdir"
 +#define HACKDIR "%%HACKDIR%%"
  #endif
  
  /*
-@@ -662,7 +662,7 @@ typedef unsigned char uchar;
+@@ -730,7 +730,7 @@ typedef unsigned char uchar;
  
  /* TEMPORARY - MAKE UNCONDITIONAL BEFORE RELEASE */
  /* undef this to check if sandbox breaks something */
 -#define NHL_SANDBOX
 +/* #define NHL_SANDBOX */
  
- /* End of Section 4 */
- 
-@@ -691,7 +691,7 @@ typedef unsigned char uchar;
- #define DUMPLOG_MSG_COUNT   50
- #endif /* DUMPLOG_MSG_COUNT */
+ #ifdef NHL_SANDBOX
+ #ifdef CHRONICLE
+@@ -764,7 +764,7 @@ typedef unsigned char uchar;
+ #ifdef DUMPLOG
+ #define DUMPLOG_CORE
  #ifndef DUMPLOG_FILE
 -#define DUMPLOG_FILE        "/tmp/xnethack.%n.%d.log"
 +#define DUMPLOG_FILE        "/tmp/xnethack.%v.%u.%n.%D.log"
  /* DUMPLOG_FILE allows following placeholders:
     %% literal '%'
     %v version (eg. "3.6.3-0")
-@@ -720,7 +720,7 @@ typedef unsigned char uchar;
+@@ -800,7 +800,7 @@ typedef unsigned char uchar;
  
  /* TEMPORARY - MAKE UNCONDITIONAL BEFORE RELEASE */
  /* undef this to check if sandbox breaks something */
 -#define NHL_SANDBOX
 +/* #define NHL_SANDBOX */
  
  /* End of Section 4 */
  
diff --git a/games/xnethack/files/patch-include-unixconf.h b/games/xnethack/files/patch-include-unixconf.h
index 5db683e8d8f9..f9461e852b46 100644
--- a/games/xnethack/files/patch-include-unixconf.h
+++ b/games/xnethack/files/patch-include-unixconf.h
@@ -1,27 +1,27 @@
---- include/unixconf.h.orig	2023-05-16 21:33:58 UTC
+--- include/unixconf.h.orig	2025-03-15 15:02:36 UTC
 +++ include/unixconf.h
 @@ -20,13 +20,13 @@
   */
  
  /* define exactly one of the following four choices */
 -/* #define BSD 1 */  /* define for 4.n/Free/Open/Net BSD  */
 +#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 */
-@@ -327,7 +327,7 @@
+@@ -332,7 +332,7 @@
  #endif
  
  #if defined(BSD) || defined(ULTRIX)
 -#if !defined(DGUX) && !defined(SUNOS4)
 +#if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
  #define memcpy(d, s, n) bcopy(s, d, n)
  #define memcmp(s1, s2, n) bcmp(s2, s1, n)
  #endif
diff --git a/games/xnethack/files/patch-src-files.c b/games/xnethack/files/patch-src-files.c
index 1b6b782cbaa3..d0c30ca9a2d6 100644
--- a/games/xnethack/files/patch-src-files.c
+++ b/games/xnethack/files/patch-src-files.c
@@ -1,10 +1,10 @@
---- src/files.c.orig	2021-03-22 22:28:14 UTC
+--- src/files.c.orig	2025-03-15 15:02:36 UTC
 +++ src/files.c
-@@ -51,6 +51,7 @@ const
+@@ -50,6 +50,7 @@ const
  
  #if defined(UNIX) && defined(SELECTSAVED)
  #include <sys/types.h>
 +#include <limits.h>
  #include <dirent.h>
- #include <stdlib.h>
  #endif
+ 
diff --git a/games/xnethack/files/patch-src_nhlua.c b/games/xnethack/files/patch-src_nhlua.c
index fa7d2fa8a480..9afd5a952205 100644
--- a/games/xnethack/files/patch-src_nhlua.c
+++ b/games/xnethack/files/patch-src_nhlua.c
@@ -1,31 +1,26 @@
 As we unbundle lua, we cannot ensure that this version check succeeds.
 Removal of the version check allows us to build a working binary, but
 it is uncertain if there are any residual effects from the version
 mismatch.
 
 To rule out that possibility, the sandbox code is left disabled by
 default but can be enabled if desired through the SANDBOX option.
 
---- src/nhlua.c.orig	2023-05-16 21:33:58 UTC
+--- src/nhlua.c.orig	2025-03-17 12:18:47 UTC
 +++ src/nhlua.c
-@@ -2074,20 +2074,6 @@ DISABLE_WARNING_CONDEXPR_IS_CONSTANT
+@@ -2236,6 +2236,7 @@ nhl_init(nhl_sandbox_info *sbi)
  lua_State *
  nhl_init(nhl_sandbox_info *sbi)
  {
--    /* It would be nice to import EXPECTED from each build system. XXX */
--    /* And it would be nice to do it only once, but it's cheap. */
--#ifndef NHL_VERSION_EXPECTED
--#define NHL_VERSION_EXPECTED 50404
--#endif
--
--#ifdef NHL_SANDBOX
--    if (NHL_VERSION_EXPECTED != LUA_VERSION_RELEASE_NUM) {
--        panic(
--             "sandbox doesn't know this Lua version: this=%d != expected=%d ",
--              LUA_VERSION_RELEASE_NUM, NHL_VERSION_EXPECTED);
--    }
--#endif
--
-     lua_State *L = nhlL_newstate(sbi);
++#if 0
+     /* It would be nice to import EXPECTED from each build system. XXX */
+     /* And it would be nice to do it only once, but it's cheap. */
+ #ifndef NHL_VERSION_EXPECTED
+@@ -2248,6 +2249,7 @@ nhl_init(nhl_sandbox_info *sbi)
+             "sandbox doesn't know this Lua version: this=%d != expected=%d ",
+             LUA_VERSION_RELEASE_NUM, NHL_VERSION_EXPECTED);
+     }
++#endif
+ #endif
  
-     iflags.in_lua = TRUE;
+     lua_State *L = nhlL_newstate(sbi, "nhl_init");
diff --git a/games/xnethack/files/patch-sys-unix-Makefile.doc b/games/xnethack/files/patch-sys-unix-Makefile.doc
index bc26192149f2..5724617301d7 100644
--- a/games/xnethack/files/patch-sys-unix-Makefile.doc
+++ b/games/xnethack/files/patch-sys-unix-Makefile.doc
@@ -1,42 +1,30 @@
---- sys/unix/Makefile.doc.orig	2023-05-16 21:33:58 UTC
+--- sys/unix/Makefile.doc.orig	2025-03-15 15:02:36 UTC
 +++ sys/unix/Makefile.doc
-@@ -78,17 +78,17 @@ Guidebook.dvi	: $(GUIDEBOOK_TEX)
+@@ -80,10 +80,10 @@ $(MAKEDEFS)	: ../util/makedefs.c ../include/config.h .
  # (note: 'make makedefs', not 'make $(MAKEDEFS)')
  $(MAKEDEFS)	: ../util/makedefs.c ../include/config.h ../src/mdlib.c \
  		  ../util/mdgrep.h
 -	( cd ../util ; make makedefs )
 +	( cd ../util ; ${MAKE} makedefs )
  
--GAME	= nethack
--MANDIR	= /usr/man/man6
-+GAME	= xnethack
-+MANDIR	= ${PREFIX}/share/man/man6
+ GAME	= xnethack
+-MANDIR	?= /usr/man/man6
++MANDIR	?= ${PREFIX}/share/man/man6
  MANEXT	= 6
+ NROFF ?= nroff
  
- # manual installation for most BSD-style systems
--GAMEMANCREATE = cat nethack.6 | $(NHGREP) >
--RCVRMANCREATE = cat recover.6 | $(NHGREP) >
--DLBMANCREATE = cat dlb.6 | $(NHGREP) >
--MDMANCREATE = cat makedefs.6 | $(NHGREP) >
-+GAMEMANCREATE = cat nethack.6 | $(NHGREP) > nethack.6.out ; ${BSD_INSTALL_MAN} nethack.6.out
-+RCVRMANCREATE = cat recover.6 | $(NHGREP) > recover.6.out ; ${BSD_INSTALL_MAN} recover.6.out
-+DLBMANCREATE = cat dlb.6 | $(NHGREP) > dlb.6.out ; ${BSD_INSTALL_MAN} dlb.6.out
-+MDMANCREATE = cat makedefs.6 | $(NHGREP) > makedefs.6.out ; ${BSD_INSTALL_MAN} makedefs.6.out
- # manual installation for most SYSV-style systems
- # GAMEMANCREATE = cat nethack.6 | $(NHGREP) | nroff -man - >
- # RCVRMANCREATE = cat recover.6 | $(NHGREP) | nroff -man - >
-@@ -96,10 +96,10 @@ MDMANCREATE = cat makedefs.6 | $(NHGREP) >
+@@ -99,10 +99,10 @@ manpages: $(PREMANPAGES)
  # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
  
- manpages:
+ manpages: $(PREMANPAGES)
 -	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
 -	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
 -	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
 -	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
 +	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)/$(GAME).$(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 recover.txt \
+ DISTRIB = Guidebook.txt xnethack.txt recover.txt \
diff --git a/games/xnethack/files/patch-sys-unix-Makefile.src b/games/xnethack/files/patch-sys-unix-Makefile.src
index b42acc111590..33f90a2930ca 100644
--- a/games/xnethack/files/patch-sys-unix-Makefile.src
+++ b/games/xnethack/files/patch-sys-unix-Makefile.src
@@ -1,184 +1,187 @@
---- sys/unix/Makefile.src.orig	2023-05-29 12:17:06 UTC
+--- sys/unix/Makefile.src.orig	2025-03-15 15:02:36 UTC
 +++ sys/unix/Makefile.src
-@@ -179,14 +179,22 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $(
+@@ -184,9 +184,17 @@ SYSOBJ = $(TARGETPFX)ioctl.o $(TARGETPFX)unixmain.o $(
  
  # flags for debugging:
  # CFLAGS = -g -I../include
 +CFLAGS += -I../include -I${LUA_INCDIR}
 +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
 +CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
 +endif
 +ifeq ("$(GRAPHICS)","QT_GRAPHICS")
 +CFLAGS += -DQT_GRAPHICS
 +endif
  
  #CFLAGS = -O -I../include
 -#LFLAGS =
 +LFLAGS += -L${LUA_LIBDIR}
 +LINK ?= $(CC)
  
+ AR = ar
+ ARFLAGS = rcs
+@@ -194,7 +202,7 @@ ARFLAGS = rcs
  # 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 = $(CCXXFLAGS) -I. -I$(QTDIR)/include $(QTCXXFLAGS)
-+CXXFLAGS += -I. -I../include -I${LUA_INCDIR}
++CXXFLAGS += $(CCXXFLAGS) -I. -I../include -I$(QTDIR)/include -I${LUA_INCDIR} $(QTCXXFLAGS)
  CXX ?= g++
  MOC ?= moc
  MOCPATH ?= $(QTDIR)/bin/$(MOC)
-@@ -257,7 +265,7 @@ WINX11SRC = ../win/X11/Window.c ../win/X11/dialogs.c .
+@@ -267,7 +275,7 @@ WINX11OBJ = $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o
  WINX11OBJ = $(TARGETPFX)Window.o $(TARGETPFX)dialogs.o $(TARGETPFX)winX.o \
  	$(TARGETPFX)winmap.o $(TARGETPFX)winmenu.o $(TARGETPFX)winmesg.o \
  	$(TARGETPFX)winmisc.o $(TARGETPFX)winstat.o $(TARGETPFX)wintext.o \
 -	$(TARGETPFX)winval.o #$(TARGETPFX)tile.o
 +	$(TARGETPFX)winval.o $(TARGETPFX)tile.o
  #
  # Files for a Qt 3 interface (renamed since nethack 3.6.x)
  #
-@@ -293,7 +301,7 @@ WINQTOBJ = $(TARGETPFX)qt_bind.o $(TARGETPFX)qt_click.
+@@ -303,7 +311,7 @@ WINQTOBJ = $(TARGETPFX)qt_bind.o $(TARGETPFX)qt_click.
  	$(TARGETPFX)qt_msg.o $(TARGETPFX)qt_plsel.o $(TARGETPFX)qt_rip.o \
  	$(TARGETPFX)qt_set.o $(TARGETPFX)qt_stat.o $(TARGETPFX)qt_str.o \
  	$(TARGETPFX)qt_streq.o $(TARGETPFX)qt_svsel.o $(TARGETPFX)qt_win.o \
 -	$(TARGETPFX)qt_xcmd.o $(TARGETPFX)qt_yndlg.o #$(TARGETPFX)tile.o
 +	$(TARGETPFX)qt_xcmd.o $(TARGETPFX)qt_yndlg.o $(TARGETPFX)tile.o
  
  # Files for Shim windowing interface for libnh -- doesn't do anything,
  # just passes along the API calls to the library
-@@ -318,6 +326,29 @@ WINBEOBJ =
+@@ -328,6 +336,29 @@ WINBEOBJ =
  # Curses - Karl Garrison, Tangles
  #WINSRC = $(WINCURSESSRC)
  #WINOBJ = $(WINCURSESOBJ)
 +
 +WINSRC = $(WINTTYSRC) $(WINCURSESSRC)
 +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
 +WINSRC += $(WINX11SRC)
 +endif
 +ifeq ("$(GRAPHICS)","QT_GRAPHICS")
 +WINSRC += $(WINQTSRC)
 +endif
 +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
 +WINSRC += $(WINGNOMESRC)
 +endif
 +
 +WINOBJ = $(WINTTYOBJ) $(WINCURSESOBJ)
 +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
 +WINOBJ += $(WINX11OBJ)
 +endif
 +ifeq ("$(GRAPHICS)","QT_GRAPHICS")
 +WINOBJ += $(WINQTOBJ)
 +endif
 +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
 +WINOBJ += $(WINGNOMEOBJ)
 +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
-@@ -334,6 +365,7 @@ WINBEOBJ =
+@@ -344,6 +375,7 @@ WINBEOBJ =
  # WINTTYLIB = -lcurses16
  # WINTTYLIB = -lncurses
  #WINTTYLIB = -ltermlib
 +WINTTYLIB = -lncurses -L${LOCALBASE}/lib
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
-@@ -341,16 +373,19 @@ WINBEOBJ =
+@@ -351,16 +383,19 @@ WINBEOBJ =
  # 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
 +WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
  #
  #
  # libraries for Qt 3
 -WINQT3LIB = -L$(QTDIR)/lib -lqt
 +#WINQTLIB = -L$(QTDIR)/lib -lqt
 +#WINQT3LIB = ${QTCFGLIBS} ${LIBQT}
 +#WINQTLIB = ${QTCFGLIBS} ${LIBQT}
  #
  # libraries for Qt 4
  WINQT4LIB = `pkg-config QtGui --libs`
  #
  # libraries for Qt 5 (use with WINQTSRC and WINQTOBJ)
 -WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
 +WINQTLIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext
-@@ -360,7 +395,7 @@ WINBELIB = -lbe
+@@ -370,7 +405,7 @@ WINBELIB = -lbe
  #
  # libraries for curses port
  # link with ncurses
 -WINCURSESLIB = -lncurses
 +WINCURSESLIB = -lncurses -L${LOCALBASE}/lib
  # link with pdcurses for SDL, installed in a separate directory
  #WINCURSESLIB = -L/usr/local/lib/pdcurses -lpdcurses -lSDL
  # same as above, for XCurses
-@@ -370,6 +405,18 @@ WINCURSESLIB = -lncurses
+@@ -380,6 +415,18 @@ WINCURSESLIB = -lncurses
  #
  # For Curses
  #WINLIB = $(WINCURSESLIB)
 +
 +WINLIB = $(WINTTYLIB)
 +ifeq ("$(GRAPHICS)","X11_GRAPHICS")
 +WINLIB += $(WINX11LIB)
 +endif
 +ifeq ("$(GRAPHICS)","QT_GRAPHICS")
 +WINLIB += $(WINQTLIB)
 +endif
 +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
 +WINLIB += $(WINGNOMELIB)
 +endif
 +
  #
  # some platforms need to build the support libraries
  # BUILDMORE = $(TARGETPFX)pdcurses.a
-@@ -425,7 +472,7 @@ AWK	= awk
+@@ -435,7 +482,7 @@ AWK	= awk
  # skip it--if nethack's sources don't reside in a git repository than
  # the script which creates that file will fail benignly and 'makedefs -v'
  # will proceed without it
 -GITINFO=1
 +GITINFO=0
  
  # if you change this to 1, feedback while building will omit -Dthis -Wthat
  # -Isomewhere so that each file being compiled is listed on one short line;
-@@ -433,7 +480,7 @@ GITINFO=1
+@@ -443,7 +490,7 @@ GITINFO=1
  # (rather than just in suffix default rule), such as is implemented by
  # gnu make and others which have picked up its extensions;
  # allowed values are 0, 1, and empty (which behaves like 0)
 -QUIETCC=1
 +QUIETCC=0
  
  # ----------------------------------------
  #
-@@ -487,7 +534,7 @@ MAKEDEFS = ../util/makedefs
- LUA_VERSION ?=5.4.4
+@@ -505,7 +552,7 @@ LUALIB = ../lib/lua/$(LUABASE)
+ LUA_VERSION ?=5.4.6
  LUABASE = liblua-$(LUA_VERSION).a
  LUALIB = ../lib/lua/$(LUABASE)
 -LUALIBS = $(LUALIB) -lm $(DLLIB)
 +LUALIBS = -llua-${LUA_VER} -lm $(DLLIB)
+ LUAHEADERS = lib/lua-$(LUA_VERSION)/src
  
  # timestamp files to reduce `make' overhead and shorten .o dependency lists
- CONFIG_H = ../src/config.h-t
-@@ -621,7 +668,7 @@ all:	$(GAME)
+@@ -644,7 +691,7 @@ pregame:
  pregame:
  	$(PREGAME)
  
 -$(GAME):	pregame $(MAKEDEFS) $(LUALIB) $(WAVS) $(SYSTEM)
 +$(GAME):	pregame $(MAKEDEFS) $(WAVS) $(SYSTEM)
  	@echo "$(GAME) is up to date."
  
- Sysunix:	$(HOSTOBJ) $(HOBJ) $(DATE_O) $(BUILDMORE) Makefile
-@@ -701,11 +748,11 @@ objects.o:
+ Sysunix: $(HOSTOBJ) $(HOBJ) $(TARGET_HACKLIB) $(DATE_O) $(BUILDMORE) Makefile
+@@ -730,11 +777,11 @@ qt3_kde0.moc: ../win/Qt3/qt3_kde0.h
  
  # outdated Qt 3 windowport meta-object-compiler output
  qt3_kde0.moc: ../win/Qt3/qt3_kde0.h
 -	$(QTDIR)/bin/moc -o qt3kde0.moc ../win/Qt3/qt3_kde0.h
 +	${MOC} -o qt3kde0.moc ../win/Qt3/qt3_kde0.h
  qt3_win.moc: ../win/Qt3/qt3_win.h
 -	$(QTDIR)/bin/moc -o qt3win.moc ../win/Qt3/qt3_win.h
 +	${MOC} -o qt3win.moc ../win/Qt3/qt3_win.h
  qt3tableview.moc: ../win/Qt3/qt3tableview.h
 -	$(QTDIR)/bin/moc -o qt3tableview.moc ../win/Qt3/qt3tableview.h
 +	${MOC} -o qt3tableview.moc ../win/Qt3/qt3tableview.h
  
  #	build monst.o and objects.o before executing '$(MAKE) makedefs'
  $(MAKEDEFS): $(FIRSTOBJ) \
diff --git a/games/xnethack/files/patch-sys-unix-Makefile.top b/games/xnethack/files/patch-sys-unix-Makefile.top
index 20b21611f44f..40f580e54f61 100644
--- a/games/xnethack/files/patch-sys-unix-Makefile.top
+++ b/games/xnethack/files/patch-sys-unix-Makefile.top
@@ -1,143 +1,143 @@
---- sys/unix/Makefile.top.orig	2023-05-16 21:33:58 UTC
+--- sys/unix/Makefile.top.orig	2025-03-15 15:02:36 UTC
 +++ sys/unix/Makefile.top
-@@ -25,15 +25,15 @@ NHSROOT=.
+@@ -25,15 +25,15 @@ GAME     = xnethack
  GAME     = xnethack
  # GAME     = nethack.prg
  #GAMEUID  = games
 -#GAMEGRP  = bin
 +GAMEGRP  = games
  
  #	Permissions - some places use setgid instead of setuid, for instance.
  #	See also the option "SECURE" in include/config.h.
 -#GAMEPERM = 04755
 +GAMEPERM = 02755
  FILEPERM = 0644
  # VARFILEPERM = 0644
  EXEPERM  = 0755
 -DIRPERM  = 0755
 +DIRPERM  = 0775
  # VARDIRPERM = 0755
  
  #	VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
 @@ -44,10 +44,12 @@ DIRPERM  = 0755
  #	keep (if there is, you'll have to do the installation by hand or
  #	modify the install commands below).
  #HACKDIR  = $(PREFIX)/games/lib/$(GAME)dir
 -#VARDIR  = $(HACKDIR)
 +HACKDIR = %%HACKDIR%%
 +INSTDIR = ${HACKDIR}
 +VARDIR  = $(HACKDIR)
  #	Where nethack.sh is installed (as 'nethack').
  #	If this is not defined, the shell wrapper script is not used.
 -#SHELLDIR = $(PREFIX)/games
 +SHELLDIR = $(PREFIX)/bin
  
  #	Extra data files depending upon the interface(s) built into nethack.
  # per discussion in Install.X11 and Install.Qt
 @@ -62,7 +64,7 @@ DIRPERM  = 0755
  #	X11 with GRAPHIC_TOMBSTONE (requires 'xpm'):
  # VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
  #	both X11 and Qt:
 -# VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
 +VARDATND = x11tiles nhtiles.bmp NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
  #	Qt without X11; assumes GRAPHIC_TOMBSTONE:
  # VARDATND = nhtiles.bmp pet_mark.xbm pilemark.xbm rip.xpm
  
-@@ -136,13 +138,11 @@ $(TOPLUALIB): $(LUATOP)/liblua.a
+@@ -152,14 +154,11 @@ $(TOPLUALIB): $(LUATOP)/liblua.a
  	@( if test -d lib/lua ; then true ; else mkdir -p lib/lua ; fi )
  	cp $(LUATOP)/liblua.a $@
  
 -include/nhlua.h: $(TOPLUALIB)
 +include/nhlua.h:
  	echo '/* nhlua.h - generated by top Makefile */' > $@
 -	@echo '#include "../$(LUAHEADERS)/lua.h"' >> $@
--	@sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' \
--		< $(LUAHEADERS)/lua.h >> $@
+-	@sed -e '/(lua_error)/!d' \
+-		-e '/(lua_error)/s/LUA_API/ATTRNORETURN LUA_API/1' \
+-		-e '/(lua_error)/s/;/ NORETURN;/1' < $(LUAHEADERS)/lua.h >> $@
 -	@echo '#include "../$(LUAHEADERS)/lualib.h"' >> $@
 -	@echo '#include "../$(LUAHEADERS)/lauxlib.h"' >> $@
 +	@echo '#include <lua.h>' >> $@
 +	@echo '#include <lualib.h>' >> $@
 +	@echo '#include <lauxlib.h>' >> $@
  	@echo '/*nhlua.h*/' >> $@
  # LUATESTTARGET is this by default
  lib/lua-$(LUA_VERSION)/src/lua.h:
-@@ -273,39 +273,22 @@ dofiles:
+@@ -304,39 +303,22 @@ 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 \
 +	cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)
 +	cp util/recover ${DESTDIR}$(INSTDIR)
 +	-if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
 +	if test -n '${DESTDIR}$(SHELLDIR)'; then \
  		sed -e 's;/usr/games/lib/nethackdir;$(HACKDIR);' \
  		-e 's;HACKDIR/nethack;HACKDIR/$(GAME);' \
  		< 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
 +		>  ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
  
  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 ; cp nhdat $(DATNODLB) ${DESTDIR}$(INSTDIR) )
  
  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 ; cp $(DAT) ${DESTDIR}$(INSTDIR) )
 +
  #
  # This is not part of the dependency build hierarchy.
  # It requires an explicit "make fetch-Lua".
-@@ -342,25 +325,17 @@ install: rootcheck $(GAME) recover $(VARDAT) spec_levs
+@@ -447,24 +429,17 @@ install: rootcheck $(PRECHECK) $(GAME) recover $(VARDA
  	true; $(PREINSTALL)
  # set up the directories
  # not all mkdirs have -p; those that don't will create a -p directory
 -	-if test -n '$(SHELLDIR)'; then \
 -		mkdir -p $(SHELLDIR); fi
 -	rm -rf $(INSTDIR) $(VARDIR)
 -	-mkdir -p $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
 +	-if test -n '${DESTDIR}$(SHELLDIR)'; then \
 +		mkdir -p ${DESTDIR}$(SHELLDIR); fi
 +	rm -rf ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)
 +	-mkdir -p ${DESTDIR}$(INSTDIR) ${DESTDIR}$(VARDIR)/save ${DESTDIR}$(VARDIR)/whereis
  	if test -d ./-p; then rmdir ./-p; fi
 -	-$(CHOWN) $(GAMEUID) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
 -	$(CHGRP) $(GAMEGRP) $(INSTDIR) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
  # order counts here:
 -	chmod $(DIRPERM) $(INSTDIR)
 -	chmod $(VARDIRPERM) $(VARDIR) $(VARDIR)/save $(VARDIR)/whereis
  # set up the game files
  	( $(MAKE) dofiles )
  # set up some additional files
 -	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile $(VARDIR)/xlogfile \
 -         $(VARDIR)/livelog
 -	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile xlogfile livelog ; \
 -			$(CHGRP) $(GAMEGRP) perm record logfile xlogfile livelog ; \
 -			chmod $(VARFILEPERM) perm record logfile xlogfile livelog )
--	true; $(POSTINSTALL)
-+	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record \
-+            ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile ${DESTDIR}$(VARDIR)/livelog
- # and a reminder
- 	@echo You may also want to reinstall the man pages via the doc Makefile.
- 
++	touch ${DESTDIR}$(VARDIR)/perm ${DESTDIR}$(VARDIR)/record ${DESTDIR}$(VARDIR)/logfile ${DESTDIR}$(VARDIR)/xlogfile \
++         ${DESTDIR}$(VARDIR)/livelog
+ # sysconf
+ 	true; $(SYSCONFINSTALL)
+ # other steps from hints file
diff --git a/games/xnethack/files/patch-sys-unix-sysconf b/games/xnethack/files/patch-sys-unix-sysconf
index 735bf28961ff..f236ed303d8e 100644
--- a/games/xnethack/files/patch-sys-unix-sysconf
+++ b/games/xnethack/files/patch-sys-unix-sysconf
@@ -1,11 +1,11 @@
---- sys/unix/sysconf.orig	2023-05-16 21:33:58 UTC
+--- sys/unix/sysconf.orig	2025-03-15 15:02:36 UTC
 +++ sys/unix/sysconf
-@@ -142,7 +142,7 @@ LIVELOG=0x11FFF
+@@ -146,7 +146,7 @@ LIVELOG=0x11FFF
  #   %D current time, YYYYMMDDhhmmss format
  #   %n player name
  #   %N first character of player name
 -DUMPLOGFILE=/tmp/xnethack.%n.%d.log
 +DUMPLOGFILE=/tmp/nethack.%v.%u.%n.%D.log
  
  # End of game HTML dump.
  # Only available if NetHack was compiled with DUMPHTML
diff --git a/games/xnethack/files/patch-util-makedefs.c b/games/xnethack/files/patch-util-makedefs.c
deleted file mode 100644
index cc81b65d80ff..000000000000
--- a/games/xnethack/files/patch-util-makedefs.c
+++ /dev/null
@@ -1,71 +0,0 @@
---- util/makedefs.c.orig	2023-05-16 21:33:58 UTC
-+++ util/makedefs.c
-@@ -113,6 +113,7 @@ static struct version_info version;
- #define MAXFNAMELEN 600
- 
- static char filename[MAXFNAMELEN];
-+static char tempfilename[MAXFNAMELEN];
- 
- #ifdef FILE_PREFIX
- /* if defined, a first argument not starting with - is
-@@ -244,6 +245,12 @@ main(int argc, char *argv[])
-         /*NOTREACHED*/
-     }
- 
-+    if (snprintf(tempfilename, sizeof(tempfilename), "%s.%d", "grep.tmp", getpid()) >= sizeof(tempfilename)) {
-+        Fprintf(stderr, "Cannot create temporary filename.");
-+        (void) fflush(stderr);
-+        return 1;
-+    }
-+
- #ifdef FILE_PREFIX
-     if (argc >= 2 && argv[1][0] != '-') {
-         file_prefix = argv[1];
-@@ -1041,12 +1048,12 @@ do_rnd_access_file(
-         Strcat(buf, "\n"); /* so make sure that the default one does too    */
-     (void) fputs(xcrypt(padline(buf, padlength)), ofp);
- 
--    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
-+    tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);
-     grep0(ifp, tfp, FLG_TEMPFILE);
- #ifndef HAS_NO_MKSTEMP
-     ifp = tfp;
- #else
--    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
-+    ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
- #endif
-     while ((line = fgetline(ifp)) != 0) {
-         if (line[0] != '#' && line[0] != '\n') {
-@@ -1059,7 +1066,7 @@ do_rnd_access_file(
-     Fclose(ofp);
- 
- #ifdef HAS_NO_MKSTEMP
--    delete_file(DATA_TEMPLATE, "grep.tmp");
-+    delete_file(DATA_TEMPLATE, templfilename);
- #endif
-     return;
- }
-@@ -1874,12 +1881,12 @@ do_dungeon(void)
-     }
-     Fprintf(ofp, "%s", Dont_Edit_Data);
- 
--    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE, FLG_TEMPFILE);
-+    tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE, FLG_TEMPFILE);
-     grep0(ifp, tfp, FLG_TEMPFILE);
- #ifndef HAS_NO_MKSTEMP
-     ifp = tfp;
- #else
--    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE, 0);
-+    ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE, 0);
- #endif
-     while ((line = fgetline(ifp)) != 0) {
-         SpinCursor(3);
-@@ -1895,7 +1902,7 @@ do_dungeon(void)
-     Fclose(ofp);
- 
- #ifdef HAS_NO_MKSTEMP
--    delete_file(DATA_TEMPLATE, "grep.tmp");
-+    delete_file(DATA_TEMPLATE, tempfilename);
- #endif
-     return;
- }
diff --git a/games/xnethack/files/patch-win-tty-termcap.c b/games/xnethack/files/patch-win-tty-termcap.c
index 3b0793f2d013..59a1c215512f 100644
--- a/games/xnethack/files/patch-win-tty-termcap.c
+++ b/games/xnethack/files/patch-win-tty-termcap.c
@@ -1,13 +1,13 @@
---- win/tty/termcap.c.orig	2023-05-16 21:33:58 UTC
+--- win/tty/termcap.c.orig	2025-03-15 15:02:36 UTC
 +++ win/tty/termcap.c
-@@ -192,10 +192,6 @@ tty_startup(int *wid, int *hgt)
+@@ -195,10 +195,6 @@ term_startup(int *wid, int *hgt)
          error("Terminal must backspace.");
  #else
          if (!(BC = Tgetstr(nhStr("bc")))) { /* termcap also uses bc/bs */
 -#ifndef MINIMAL_TERM
 -            if (!tgetflag(nhStr("bs")))
 -                error("Terminal must backspace.");
 -#endif
              BC = tbufptr;
              tbufptr += 2;
              *BC = '\b';
diff --git a/games/xnethack/files/patch-win_curses_cursmesg.c b/games/xnethack/files/patch-win_curses_cursmesg.c
new file mode 100644
index 000000000000..46232f19ef07
--- /dev/null
+++ b/games/xnethack/files/patch-win_curses_cursmesg.c
@@ -0,0 +1,11 @@
+--- win/curses/cursmesg.c.orig	2025-03-17 13:33:30 UTC
++++ win/curses/cursmesg.c
+@@ -31,7 +31,7 @@ glyph_info mesg_gi;
+ glyph_info mesg_gi;
+ 
+ #ifndef CURSES_GENL_PUTMIXED
+-#if defined(PDC_WIDE) || defined(NCURSES_WIDECHAR)
++#if defined(PDC_WIDE) || NCURSES_WIDECHAR
+ #define USE_CURSES_PUTMIXED
+ #else  /* WIDE */
+ #ifdef NH_PRAGMA_MESSAGE
diff --git a/games/xnethack/pkg-plist b/games/xnethack/pkg-plist
index 677fcf42551f..dfb0e6722ada 100644
--- a/games/xnethack/pkg-plist
+++ b/games/xnethack/pkg-plist
@@ -1,200 +1,201 @@
 @mode 555
 bin/%%HACKNAME%%
 @owner games
 @group games
 @mode 02755
 %%DATADIR%%/%%HACKNAME%%
 @mode
 %%DATADIR%%/Arc-fila.lua
 %%DATADIR%%/Arc-filb.lua
 %%DATADIR%%/Arc-goal.lua
 %%DATADIR%%/Arc-loca.lua
 %%DATADIR%%/Arc-strt.lua
 %%DATADIR%%/Bar-fila.lua
 %%DATADIR%%/Bar-filb.lua
 %%DATADIR%%/Bar-goal.lua
 %%DATADIR%%/Bar-loca.lua
 %%DATADIR%%/Bar-strt.lua
 %%DATADIR%%/Cav-fila.lua
 %%DATADIR%%/Cav-filb.lua
 %%DATADIR%%/Cav-goal.lua
 %%DATADIR%%/Cav-loca.lua
 %%DATADIR%%/Cav-strt.lua
 %%DATADIR%%/Hea-fila.lua
 %%DATADIR%%/Hea-filb.lua
 %%DATADIR%%/Hea-goal.lua
 %%DATADIR%%/Hea-loca.lua
 %%DATADIR%%/Hea-strt.lua
 %%DATADIR%%/Kni-fila.lua
 %%DATADIR%%/Kni-filb.lua
 %%DATADIR%%/Kni-goal.lua
 %%DATADIR%%/Kni-loca.lua
 %%DATADIR%%/Kni-strt.lua
 %%DATADIR%%/Mon-fila.lua
 %%DATADIR%%/Mon-filb.lua
 %%DATADIR%%/Mon-goal.lua
 %%DATADIR%%/Mon-loca.lua
 %%DATADIR%%/Mon-strt.lua
 %%DATADIR%%/NHdump.css
 %%DATADIR%%/NetHack.ad
 %%DATADIR%%/Pri-fila.lua
 %%DATADIR%%/Pri-filb.lua
 %%DATADIR%%/Pri-goal.lua
 %%DATADIR%%/Pri-loca.lua
 %%DATADIR%%/Pri-strt.lua
 %%DATADIR%%/Ran-fila.lua
 %%DATADIR%%/Ran-filb.lua
 %%DATADIR%%/Ran-goal.lua
 %%DATADIR%%/Ran-loca.lua
 %%DATADIR%%/Ran-strt.lua
 %%DATADIR%%/Rog-fila.lua
 %%DATADIR%%/Rog-filb.lua
 %%DATADIR%%/Rog-goal.lua
 %%DATADIR%%/Rog-loca.lua
 %%DATADIR%%/Rog-strt.lua
 %%DATADIR%%/Sam-fila.lua
 %%DATADIR%%/Sam-filb.lua
 %%DATADIR%%/Sam-goal.lua
 %%DATADIR%%/Sam-loca.lua
 %%DATADIR%%/Sam-strt.lua
 %%DATADIR%%/Tou-fila.lua
 %%DATADIR%%/Tou-filb.lua
 %%DATADIR%%/Tou-goal.lua
 %%DATADIR%%/Tou-loca.lua
 %%DATADIR%%/Tou-strt.lua
 %%DATADIR%%/Val-fila.lua
 %%DATADIR%%/Val-filb.lua
 %%DATADIR%%/Val-goal.lua
 %%DATADIR%%/Val-loca.lua
 %%DATADIR%%/Val-strt.lua
 %%DATADIR%%/Wiz-fila.lua
 %%DATADIR%%/Wiz-filb.lua
 %%DATADIR%%/Wiz-goal.lua
 %%DATADIR%%/Wiz-loca.lua
 %%DATADIR%%/Wiz-strt.lua
 %%DATADIR%%/abyssfill.lua
 %%DATADIR%%/air.lua
 %%DATADIR%%/asmodeus.lua
 %%DATADIR%%/astral.lua
 %%DATADIR%%/baalz.lua
 %%DATADIR%%/bigrm-1.lua
 %%DATADIR%%/bigrm-10.lua
 %%DATADIR%%/bigrm-11.lua
 %%DATADIR%%/bigrm-12.lua
 %%DATADIR%%/bigrm-13.lua
+%%DATADIR%%/bigrm-14.lua
 %%DATADIR%%/bigrm-2.lua
 %%DATADIR%%/bigrm-3.lua
 %%DATADIR%%/bigrm-4.lua
 %%DATADIR%%/bigrm-5.lua
 %%DATADIR%%/bigrm-6.lua
 %%DATADIR%%/bigrm-7.lua
 %%DATADIR%%/bigrm-8.lua
 %%DATADIR%%/bigrm-9.lua
 %%DATADIR%%/bogusmon
 %%DATADIR%%/castle.lua
 %%DATADIR%%/cmdhelp
 %%DATADIR%%/cocytusfill.lua
 %%DATADIR%%/data
 %%DATADIR%%/demogorgon.lua
 %%DATADIR%%/dis.lua
 %%DATADIR%%/dispater.lua
 %%DATADIR%%/dungeon.lua
 %%DATADIR%%/earth.lua
 %%DATADIR%%/engrave
 %%DATADIR%%/epitaph
 %%DATADIR%%/fire.lua
 %%DATADIR%%/geryon.lua
 %%DATADIR%%/hellfill.lua
 %%DATADIR%%/hellgate.lua
 %%DATADIR%%/help
 %%DATADIR%%/hh
 %%DATADIR%%/history
 %%DATADIR%%/invocation.lua
 %%DATADIR%%/juiblex.lua
 %%DATADIR%%/keyhelp
 %%DATADIR%%/knox.lua
 %%DATADIR%%/license
 @sample(games,games,664) %%DATADIR%%/livelog.sample
 @sample(games,games,664) %%DATADIR%%/logfile.sample
 %%DATADIR%%/medusa-1.lua
 %%DATADIR%%/medusa-2.lua
 %%DATADIR%%/medusa-3.lua
 %%DATADIR%%/medusa-4.lua
 %%DATADIR%%/minefill.lua
 %%DATADIR%%/minend-1.lua
 %%DATADIR%%/minend-2.lua
 %%DATADIR%%/minend-3.lua
 %%DATADIR%%/minend-4.lua
 %%DATADIR%%/minetn-1.lua
 %%DATADIR%%/minetn-2.lua
 %%DATADIR%%/minetn-3.lua
 %%DATADIR%%/minetn-4.lua
 %%DATADIR%%/minetn-5.lua
 %%DATADIR%%/minetn-6.lua
 %%DATADIR%%/minetn-7.lua
 %%DATADIR%%/minetn-8.lua
 %%DATADIR%%/nhcore.lua
 %%DATADIR%%/nhlib.lua
 %%DATADIR%%/nhtiles.bmp
 %%DATADIR%%/opthelp
 %%DATADIR%%/options
 %%DATADIR%%/optmenu
 %%DATADIR%%/oracle-1.lua
 %%DATADIR%%/oracle-2.lua
 %%DATADIR%%/oracle-3.lua
 %%DATADIR%%/oracles
 %%DATADIR%%/orcus.lua
 @mode 664
 %%DATADIR%%/perm
 @mode
 %%DATADIR%%/pet_mark.xbm
 %%DATADIR%%/pilemark.xbm
 %%DATADIR%%/quest.lua
 @sample(games,games,664) %%DATADIR%%/record.sample
 @mode 02755
 %%DATADIR%%/recover
 @mode
 %%DATADIR%%/repair-Val-loca.lua
 %%DATADIR%%/rip.xpm
 %%DATADIR%%/rumors
 %%DATADIR%%/sanctum.lua
 %%DATADIR%%/shirts
 %%DATADIR%%/soko1-1.lua
 %%DATADIR%%/soko1-2.lua
 %%DATADIR%%/soko2-1.lua
 %%DATADIR%%/soko2-2.lua
 %%DATADIR%%/soko3-1.lua
 %%DATADIR%%/soko3-2.lua
 %%DATADIR%%/soko4-1.lua
 %%DATADIR%%/soko4-2.lua
 %%DATADIR%%/styxmarsh.lua
 %%DATADIR%%/symbols
 @sample(games,games,) %%DATADIR%%/sysconf.sample
 %%DATADIR%%/themerms.lua
 %%DATADIR%%/tower1.lua
 %%DATADIR%%/tower2.lua
 %%DATADIR%%/tower3.lua
 %%DATADIR%%/tower4.lua
 %%DATADIR%%/tribute
 %%DATADIR%%/tut-1.lua
 %%DATADIR%%/tut-2.lua
 %%DATADIR%%/usagehlp
 %%DATADIR%%/valley.lua
 %%DATADIR%%/water.lua
 %%DATADIR%%/wizard1.lua
 %%DATADIR%%/wizard2.lua
 %%DATADIR%%/wizard3.lua
 %%DATADIR%%/wizhelp
 %%DATADIR%%/x11tiles
 %%DATADIR%%/yeenoghu.lua
 @sample(games,games,664) %%DATADIR%%/xlogfile.sample
 @owner
 @group
 share/man/man6/dlb.6.gz
 share/man/man6/makedefs.6.gz
 share/man/man6/recover.6.gz
 share/man/man6/%%HACKNAME%%.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
 @dir(games,games,0775) %%DATADIR%%/save
 @dir(games,games,0775) %%DATADIR%%/whereis
 @dir(games,games,0775) %%DATADIR%%