diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index e84dac0d776d..501d6520f1b8 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -1,112 +1,112 @@
 PORTNAME=	nethack33
 PORTVERSION=	3.3.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
 DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon explorin', slashin', hackin' game
 WWW=		https://www.nethack.org/
 
 WRKSRC=		${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION}
 
 USES=		gmake ncurses tar:tgz
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
 MAKE_JOBS_UNSAFE=	yes
 TRUEPORTNAME=	nethack
 
 HACKEXT?=	33
 HACKNAME?=	${TRUEPORTNAME}${HACKEXT}
 HACKDIR?=	share/${HACKNAME}
 HACKLINK=	${TRUEPORTNAME}
 
 DATADIR=	${PREFIX}/${HACKDIR}
 DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 .if !defined(PKGNAMESUFFIX)
 USES+=		xorg
 USE_XORG=	xaw xpm
 GRAPHICS=	X11_GRAPHICS
 .else
 .if ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
 .endif
 .endif
 
 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
 
 pre-everything::
 .if defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel   "
 	@${ECHO_MSG} " But ${PKGBASE} reads your prior nethack scores           "
 	@${ECHO_MSG} " Don't forget to backup your nethack libdir if it's      "
 	@${ECHO_MSG} " important for you                                       "
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 .else
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} " You may use the following build options:                "
 	@${ECHO_MSG} " WITH_TTY_GRAPHICS=yes              build with no GUI    "
 	@${ECHO_MSG} " WITHOUT_X11=yes                    same as above        "
 	@${ECHO_MSG} "                                                         "
 	@${ECHO_MSG} " By default, nethack port is built with X11 GUI.         "
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 	@${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
 .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:
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 	@${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}
 .endif
 	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
 	@${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 ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/nethack33/files/patch-sys-unix-Makefile.doc b/games/nethack33/files/patch-sys-unix-Makefile.doc
index f1064c2f1a74..97fd04fd0a42 100644
--- a/games/nethack33/files/patch-sys-unix-Makefile.doc
+++ b/games/nethack33/files/patch-sys-unix-Makefile.doc
@@ -1,41 +1,41 @@
 --- sys/unix/Makefile.doc.orig	2000-01-14 12:49:48.000000000 -0800
 +++ sys/unix/Makefile.doc	2014-06-28 23:11:38.000000000 -0700
 @@ -34,15 +34,15 @@
  
  
  GAME	= nethack
 -MANDIR	= /usr/man/man6
-+MANDIR	= ${MANPREFIX}/man/man
++MANDIR	= ${PREFIX}/share/man/man
  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 >
 @@ -51,11 +51,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)$(MANEXT)/%%HACKNAME%%.$(MANEXT)
 +	-$(LEVMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/lev_comp%%HACKEXT%%.$(MANEXT)
 +	-$(DGNMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/dgn_comp%%HACKEXT%%.$(MANEXT)
 +	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/recover%%HACKEXT%%.$(MANEXT)
 +	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)$(MANEXT)/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/nethack33/pkg-plist b/games/nethack33/pkg-plist
index de3fa9ce2027..46c665798c2c 100644
--- a/games/nethack33/pkg-plist
+++ b/games/nethack33/pkg-plist
@@ -1,149 +1,149 @@
 %%HACKLINK%%bin/nethack
 @mode 555
 bin/%%HACKNAME%%
 @owner games
 @group games
 @mode 02755
 %%DATADIR%%/%%HACKNAME%%
 @mode
 %%DATADIR%%/Arc-fila.lev
 %%DATADIR%%/Arc-filb.lev
 %%DATADIR%%/Arc-goal.lev
 %%DATADIR%%/Arc-loca.lev
 %%DATADIR%%/Arc-strt.lev
 %%DATADIR%%/Bar-fila.lev
 %%DATADIR%%/Bar-filb.lev
 %%DATADIR%%/Bar-goal.lev
 %%DATADIR%%/Bar-loca.lev
 %%DATADIR%%/Bar-strt.lev
 %%DATADIR%%/Cav-fila.lev
 %%DATADIR%%/Cav-filb.lev
 %%DATADIR%%/Cav-goal.lev
 %%DATADIR%%/Cav-loca.lev
 %%DATADIR%%/Cav-strt.lev
 %%DATADIR%%/Hea-fila.lev
 %%DATADIR%%/Hea-filb.lev
 %%DATADIR%%/Hea-goal.lev
 %%DATADIR%%/Hea-loca.lev
 %%DATADIR%%/Hea-strt.lev
 %%DATADIR%%/Kni-fila.lev
 %%DATADIR%%/Kni-filb.lev
 %%DATADIR%%/Kni-goal.lev
 %%DATADIR%%/Kni-loca.lev
 %%DATADIR%%/Kni-strt.lev
 %%DATADIR%%/Mon-fila.lev
 %%DATADIR%%/Mon-filb.lev
 %%DATADIR%%/Mon-goal.lev
 %%DATADIR%%/Mon-loca.lev
 %%DATADIR%%/Mon-strt.lev
 %%DATADIR%%/Pri-fila.lev
 %%DATADIR%%/Pri-filb.lev
 %%DATADIR%%/Pri-goal.lev
 %%DATADIR%%/Pri-loca.lev
 %%DATADIR%%/Pri-strt.lev
 %%DATADIR%%/Ran-fila.lev
 %%DATADIR%%/Ran-filb.lev
 %%DATADIR%%/Ran-goal.lev
 %%DATADIR%%/Ran-loca.lev
 %%DATADIR%%/Ran-strt.lev
 %%DATADIR%%/Rog-fila.lev
 %%DATADIR%%/Rog-filb.lev
 %%DATADIR%%/Rog-goal.lev
 %%DATADIR%%/Rog-loca.lev
 %%DATADIR%%/Rog-strt.lev
 %%DATADIR%%/Sam-fila.lev
 %%DATADIR%%/Sam-filb.lev
 %%DATADIR%%/Sam-goal.lev
 %%DATADIR%%/Sam-loca.lev
 %%DATADIR%%/Sam-strt.lev
 %%DATADIR%%/Tou-fila.lev
 %%DATADIR%%/Tou-filb.lev
 %%DATADIR%%/Tou-goal.lev
 %%DATADIR%%/Tou-loca.lev
 %%DATADIR%%/Tou-strt.lev
 %%DATADIR%%/Val-fila.lev
 %%DATADIR%%/Val-filb.lev
 %%DATADIR%%/Val-goal.lev
 %%DATADIR%%/Val-loca.lev
 %%DATADIR%%/Val-strt.lev
 %%DATADIR%%/Wiz-fila.lev
 %%DATADIR%%/Wiz-filb.lev
 %%DATADIR%%/Wiz-goal.lev
 %%DATADIR%%/Wiz-loca.lev
 %%DATADIR%%/Wiz-strt.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%%/mapbg.xpm
 %%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
 @mode 02755
 %%DATADIR%%/recover
 @mode
 %%DATADIR%%/rip.xpm
 %%DATADIR%%/rumors
 %%DATADIR%%/sanctum.lev
 %%DATADIR%%/soko1-1.lev
 %%DATADIR%%/soko1-2.lev
 %%DATADIR%%/soko2-1.lev
 %%DATADIR%%/soko2-2.lev
 %%DATADIR%%/soko3-1.lev
 %%DATADIR%%/soko3-2.lev
 %%DATADIR%%/soko4-1.lev
 %%DATADIR%%/soko4-2.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