diff --git a/games/xnethack/Makefile b/games/xnethack/Makefile
index 148567aa4341..990d6b994945 100644
--- a/games/xnethack/Makefile
+++ b/games/xnethack/Makefile
@@ -1,97 +1,98 @@
 PORTNAME=	xNetHack
 DISTVERSIONPREFIX=	xnh
 DISTVERSION=	8.0
+PORTREVISION=	1
 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
 
 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}
 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
 .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/files/patch-sys-unix-Makefile.doc b/games/xnethack/files/patch-sys-unix-Makefile.doc
index 9dbf2ddf142b..bc26192149f2 100644
--- a/games/xnethack/files/patch-sys-unix-Makefile.doc
+++ b/games/xnethack/files/patch-sys-unix-Makefile.doc
@@ -1,42 +1,42 @@
 --- sys/unix/Makefile.doc.orig	2023-05-16 21:33:58 UTC
 +++ sys/unix/Makefile.doc
 @@ -78,17 +78,17 @@ Guidebook.dvi	: $(GUIDEBOOK_TEX)
  # (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}/man/man6
++MANDIR	= ${PREFIX}/share/man/man6
  MANEXT	= 6
  
  # 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) >
  # MDMANCREATE = cat makedefs.6 | $(NHGREP) | nroff -man - >
  
  manpages:
 -	-$(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 \
diff --git a/games/xnethack/pkg-plist b/games/xnethack/pkg-plist
index b82a341e75b2..677fcf42551f 100644
--- a/games/xnethack/pkg-plist
+++ b/games/xnethack/pkg-plist
@@ -1,200 +1,200 @@
 @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-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
-man/man6/dlb.6.gz
-man/man6/makedefs.6.gz
-man/man6/recover.6.gz
-man/man6/%%HACKNAME%%.6.gz
+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%%