40 files changed, 288 insertions, 144 deletions

diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack/distinfo b/games/nethack/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack/distinfo
+++ b/games/nethack/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack/pkg-comment b/games/nethack/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack/pkg-comment
+++ b/games/nethack/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack/pkg-descr b/games/nethack/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack/pkg-descr
+++ b/games/nethack/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack/pkg-plist b/games/nethack/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack/pkg-plist
+++ b/games/nethack/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack3-tty/distinfo b/games/nethack3-tty/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack3-tty/distinfo
+++ b/games/nethack3-tty/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack3-tty/pkg-comment b/games/nethack3-tty/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack3-tty/pkg-comment
+++ b/games/nethack3-tty/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack3-tty/pkg-descr b/games/nethack3-tty/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack3-tty/pkg-descr
+++ b/games/nethack3-tty/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack3-tty/pkg-plist b/games/nethack3-tty/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack3-tty/pkg-plist
+++ b/games/nethack3-tty/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack3/distinfo b/games/nethack3/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack3/distinfo
+++ b/games/nethack3/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack3/pkg-comment b/games/nethack3/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack3/pkg-comment
+++ b/games/nethack3/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack3/pkg-descr b/games/nethack3/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack3/pkg-descr
+++ b/games/nethack3/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack3/pkg-plist b/games/nethack3/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack3/pkg-plist
+++ b/games/nethack3/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack32/distinfo b/games/nethack32/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack32/distinfo
+++ b/games/nethack32/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack32/pkg-comment b/games/nethack32/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack32/pkg-comment
+++ b/games/nethack32/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack32/pkg-descr b/games/nethack32/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack32/pkg-descr
+++ b/games/nethack32/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack32/pkg-plist b/games/nethack32/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack32/pkg-plist
+++ b/games/nethack32/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack33-nox11/distinfo b/games/nethack33-nox11/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack33-nox11/distinfo
+++ b/games/nethack33-nox11/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack33-nox11/pkg-comment b/games/nethack33-nox11/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack33-nox11/pkg-comment
+++ b/games/nethack33-nox11/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack33-nox11/pkg-descr b/games/nethack33-nox11/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack33-nox11/pkg-descr
+++ b/games/nethack33-nox11/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack33-nox11/pkg-plist b/games/nethack33-nox11/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack33-nox11/pkg-plist
+++ b/games/nethack33-nox11/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack33/distinfo b/games/nethack33/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack33/distinfo
+++ b/games/nethack33/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack33/pkg-comment b/games/nethack33/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack33/pkg-comment
+++ b/games/nethack33/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack33/pkg-descr b/games/nethack33/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack33/pkg-descr
+++ b/games/nethack33/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack33/pkg-plist b/games/nethack33/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack33/pkg-plist
+++ b/games/nethack33/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack34-nox11/distinfo b/games/nethack34-nox11/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack34-nox11/distinfo
+++ b/games/nethack34-nox11/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack34-nox11/pkg-comment b/games/nethack34-nox11/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack34-nox11/pkg-comment
+++ b/games/nethack34-nox11/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack34-nox11/pkg-descr b/games/nethack34-nox11/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack34-nox11/pkg-descr
+++ b/games/nethack34-nox11/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack34-nox11/pkg-plist b/games/nethack34-nox11/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack34-nox11/pkg-plist
+++ b/games/nethack34-nox11/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 1aa415d65224..c99f035cccae 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -1,27 +1,35 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.1.3
+# Version required:	3.2.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:17 asami Exp $
 #
 
-DISTNAME=	nethack3.1.3
-PKGNAME=	nethack-3.1.3
+DISTNAME=	nethack-3.2.0
 CATEGORIES+=	games
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
+	ftp://ftp.win.tue.nl/pub/games/nethack/General/Source/NH32/sources/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/nethack313
+NO_WRKSUBDIR=	yes
 USE_GMAKE=	yes
 SHELL=		/bin/sh
 
 pre-configure:
 	@cd ${WRKSRC}/sys/unix; ${SHELL} setup.sh
 
-pre-install:
-	@cd ${WRKSRC}/doc; ${MAKE} manpages
+post-install:
+	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+.if !defined(NOMANCOMPRESS)
+	for file in dgn_comp dlb lev_comp nethack recover; do \
+	  gzip -9nf ${PREFIX}/man/man6/$$file.6; \
+	done
+.endif
+.if !defined(NOPORTDOCS)
+	mkdir -p ${PREFIX}/share/doc/nethack
+	cp ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/nethack34/distinfo b/games/nethack34/distinfo
index 8ea1ea425e39..07be6a89b1a5 100644
--- a/games/nethack34/distinfo
+++ b/games/nethack34/distinfo
@@ -1 +1 @@
-MD5 (nethack3.1.3.tar.Z) = f196ed9659814cd85beeee10e60b7e73
+MD5 (nethack-3.2.0.tar.gz) = ad80565db2ada50f6535a4375daf372d
diff --git a/games/nethack34/pkg-comment b/games/nethack34/pkg-comment
index 70ca7a893988..241792bf2fb7 100644
--- a/games/nethack34/pkg-comment
+++ b/games/nethack34/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game
+A dungeon explorin', slashin', hackin' game.
diff --git a/games/nethack34/pkg-descr b/games/nethack34/pkg-descr
index 930792660105..7a387994d6fd 100644
--- a/games/nethack34/pkg-descr
+++ b/games/nethack34/pkg-descr
@@ -1,6 +1,6 @@
-This is version 3.1.3 of nethack.  You and your puppy (or kitten) will
-explore the deep dungeons to retrieve the long-lost magical item that
-causes so much trouble to anyone.
+This is nethack.  You and your puppy (or kitten) will explore the deep
+dungeons to retrieve the long-lost magical item that causes so much
+trouble to anyone.
 
 Take care, and try not to miss meals.
 
diff --git a/games/nethack34/pkg-plist b/games/nethack34/pkg-plist
index bc34c6609649..fc1a8769dd90 100644
--- a/games/nethack34/pkg-plist
+++ b/games/nethack34/pkg-plist
@@ -1,7 +1,11 @@
 bin/nethack
-lib/nethackdir/save
+@exec mkdir %D/lib/nethackdir/save
+@exec chmod 775 %D/lib/nethackdir/save
+@exec chown games.games %D/lib/nethackdir/save
+@unexec rmdir %D/lib/nethackdir/save
 lib/nethackdir/nethack
 man/man6/dgn_comp.6.gz
+man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
 man/man6/nethack.6.gz
 man/man6/recover.6.gz
@@ -69,7 +73,11 @@ lib/nethackdir/air.lev
 lib/nethackdir/asmodeus.lev
 lib/nethackdir/astral.lev
 lib/nethackdir/baalz.lev
-lib/nethackdir/bigroom.lev
+lib/nethackdir/bigrm-1.lev
+lib/nethackdir/bigrm-2.lev
+lib/nethackdir/bigrm-3.lev
+lib/nethackdir/bigrm-4.lev
+lib/nethackdir/bigrm-5.lev
 lib/nethackdir/castle.lev
 lib/nethackdir/cmdhelp
 lib/nethackdir/data
@@ -87,9 +95,11 @@ lib/nethackdir/license
 lib/nethackdir/logfile
 lib/nethackdir/medusa-1.lev
 lib/nethackdir/medusa-2.lev
-lib/nethackdir/mine_end.lev
 lib/nethackdir/minefill.lev
-lib/nethackdir/minetown.lev
+lib/nethackdir/minend-1.lev
+lib/nethackdir/minend-2.lev
+lib/nethackdir/minetn-1.lev
+lib/nethackdir/minetn-2.lev
 lib/nethackdir/opthelp
 lib/nethackdir/options
 lib/nethackdir/oracle.lev