Index: head/games/nethack36/Makefile
===================================================================
--- head/games/nethack36/Makefile	(revision 530625)
+++ head/games/nethack36/Makefile	(revision 530626)
@@ -1,109 +1,109 @@
 # Created by: asami
 # $FreeBSD$
 
 PORTNAME=	nethack36
-PORTVERSION=	3.6.4
+PORTVERSION=	3.6.6
 CATEGORIES=	games
 MASTER_SITES=	https://nethack.org/download/${PORTVERSION}/
 DISTNAME=	${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Dungeon explorin', slashin', hackin' game
 
 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
 
 USES=		alias compiler:c11 gmake ncurses tar:tgz
 
 WRKSRC=		${WRKDIR}/NetHack-NetHack-${PORTVERSION}_Released
 
 MAKE_ENV=	GRAPHICS="${GRAPHICS}"
 PLIST_SUB=	HACKNAME="${HACKNAME}" \
 		HACKEXT="${HACKEXT}"
 TRUEPORTNAME=	nethack
 
 # Configure these variables as you want them to be.
 HACKEXT?=	36
 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 xmu xext xt x11 sm ice
 CFLAGS+=	-DX11_GRAPHICS -DUSE_TILES
 GRAPHICS=	X11_GRAPHICS
 .else
 .if ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
 .endif
 .endif
 CFLAGS+=	-DNOMAIL
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else
 PLIST_SUB+=	HACKLINK="@comment "
 .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.doc sys/unix/Makefile.src sys/unix/Makefile.top
+.for f in sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top
 	@${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
 .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:
 	@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
 	@${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf
 	# Make sysconf a sample to prevent it being removed if altered
 	@${CP} ${STAGEDIR}/${DATADIR}/sysconf ${STAGEDIR}/${DATADIR}/sysconf.sample
 	# 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
 	@${CP} ${STAGEDIR}/${DATADIR}/xlogfile ${STAGEDIR}/${DATADIR}/xlogfile.sample
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/games/nethack36/distinfo
===================================================================
--- head/games/nethack36/distinfo	(revision 530625)
+++ head/games/nethack36/distinfo	(revision 530626)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577729401
-SHA256 (nethack-364-src.tgz) = 0531ab8466032611d61f702cb71fb3ceca78a7a4918885c1b4f2f17cb57dbd59
-SIZE (nethack-364-src.tgz) = 5573777
+TIMESTAMP = 1585980827
+SHA256 (nethack-366-src.tgz) = cfde0c3ab6dd7c22ae82e1e5a59ab80152304eb23fb06e3129439271e5643ed2
+SIZE (nethack-366-src.tgz) = 5577633
Index: head/games/nethack36/files/patch-util-makedefs.c
===================================================================
--- head/games/nethack36/files/patch-util-makedefs.c	(revision 530625)
+++ head/games/nethack36/files/patch-util-makedefs.c	(revision 530626)
@@ -1,65 +1,65 @@
---- util/makedefs.c.orig	2019-05-08 00:00:16.000000000 -0700
-+++ util/makedefs.c	2019-05-16 08:21:09.868001000 -0700
+--- util/makedefs.c.orig	2020-04-04 00:36:25.595499000 -0700
++++ util/makedefs.c	2020-04-04 00:42:25.126524000 -0700
 @@ -139,6 +139,7 @@
  #define MAXFNAMELEN 600
  
  static char filename[MAXFNAMELEN];
 +static char tempfilename[MAXFNAMELEN];
  
  #ifdef FILE_PREFIX
  /* if defined, a first argument not starting with - is
-@@ -272,6 +273,12 @@
+@@ -279,6 +280,12 @@
          return 1;
      }
  
 +    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];
-@@ -967,9 +974,9 @@
-     }
-     Fprintf(ofp, "%s", Dont_Edit_Data);
+@@ -993,9 +1000,9 @@
+        more likely to be picked than normal but it's nothing to worry about */
+     (void) fputs(xcrypt(deflt_content), ofp);
  
 -    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE);
 +    tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE);
      grep0(ifp, tfp);
 -    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE);
 +    ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE);
  
      while ((line = fgetline(ifp)) != 0) {
          if (line[0] != '#' && line[0] != '\n')
-@@ -979,7 +986,7 @@
+@@ -1005,7 +1012,7 @@
      Fclose(ifp);
      Fclose(ofp);
  
 -    delete_file(DATA_TEMPLATE, "grep.tmp");
 +    delete_file(DATA_TEMPLATE, tempfilename);
      return;
  }
  
-@@ -2230,9 +2237,9 @@
+@@ -2291,9 +2298,9 @@
      }
      Fprintf(ofp, "%s", Dont_Edit_Data);
  
 -    tfp = getfp(DATA_TEMPLATE, "grep.tmp", WRTMODE);
 +    tfp = getfp(DATA_TEMPLATE, tempfilename, WRTMODE);
      grep0(ifp, tfp);
 -    ifp = getfp(DATA_TEMPLATE, "grep.tmp", RDTMODE);
 +    ifp = getfp(DATA_TEMPLATE, tempfilename, RDTMODE);
  
      while ((line = fgetline(ifp)) != 0) {
          SpinCursor(3);
-@@ -2247,7 +2254,7 @@
+@@ -2308,7 +2315,7 @@
      Fclose(ifp);
      Fclose(ofp);
  
 -    delete_file(DATA_TEMPLATE, "grep.tmp");
 +    delete_file(DATA_TEMPLATE, tempfilename);
      return;
  }
  
Index: head/games/nethack36/pkg-plist
===================================================================
--- head/games/nethack36/pkg-plist	(revision 530625)
+++ head/games/nethack36/pkg-plist	(revision 530626)
@@ -1,173 +1,173 @@
 %%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%%/bigrm-10.lev
 %%DATADIR%%/bigrm-6.lev
 %%DATADIR%%/bigrm-7.lev
 %%DATADIR%%/bigrm-8.lev
 %%DATADIR%%/bigrm-9.lev
+%%DATADIR%%/bigrm-10.lev
 %%DATADIR%%/bogusmon
 %%DATADIR%%/castle.lev
 %%DATADIR%%/cmdhelp
 %%DATADIR%%/data
 %%DATADIR%%/dungeon
 %%DATADIR%%/earth.lev
 %%DATADIR%%/engrave
 %%DATADIR%%/epitaph
 %%DATADIR%%/fakewiz1.lev
 %%DATADIR%%/fakewiz2.lev
 %%DATADIR%%/fire.lev
 %%DATADIR%%/help
 %%DATADIR%%/hh
 %%DATADIR%%/history
 %%DATADIR%%/juiblex.lev
 %%DATADIR%%/keyhelp
 %%DATADIR%%/knox.lev
 %%DATADIR%%/license
 @sample(games,games,664) %%DATADIR%%/logfile.sample
 %%DATADIR%%/mapbg.xpm
 %%DATADIR%%/medusa-1.lev
 %%DATADIR%%/medusa-2.lev
 %%DATADIR%%/medusa-3.lev
 %%DATADIR%%/medusa-4.lev
 %%DATADIR%%/minefill.lev
 %%DATADIR%%/minend-1.lev
 %%DATADIR%%/minend-2.lev
 %%DATADIR%%/minend-3.lev
 %%DATADIR%%/minetn-1.lev
 %%DATADIR%%/minetn-2.lev
 %%DATADIR%%/minetn-3.lev
 %%DATADIR%%/minetn-4.lev
 %%DATADIR%%/minetn-5.lev
 %%DATADIR%%/minetn-6.lev
 %%DATADIR%%/minetn-7.lev
 %%DATADIR%%/opthelp
 %%DATADIR%%/options
 %%DATADIR%%/oracle.lev
 %%DATADIR%%/oracles
 %%DATADIR%%/orcus.lev
 @mode 664
 %%DATADIR%%/perm
 @mode
 %%DATADIR%%/pet_mark.xbm
 %%DATADIR%%/pilemark.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%%/symbols
 @sample(games,games,) %%DATADIR%%/sysconf.sample
 %%DATADIR%%/tower1.lev
 %%DATADIR%%/tower2.lev
 %%DATADIR%%/tower3.lev
 %%DATADIR%%/tribute
 %%DATADIR%%/valley.lev
 %%DATADIR%%/water.lev
 %%DATADIR%%/wizard1.lev
 %%DATADIR%%/wizard2.lev
 %%DATADIR%%/wizard3.lev
 %%DATADIR%%/wizhelp
 %%DATADIR%%/x11tiles
 @sample(games,games,664) %%DATADIR%%/xlogfile.sample
 @owner
 @group
 man/man6/dgn_comp%%HACKEXT%%.6.gz
 man/man6/dlb%%HACKEXT%%.6.gz
 man/man6/lev_comp%%HACKEXT%%.6.gz
 man/man6/makedefs%%HACKEXT%%.6.gz
 man/man6/%%HACKNAME%%.6.gz
 man/man6/recover%%HACKEXT%%.6.gz
 %%PORTDOCS%%%%DOCSDIR%%/Guidebook.txt
 @dir(games,games,0775) %%DATADIR%%/save
 @dir(games,games,0775) %%DATADIR%%