diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 88ec84832b94..8a015487f91e 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	nethack32
 PORTVERSION=	3.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	SF/${TRUEPORTNAME}/${TRUEPORTNAME}/3.2.2
 DISTNAME=	nethack-322
 
 PATCH_SITES=	SOURCEFORGE/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
 PATCHFILES=	nh-3.2.2-3.2.3.diff
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon explorin', slashin', hackin' game
 WWW=		https://www.nethack.org/
 
 WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-3.2.2
 
 USES=		tar:tgz xorg
 USE_XORG=	xaw xpm
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
 MAKE_JOBS_UNSAFE=	yes
 TRUEPORTNAME=	nethack
 
 HACKEXT?=	32
 HACKNAME?=	${TRUEPORTNAME}${HACKEXT}
 HACKDIR?=	share/${HACKNAME}
 HACKLINK=	${TRUEPORTNAME}
 
 DATADIR=	${PREFIX}/${HACKDIR}
 DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else
 PLIST_SUB+=	HACKLINK="@comment "
 .endif
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-patch:
 .for f in include/config.h sys/unix/Makefile.top sys/unix/Makefile.doc
 	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
 		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
 		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
 		${WRKSRC}/${f}
 .endfor
 .for f in dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
 		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
 		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
 		${WRKSRC}/doc/${f}
 .endfor
 
 do-configure:
 	@(cd ${WRKSRC}/sys/unix && ${SH} setup.sh)
 
 pre-install:
 	@${CAT} ${FILESDIR}/pkg-deinstall.in | ${SED} \
 		-e 's|%%HACKDIR%%|${HACKDIR}|g' > ${PKGDEINSTALL}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/save
 	# Make "sample" files from records to prevent them being removed
 	# if they have been altered
 	@${CP} ${STAGEDIR}/${DATADIR}/logfile ${STAGEDIR}/${DATADIR}/logfile.sample
 	@${CP} ${STAGEDIR}/${DATADIR}/record ${STAGEDIR}/${DATADIR}/record.sample
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 	@${LN} -s -f ${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}
 .endif
 	${DO_MAKE_BUILD} -C ${WRKSRC}/doc ${MAKE_ARGS} manpages
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/games/nethack32/files/patch-sys-unix-Makefile.doc b/games/nethack32/files/patch-sys-unix-Makefile.doc
index d1e20b0424b2..6ed225fc17d2 100644
--- a/games/nethack32/files/patch-sys-unix-Makefile.doc
+++ b/games/nethack32/files/patch-sys-unix-Makefile.doc
@@ -1,41 +1,41 @@
 --- sys/unix/Makefile.doc.orig	1996-12-10 12:20:08.000000000 -0800
 +++ sys/unix/Makefile.doc	2014-06-28 15:07:24.000000000 -0700
 @@ -31,15 +31,15 @@
  
  
  GAME	= nethack
 -MANDIR	= /usr/man/man6
-+MANDIR	= ${MANPREFIX}/man/man6
++MANDIR	= ${PREFIX}/share/man/man6
  MANEXT	= 6
  
  # manual installation for most BSD-style systems
 -GAMEMANCREATE = cp nethack.6
 -LEVMANCREATE = cp lev_comp.6
 -DGNMANCREATE = cp dgn_comp.6
 -RCVRMANCREATE = cp recover.6
 -DLBMANCREATE = cp dlb.6
 +GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
 +LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
 +DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
 +RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
 +DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
  # manual installation for most SYSV-style systems
  # GAMEMANCREATE = nroff -man nethack.6 >
  # LEVMANCREATE = nroff -man lev_comp.6 >
 @@ -48,11 +48,11 @@
  # DLBMANCREATE = nroff -man dlb.6 >
  
  manpages:
 -	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
 -	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
 -	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
 -	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
 -	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
 +	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)/%%HACKNAME%%.$(MANEXT)
 +	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)/lev_comp%%HACKEXT%%.$(MANEXT)
 +	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)/dgn_comp%%HACKEXT%%.$(MANEXT)
 +	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)/recover%%HACKEXT%%.$(MANEXT)
 +	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)/dlb%%HACKEXT%%.$(MANEXT)
  
  # manual creation for distribution
  DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/games/nethack32/pkg-plist b/games/nethack32/pkg-plist
index ce52514b77d7..6cf3febc4379 100644
--- a/games/nethack32/pkg-plist
+++ b/games/nethack32/pkg-plist
@@ -1,130 +1,130 @@
 %%HACKLINK%%bin/nethack
 @(,,555) bin/%%HACKNAME%%
 @owner games
 @group games
 @(,,02755) %%DATADIR%%/%%HACKNAME%%
 %%DATADIR%%/A-filla.lev
 %%DATADIR%%/A-fillb.lev
 %%DATADIR%%/A-goal.lev
 %%DATADIR%%/A-locate.lev
 %%DATADIR%%/A-start.lev
 %%DATADIR%%/B-filla.lev
 %%DATADIR%%/B-fillb.lev
 %%DATADIR%%/B-goal.lev
 %%DATADIR%%/B-locate.lev
 %%DATADIR%%/B-start.lev
 %%DATADIR%%/C-filla.lev
 %%DATADIR%%/C-fillb.lev
 %%DATADIR%%/C-goal.lev
 %%DATADIR%%/C-locate.lev
 %%DATADIR%%/C-start.lev
 %%DATADIR%%/E-filla.lev
 %%DATADIR%%/E-fillb.lev
 %%DATADIR%%/E-goal.lev
 %%DATADIR%%/E-locate.lev
 %%DATADIR%%/E-start.lev
 %%DATADIR%%/H-filla.lev
 %%DATADIR%%/H-fillb.lev
 %%DATADIR%%/H-goal.lev
 %%DATADIR%%/H-locate.lev
 %%DATADIR%%/H-start.lev
 %%DATADIR%%/K-filla.lev
 %%DATADIR%%/K-fillb.lev
 %%DATADIR%%/K-goal.lev
 %%DATADIR%%/K-locate.lev
 %%DATADIR%%/K-start.lev
 %%DATADIR%%/P-filla.lev
 %%DATADIR%%/P-fillb.lev
 %%DATADIR%%/P-goal.lev
 %%DATADIR%%/P-locate.lev
 %%DATADIR%%/P-start.lev
 %%DATADIR%%/R-filla.lev
 %%DATADIR%%/R-fillb.lev
 %%DATADIR%%/R-goal.lev
 %%DATADIR%%/R-locate.lev
 %%DATADIR%%/R-start.lev
 %%DATADIR%%/S-filla.lev
 %%DATADIR%%/S-fillb.lev
 %%DATADIR%%/S-goal.lev
 %%DATADIR%%/S-locate.lev
 %%DATADIR%%/S-start.lev
 %%DATADIR%%/T-filla.lev
 %%DATADIR%%/T-fillb.lev
 %%DATADIR%%/T-goal.lev
 %%DATADIR%%/T-locate.lev
 %%DATADIR%%/T-start.lev
 %%DATADIR%%/V-filla.lev
 %%DATADIR%%/V-fillb.lev
 %%DATADIR%%/V-goal.lev
 %%DATADIR%%/V-locate.lev
 %%DATADIR%%/V-start.lev
 %%DATADIR%%/W-filla.lev
 %%DATADIR%%/W-fillb.lev
 %%DATADIR%%/W-goal.lev
 %%DATADIR%%/W-locate.lev
 %%DATADIR%%/W-start.lev
 %%DATADIR%%/air.lev
 %%DATADIR%%/asmodeus.lev
 %%DATADIR%%/astral.lev
 %%DATADIR%%/baalz.lev
 %%DATADIR%%/bigrm-1.lev
 %%DATADIR%%/bigrm-2.lev
 %%DATADIR%%/bigrm-3.lev
 %%DATADIR%%/bigrm-4.lev
 %%DATADIR%%/bigrm-5.lev
 %%DATADIR%%/castle.lev
 %%DATADIR%%/cmdhelp
 %%DATADIR%%/data
 %%DATADIR%%/dungeon
 %%DATADIR%%/earth.lev
 %%DATADIR%%/fakewiz1.lev
 %%DATADIR%%/fakewiz2.lev
 %%DATADIR%%/fire.lev
 %%DATADIR%%/help
 %%DATADIR%%/hh
 %%DATADIR%%/history
 %%DATADIR%%/juiblex.lev
 %%DATADIR%%/knox.lev
 %%DATADIR%%/license
 @sample(games,games,664) %%DATADIR%%/logfile.sample
 %%DATADIR%%/medusa-1.lev
 %%DATADIR%%/medusa-2.lev
 %%DATADIR%%/minefill.lev
 %%DATADIR%%/minend-1.lev
 %%DATADIR%%/minend-2.lev
 %%DATADIR%%/minetn-1.lev
 %%DATADIR%%/minetn-2.lev
 %%DATADIR%%/opthelp
 %%DATADIR%%/options
 %%DATADIR%%/oracle.lev
 %%DATADIR%%/oracles
 %%DATADIR%%/orcus.lev
 %%DATADIR%%/perm
 %%DATADIR%%/pet_mark.xbm
 %%DATADIR%%/quest.dat
 @sample(games,games,664) %%DATADIR%%/record.sample
 @(,,02755) %%DATADIR%%/recover
 %%DATADIR%%/rip.xpm
 %%DATADIR%%/rumors
 %%DATADIR%%/sanctum.lev
 %%DATADIR%%/tower1.lev
 %%DATADIR%%/tower2.lev
 %%DATADIR%%/tower3.lev
 %%DATADIR%%/valley.lev
 %%DATADIR%%/water.lev
 %%DATADIR%%/wizard1.lev
 %%DATADIR%%/wizard2.lev
 %%DATADIR%%/wizard3.lev
 %%DATADIR%%/wizhelp
 %%DATADIR%%/x11tiles
 @mode
 @owner
 @group
-man/man6/dgn_comp%%HACKEXT%%.6.gz
-man/man6/dlb%%HACKEXT%%.6.gz
-man/man6/lev_comp%%HACKEXT%%.6.gz
-man/man6/%%HACKNAME%%.6.gz
-man/man6/recover%%HACKEXT%%.6.gz
+share/man/man6/dgn_comp%%HACKEXT%%.6.gz
+share/man/man6/dlb%%HACKEXT%%.6.gz
+share/man/man6/lev_comp%%HACKEXT%%.6.gz
+share/man/man6/%%HACKNAME%%.6.gz
+share/man/man6/recover%%HACKEXT%%.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
 @dir(games,games,0775) %%DATADIR%%
 @dir(games,games,0775) %%DATADIR%%/save