Update to 3.3.1

PR:		ports/29822
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

This port should be repocopied and renamed to nethack3-qt later.

60 files changed, 1101 insertions, 1707 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 3fbc438c3ef0..baf3973c83dc 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -5,69 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt-nethack
-PORTVERSION=	1.0.1
+PORTNAME=	nethack
+PKGNAMESUFFIX=	-qt
+PORTVERSION=	3.3.1
 CATEGORIES=	games
-MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
-		ftp://ftp.troll.no/contrib/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	nethack
-DISTNAME=	nethack-3.2.2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
-		xpmtoppm:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
-
-QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
-QT_SOUND=	nhs.tar.gz
-EXTRACT_ONLY=	nethack-3.2.2.tar.gz
-
-USE_QT_VER=	1
-USE_XPM=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_QT_VER=	2
 USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
-BROKEN=		"Compiler error"
+pre-everything:
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!! You cannot install nethack and nethack-qt in parallel  !!"
+	@${ECHO} "!! But nethack-qt might read your prior nethack scores    !!"
+	@${ECHO} "!! Don't forget to backup your nethack libdir if it's     !!"
+	@${ECHO} "!! important for you                                      !!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 
-pre-configure:
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
-	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
-	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
-	@ ${ECHO} "!! important for you                                     !!"
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ cd ${WRKSRC}/win; tar xzf ${DISTDIR}/${QT_PATCH}
-	@ cd ${WRKSRC}; ${PATCH} -s < win/Qt/nhqt.patch
-	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-Makefile.diff
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-sounds.c.diff
-	@ cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/include-unixconf.h.diff
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 
-pre-build:
-	(cd ${WRKSRC}/util; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} tile2x11 )
+pre-configure:
+	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 post-install:
-	@ cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
+	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/nethack
-	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
 .endif
-	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@ cd ${PREFIX}/lib/nethackdir; ${CHOWN} root:games *.au .nethackrc
-	@ cd ${PREFIX}/lib/nethackdir; ${CHMOD} 444 *.au .nethackrc
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "post-installation hints
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "a) Add this to your user environment:"
-	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
-	@ ${ECHO}  "b) Start the NAS audio server"
-	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
-	@ ${ECHO}  "c) Copy the example nethackrc file from ${FILESDIR} to your"
-	@ ${ECHO}  "   login directory:"
-	@ ${ECHO}  "   ${CP} ${FILESDIR}/sample.nethackrc ${HOME}/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index c622e477464a..24595f9d9a12 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,3 +1 @@
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a
-MD5 (nhs.tar.gz) = 6f0540d7fee3c8cf927f47031f6ca6a2
+MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack-qt/files/include-unixconf.h.diff b/games/nethack-qt/files/include-unixconf.h.diff
deleted file mode 100644
index 53150d818111..000000000000
--- a/games/nethack-qt/files/include-unixconf.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/unixconf.h.orig	Thu Mar 20 23:17:16 1997
-+++ include/unixconf.h	Thu Mar 20 23:17:29 1997
-@@ -42,7 +42,7 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
- #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
diff --git a/games/nethack-qt/files/patch-aa b/games/nethack-qt/files/patch-aa
deleted file mode 100644
index 4f8040adbbc0..000000000000
--- a/games/nethack-qt/files/patch-aa
+++ /dev/null
@@ -1,127 +0,0 @@
---- ./include/system.h.org	Mon Mar 25 17:18:32 1996
-+++ ./include/system.h	Sun Apr 21 18:10:01 1996
-@@ -78,7 +78,7 @@
- # if !defined(SUNOS4) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
--#  ifndef bsdi
-+#  if !defined(bsdi) && !defined(__FreeBSD__)
- E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
---- ./include/unixconf.h.org	Mon Mar 25 12:47:47 1996
-+++ ./include/unixconf.h	Sun Apr 21 18:10:02 1996
-@@ -31,7 +31,7 @@
- 
- /* define any of the following that are appropriate */
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
--#define NETWORK		/* if running on a networked system */
-+/* #define NETWORK		/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
- #define SUNOS4	/* SunOS 4.x */
- /* #define LINUX	/* Another Unix clone */
-@@ -42,12 +42,12 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
--/* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
-+#define POSIX_JOB_CONTROL	/* use System V / POSIX job control
- 			 * (e.g., VSUSP) */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
- 			/* define for many recent OS releases, including
- 			 * those with specific defines (since types are
- 			 * changing toward the standard from earlier chaos).
-@@ -125,7 +125,7 @@
-  * A stat system call is done on the mailbox every MAILCKFREQ moves.
-  */
- 
--#define MAIL			/* Deliver mail during the game */
-+/* #define MAIL			/* Deliver mail during the game */
- 
- /* The Andrew Message System does mail a little differently from normal
-  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
---- ./include/config.h.org	Thu Feb 29 11:00:26 1996
-+++ ./include/config.h	Sun Apr 21 18:10:06 1996
-@@ -248,7 +248,7 @@
-  * would allow:
-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
-  */
--/* # define USE_XPM		/* Disable if you do not have the XPM library */
-+# define USE_XPM		/* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -288,12 +288,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/compress"     /* Lempel-Ziv compression */
-+/* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
- 
- /* An example of one alternative you might want to use: */
--/* # define COMPRESS "/usr/local/bin/gzip"   /* FSF gzip compression */
--/* # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
-+# define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
-+# define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -323,7 +323,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "/usr/local/lib/nethackdir"	/* nethack directory */
- # endif
- 
- /*
---- ./sys/unix/Makefile.doc.org	Wed Apr  3 21:17:35 1996
-+++ ./sys/unix/Makefile.doc	Sun Apr 21 18:10:03 1996
-@@ -31,7 +31,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= ${PREFIX}/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
---- ./sys/unix/Makefile.top.org	Mon Mar 25 17:22:00 1996
-+++ ./sys/unix/Makefile.top	Sun Apr 21 18:28:09 1996
-@@ -16,14 +16,14 @@
- # make NetHack
- GAME     = nethack
- GAMEUID  = games
--GAMEGRP  = bin
-+GAMEGRP  = games
- 
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- #
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
-+SHELLDIR = ${PREFIX}/bin
- 
- # per discussion in Install.X11
- VARDATND = 
diff --git a/games/nethack-qt/files/patch-ab b/games/nethack-qt/files/patch-ab
deleted file mode 100644
index b609686e6166..000000000000
--- a/games/nethack-qt/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/youprop.h.orig	Tue Oct 28 22:32:04 1997
-+++ ./include/youprop.h	Tue Oct 28 22:33:08 1997
-@@ -79,7 +79,7 @@
- #define Protection		u.uprops[PROTECTION].p_flgs
- #define Protection_from_shape_changers \
- 				u.uprops[PROT_FROM_SHAPE_CHANGERS].p_flgs
--#define Warning			u.uprops[WARNING].p_flgs
-+#define HWarning		u.uprops[WARNING].p_flgs
- 
- #define HTelepat		u.uprops[TELEPAT].p_flgs
- #define Telepat			(HTelepat || telepathic(uasmon))
diff --git a/games/nethack-qt/files/patch-ac b/games/nethack-qt/files/patch-ac
deleted file mode 100644
index d5ece267d3a6..000000000000
--- a/games/nethack-qt/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/artifact.c.orig	Tue Oct 28 22:30:56 1997
-+++ ./src/artifact.c	Tue Oct 28 22:34:10 1997
-@@ -382,8 +382,8 @@
- 	    else HTeleport_control &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_WARN) {
--	    if (on) Warning |= wp_mask;
--	    else Warning &= ~wp_mask;
-+	    if (on) HWarning |= wp_mask;
-+	    else HWarning &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_EREGEN) {
- 	    if (on) Energy_regeneration |= wp_mask;
diff --git a/games/nethack-qt/files/patch-ad b/games/nethack-qt/files/patch-ad
deleted file mode 100644
index 66ff78506faa..000000000000
--- a/games/nethack-qt/files/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./src/attrib.c.orig	Tue Oct 28 22:31:02 1997
-+++ ./src/attrib.c	Tue Oct 28 22:34:18 1997
-@@ -44,7 +44,7 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	c_abil[] = { {	 7, &(Fast), "quick", "slow" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	e_abil[] = { {   1, &(Fast), "", "" },
-@@ -54,13 +54,13 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	h_abil[] = { {	 1, &(HPoison_resistance), "", "" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	k_abil[] = { {	 7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	p_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	p_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  20, &(HFire_resistance), "cool", "warmer" },
- 		     {	 0, 0, 0, 0 } },
- 
-@@ -81,7 +81,7 @@
- 		     {   7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	w_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	w_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  17, &(HTeleport_control), "controlled","uncontrolled" },
- 		     {	 0, 0, 0, 0 } };
- 
diff --git a/games/nethack-qt/files/patch-ae b/games/nethack-qt/files/patch-ae
deleted file mode 100644
index a8adb09592b3..000000000000
--- a/games/nethack-qt/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cmd.c.orig	Tue Oct 28 22:31:09 1997
-+++ ./src/cmd.c	Tue Oct 28 22:34:21 1997
-@@ -643,7 +643,7 @@
- 	if (Lifesaved)
- 		enl_msg("Your life ", "will be", "would have been", " saved");
- 	if (Adornment) you_are("adorned");
--	if (Warning) you_are("warned");
-+	if (HWarning) you_are("warned");
- 	if (Protection) you_are("protected");
- 	if (Reflecting) you_have("reflection");
- 	if ((HLevitation & (I_SPECIAL|W_ARTI)) != 0L &&
diff --git a/games/nethack-qt/files/patch-af b/games/nethack-qt/files/patch-af
deleted file mode 100644
index d188f9810bd1..000000000000
--- a/games/nethack-qt/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mon.c.orig	Tue Oct 28 22:31:23 1997
-+++ ./src/mon.c	Tue Oct 28 22:34:29 1997
-@@ -212,7 +212,7 @@
- 
- 	    lastwarntime = moves;
- 	    lastwarnlev = warnlevel;
--	    switch((int) (Warning & (LEFT_RING | RIGHT_RING))) {
-+	    switch((int) (HWarning & (LEFT_RING | RIGHT_RING))) {
- 	    case LEFT_RING:
- 		rr = Hallucination ? "left mood ring glows" : "left ring glows";
- 		break;
diff --git a/games/nethack-qt/files/patch-ag b/games/nethack-qt/files/patch-ag
deleted file mode 100644
index 779ef4482a5b..000000000000
--- a/games/nethack-qt/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/monmove.c.orig	Tue Oct 28 22:31:30 1997
-+++ ./src/monmove.c	Tue Oct 28 22:34:36 1997
-@@ -83,7 +83,7 @@
- 	int rd = dochug(mtmp);
- 	int dd;
- 
--	if(Warning && !rd && !mtmp->mpeaceful &&
-+	if(HWarning && !rd && !mtmp->mpeaceful &&
- 			(dd = distu(mtmp->mx,mtmp->my)) < distu(x,y) &&
- 			dd < 100 && !canseemon(mtmp)) {
- 	    /* Note: this assumes we only want to warn against the monster to
diff --git a/games/nethack-qt/files/patch-include:config.h b/games/nethack-qt/files/patch-include:config.h
new file mode 100644
index 000000000000..bfb4a2c47a67
--- /dev/null
+++ b/games/nethack-qt/files/patch-include:config.h
@@ -0,0 +1,36 @@
+--- include/config.h.orig	Sat Jul 22 10:13:51 2000
++++ include/config.h	Sat Aug 11 10:09:12 2001
+@@ -44,7 +44,7 @@
+  */
+ #define TTY_GRAPHICS	/* good old tty based graphics */
+ /* #define X11_GRAPHICS */	/* X11 interface */
+-/* #define QT_GRAPHICS */	/* Qt interface */
++#define QT_GRAPHICS	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
+ 
+ /*
+@@ -151,11 +151,11 @@
+ 
+ #ifdef UNIX
+ /* path and file name extension for compression program */
+-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
++/* #define COMPRESS "/usr/bin/compress"*/	/* Lempel-Ziv compression */
++/* #define COMPRESS_EXTENSION ".Z"	*/	/* compress's extension */
+ /* An example of one alternative you might want to use: */
+-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
++#define COMPRESS "/usr/bin/gzip"	 	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
+ #endif
+ 
+ #ifndef COMPRESS
+@@ -186,7 +186,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
++#  define HACKDIR "%%PREFIX%%/lib/nethack"	/* nethack directory */
+ # endif
+ 
+ /*
diff --git a/games/nethack-qt/files/patch-include:unixconf.h b/games/nethack-qt/files/patch-include:unixconf.h
new file mode 100644
index 000000000000..d43f9d82b7dd
--- /dev/null
+++ b/games/nethack-qt/files/patch-include:unixconf.h
@@ -0,0 +1,20 @@
+--- include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
++++ include/unixconf.h	Fri Oct 13 10:06:57 2000
+@@ -47,7 +47,7 @@
+ 			 * job control (note that AIX is SYSV otherwise)
+ 			 * Also define this for AIX 3.2 */
+ 
+-#define TERMINFO	/* uses terminfo rather than termcap */
++/* #define TERMINFO */	/* uses terminfo rather than termcap */
+ 			/* Should be defined for most SYSV, SVR4 (including
+ 			 * Solaris 2+), HPUX, and Linux systems.  In
+ 			 * particular, it should NOT be defined for the UNIXPC
+@@ -143,7 +143,7 @@
+  * A stat system call is done on the mailbox every MAILCKFREQ moves.
+  */
+ 
+-#define MAIL			/* Deliver mail during the game */
++/* #define MAIL			/* Deliver mail during the game */
+ 
+ /* The Andrew Message System does mail a little differently from normal
+  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
diff --git a/games/nethack-qt/files/patch-sys:unix:Makefile.doc b/games/nethack-qt/files/patch-sys:unix:Makefile.doc
new file mode 100644
index 000000000000..2527c7b4128e
--- /dev/null
+++ b/games/nethack-qt/files/patch-sys:unix:Makefile.doc
@@ -0,0 +1,41 @@
+--- sys/unix/Makefile.doc.orig	Sat Jan 15 05:49:48 2000
++++ sys/unix/Makefile.doc	Sat Aug 11 11:08:33 2001
+@@ -34,15 +34,15 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/man/man6
++MANDIR	= ${PREFIX}/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) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+ 
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/games/nethack-qt/files/patch-sys:unix:Makefile.src b/games/nethack-qt/files/patch-sys:unix:Makefile.src
new file mode 100644
index 000000000000..1a58379ae1ad
--- /dev/null
+++ b/games/nethack-qt/files/patch-sys:unix:Makefile.src
@@ -0,0 +1,62 @@
+--- sys/unix/Makefile.src.orig	Sat Aug  5 19:52:57 2000
++++ sys/unix/Makefile.src	Sat Aug 11 09:53:08 2001
+@@ -144,14 +144,14 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
+ LFLAGS =
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LD line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LD=g++
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -203,8 +203,8 @@
+ 
+ #
+ #
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINQTSRC)
++WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -230,7 +230,7 @@
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+@@ -244,7 +244,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINQTLIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -445,10 +445,10 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
++	${MOC} ../include/qt_kde0.h > qt_kde0.moc
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
++	${MOC} ../include/qt_win.h > qt_win.moc
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/games/nethack-qt/files/patch-sys:unix:Makefile.top b/games/nethack-qt/files/patch-sys:unix:Makefile.top
new file mode 100644
index 000000000000..fb4a9021dd90
--- /dev/null
+++ b/games/nethack-qt/files/patch-sys:unix:Makefile.top
@@ -0,0 +1,44 @@
+--- sys/unix/Makefile.top.orig	Tue Jul  4 09:42:05 2000
++++ sys/unix/Makefile.top	Sat Aug 11 11:21:15 2001
+@@ -14,18 +14,17 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
+ GAME     = nethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+-GAMEGRP  = bin
++GAMEGRP  = games
+ 
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,14 +34,14 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = $(PREFIX)/lib/$(GAME)
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC
+ # for BeOS
diff --git a/games/nethack-qt/files/sample.nethackrc b/games/nethack-qt/files/sample.nethackrc
deleted file mode 100644
index 33dbe47118fc..000000000000
--- a/games/nethack-qt/files/sample.nethackrc
+++ /dev/null
@@ -1,88 +0,0 @@
-OPTIONS=!silent
-OPTIONS=!time
-OPTIONS=catname:Ghisteslwchlohm
-OPTIONS=color
-OPTIONS=dogname:Dhairrhuwyth
-OPTIONS=hilite_pet
-OPTIONS=lit_corridor
-OPTIONS=menustyle:partial
-OPTIONS=msghistory:200
-OPTIONS=news
-OPTIONS=noautopickup
-OPTIONS=rest_on_space
-OPTIONS=safe_pet
-OPTIONS=showexp
-OPTIONS=showscore
-OPTIONS=sortpack
-OPTIONS=time
-OPTIONS=tombstone
-OPTIONS=toptenwin
-OPTIONS=verbose
-SOUNDDIR=/usr/local/lib/nethackdir
-SOUND=MESG "needs food, badly"            "weak.au" 100
-SOUND=MESG "feel weak"                    "weak.au" 100
-SOUND=MESG "bear trap closes"             "beartrap.au" 100
-SOUND=MESG "board beneath you squeaks"    "squeek.au"   100
-SOUND=MESG "board beneath .....* squeaks" "squeek.au"    60
-SOUND=MESG "a distant squeak"             "squeek.au"    25
-SOUND=MESG "mind releases itself from"    "memories.au" 100
-SOUND=MESG "on itself, you forget"        "memories.au" 100
-SOUND=MESG "Who was that Maud person"     "memories.au" 100
-SOUND=MESG "Thinking of Maud you forget"  "memories.au" 100
-SOUND=MESG "you forget everything"        "memories.au" 100
-SOUND=MESG "smell marsh gas"              "frogs.au"    100
-SOUND=MESG "must have been exercising"    "tada.au"     100
-SOUND=MESG "must have been very obs"      "tada.au"     100
-SOUND=MESG "must have been working on"    "tada.au"     100
-SOUND=MESG "must be leading a healthy"    "tada.au"     100
-SOUND=MESG "Keystone Kops appear!"        "kops.au"    100
-SOUND=MESG "Keystone Kops are after you"  "kops.au"    100
-SOUND=MESG "interesting topological ex"   "mock.au"     100
-SOUND=MESG "Interesting\.\.\."            "mock.au"     100
-SOUND=MESG "deathly sick\."               "ohdear.au"    80
-SOUND=MESG "feel feverish"                "ohdear.au"    80
-SOUND=MESG "brain is eaten"               "minderode.au" 80
-SOUND=MESG "thought thou couldst kill"    "yendor.au"   120
-SOUND=MESG "begin praying to"             "latin_short.au"  70
-SOUND=MESG "sense of peace"               "latin.au"     20
-SOUND=MESG "have a.* forbidding feeling"  "latin.au"     20
-#SOUND=MESG "door opens\."                 "dooropen2.au" 100
-#SOUND=MESG "You drop "                    "drop.au"      10
-#SOUND=MESG "You destroy "                 "destroy2.au"  30
-#SOUND=MESG "You kill "                    "destroy2.au"  20
-#SOUND=MESG "is killed"                    "destroy2.au"  10
-#SOUND=MESG "You miss "                    "miss2.au"     20
-#SOUND=MESG "fiery blade burns"            "hit2.au"      30
-#SOUND=MESG "ice-cold blade freezes"       "hit2.au"      30
-#SOUND=MESG "You hit "                     "hit2.au"      20
-#SOUND=MESG "The spell hits"               "hit2.au"      20
-SOUND=MESG "breathes"                     "breath.au"   100
-SOUND=MESG "a door open\."                "dooropen2.au" 100
-SOUND=MESG "Klunk"                        "clunk.au"    100
-SOUND=MESG "guard on patrol"              "coin.au"      50
-SOUND=MESG "quarterback calling"          "coin.au"      50
-SOUND=MESG "someone counting"             "coin.au"      50
-SOUND=MESG "Ebenezer Scrooge"             "coin.au"      50
-SOUND=MESG "someone cursing shoplifters"  "gong.au"      50
-SOUND=MESG "chime of a cash register"     "gong.au"      50
-SOUND=MESG "Neiman and Marcus"            "gong.au"      50
-SOUND=MESG "You die"                      "death.au"    100
-SOUND=MESG "sad feeling"                  "death.au"    50
-SOUND=MESG "door closes\."                "doorclos.au" 100
-SOUND=MESG "cosmic"                       "hallu.au"    100
-SOUND=MESG "explosion"                    "landmine.au" 100
-SOUND=MESG "KABOOM"                       "landmine.au" 100
-#SOUND=MESG "KAABLAM"                      "landmine.au" 100
-SOUND=MESG "trigger.* a land *mine"         "landmine.au" 100
-SOUND=MESG "elcome to experi"             "level_up.au" 100
-SOUND=MESG "memorize"                     "memor.au"    100
-#SOUND=MESG "Ouch"                         "ouch2.au"    100
-#SOUND=MESG "XXXfall through\.\.\."        "trapdoor.au" 100
-SOUND=MESG "vomit"                        "vomit.au"    100
-SOUND=MESG "whistling"                    "whistle2.au" 100
-SOUND=MESG "crashes open"                 "thump.au"    100
-SOUND=MESG "You break open the lock"      "thump.au"    100
-#SOUND=MESG "THUD"                         "thump.au"     40
-#SOUND=MESG "WHAMM"                        "thump.au"     50
-SOUND=MESG "welcome to NetHack"            "awaits.au"     100
-SOUND=MESG "strange vibration under"       "forcefld.au"     100
diff --git a/games/nethack-qt/files/src-Makefile.diff b/games/nethack-qt/files/src-Makefile.diff
deleted file mode 100644
index 92f754dcd9b2..000000000000
--- a/games/nethack-qt/files/src-Makefile.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Makefile.orig	Sat Apr  5 19:43:25 1997
-+++ src/Makefile	Sat Apr  5 19:51:26 1997
-@@ -124,11 +124,11 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O2 -I../include
--LFLAGS = -L/usr/X11/lib -L$(QTDIR)/lib
-+CFLAGS = -pipe -O -I../include
-+LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib
- 
- # For USER_SOUNDS support, include -I/usr/X11/include
--CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -I/usr/X11/include
-+CXXFLAGS = $(CFLAGS) -I. -I/usr/X11R6/include -I/usr/X11R6/include/X11/qt
- 
- # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
- # combination of windowing systems.  Also set windowing systems in config.h.
-@@ -213,7 +213,7 @@
- # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
- # LIBS = -lsun
- #
--LIBS =
-+LIBS = -lgnuregex
- 
- # make NetHack
- GAME     = nethack
diff --git a/games/nethack-qt/files/src-sounds.c.diff b/games/nethack-qt/files/src-sounds.c.diff
deleted file mode 100644
index de1fdf62b02f..000000000000
--- a/games/nethack-qt/files/src-sounds.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sounds.c.orig	Thu Mar 20 22:48:36 1997
-+++ src/sounds.c	Thu Mar 20 22:50:00 1997
-@@ -5,7 +5,11 @@
- #include "hack.h"
- #include "edog.h"
- #ifdef USER_SOUNDS
-+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #endif
- 
- #ifdef OVLB
diff --git a/games/nethack-qt/pkg-descr b/games/nethack-qt/pkg-descr
index 08079923cd43..c80764a5e38c 100644
--- a/games/nethack-qt/pkg-descr
+++ b/games/nethack-qt/pkg-descr
@@ -1,5 +1,3 @@
-WWW: http://www.uq.edu.au/~cswallis/nhqt/
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
@@ -20,3 +18,5 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
+
+WWW: http://trolls.troll.no/warwick/nethack/
diff --git a/games/nethack-qt/pkg-plist b/games/nethack-qt/pkg-plist
index 97b050819591..95e4f2cc5823 100644
--- a/games/nethack-qt/pkg-plist
+++ b/games/nethack-qt/pkg-plist
@@ -1,155 +1,137 @@
 bin/nethack
-@exec mkdir %D/lib/nethackdir/save
-@exec chmod 775 %D/lib/nethackdir/save
-@exec chown games:games %D/lib/nethackdir/save
-lib/nethackdir/.nethackrc
-lib/nethackdir/A-filla.lev
-lib/nethackdir/A-fillb.lev
-lib/nethackdir/A-goal.lev
-lib/nethackdir/A-locate.lev
-lib/nethackdir/A-start.lev
-lib/nethackdir/B-filla.lev
-lib/nethackdir/B-fillb.lev
-lib/nethackdir/B-goal.lev
-lib/nethackdir/B-locate.lev
-lib/nethackdir/B-start.lev
-lib/nethackdir/C-filla.lev
-lib/nethackdir/C-fillb.lev
-lib/nethackdir/C-goal.lev
-lib/nethackdir/C-locate.lev
-lib/nethackdir/C-start.lev
-lib/nethackdir/E-filla.lev
-lib/nethackdir/E-fillb.lev
-lib/nethackdir/E-goal.lev
-lib/nethackdir/E-locate.lev
-lib/nethackdir/E-start.lev
-lib/nethackdir/H-filla.lev
-lib/nethackdir/H-fillb.lev
-lib/nethackdir/H-goal.lev
-lib/nethackdir/H-locate.lev
-lib/nethackdir/H-start.lev
-lib/nethackdir/K-filla.lev
-lib/nethackdir/K-fillb.lev
-lib/nethackdir/K-goal.lev
-lib/nethackdir/K-locate.lev
-lib/nethackdir/K-start.lev
-lib/nethackdir/P-filla.lev
-lib/nethackdir/P-fillb.lev
-lib/nethackdir/P-goal.lev
-lib/nethackdir/P-locate.lev
-lib/nethackdir/P-start.lev
-lib/nethackdir/R-filla.lev
-lib/nethackdir/R-fillb.lev
-lib/nethackdir/R-goal.lev
-lib/nethackdir/R-locate.lev
-lib/nethackdir/R-start.lev
-lib/nethackdir/S-filla.lev
-lib/nethackdir/S-fillb.lev
-lib/nethackdir/S-goal.lev
-lib/nethackdir/S-locate.lev
-lib/nethackdir/S-start.lev
-lib/nethackdir/T-filla.lev
-lib/nethackdir/T-fillb.lev
-lib/nethackdir/T-goal.lev
-lib/nethackdir/T-locate.lev
-lib/nethackdir/T-start.lev
-lib/nethackdir/V-filla.lev
-lib/nethackdir/V-fillb.lev
-lib/nethackdir/V-goal.lev
-lib/nethackdir/V-locate.lev
-lib/nethackdir/V-start.lev
-lib/nethackdir/W-filla.lev
-lib/nethackdir/W-fillb.lev
-lib/nethackdir/W-goal.lev
-lib/nethackdir/W-locate.lev
-lib/nethackdir/W-start.lev
-lib/nethackdir/air.lev
-lib/nethackdir/asmodeus.lev
-lib/nethackdir/astral.lev
-lib/nethackdir/awaits.au
-lib/nethackdir/baalz.lev
-lib/nethackdir/beartrap.au
-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/breath.au
-lib/nethackdir/castle.lev
-lib/nethackdir/clunk.au
-lib/nethackdir/cmdhelp
-lib/nethackdir/coin.au
-lib/nethackdir/data
-lib/nethackdir/death.au
-lib/nethackdir/destroy2.au
-lib/nethackdir/doorclos.au
-lib/nethackdir/dooropen2.au
-lib/nethackdir/drop.au
-lib/nethackdir/dungeon
-lib/nethackdir/earth.lev
-lib/nethackdir/fakewiz1.lev
-lib/nethackdir/fakewiz2.lev
-lib/nethackdir/fire.lev
-lib/nethackdir/forcefld.au
-lib/nethackdir/frogs.au
-lib/nethackdir/gong.au
-lib/nethackdir/hallu.au
-lib/nethackdir/help
-lib/nethackdir/hh
-lib/nethackdir/history
-lib/nethackdir/hit2.au
-lib/nethackdir/juiblex.lev
-lib/nethackdir/knox.lev
-lib/nethackdir/kops.au
-lib/nethackdir/landmine.au
-lib/nethackdir/latin.au
-lib/nethackdir/latin_short.au
-lib/nethackdir/level_up.au
-lib/nethackdir/license
-lib/nethackdir/logfile
-lib/nethackdir/medusa-1.lev
-lib/nethackdir/medusa-2.lev
-lib/nethackdir/memor.au
-lib/nethackdir/memories.au
-lib/nethackdir/minderode.au
-lib/nethackdir/minefill.lev
-lib/nethackdir/minend-1.lev
-lib/nethackdir/minend-2.lev
-lib/nethackdir/minetn-1.lev
-lib/nethackdir/minetn-2.lev
-lib/nethackdir/miss2.au
-lib/nethackdir/mock.au
-lib/nethackdir/nethack
-lib/nethackdir/ohdear.au
-lib/nethackdir/opthelp
-lib/nethackdir/options
-lib/nethackdir/oracle.lev
-lib/nethackdir/oracles
-lib/nethackdir/orcus.lev
-lib/nethackdir/ouch2.au
-lib/nethackdir/perm
-lib/nethackdir/quest.dat
-lib/nethackdir/record
-lib/nethackdir/rip.xpm
-lib/nethackdir/rumors
-lib/nethackdir/sanctum.lev
-lib/nethackdir/squeek.au
-lib/nethackdir/tada.au
-lib/nethackdir/thump.au
-lib/nethackdir/tiles.xpm
-lib/nethackdir/tower1.lev
-lib/nethackdir/tower2.lev
-lib/nethackdir/tower3.lev
-lib/nethackdir/trapdoor.au
-lib/nethackdir/valley.lev
-lib/nethackdir/vomit.au
-lib/nethackdir/water.lev
-lib/nethackdir/weak.au
-lib/nethackdir/whistle2.au
-lib/nethackdir/wizard1.lev
-lib/nethackdir/wizard2.lev
-lib/nethackdir/wizard3.lev
-lib/nethackdir/wizhelp
-lib/nethackdir/yendor.au
-@dirrm lib/nethackdir/save
-@dirrm lib/nethackdir
+%%PORTDOCS%%share/doc/nethack/Guidebook.txt
+lib/nethack/nethack
+@exec mkdir %D/lib/nethack/save
+@exec chmod -R 775 %D/lib/nethack
+@exec chmod 2755 %D/lib/nethack/nethack
+@exec chown games:games %D/lib/nethack/save
+@unexec rm -rf %D/lib/nethack/save
+lib/nethack/Arc-fila.lev
+lib/nethack/Arc-filb.lev
+lib/nethack/Arc-goal.lev
+lib/nethack/Arc-loca.lev
+lib/nethack/Arc-strt.lev
+lib/nethack/Bar-fila.lev
+lib/nethack/Bar-filb.lev
+lib/nethack/Bar-goal.lev
+lib/nethack/Bar-loca.lev
+lib/nethack/Bar-strt.lev
+lib/nethack/Cav-fila.lev
+lib/nethack/Cav-filb.lev
+lib/nethack/Cav-goal.lev
+lib/nethack/Cav-loca.lev
+lib/nethack/Cav-strt.lev
+lib/nethack/Hea-fila.lev
+lib/nethack/Hea-filb.lev
+lib/nethack/Hea-goal.lev
+lib/nethack/Hea-loca.lev
+lib/nethack/Hea-strt.lev
+lib/nethack/Kni-fila.lev
+lib/nethack/Kni-filb.lev
+lib/nethack/Kni-goal.lev
+lib/nethack/Kni-loca.lev
+lib/nethack/Kni-strt.lev
+lib/nethack/Mon-fila.lev
+lib/nethack/Mon-filb.lev
+lib/nethack/Mon-goal.lev
+lib/nethack/Mon-loca.lev
+lib/nethack/Mon-strt.lev
+lib/nethack/Pri-fila.lev
+lib/nethack/Pri-filb.lev
+lib/nethack/Pri-goal.lev
+lib/nethack/Pri-loca.lev
+lib/nethack/Pri-strt.lev
+lib/nethack/Ran-fila.lev
+lib/nethack/Ran-filb.lev
+lib/nethack/Ran-goal.lev
+lib/nethack/Ran-loca.lev
+lib/nethack/Ran-strt.lev
+lib/nethack/Rog-fila.lev
+lib/nethack/Rog-filb.lev
+lib/nethack/Rog-goal.lev
+lib/nethack/Rog-loca.lev
+lib/nethack/Rog-strt.lev
+lib/nethack/Sam-fila.lev
+lib/nethack/Sam-filb.lev
+lib/nethack/Sam-goal.lev
+lib/nethack/Sam-loca.lev
+lib/nethack/Sam-strt.lev
+lib/nethack/Tou-fila.lev
+lib/nethack/Tou-filb.lev
+lib/nethack/Tou-goal.lev
+lib/nethack/Tou-loca.lev
+lib/nethack/Tou-strt.lev
+lib/nethack/Val-fila.lev
+lib/nethack/Val-filb.lev
+lib/nethack/Val-goal.lev
+lib/nethack/Val-loca.lev
+lib/nethack/Val-strt.lev
+lib/nethack/Wiz-fila.lev
+lib/nethack/Wiz-filb.lev
+lib/nethack/Wiz-goal.lev
+lib/nethack/Wiz-loca.lev
+lib/nethack/Wiz-strt.lev
+lib/nethack/air.lev
+lib/nethack/asmodeus.lev
+lib/nethack/astral.lev
+lib/nethack/baalz.lev
+lib/nethack/bigrm-1.lev
+lib/nethack/bigrm-2.lev
+lib/nethack/bigrm-3.lev
+lib/nethack/bigrm-4.lev
+lib/nethack/bigrm-5.lev
+lib/nethack/castle.lev
+lib/nethack/cmdhelp
+lib/nethack/data
+lib/nethack/dungeon
+lib/nethack/earth.lev
+lib/nethack/fakewiz1.lev
+lib/nethack/fakewiz2.lev
+lib/nethack/fire.lev
+lib/nethack/help
+lib/nethack/hh
+lib/nethack/history
+lib/nethack/juiblex.lev
+lib/nethack/knox.lev
+lib/nethack/license
+lib/nethack/medusa-1.lev
+lib/nethack/medusa-2.lev
+lib/nethack/minefill.lev
+lib/nethack/minend-1.lev
+lib/nethack/minend-2.lev
+lib/nethack/minetn-1.lev
+lib/nethack/minetn-2.lev
+lib/nethack/opthelp
+lib/nethack/options
+lib/nethack/oracle.lev
+lib/nethack/oracles
+lib/nethack/orcus.lev
+lib/nethack/pet_mark.xbm
+lib/nethack/quest.dat
+lib/nethack/rip.xpm
+lib/nethack/rumors
+lib/nethack/sanctum.lev
+lib/nethack/soko1-1.lev
+lib/nethack/soko1-2.lev
+lib/nethack/soko2-1.lev
+lib/nethack/soko2-2.lev
+lib/nethack/soko3-1.lev
+lib/nethack/soko3-2.lev
+lib/nethack/soko4-1.lev
+lib/nethack/soko4-2.lev
+lib/nethack/tower1.lev
+lib/nethack/tower2.lev
+lib/nethack/tower3.lev
+lib/nethack/valley.lev
+lib/nethack/water.lev
+lib/nethack/wizard1.lev
+lib/nethack/wizard2.lev
+lib/nethack/wizard3.lev
+lib/nethack/wizhelp
+lib/nethack/x11tiles
+@mode 664
+lib/nethack/logfile
+lib/nethack/record
+lib/nethack/perm
+@dirrm lib/nethack
+%%PORTDOCS%%@dirrm share/doc/nethack
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index 3fbc438c3ef0..baf3973c83dc 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -5,69 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt-nethack
-PORTVERSION=	1.0.1
+PORTNAME=	nethack
+PKGNAMESUFFIX=	-qt
+PORTVERSION=	3.3.1
 CATEGORIES=	games
-MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
-		ftp://ftp.troll.no/contrib/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	nethack
-DISTNAME=	nethack-3.2.2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
-		xpmtoppm:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
-
-QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
-QT_SOUND=	nhs.tar.gz
-EXTRACT_ONLY=	nethack-3.2.2.tar.gz
-
-USE_QT_VER=	1
-USE_XPM=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_QT_VER=	2
 USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
-BROKEN=		"Compiler error"
+pre-everything:
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!! You cannot install nethack and nethack-qt in parallel  !!"
+	@${ECHO} "!! But nethack-qt might read your prior nethack scores    !!"
+	@${ECHO} "!! Don't forget to backup your nethack libdir if it's     !!"
+	@${ECHO} "!! important for you                                      !!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 
-pre-configure:
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
-	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
-	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
-	@ ${ECHO} "!! important for you                                     !!"
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ cd ${WRKSRC}/win; tar xzf ${DISTDIR}/${QT_PATCH}
-	@ cd ${WRKSRC}; ${PATCH} -s < win/Qt/nhqt.patch
-	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-Makefile.diff
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-sounds.c.diff
-	@ cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/include-unixconf.h.diff
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 
-pre-build:
-	(cd ${WRKSRC}/util; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} tile2x11 )
+pre-configure:
+	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 post-install:
-	@ cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
+	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/nethack
-	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
 .endif
-	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@ cd ${PREFIX}/lib/nethackdir; ${CHOWN} root:games *.au .nethackrc
-	@ cd ${PREFIX}/lib/nethackdir; ${CHMOD} 444 *.au .nethackrc
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "post-installation hints
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "a) Add this to your user environment:"
-	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
-	@ ${ECHO}  "b) Start the NAS audio server"
-	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
-	@ ${ECHO}  "c) Copy the example nethackrc file from ${FILESDIR} to your"
-	@ ${ECHO}  "   login directory:"
-	@ ${ECHO}  "   ${CP} ${FILESDIR}/sample.nethackrc ${HOME}/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack33-qt/distinfo b/games/nethack33-qt/distinfo
index c622e477464a..24595f9d9a12 100644
--- a/games/nethack33-qt/distinfo
+++ b/games/nethack33-qt/distinfo
@@ -1,3 +1 @@
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a
-MD5 (nhs.tar.gz) = 6f0540d7fee3c8cf927f47031f6ca6a2
+MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack33-qt/files/include-unixconf.h.diff b/games/nethack33-qt/files/include-unixconf.h.diff
deleted file mode 100644
index 53150d818111..000000000000
--- a/games/nethack33-qt/files/include-unixconf.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/unixconf.h.orig	Thu Mar 20 23:17:16 1997
-+++ include/unixconf.h	Thu Mar 20 23:17:29 1997
-@@ -42,7 +42,7 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
- #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
diff --git a/games/nethack33-qt/files/patch-aa b/games/nethack33-qt/files/patch-aa
deleted file mode 100644
index 4f8040adbbc0..000000000000
--- a/games/nethack33-qt/files/patch-aa
+++ /dev/null
@@ -1,127 +0,0 @@
---- ./include/system.h.org	Mon Mar 25 17:18:32 1996
-+++ ./include/system.h	Sun Apr 21 18:10:01 1996
-@@ -78,7 +78,7 @@
- # if !defined(SUNOS4) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
--#  ifndef bsdi
-+#  if !defined(bsdi) && !defined(__FreeBSD__)
- E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
---- ./include/unixconf.h.org	Mon Mar 25 12:47:47 1996
-+++ ./include/unixconf.h	Sun Apr 21 18:10:02 1996
-@@ -31,7 +31,7 @@
- 
- /* define any of the following that are appropriate */
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
--#define NETWORK		/* if running on a networked system */
-+/* #define NETWORK		/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
- #define SUNOS4	/* SunOS 4.x */
- /* #define LINUX	/* Another Unix clone */
-@@ -42,12 +42,12 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
--/* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
-+#define POSIX_JOB_CONTROL	/* use System V / POSIX job control
- 			 * (e.g., VSUSP) */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
- 			/* define for many recent OS releases, including
- 			 * those with specific defines (since types are
- 			 * changing toward the standard from earlier chaos).
-@@ -125,7 +125,7 @@
-  * A stat system call is done on the mailbox every MAILCKFREQ moves.
-  */
- 
--#define MAIL			/* Deliver mail during the game */
-+/* #define MAIL			/* Deliver mail during the game */
- 
- /* The Andrew Message System does mail a little differently from normal
-  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
---- ./include/config.h.org	Thu Feb 29 11:00:26 1996
-+++ ./include/config.h	Sun Apr 21 18:10:06 1996
-@@ -248,7 +248,7 @@
-  * would allow:
-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
-  */
--/* # define USE_XPM		/* Disable if you do not have the XPM library */
-+# define USE_XPM		/* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -288,12 +288,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/compress"     /* Lempel-Ziv compression */
-+/* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
- 
- /* An example of one alternative you might want to use: */
--/* # define COMPRESS "/usr/local/bin/gzip"   /* FSF gzip compression */
--/* # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
-+# define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
-+# define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -323,7 +323,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "/usr/local/lib/nethackdir"	/* nethack directory */
- # endif
- 
- /*
---- ./sys/unix/Makefile.doc.org	Wed Apr  3 21:17:35 1996
-+++ ./sys/unix/Makefile.doc	Sun Apr 21 18:10:03 1996
-@@ -31,7 +31,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= ${PREFIX}/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
---- ./sys/unix/Makefile.top.org	Mon Mar 25 17:22:00 1996
-+++ ./sys/unix/Makefile.top	Sun Apr 21 18:28:09 1996
-@@ -16,14 +16,14 @@
- # make NetHack
- GAME     = nethack
- GAMEUID  = games
--GAMEGRP  = bin
-+GAMEGRP  = games
- 
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- #
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
-+SHELLDIR = ${PREFIX}/bin
- 
- # per discussion in Install.X11
- VARDATND = 
diff --git a/games/nethack33-qt/files/patch-ab b/games/nethack33-qt/files/patch-ab
deleted file mode 100644
index b609686e6166..000000000000
--- a/games/nethack33-qt/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/youprop.h.orig	Tue Oct 28 22:32:04 1997
-+++ ./include/youprop.h	Tue Oct 28 22:33:08 1997
-@@ -79,7 +79,7 @@
- #define Protection		u.uprops[PROTECTION].p_flgs
- #define Protection_from_shape_changers \
- 				u.uprops[PROT_FROM_SHAPE_CHANGERS].p_flgs
--#define Warning			u.uprops[WARNING].p_flgs
-+#define HWarning		u.uprops[WARNING].p_flgs
- 
- #define HTelepat		u.uprops[TELEPAT].p_flgs
- #define Telepat			(HTelepat || telepathic(uasmon))
diff --git a/games/nethack33-qt/files/patch-ac b/games/nethack33-qt/files/patch-ac
deleted file mode 100644
index d5ece267d3a6..000000000000
--- a/games/nethack33-qt/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/artifact.c.orig	Tue Oct 28 22:30:56 1997
-+++ ./src/artifact.c	Tue Oct 28 22:34:10 1997
-@@ -382,8 +382,8 @@
- 	    else HTeleport_control &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_WARN) {
--	    if (on) Warning |= wp_mask;
--	    else Warning &= ~wp_mask;
-+	    if (on) HWarning |= wp_mask;
-+	    else HWarning &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_EREGEN) {
- 	    if (on) Energy_regeneration |= wp_mask;
diff --git a/games/nethack33-qt/files/patch-ad b/games/nethack33-qt/files/patch-ad
deleted file mode 100644
index 66ff78506faa..000000000000
--- a/games/nethack33-qt/files/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./src/attrib.c.orig	Tue Oct 28 22:31:02 1997
-+++ ./src/attrib.c	Tue Oct 28 22:34:18 1997
-@@ -44,7 +44,7 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	c_abil[] = { {	 7, &(Fast), "quick", "slow" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	e_abil[] = { {   1, &(Fast), "", "" },
-@@ -54,13 +54,13 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	h_abil[] = { {	 1, &(HPoison_resistance), "", "" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	k_abil[] = { {	 7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	p_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	p_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  20, &(HFire_resistance), "cool", "warmer" },
- 		     {	 0, 0, 0, 0 } },
- 
-@@ -81,7 +81,7 @@
- 		     {   7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	w_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	w_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  17, &(HTeleport_control), "controlled","uncontrolled" },
- 		     {	 0, 0, 0, 0 } };
- 
diff --git a/games/nethack33-qt/files/patch-ae b/games/nethack33-qt/files/patch-ae
deleted file mode 100644
index a8adb09592b3..000000000000
--- a/games/nethack33-qt/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cmd.c.orig	Tue Oct 28 22:31:09 1997
-+++ ./src/cmd.c	Tue Oct 28 22:34:21 1997
-@@ -643,7 +643,7 @@
- 	if (Lifesaved)
- 		enl_msg("Your life ", "will be", "would have been", " saved");
- 	if (Adornment) you_are("adorned");
--	if (Warning) you_are("warned");
-+	if (HWarning) you_are("warned");
- 	if (Protection) you_are("protected");
- 	if (Reflecting) you_have("reflection");
- 	if ((HLevitation & (I_SPECIAL|W_ARTI)) != 0L &&
diff --git a/games/nethack33-qt/files/patch-af b/games/nethack33-qt/files/patch-af
deleted file mode 100644
index d188f9810bd1..000000000000
--- a/games/nethack33-qt/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mon.c.orig	Tue Oct 28 22:31:23 1997
-+++ ./src/mon.c	Tue Oct 28 22:34:29 1997
-@@ -212,7 +212,7 @@
- 
- 	    lastwarntime = moves;
- 	    lastwarnlev = warnlevel;
--	    switch((int) (Warning & (LEFT_RING | RIGHT_RING))) {
-+	    switch((int) (HWarning & (LEFT_RING | RIGHT_RING))) {
- 	    case LEFT_RING:
- 		rr = Hallucination ? "left mood ring glows" : "left ring glows";
- 		break;
diff --git a/games/nethack33-qt/files/patch-ag b/games/nethack33-qt/files/patch-ag
deleted file mode 100644
index 779ef4482a5b..000000000000
--- a/games/nethack33-qt/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/monmove.c.orig	Tue Oct 28 22:31:30 1997
-+++ ./src/monmove.c	Tue Oct 28 22:34:36 1997
-@@ -83,7 +83,7 @@
- 	int rd = dochug(mtmp);
- 	int dd;
- 
--	if(Warning && !rd && !mtmp->mpeaceful &&
-+	if(HWarning && !rd && !mtmp->mpeaceful &&
- 			(dd = distu(mtmp->mx,mtmp->my)) < distu(x,y) &&
- 			dd < 100 && !canseemon(mtmp)) {
- 	    /* Note: this assumes we only want to warn against the monster to
diff --git a/games/nethack33-qt/files/patch-include:config.h b/games/nethack33-qt/files/patch-include:config.h
new file mode 100644
index 000000000000..bfb4a2c47a67
--- /dev/null
+++ b/games/nethack33-qt/files/patch-include:config.h
@@ -0,0 +1,36 @@
+--- include/config.h.orig	Sat Jul 22 10:13:51 2000
++++ include/config.h	Sat Aug 11 10:09:12 2001
+@@ -44,7 +44,7 @@
+  */
+ #define TTY_GRAPHICS	/* good old tty based graphics */
+ /* #define X11_GRAPHICS */	/* X11 interface */
+-/* #define QT_GRAPHICS */	/* Qt interface */
++#define QT_GRAPHICS	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
+ 
+ /*
+@@ -151,11 +151,11 @@
+ 
+ #ifdef UNIX
+ /* path and file name extension for compression program */
+-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
++/* #define COMPRESS "/usr/bin/compress"*/	/* Lempel-Ziv compression */
++/* #define COMPRESS_EXTENSION ".Z"	*/	/* compress's extension */
+ /* An example of one alternative you might want to use: */
+-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
++#define COMPRESS "/usr/bin/gzip"	 	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
+ #endif
+ 
+ #ifndef COMPRESS
+@@ -186,7 +186,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
++#  define HACKDIR "%%PREFIX%%/lib/nethack"	/* nethack directory */
+ # endif
+ 
+ /*
diff --git a/games/nethack33-qt/files/patch-include:unixconf.h b/games/nethack33-qt/files/patch-include:unixconf.h
new file mode 100644
index 000000000000..d43f9d82b7dd
--- /dev/null
+++ b/games/nethack33-qt/files/patch-include:unixconf.h
@@ -0,0 +1,20 @@
+--- include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
++++ include/unixconf.h	Fri Oct 13 10:06:57 2000
+@@ -47,7 +47,7 @@
+ 			 * job control (note that AIX is SYSV otherwise)
+ 			 * Also define this for AIX 3.2 */
+ 
+-#define TERMINFO	/* uses terminfo rather than termcap */
++/* #define TERMINFO */	/* uses terminfo rather than termcap */
+ 			/* Should be defined for most SYSV, SVR4 (including
+ 			 * Solaris 2+), HPUX, and Linux systems.  In
+ 			 * particular, it should NOT be defined for the UNIXPC
+@@ -143,7 +143,7 @@
+  * A stat system call is done on the mailbox every MAILCKFREQ moves.
+  */
+ 
+-#define MAIL			/* Deliver mail during the game */
++/* #define MAIL			/* Deliver mail during the game */
+ 
+ /* The Andrew Message System does mail a little differently from normal
+  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
diff --git a/games/nethack33-qt/files/patch-sys:unix:Makefile.doc b/games/nethack33-qt/files/patch-sys:unix:Makefile.doc
new file mode 100644
index 000000000000..2527c7b4128e
--- /dev/null
+++ b/games/nethack33-qt/files/patch-sys:unix:Makefile.doc
@@ -0,0 +1,41 @@
+--- sys/unix/Makefile.doc.orig	Sat Jan 15 05:49:48 2000
++++ sys/unix/Makefile.doc	Sat Aug 11 11:08:33 2001
+@@ -34,15 +34,15 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/man/man6
++MANDIR	= ${PREFIX}/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) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(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-qt/files/patch-sys:unix:Makefile.src b/games/nethack33-qt/files/patch-sys:unix:Makefile.src
new file mode 100644
index 000000000000..1a58379ae1ad
--- /dev/null
+++ b/games/nethack33-qt/files/patch-sys:unix:Makefile.src
@@ -0,0 +1,62 @@
+--- sys/unix/Makefile.src.orig	Sat Aug  5 19:52:57 2000
++++ sys/unix/Makefile.src	Sat Aug 11 09:53:08 2001
+@@ -144,14 +144,14 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
+ LFLAGS =
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LD line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LD=g++
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -203,8 +203,8 @@
+ 
+ #
+ #
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINQTSRC)
++WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -230,7 +230,7 @@
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+@@ -244,7 +244,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINQTLIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -445,10 +445,10 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
++	${MOC} ../include/qt_kde0.h > qt_kde0.moc
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
++	${MOC} ../include/qt_win.h > qt_win.moc
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/games/nethack33-qt/files/patch-sys:unix:Makefile.top b/games/nethack33-qt/files/patch-sys:unix:Makefile.top
new file mode 100644
index 000000000000..fb4a9021dd90
--- /dev/null
+++ b/games/nethack33-qt/files/patch-sys:unix:Makefile.top
@@ -0,0 +1,44 @@
+--- sys/unix/Makefile.top.orig	Tue Jul  4 09:42:05 2000
++++ sys/unix/Makefile.top	Sat Aug 11 11:21:15 2001
+@@ -14,18 +14,17 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
+ GAME     = nethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+-GAMEGRP  = bin
++GAMEGRP  = games
+ 
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,14 +34,14 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = $(PREFIX)/lib/$(GAME)
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC
+ # for BeOS
diff --git a/games/nethack33-qt/files/sample.nethackrc b/games/nethack33-qt/files/sample.nethackrc
deleted file mode 100644
index 33dbe47118fc..000000000000
--- a/games/nethack33-qt/files/sample.nethackrc
+++ /dev/null
@@ -1,88 +0,0 @@
-OPTIONS=!silent
-OPTIONS=!time
-OPTIONS=catname:Ghisteslwchlohm
-OPTIONS=color
-OPTIONS=dogname:Dhairrhuwyth
-OPTIONS=hilite_pet
-OPTIONS=lit_corridor
-OPTIONS=menustyle:partial
-OPTIONS=msghistory:200
-OPTIONS=news
-OPTIONS=noautopickup
-OPTIONS=rest_on_space
-OPTIONS=safe_pet
-OPTIONS=showexp
-OPTIONS=showscore
-OPTIONS=sortpack
-OPTIONS=time
-OPTIONS=tombstone
-OPTIONS=toptenwin
-OPTIONS=verbose
-SOUNDDIR=/usr/local/lib/nethackdir
-SOUND=MESG "needs food, badly"            "weak.au" 100
-SOUND=MESG "feel weak"                    "weak.au" 100
-SOUND=MESG "bear trap closes"             "beartrap.au" 100
-SOUND=MESG "board beneath you squeaks"    "squeek.au"   100
-SOUND=MESG "board beneath .....* squeaks" "squeek.au"    60
-SOUND=MESG "a distant squeak"             "squeek.au"    25
-SOUND=MESG "mind releases itself from"    "memories.au" 100
-SOUND=MESG "on itself, you forget"        "memories.au" 100
-SOUND=MESG "Who was that Maud person"     "memories.au" 100
-SOUND=MESG "Thinking of Maud you forget"  "memories.au" 100
-SOUND=MESG "you forget everything"        "memories.au" 100
-SOUND=MESG "smell marsh gas"              "frogs.au"    100
-SOUND=MESG "must have been exercising"    "tada.au"     100
-SOUND=MESG "must have been very obs"      "tada.au"     100
-SOUND=MESG "must have been working on"    "tada.au"     100
-SOUND=MESG "must be leading a healthy"    "tada.au"     100
-SOUND=MESG "Keystone Kops appear!"        "kops.au"    100
-SOUND=MESG "Keystone Kops are after you"  "kops.au"    100
-SOUND=MESG "interesting topological ex"   "mock.au"     100
-SOUND=MESG "Interesting\.\.\."            "mock.au"     100
-SOUND=MESG "deathly sick\."               "ohdear.au"    80
-SOUND=MESG "feel feverish"                "ohdear.au"    80
-SOUND=MESG "brain is eaten"               "minderode.au" 80
-SOUND=MESG "thought thou couldst kill"    "yendor.au"   120
-SOUND=MESG "begin praying to"             "latin_short.au"  70
-SOUND=MESG "sense of peace"               "latin.au"     20
-SOUND=MESG "have a.* forbidding feeling"  "latin.au"     20
-#SOUND=MESG "door opens\."                 "dooropen2.au" 100
-#SOUND=MESG "You drop "                    "drop.au"      10
-#SOUND=MESG "You destroy "                 "destroy2.au"  30
-#SOUND=MESG "You kill "                    "destroy2.au"  20
-#SOUND=MESG "is killed"                    "destroy2.au"  10
-#SOUND=MESG "You miss "                    "miss2.au"     20
-#SOUND=MESG "fiery blade burns"            "hit2.au"      30
-#SOUND=MESG "ice-cold blade freezes"       "hit2.au"      30
-#SOUND=MESG "You hit "                     "hit2.au"      20
-#SOUND=MESG "The spell hits"               "hit2.au"      20
-SOUND=MESG "breathes"                     "breath.au"   100
-SOUND=MESG "a door open\."                "dooropen2.au" 100
-SOUND=MESG "Klunk"                        "clunk.au"    100
-SOUND=MESG "guard on patrol"              "coin.au"      50
-SOUND=MESG "quarterback calling"          "coin.au"      50
-SOUND=MESG "someone counting"             "coin.au"      50
-SOUND=MESG "Ebenezer Scrooge"             "coin.au"      50
-SOUND=MESG "someone cursing shoplifters"  "gong.au"      50
-SOUND=MESG "chime of a cash register"     "gong.au"      50
-SOUND=MESG "Neiman and Marcus"            "gong.au"      50
-SOUND=MESG "You die"                      "death.au"    100
-SOUND=MESG "sad feeling"                  "death.au"    50
-SOUND=MESG "door closes\."                "doorclos.au" 100
-SOUND=MESG "cosmic"                       "hallu.au"    100
-SOUND=MESG "explosion"                    "landmine.au" 100
-SOUND=MESG "KABOOM"                       "landmine.au" 100
-#SOUND=MESG "KAABLAM"                      "landmine.au" 100
-SOUND=MESG "trigger.* a land *mine"         "landmine.au" 100
-SOUND=MESG "elcome to experi"             "level_up.au" 100
-SOUND=MESG "memorize"                     "memor.au"    100
-#SOUND=MESG "Ouch"                         "ouch2.au"    100
-#SOUND=MESG "XXXfall through\.\.\."        "trapdoor.au" 100
-SOUND=MESG "vomit"                        "vomit.au"    100
-SOUND=MESG "whistling"                    "whistle2.au" 100
-SOUND=MESG "crashes open"                 "thump.au"    100
-SOUND=MESG "You break open the lock"      "thump.au"    100
-#SOUND=MESG "THUD"                         "thump.au"     40
-#SOUND=MESG "WHAMM"                        "thump.au"     50
-SOUND=MESG "welcome to NetHack"            "awaits.au"     100
-SOUND=MESG "strange vibration under"       "forcefld.au"     100
diff --git a/games/nethack33-qt/files/src-Makefile.diff b/games/nethack33-qt/files/src-Makefile.diff
deleted file mode 100644
index 92f754dcd9b2..000000000000
--- a/games/nethack33-qt/files/src-Makefile.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Makefile.orig	Sat Apr  5 19:43:25 1997
-+++ src/Makefile	Sat Apr  5 19:51:26 1997
-@@ -124,11 +124,11 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O2 -I../include
--LFLAGS = -L/usr/X11/lib -L$(QTDIR)/lib
-+CFLAGS = -pipe -O -I../include
-+LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib
- 
- # For USER_SOUNDS support, include -I/usr/X11/include
--CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -I/usr/X11/include
-+CXXFLAGS = $(CFLAGS) -I. -I/usr/X11R6/include -I/usr/X11R6/include/X11/qt
- 
- # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
- # combination of windowing systems.  Also set windowing systems in config.h.
-@@ -213,7 +213,7 @@
- # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
- # LIBS = -lsun
- #
--LIBS =
-+LIBS = -lgnuregex
- 
- # make NetHack
- GAME     = nethack
diff --git a/games/nethack33-qt/files/src-sounds.c.diff b/games/nethack33-qt/files/src-sounds.c.diff
deleted file mode 100644
index de1fdf62b02f..000000000000
--- a/games/nethack33-qt/files/src-sounds.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sounds.c.orig	Thu Mar 20 22:48:36 1997
-+++ src/sounds.c	Thu Mar 20 22:50:00 1997
-@@ -5,7 +5,11 @@
- #include "hack.h"
- #include "edog.h"
- #ifdef USER_SOUNDS
-+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #endif
- 
- #ifdef OVLB
diff --git a/games/nethack33-qt/pkg-descr b/games/nethack33-qt/pkg-descr
index 08079923cd43..c80764a5e38c 100644
--- a/games/nethack33-qt/pkg-descr
+++ b/games/nethack33-qt/pkg-descr
@@ -1,5 +1,3 @@
-WWW: http://www.uq.edu.au/~cswallis/nhqt/
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
@@ -20,3 +18,5 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
+
+WWW: http://trolls.troll.no/warwick/nethack/
diff --git a/games/nethack33-qt/pkg-plist b/games/nethack33-qt/pkg-plist
index 97b050819591..95e4f2cc5823 100644
--- a/games/nethack33-qt/pkg-plist
+++ b/games/nethack33-qt/pkg-plist
@@ -1,155 +1,137 @@
 bin/nethack
-@exec mkdir %D/lib/nethackdir/save
-@exec chmod 775 %D/lib/nethackdir/save
-@exec chown games:games %D/lib/nethackdir/save
-lib/nethackdir/.nethackrc
-lib/nethackdir/A-filla.lev
-lib/nethackdir/A-fillb.lev
-lib/nethackdir/A-goal.lev
-lib/nethackdir/A-locate.lev
-lib/nethackdir/A-start.lev
-lib/nethackdir/B-filla.lev
-lib/nethackdir/B-fillb.lev
-lib/nethackdir/B-goal.lev
-lib/nethackdir/B-locate.lev
-lib/nethackdir/B-start.lev
-lib/nethackdir/C-filla.lev
-lib/nethackdir/C-fillb.lev
-lib/nethackdir/C-goal.lev
-lib/nethackdir/C-locate.lev
-lib/nethackdir/C-start.lev
-lib/nethackdir/E-filla.lev
-lib/nethackdir/E-fillb.lev
-lib/nethackdir/E-goal.lev
-lib/nethackdir/E-locate.lev
-lib/nethackdir/E-start.lev
-lib/nethackdir/H-filla.lev
-lib/nethackdir/H-fillb.lev
-lib/nethackdir/H-goal.lev
-lib/nethackdir/H-locate.lev
-lib/nethackdir/H-start.lev
-lib/nethackdir/K-filla.lev
-lib/nethackdir/K-fillb.lev
-lib/nethackdir/K-goal.lev
-lib/nethackdir/K-locate.lev
-lib/nethackdir/K-start.lev
-lib/nethackdir/P-filla.lev
-lib/nethackdir/P-fillb.lev
-lib/nethackdir/P-goal.lev
-lib/nethackdir/P-locate.lev
-lib/nethackdir/P-start.lev
-lib/nethackdir/R-filla.lev
-lib/nethackdir/R-fillb.lev
-lib/nethackdir/R-goal.lev
-lib/nethackdir/R-locate.lev
-lib/nethackdir/R-start.lev
-lib/nethackdir/S-filla.lev
-lib/nethackdir/S-fillb.lev
-lib/nethackdir/S-goal.lev
-lib/nethackdir/S-locate.lev
-lib/nethackdir/S-start.lev
-lib/nethackdir/T-filla.lev
-lib/nethackdir/T-fillb.lev
-lib/nethackdir/T-goal.lev
-lib/nethackdir/T-locate.lev
-lib/nethackdir/T-start.lev
-lib/nethackdir/V-filla.lev
-lib/nethackdir/V-fillb.lev
-lib/nethackdir/V-goal.lev
-lib/nethackdir/V-locate.lev
-lib/nethackdir/V-start.lev
-lib/nethackdir/W-filla.lev
-lib/nethackdir/W-fillb.lev
-lib/nethackdir/W-goal.lev
-lib/nethackdir/W-locate.lev
-lib/nethackdir/W-start.lev
-lib/nethackdir/air.lev
-lib/nethackdir/asmodeus.lev
-lib/nethackdir/astral.lev
-lib/nethackdir/awaits.au
-lib/nethackdir/baalz.lev
-lib/nethackdir/beartrap.au
-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/breath.au
-lib/nethackdir/castle.lev
-lib/nethackdir/clunk.au
-lib/nethackdir/cmdhelp
-lib/nethackdir/coin.au
-lib/nethackdir/data
-lib/nethackdir/death.au
-lib/nethackdir/destroy2.au
-lib/nethackdir/doorclos.au
-lib/nethackdir/dooropen2.au
-lib/nethackdir/drop.au
-lib/nethackdir/dungeon
-lib/nethackdir/earth.lev
-lib/nethackdir/fakewiz1.lev
-lib/nethackdir/fakewiz2.lev
-lib/nethackdir/fire.lev
-lib/nethackdir/forcefld.au
-lib/nethackdir/frogs.au
-lib/nethackdir/gong.au
-lib/nethackdir/hallu.au
-lib/nethackdir/help
-lib/nethackdir/hh
-lib/nethackdir/history
-lib/nethackdir/hit2.au
-lib/nethackdir/juiblex.lev
-lib/nethackdir/knox.lev
-lib/nethackdir/kops.au
-lib/nethackdir/landmine.au
-lib/nethackdir/latin.au
-lib/nethackdir/latin_short.au
-lib/nethackdir/level_up.au
-lib/nethackdir/license
-lib/nethackdir/logfile
-lib/nethackdir/medusa-1.lev
-lib/nethackdir/medusa-2.lev
-lib/nethackdir/memor.au
-lib/nethackdir/memories.au
-lib/nethackdir/minderode.au
-lib/nethackdir/minefill.lev
-lib/nethackdir/minend-1.lev
-lib/nethackdir/minend-2.lev
-lib/nethackdir/minetn-1.lev
-lib/nethackdir/minetn-2.lev
-lib/nethackdir/miss2.au
-lib/nethackdir/mock.au
-lib/nethackdir/nethack
-lib/nethackdir/ohdear.au
-lib/nethackdir/opthelp
-lib/nethackdir/options
-lib/nethackdir/oracle.lev
-lib/nethackdir/oracles
-lib/nethackdir/orcus.lev
-lib/nethackdir/ouch2.au
-lib/nethackdir/perm
-lib/nethackdir/quest.dat
-lib/nethackdir/record
-lib/nethackdir/rip.xpm
-lib/nethackdir/rumors
-lib/nethackdir/sanctum.lev
-lib/nethackdir/squeek.au
-lib/nethackdir/tada.au
-lib/nethackdir/thump.au
-lib/nethackdir/tiles.xpm
-lib/nethackdir/tower1.lev
-lib/nethackdir/tower2.lev
-lib/nethackdir/tower3.lev
-lib/nethackdir/trapdoor.au
-lib/nethackdir/valley.lev
-lib/nethackdir/vomit.au
-lib/nethackdir/water.lev
-lib/nethackdir/weak.au
-lib/nethackdir/whistle2.au
-lib/nethackdir/wizard1.lev
-lib/nethackdir/wizard2.lev
-lib/nethackdir/wizard3.lev
-lib/nethackdir/wizhelp
-lib/nethackdir/yendor.au
-@dirrm lib/nethackdir/save
-@dirrm lib/nethackdir
+%%PORTDOCS%%share/doc/nethack/Guidebook.txt
+lib/nethack/nethack
+@exec mkdir %D/lib/nethack/save
+@exec chmod -R 775 %D/lib/nethack
+@exec chmod 2755 %D/lib/nethack/nethack
+@exec chown games:games %D/lib/nethack/save
+@unexec rm -rf %D/lib/nethack/save
+lib/nethack/Arc-fila.lev
+lib/nethack/Arc-filb.lev
+lib/nethack/Arc-goal.lev
+lib/nethack/Arc-loca.lev
+lib/nethack/Arc-strt.lev
+lib/nethack/Bar-fila.lev
+lib/nethack/Bar-filb.lev
+lib/nethack/Bar-goal.lev
+lib/nethack/Bar-loca.lev
+lib/nethack/Bar-strt.lev
+lib/nethack/Cav-fila.lev
+lib/nethack/Cav-filb.lev
+lib/nethack/Cav-goal.lev
+lib/nethack/Cav-loca.lev
+lib/nethack/Cav-strt.lev
+lib/nethack/Hea-fila.lev
+lib/nethack/Hea-filb.lev
+lib/nethack/Hea-goal.lev
+lib/nethack/Hea-loca.lev
+lib/nethack/Hea-strt.lev
+lib/nethack/Kni-fila.lev
+lib/nethack/Kni-filb.lev
+lib/nethack/Kni-goal.lev
+lib/nethack/Kni-loca.lev
+lib/nethack/Kni-strt.lev
+lib/nethack/Mon-fila.lev
+lib/nethack/Mon-filb.lev
+lib/nethack/Mon-goal.lev
+lib/nethack/Mon-loca.lev
+lib/nethack/Mon-strt.lev
+lib/nethack/Pri-fila.lev
+lib/nethack/Pri-filb.lev
+lib/nethack/Pri-goal.lev
+lib/nethack/Pri-loca.lev
+lib/nethack/Pri-strt.lev
+lib/nethack/Ran-fila.lev
+lib/nethack/Ran-filb.lev
+lib/nethack/Ran-goal.lev
+lib/nethack/Ran-loca.lev
+lib/nethack/Ran-strt.lev
+lib/nethack/Rog-fila.lev
+lib/nethack/Rog-filb.lev
+lib/nethack/Rog-goal.lev
+lib/nethack/Rog-loca.lev
+lib/nethack/Rog-strt.lev
+lib/nethack/Sam-fila.lev
+lib/nethack/Sam-filb.lev
+lib/nethack/Sam-goal.lev
+lib/nethack/Sam-loca.lev
+lib/nethack/Sam-strt.lev
+lib/nethack/Tou-fila.lev
+lib/nethack/Tou-filb.lev
+lib/nethack/Tou-goal.lev
+lib/nethack/Tou-loca.lev
+lib/nethack/Tou-strt.lev
+lib/nethack/Val-fila.lev
+lib/nethack/Val-filb.lev
+lib/nethack/Val-goal.lev
+lib/nethack/Val-loca.lev
+lib/nethack/Val-strt.lev
+lib/nethack/Wiz-fila.lev
+lib/nethack/Wiz-filb.lev
+lib/nethack/Wiz-goal.lev
+lib/nethack/Wiz-loca.lev
+lib/nethack/Wiz-strt.lev
+lib/nethack/air.lev
+lib/nethack/asmodeus.lev
+lib/nethack/astral.lev
+lib/nethack/baalz.lev
+lib/nethack/bigrm-1.lev
+lib/nethack/bigrm-2.lev
+lib/nethack/bigrm-3.lev
+lib/nethack/bigrm-4.lev
+lib/nethack/bigrm-5.lev
+lib/nethack/castle.lev
+lib/nethack/cmdhelp
+lib/nethack/data
+lib/nethack/dungeon
+lib/nethack/earth.lev
+lib/nethack/fakewiz1.lev
+lib/nethack/fakewiz2.lev
+lib/nethack/fire.lev
+lib/nethack/help
+lib/nethack/hh
+lib/nethack/history
+lib/nethack/juiblex.lev
+lib/nethack/knox.lev
+lib/nethack/license
+lib/nethack/medusa-1.lev
+lib/nethack/medusa-2.lev
+lib/nethack/minefill.lev
+lib/nethack/minend-1.lev
+lib/nethack/minend-2.lev
+lib/nethack/minetn-1.lev
+lib/nethack/minetn-2.lev
+lib/nethack/opthelp
+lib/nethack/options
+lib/nethack/oracle.lev
+lib/nethack/oracles
+lib/nethack/orcus.lev
+lib/nethack/pet_mark.xbm
+lib/nethack/quest.dat
+lib/nethack/rip.xpm
+lib/nethack/rumors
+lib/nethack/sanctum.lev
+lib/nethack/soko1-1.lev
+lib/nethack/soko1-2.lev
+lib/nethack/soko2-1.lev
+lib/nethack/soko2-2.lev
+lib/nethack/soko3-1.lev
+lib/nethack/soko3-2.lev
+lib/nethack/soko4-1.lev
+lib/nethack/soko4-2.lev
+lib/nethack/tower1.lev
+lib/nethack/tower2.lev
+lib/nethack/tower3.lev
+lib/nethack/valley.lev
+lib/nethack/water.lev
+lib/nethack/wizard1.lev
+lib/nethack/wizard2.lev
+lib/nethack/wizard3.lev
+lib/nethack/wizhelp
+lib/nethack/x11tiles
+@mode 664
+lib/nethack/logfile
+lib/nethack/record
+lib/nethack/perm
+@dirrm lib/nethack
+%%PORTDOCS%%@dirrm share/doc/nethack
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index 3fbc438c3ef0..baf3973c83dc 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -5,69 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt-nethack
-PORTVERSION=	1.0.1
+PORTNAME=	nethack
+PKGNAMESUFFIX=	-qt
+PORTVERSION=	3.3.1
 CATEGORIES=	games
-MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
-		ftp://ftp.troll.no/contrib/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	nethack
-DISTNAME=	nethack-3.2.2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
-		xpmtoppm:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
-
-QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
-QT_SOUND=	nhs.tar.gz
-EXTRACT_ONLY=	nethack-3.2.2.tar.gz
-
-USE_QT_VER=	1
-USE_XPM=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_QT_VER=	2
 USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
-BROKEN=		"Compiler error"
+pre-everything:
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!! You cannot install nethack and nethack-qt in parallel  !!"
+	@${ECHO} "!! But nethack-qt might read your prior nethack scores    !!"
+	@${ECHO} "!! Don't forget to backup your nethack libdir if it's     !!"
+	@${ECHO} "!! important for you                                      !!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 
-pre-configure:
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
-	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
-	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
-	@ ${ECHO} "!! important for you                                     !!"
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ cd ${WRKSRC}/win; tar xzf ${DISTDIR}/${QT_PATCH}
-	@ cd ${WRKSRC}; ${PATCH} -s < win/Qt/nhqt.patch
-	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-Makefile.diff
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-sounds.c.diff
-	@ cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/include-unixconf.h.diff
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 
-pre-build:
-	(cd ${WRKSRC}/util; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} tile2x11 )
+pre-configure:
+	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 post-install:
-	@ cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
+	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/nethack
-	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
 .endif
-	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@ cd ${PREFIX}/lib/nethackdir; ${CHOWN} root:games *.au .nethackrc
-	@ cd ${PREFIX}/lib/nethackdir; ${CHMOD} 444 *.au .nethackrc
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "post-installation hints
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "a) Add this to your user environment:"
-	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
-	@ ${ECHO}  "b) Start the NAS audio server"
-	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
-	@ ${ECHO}  "c) Copy the example nethackrc file from ${FILESDIR} to your"
-	@ ${ECHO}  "   login directory:"
-	@ ${ECHO}  "   ${CP} ${FILESDIR}/sample.nethackrc ${HOME}/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack34-qt/distinfo b/games/nethack34-qt/distinfo
index c622e477464a..24595f9d9a12 100644
--- a/games/nethack34-qt/distinfo
+++ b/games/nethack34-qt/distinfo
@@ -1,3 +1 @@
-MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a
-MD5 (nhs.tar.gz) = 6f0540d7fee3c8cf927f47031f6ca6a2
+MD5 (nethack-331.tgz) = d0600ce4698c80e5ad1f917ded1c36d2
diff --git a/games/nethack34-qt/files/include-unixconf.h.diff b/games/nethack34-qt/files/include-unixconf.h.diff
deleted file mode 100644
index 53150d818111..000000000000
--- a/games/nethack34-qt/files/include-unixconf.h.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/unixconf.h.orig	Thu Mar 20 23:17:16 1997
-+++ include/unixconf.h	Thu Mar 20 23:17:29 1997
-@@ -42,7 +42,7 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
- #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
diff --git a/games/nethack34-qt/files/patch-aa b/games/nethack34-qt/files/patch-aa
deleted file mode 100644
index 4f8040adbbc0..000000000000
--- a/games/nethack34-qt/files/patch-aa
+++ /dev/null
@@ -1,127 +0,0 @@
---- ./include/system.h.org	Mon Mar 25 17:18:32 1996
-+++ ./include/system.h	Sun Apr 21 18:10:01 1996
-@@ -78,7 +78,7 @@
- # if !defined(SUNOS4) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
--#  ifndef bsdi
-+#  if !defined(bsdi) && !defined(__FreeBSD__)
- E int FDECL(srandom, (unsigned int));
- #  endif
- # endif
---- ./include/unixconf.h.org	Mon Mar 25 12:47:47 1996
-+++ ./include/unixconf.h	Sun Apr 21 18:10:02 1996
-@@ -31,7 +31,7 @@
- 
- /* define any of the following that are appropriate */
- /* #define SVR4		/* use in addition to SYSV for System V Release 4 */
--#define NETWORK		/* if running on a networked system */
-+/* #define NETWORK		/* if running on a networked system */
- 			/* e.g. Suns sharing a playground through NFS */
- #define SUNOS4	/* SunOS 4.x */
- /* #define LINUX	/* Another Unix clone */
-@@ -42,12 +42,12 @@
- /* #define AIX_31	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
- 			 * job control (note that AIX is SYSV otherwise)
- 			 * Also define this for AIX 3.2 */
--/* #define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
-+#define TEXTCOLOR	/* Use System V r3.2 terminfo color support */
- 			/* and/or ANSI color support on termcap systems */
- 			/* and/or X11 color */
--/* #define POSIX_JOB_CONTROL	/* use System V / POSIX job control
-+#define POSIX_JOB_CONTROL	/* use System V / POSIX job control
- 			 * (e.g., VSUSP) */
--/* #define POSIX_TYPES	/* use POSIX types for system calls and termios */
-+#define POSIX_TYPES	/* use POSIX types for system calls and termios */
- 			/* define for many recent OS releases, including
- 			 * those with specific defines (since types are
- 			 * changing toward the standard from earlier chaos).
-@@ -125,7 +125,7 @@
-  * A stat system call is done on the mailbox every MAILCKFREQ moves.
-  */
- 
--#define MAIL			/* Deliver mail during the game */
-+/* #define MAIL			/* Deliver mail during the game */
- 
- /* The Andrew Message System does mail a little differently from normal
-  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
---- ./include/config.h.org	Thu Feb 29 11:00:26 1996
-+++ ./include/config.h	Sun Apr 21 18:10:06 1996
-@@ -248,7 +248,7 @@
-  * would allow:
-  *  xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
-  */
--/* # define USE_XPM		/* Disable if you do not have the XPM library */
-+# define USE_XPM		/* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- #  define GRAPHIC_TOMBSTONE	/* Use graphical tombstone (rip.xpm) */
- # endif
-@@ -288,12 +288,12 @@
- 
- #ifdef UNIX
- /* path and file name extension for compression program */
--# define COMPRESS "/usr/ucb/compress"	     /* Lempel-Ziv compression */
--# define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
-+/* # define COMPRESS "/usr/ucb/compress"     /* Lempel-Ziv compression */
-+/* # define COMPRESS_EXTENSION ".Z"	     /* compress's extension */
- 
- /* An example of one alternative you might want to use: */
--/* # define COMPRESS "/usr/local/bin/gzip"   /* FSF gzip compression */
--/* # define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
-+# define COMPRESS "/usr/bin/gzip"   /* FSF gzip compression */
-+# define COMPRESS_EXTENSION ".gz"	     /* normal gzip extension */
- #endif
- #ifndef COMPRESS
- # define INTERNAL_COMP	/* control use of NetHack's compression routines */
-@@ -323,7 +323,7 @@
-  * otherwise it will be the current directory.
-  */
- # ifndef HACKDIR
--#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
-+#  define HACKDIR "/usr/local/lib/nethackdir"	/* nethack directory */
- # endif
- 
- /*
---- ./sys/unix/Makefile.doc.org	Wed Apr  3 21:17:35 1996
-+++ ./sys/unix/Makefile.doc	Sun Apr 21 18:10:03 1996
-@@ -31,7 +31,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= ${PREFIX}/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems
---- ./sys/unix/Makefile.top.org	Mon Mar 25 17:22:00 1996
-+++ ./sys/unix/Makefile.top	Sun Apr 21 18:28:09 1996
-@@ -16,14 +16,14 @@
- # make NetHack
- GAME     = nethack
- GAMEUID  = games
--GAMEGRP  = bin
-+GAMEGRP  = games
- 
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM  = 0755
--DIRPERM  = 0755
-+DIRPERM  = 0775
- 
- # GAMEDIR also appears in config.h as "HACKDIR".
- #
-@@ -32,8 +32,8 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = /usr/games/lib/$(GAME)dir
--SHELLDIR = /usr/games
-+GAMEDIR  = ${PREFIX}/lib/$(GAME)dir
-+SHELLDIR = ${PREFIX}/bin
- 
- # per discussion in Install.X11
- VARDATND = 
diff --git a/games/nethack34-qt/files/patch-ab b/games/nethack34-qt/files/patch-ab
deleted file mode 100644
index b609686e6166..000000000000
--- a/games/nethack34-qt/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/youprop.h.orig	Tue Oct 28 22:32:04 1997
-+++ ./include/youprop.h	Tue Oct 28 22:33:08 1997
-@@ -79,7 +79,7 @@
- #define Protection		u.uprops[PROTECTION].p_flgs
- #define Protection_from_shape_changers \
- 				u.uprops[PROT_FROM_SHAPE_CHANGERS].p_flgs
--#define Warning			u.uprops[WARNING].p_flgs
-+#define HWarning		u.uprops[WARNING].p_flgs
- 
- #define HTelepat		u.uprops[TELEPAT].p_flgs
- #define Telepat			(HTelepat || telepathic(uasmon))
diff --git a/games/nethack34-qt/files/patch-ac b/games/nethack34-qt/files/patch-ac
deleted file mode 100644
index d5ece267d3a6..000000000000
--- a/games/nethack34-qt/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/artifact.c.orig	Tue Oct 28 22:30:56 1997
-+++ ./src/artifact.c	Tue Oct 28 22:34:10 1997
-@@ -382,8 +382,8 @@
- 	    else HTeleport_control &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_WARN) {
--	    if (on) Warning |= wp_mask;
--	    else Warning &= ~wp_mask;
-+	    if (on) HWarning |= wp_mask;
-+	    else HWarning &= ~wp_mask;
- 	}
- 	if (spfx & SPFX_EREGEN) {
- 	    if (on) Energy_regeneration |= wp_mask;
diff --git a/games/nethack34-qt/files/patch-ad b/games/nethack34-qt/files/patch-ad
deleted file mode 100644
index 66ff78506faa..000000000000
--- a/games/nethack34-qt/files/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./src/attrib.c.orig	Tue Oct 28 22:31:02 1997
-+++ ./src/attrib.c	Tue Oct 28 22:34:18 1997
-@@ -44,7 +44,7 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	c_abil[] = { {	 7, &(Fast), "quick", "slow" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	e_abil[] = { {   1, &(Fast), "", "" },
-@@ -54,13 +54,13 @@
- 		     {	 0, 0, 0, 0 } },
- 
- 	h_abil[] = { {	 1, &(HPoison_resistance), "", "" },
--		     {	15, &(Warning), "sensitive", "" },
-+		     {	15, &(HWarning), "sensitive", "" },
- 		     {	 0, 0, 0, 0 } },
- 
- 	k_abil[] = { {	 7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	p_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	p_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  20, &(HFire_resistance), "cool", "warmer" },
- 		     {	 0, 0, 0, 0 } },
- 
-@@ -81,7 +81,7 @@
- 		     {   7, &(Fast), "quick", "slow" },
- 		     {	 0, 0, 0, 0 } },
- 
--	w_abil[] = { {	15, &(Warning), "sensitive", "" },
-+	w_abil[] = { {	15, &(HWarning), "sensitive", "" },
- 		     {  17, &(HTeleport_control), "controlled","uncontrolled" },
- 		     {	 0, 0, 0, 0 } };
- 
diff --git a/games/nethack34-qt/files/patch-ae b/games/nethack34-qt/files/patch-ae
deleted file mode 100644
index a8adb09592b3..000000000000
--- a/games/nethack34-qt/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cmd.c.orig	Tue Oct 28 22:31:09 1997
-+++ ./src/cmd.c	Tue Oct 28 22:34:21 1997
-@@ -643,7 +643,7 @@
- 	if (Lifesaved)
- 		enl_msg("Your life ", "will be", "would have been", " saved");
- 	if (Adornment) you_are("adorned");
--	if (Warning) you_are("warned");
-+	if (HWarning) you_are("warned");
- 	if (Protection) you_are("protected");
- 	if (Reflecting) you_have("reflection");
- 	if ((HLevitation & (I_SPECIAL|W_ARTI)) != 0L &&
diff --git a/games/nethack34-qt/files/patch-af b/games/nethack34-qt/files/patch-af
deleted file mode 100644
index d188f9810bd1..000000000000
--- a/games/nethack34-qt/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mon.c.orig	Tue Oct 28 22:31:23 1997
-+++ ./src/mon.c	Tue Oct 28 22:34:29 1997
-@@ -212,7 +212,7 @@
- 
- 	    lastwarntime = moves;
- 	    lastwarnlev = warnlevel;
--	    switch((int) (Warning & (LEFT_RING | RIGHT_RING))) {
-+	    switch((int) (HWarning & (LEFT_RING | RIGHT_RING))) {
- 	    case LEFT_RING:
- 		rr = Hallucination ? "left mood ring glows" : "left ring glows";
- 		break;
diff --git a/games/nethack34-qt/files/patch-ag b/games/nethack34-qt/files/patch-ag
deleted file mode 100644
index 779ef4482a5b..000000000000
--- a/games/nethack34-qt/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/monmove.c.orig	Tue Oct 28 22:31:30 1997
-+++ ./src/monmove.c	Tue Oct 28 22:34:36 1997
-@@ -83,7 +83,7 @@
- 	int rd = dochug(mtmp);
- 	int dd;
- 
--	if(Warning && !rd && !mtmp->mpeaceful &&
-+	if(HWarning && !rd && !mtmp->mpeaceful &&
- 			(dd = distu(mtmp->mx,mtmp->my)) < distu(x,y) &&
- 			dd < 100 && !canseemon(mtmp)) {
- 	    /* Note: this assumes we only want to warn against the monster to
diff --git a/games/nethack34-qt/files/patch-include:config.h b/games/nethack34-qt/files/patch-include:config.h
new file mode 100644
index 000000000000..bfb4a2c47a67
--- /dev/null
+++ b/games/nethack34-qt/files/patch-include:config.h
@@ -0,0 +1,36 @@
+--- include/config.h.orig	Sat Jul 22 10:13:51 2000
++++ include/config.h	Sat Aug 11 10:09:12 2001
+@@ -44,7 +44,7 @@
+  */
+ #define TTY_GRAPHICS	/* good old tty based graphics */
+ /* #define X11_GRAPHICS */	/* X11 interface */
+-/* #define QT_GRAPHICS */	/* Qt interface */
++#define QT_GRAPHICS	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
+ 
+ /*
+@@ -151,11 +151,11 @@
+ 
+ #ifdef UNIX
+ /* path and file name extension for compression program */
+-#define COMPRESS "/usr/bin/compress"	/* Lempel-Ziv compression */
+-#define COMPRESS_EXTENSION ".Z"		/* compress's extension */
++/* #define COMPRESS "/usr/bin/compress"*/	/* Lempel-Ziv compression */
++/* #define COMPRESS_EXTENSION ".Z"	*/	/* compress's extension */
+ /* An example of one alternative you might want to use: */
+-/* #define COMPRESS "/usr/local/bin/gzip" */	/* FSF gzip compression */
+-/* #define COMPRESS_EXTENSION ".gz" */		/* normal gzip extension */
++#define COMPRESS "/usr/bin/gzip"	 	/* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz" 		/* normal gzip extension */
+ #endif
+ 
+ #ifndef COMPRESS
+@@ -186,7 +186,7 @@
+  * otherwise it will be the current directory.
+  */
+ # ifndef HACKDIR
+-#  define HACKDIR "/usr/games/lib/nethackdir"	/* nethack directory */
++#  define HACKDIR "%%PREFIX%%/lib/nethack"	/* nethack directory */
+ # endif
+ 
+ /*
diff --git a/games/nethack34-qt/files/patch-include:unixconf.h b/games/nethack34-qt/files/patch-include:unixconf.h
new file mode 100644
index 000000000000..d43f9d82b7dd
--- /dev/null
+++ b/games/nethack34-qt/files/patch-include:unixconf.h
@@ -0,0 +1,20 @@
+--- include/unixconf.h.orig	Mon Jul 17 11:03:51 2000
++++ include/unixconf.h	Fri Oct 13 10:06:57 2000
+@@ -47,7 +47,7 @@
+ 			 * job control (note that AIX is SYSV otherwise)
+ 			 * Also define this for AIX 3.2 */
+ 
+-#define TERMINFO	/* uses terminfo rather than termcap */
++/* #define TERMINFO */	/* uses terminfo rather than termcap */
+ 			/* Should be defined for most SYSV, SVR4 (including
+ 			 * Solaris 2+), HPUX, and Linux systems.  In
+ 			 * particular, it should NOT be defined for the UNIXPC
+@@ -143,7 +143,7 @@
+  * A stat system call is done on the mailbox every MAILCKFREQ moves.
+  */
+ 
+-#define MAIL			/* Deliver mail during the game */
++/* #define MAIL			/* Deliver mail during the game */
+ 
+ /* The Andrew Message System does mail a little differently from normal
+  * UNIX.  Mail is deposited in the user's own directory in ~/Mailbox
diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.doc b/games/nethack34-qt/files/patch-sys:unix:Makefile.doc
new file mode 100644
index 000000000000..2527c7b4128e
--- /dev/null
+++ b/games/nethack34-qt/files/patch-sys:unix:Makefile.doc
@@ -0,0 +1,41 @@
+--- sys/unix/Makefile.doc.orig	Sat Jan 15 05:49:48 2000
++++ sys/unix/Makefile.doc	Sat Aug 11 11:08:33 2001
+@@ -34,15 +34,15 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/man/man6
++MANDIR	= ${PREFIX}/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) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
++	-$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
++	-$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
++	-$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
+ 
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.src b/games/nethack34-qt/files/patch-sys:unix:Makefile.src
new file mode 100644
index 000000000000..1a58379ae1ad
--- /dev/null
+++ b/games/nethack34-qt/files/patch-sys:unix:Makefile.src
@@ -0,0 +1,62 @@
+--- sys/unix/Makefile.src.orig	Sat Aug  5 19:52:57 2000
++++ sys/unix/Makefile.src	Sat Aug 11 09:53:08 2001
+@@ -144,14 +144,14 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
++CFLAGS += -I../include
+ LFLAGS =
+ 
+ # The Qt and Be window systems are written in C++, while the rest of
+ # NetHack is standard C.  If using Qt, uncomment the LD line here to get
+ # the C++ libraries linked in.
+-CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
+-CXX=g++
++CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
++#CXX=g++
+ #LD=g++
+ 
+ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
+@@ -203,8 +203,8 @@
+ 
+ #
+ #
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINQTSRC)
++WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -230,7 +230,7 @@
+ # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
+ #
+ # libraries for Qt
+-WINQTLIB = -L$(QTDIR)/lib -lqt
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
+ #
+ # libraries for KDE (with Qt)
+ WINKDELIB = -lkdecore -lkdeui -lXext
+@@ -244,7 +244,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINQTLIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)
+@@ -445,10 +445,10 @@
+ 
+ # Qt windowport meta-object-compiler output
+ qt_kde0.moc: ../include/qt_kde0.h
+-	$(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
++	${MOC} ../include/qt_kde0.h > qt_kde0.moc
+ 
+ qt_win.moc: ../include/qt_win.h
+-	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
++	${MOC} ../include/qt_win.h > qt_win.moc
+ 
+ $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
+ 		../include/objclass.h ../include/monsym.h \
diff --git a/games/nethack34-qt/files/patch-sys:unix:Makefile.top b/games/nethack34-qt/files/patch-sys:unix:Makefile.top
new file mode 100644
index 000000000000..fb4a9021dd90
--- /dev/null
+++ b/games/nethack34-qt/files/patch-sys:unix:Makefile.top
@@ -0,0 +1,44 @@
+--- sys/unix/Makefile.top.orig	Tue Jul  4 09:42:05 2000
++++ sys/unix/Makefile.top	Sat Aug 11 11:21:15 2001
+@@ -14,18 +14,17 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
+ GAME     = nethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+-GAMEGRP  = bin
++GAMEGRP  = games
+ 
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM  = 0755
+-DIRPERM  = 0755
++DIRPERM  = 0775
+ 
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -35,14 +34,14 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = $(PREFIX)/lib/$(GAME)
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
++# VARDATND = 
+ # VARDATND = x11tiles pet_mark.xbm
+-# VARDATND = x11tiles pet_mark.xbm rip.xpm
++VARDATND = x11tiles pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC
+ # for BeOS
diff --git a/games/nethack34-qt/files/sample.nethackrc b/games/nethack34-qt/files/sample.nethackrc
deleted file mode 100644
index 33dbe47118fc..000000000000
--- a/games/nethack34-qt/files/sample.nethackrc
+++ /dev/null
@@ -1,88 +0,0 @@
-OPTIONS=!silent
-OPTIONS=!time
-OPTIONS=catname:Ghisteslwchlohm
-OPTIONS=color
-OPTIONS=dogname:Dhairrhuwyth
-OPTIONS=hilite_pet
-OPTIONS=lit_corridor
-OPTIONS=menustyle:partial
-OPTIONS=msghistory:200
-OPTIONS=news
-OPTIONS=noautopickup
-OPTIONS=rest_on_space
-OPTIONS=safe_pet
-OPTIONS=showexp
-OPTIONS=showscore
-OPTIONS=sortpack
-OPTIONS=time
-OPTIONS=tombstone
-OPTIONS=toptenwin
-OPTIONS=verbose
-SOUNDDIR=/usr/local/lib/nethackdir
-SOUND=MESG "needs food, badly"            "weak.au" 100
-SOUND=MESG "feel weak"                    "weak.au" 100
-SOUND=MESG "bear trap closes"             "beartrap.au" 100
-SOUND=MESG "board beneath you squeaks"    "squeek.au"   100
-SOUND=MESG "board beneath .....* squeaks" "squeek.au"    60
-SOUND=MESG "a distant squeak"             "squeek.au"    25
-SOUND=MESG "mind releases itself from"    "memories.au" 100
-SOUND=MESG "on itself, you forget"        "memories.au" 100
-SOUND=MESG "Who was that Maud person"     "memories.au" 100
-SOUND=MESG "Thinking of Maud you forget"  "memories.au" 100
-SOUND=MESG "you forget everything"        "memories.au" 100
-SOUND=MESG "smell marsh gas"              "frogs.au"    100
-SOUND=MESG "must have been exercising"    "tada.au"     100
-SOUND=MESG "must have been very obs"      "tada.au"     100
-SOUND=MESG "must have been working on"    "tada.au"     100
-SOUND=MESG "must be leading a healthy"    "tada.au"     100
-SOUND=MESG "Keystone Kops appear!"        "kops.au"    100
-SOUND=MESG "Keystone Kops are after you"  "kops.au"    100
-SOUND=MESG "interesting topological ex"   "mock.au"     100
-SOUND=MESG "Interesting\.\.\."            "mock.au"     100
-SOUND=MESG "deathly sick\."               "ohdear.au"    80
-SOUND=MESG "feel feverish"                "ohdear.au"    80
-SOUND=MESG "brain is eaten"               "minderode.au" 80
-SOUND=MESG "thought thou couldst kill"    "yendor.au"   120
-SOUND=MESG "begin praying to"             "latin_short.au"  70
-SOUND=MESG "sense of peace"               "latin.au"     20
-SOUND=MESG "have a.* forbidding feeling"  "latin.au"     20
-#SOUND=MESG "door opens\."                 "dooropen2.au" 100
-#SOUND=MESG "You drop "                    "drop.au"      10
-#SOUND=MESG "You destroy "                 "destroy2.au"  30
-#SOUND=MESG "You kill "                    "destroy2.au"  20
-#SOUND=MESG "is killed"                    "destroy2.au"  10
-#SOUND=MESG "You miss "                    "miss2.au"     20
-#SOUND=MESG "fiery blade burns"            "hit2.au"      30
-#SOUND=MESG "ice-cold blade freezes"       "hit2.au"      30
-#SOUND=MESG "You hit "                     "hit2.au"      20
-#SOUND=MESG "The spell hits"               "hit2.au"      20
-SOUND=MESG "breathes"                     "breath.au"   100
-SOUND=MESG "a door open\."                "dooropen2.au" 100
-SOUND=MESG "Klunk"                        "clunk.au"    100
-SOUND=MESG "guard on patrol"              "coin.au"      50
-SOUND=MESG "quarterback calling"          "coin.au"      50
-SOUND=MESG "someone counting"             "coin.au"      50
-SOUND=MESG "Ebenezer Scrooge"             "coin.au"      50
-SOUND=MESG "someone cursing shoplifters"  "gong.au"      50
-SOUND=MESG "chime of a cash register"     "gong.au"      50
-SOUND=MESG "Neiman and Marcus"            "gong.au"      50
-SOUND=MESG "You die"                      "death.au"    100
-SOUND=MESG "sad feeling"                  "death.au"    50
-SOUND=MESG "door closes\."                "doorclos.au" 100
-SOUND=MESG "cosmic"                       "hallu.au"    100
-SOUND=MESG "explosion"                    "landmine.au" 100
-SOUND=MESG "KABOOM"                       "landmine.au" 100
-#SOUND=MESG "KAABLAM"                      "landmine.au" 100
-SOUND=MESG "trigger.* a land *mine"         "landmine.au" 100
-SOUND=MESG "elcome to experi"             "level_up.au" 100
-SOUND=MESG "memorize"                     "memor.au"    100
-#SOUND=MESG "Ouch"                         "ouch2.au"    100
-#SOUND=MESG "XXXfall through\.\.\."        "trapdoor.au" 100
-SOUND=MESG "vomit"                        "vomit.au"    100
-SOUND=MESG "whistling"                    "whistle2.au" 100
-SOUND=MESG "crashes open"                 "thump.au"    100
-SOUND=MESG "You break open the lock"      "thump.au"    100
-#SOUND=MESG "THUD"                         "thump.au"     40
-#SOUND=MESG "WHAMM"                        "thump.au"     50
-SOUND=MESG "welcome to NetHack"            "awaits.au"     100
-SOUND=MESG "strange vibration under"       "forcefld.au"     100
diff --git a/games/nethack34-qt/files/src-Makefile.diff b/games/nethack34-qt/files/src-Makefile.diff
deleted file mode 100644
index 92f754dcd9b2..000000000000
--- a/games/nethack34-qt/files/src-Makefile.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/Makefile.orig	Sat Apr  5 19:43:25 1997
-+++ src/Makefile	Sat Apr  5 19:51:26 1997
-@@ -124,11 +124,11 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O2 -I../include
--LFLAGS = -L/usr/X11/lib -L$(QTDIR)/lib
-+CFLAGS = -pipe -O -I../include
-+LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib
- 
- # For USER_SOUNDS support, include -I/usr/X11/include
--CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -I/usr/X11/include
-+CXXFLAGS = $(CFLAGS) -I. -I/usr/X11R6/include -I/usr/X11R6/include/X11/qt
- 
- # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
- # combination of windowing systems.  Also set windowing systems in config.h.
-@@ -213,7 +213,7 @@
- # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
- # LIBS = -lsun
- #
--LIBS =
-+LIBS = -lgnuregex
- 
- # make NetHack
- GAME     = nethack
diff --git a/games/nethack34-qt/files/src-sounds.c.diff b/games/nethack34-qt/files/src-sounds.c.diff
deleted file mode 100644
index de1fdf62b02f..000000000000
--- a/games/nethack34-qt/files/src-sounds.c.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sounds.c.orig	Thu Mar 20 22:48:36 1997
-+++ src/sounds.c	Thu Mar 20 22:50:00 1997
-@@ -5,7 +5,11 @@
- #include "hack.h"
- #include "edog.h"
- #ifdef USER_SOUNDS
-+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #endif
- 
- #ifdef OVLB
diff --git a/games/nethack34-qt/pkg-descr b/games/nethack34-qt/pkg-descr
index 08079923cd43..c80764a5e38c 100644
--- a/games/nethack34-qt/pkg-descr
+++ b/games/nethack34-qt/pkg-descr
@@ -1,5 +1,3 @@
-WWW: http://www.uq.edu.au/~cswallis/nhqt/
-
 NetHack is a Free graphical one-player roleplaying game with a
 highly modular window system interface supporting TTY, VGA, Mac,
 Amiga, and other displays. Qt is a graphical user interface toolkit.
@@ -20,3 +18,5 @@ o   You rarely need to put the mouse in a pop-up to interact with it.
 o   Macros - hidden feature - F1=multi-rest F2=multi-search F3=try-it 
 o   It is much easier to code, so new feature-requests are more easily done. 
 o   Sound support.
+
+WWW: http://trolls.troll.no/warwick/nethack/
diff --git a/games/nethack34-qt/pkg-plist b/games/nethack34-qt/pkg-plist
index 97b050819591..95e4f2cc5823 100644
--- a/games/nethack34-qt/pkg-plist
+++ b/games/nethack34-qt/pkg-plist
@@ -1,155 +1,137 @@
 bin/nethack
-@exec mkdir %D/lib/nethackdir/save
-@exec chmod 775 %D/lib/nethackdir/save
-@exec chown games:games %D/lib/nethackdir/save
-lib/nethackdir/.nethackrc
-lib/nethackdir/A-filla.lev
-lib/nethackdir/A-fillb.lev
-lib/nethackdir/A-goal.lev
-lib/nethackdir/A-locate.lev
-lib/nethackdir/A-start.lev
-lib/nethackdir/B-filla.lev
-lib/nethackdir/B-fillb.lev
-lib/nethackdir/B-goal.lev
-lib/nethackdir/B-locate.lev
-lib/nethackdir/B-start.lev
-lib/nethackdir/C-filla.lev
-lib/nethackdir/C-fillb.lev
-lib/nethackdir/C-goal.lev
-lib/nethackdir/C-locate.lev
-lib/nethackdir/C-start.lev
-lib/nethackdir/E-filla.lev
-lib/nethackdir/E-fillb.lev
-lib/nethackdir/E-goal.lev
-lib/nethackdir/E-locate.lev
-lib/nethackdir/E-start.lev
-lib/nethackdir/H-filla.lev
-lib/nethackdir/H-fillb.lev
-lib/nethackdir/H-goal.lev
-lib/nethackdir/H-locate.lev
-lib/nethackdir/H-start.lev
-lib/nethackdir/K-filla.lev
-lib/nethackdir/K-fillb.lev
-lib/nethackdir/K-goal.lev
-lib/nethackdir/K-locate.lev
-lib/nethackdir/K-start.lev
-lib/nethackdir/P-filla.lev
-lib/nethackdir/P-fillb.lev
-lib/nethackdir/P-goal.lev
-lib/nethackdir/P-locate.lev
-lib/nethackdir/P-start.lev
-lib/nethackdir/R-filla.lev
-lib/nethackdir/R-fillb.lev
-lib/nethackdir/R-goal.lev
-lib/nethackdir/R-locate.lev
-lib/nethackdir/R-start.lev
-lib/nethackdir/S-filla.lev
-lib/nethackdir/S-fillb.lev
-lib/nethackdir/S-goal.lev
-lib/nethackdir/S-locate.lev
-lib/nethackdir/S-start.lev
-lib/nethackdir/T-filla.lev
-lib/nethackdir/T-fillb.lev
-lib/nethackdir/T-goal.lev
-lib/nethackdir/T-locate.lev
-lib/nethackdir/T-start.lev
-lib/nethackdir/V-filla.lev
-lib/nethackdir/V-fillb.lev
-lib/nethackdir/V-goal.lev
-lib/nethackdir/V-locate.lev
-lib/nethackdir/V-start.lev
-lib/nethackdir/W-filla.lev
-lib/nethackdir/W-fillb.lev
-lib/nethackdir/W-goal.lev
-lib/nethackdir/W-locate.lev
-lib/nethackdir/W-start.lev
-lib/nethackdir/air.lev
-lib/nethackdir/asmodeus.lev
-lib/nethackdir/astral.lev
-lib/nethackdir/awaits.au
-lib/nethackdir/baalz.lev
-lib/nethackdir/beartrap.au
-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/breath.au
-lib/nethackdir/castle.lev
-lib/nethackdir/clunk.au
-lib/nethackdir/cmdhelp
-lib/nethackdir/coin.au
-lib/nethackdir/data
-lib/nethackdir/death.au
-lib/nethackdir/destroy2.au
-lib/nethackdir/doorclos.au
-lib/nethackdir/dooropen2.au
-lib/nethackdir/drop.au
-lib/nethackdir/dungeon
-lib/nethackdir/earth.lev
-lib/nethackdir/fakewiz1.lev
-lib/nethackdir/fakewiz2.lev
-lib/nethackdir/fire.lev
-lib/nethackdir/forcefld.au
-lib/nethackdir/frogs.au
-lib/nethackdir/gong.au
-lib/nethackdir/hallu.au
-lib/nethackdir/help
-lib/nethackdir/hh
-lib/nethackdir/history
-lib/nethackdir/hit2.au
-lib/nethackdir/juiblex.lev
-lib/nethackdir/knox.lev
-lib/nethackdir/kops.au
-lib/nethackdir/landmine.au
-lib/nethackdir/latin.au
-lib/nethackdir/latin_short.au
-lib/nethackdir/level_up.au
-lib/nethackdir/license
-lib/nethackdir/logfile
-lib/nethackdir/medusa-1.lev
-lib/nethackdir/medusa-2.lev
-lib/nethackdir/memor.au
-lib/nethackdir/memories.au
-lib/nethackdir/minderode.au
-lib/nethackdir/minefill.lev
-lib/nethackdir/minend-1.lev
-lib/nethackdir/minend-2.lev
-lib/nethackdir/minetn-1.lev
-lib/nethackdir/minetn-2.lev
-lib/nethackdir/miss2.au
-lib/nethackdir/mock.au
-lib/nethackdir/nethack
-lib/nethackdir/ohdear.au
-lib/nethackdir/opthelp
-lib/nethackdir/options
-lib/nethackdir/oracle.lev
-lib/nethackdir/oracles
-lib/nethackdir/orcus.lev
-lib/nethackdir/ouch2.au
-lib/nethackdir/perm
-lib/nethackdir/quest.dat
-lib/nethackdir/record
-lib/nethackdir/rip.xpm
-lib/nethackdir/rumors
-lib/nethackdir/sanctum.lev
-lib/nethackdir/squeek.au
-lib/nethackdir/tada.au
-lib/nethackdir/thump.au
-lib/nethackdir/tiles.xpm
-lib/nethackdir/tower1.lev
-lib/nethackdir/tower2.lev
-lib/nethackdir/tower3.lev
-lib/nethackdir/trapdoor.au
-lib/nethackdir/valley.lev
-lib/nethackdir/vomit.au
-lib/nethackdir/water.lev
-lib/nethackdir/weak.au
-lib/nethackdir/whistle2.au
-lib/nethackdir/wizard1.lev
-lib/nethackdir/wizard2.lev
-lib/nethackdir/wizard3.lev
-lib/nethackdir/wizhelp
-lib/nethackdir/yendor.au
-@dirrm lib/nethackdir/save
-@dirrm lib/nethackdir
+%%PORTDOCS%%share/doc/nethack/Guidebook.txt
+lib/nethack/nethack
+@exec mkdir %D/lib/nethack/save
+@exec chmod -R 775 %D/lib/nethack
+@exec chmod 2755 %D/lib/nethack/nethack
+@exec chown games:games %D/lib/nethack/save
+@unexec rm -rf %D/lib/nethack/save
+lib/nethack/Arc-fila.lev
+lib/nethack/Arc-filb.lev
+lib/nethack/Arc-goal.lev
+lib/nethack/Arc-loca.lev
+lib/nethack/Arc-strt.lev
+lib/nethack/Bar-fila.lev
+lib/nethack/Bar-filb.lev
+lib/nethack/Bar-goal.lev
+lib/nethack/Bar-loca.lev
+lib/nethack/Bar-strt.lev
+lib/nethack/Cav-fila.lev
+lib/nethack/Cav-filb.lev
+lib/nethack/Cav-goal.lev
+lib/nethack/Cav-loca.lev
+lib/nethack/Cav-strt.lev
+lib/nethack/Hea-fila.lev
+lib/nethack/Hea-filb.lev
+lib/nethack/Hea-goal.lev
+lib/nethack/Hea-loca.lev
+lib/nethack/Hea-strt.lev
+lib/nethack/Kni-fila.lev
+lib/nethack/Kni-filb.lev
+lib/nethack/Kni-goal.lev
+lib/nethack/Kni-loca.lev
+lib/nethack/Kni-strt.lev
+lib/nethack/Mon-fila.lev
+lib/nethack/Mon-filb.lev
+lib/nethack/Mon-goal.lev
+lib/nethack/Mon-loca.lev
+lib/nethack/Mon-strt.lev
+lib/nethack/Pri-fila.lev
+lib/nethack/Pri-filb.lev
+lib/nethack/Pri-goal.lev
+lib/nethack/Pri-loca.lev
+lib/nethack/Pri-strt.lev
+lib/nethack/Ran-fila.lev
+lib/nethack/Ran-filb.lev
+lib/nethack/Ran-goal.lev
+lib/nethack/Ran-loca.lev
+lib/nethack/Ran-strt.lev
+lib/nethack/Rog-fila.lev
+lib/nethack/Rog-filb.lev
+lib/nethack/Rog-goal.lev
+lib/nethack/Rog-loca.lev
+lib/nethack/Rog-strt.lev
+lib/nethack/Sam-fila.lev
+lib/nethack/Sam-filb.lev
+lib/nethack/Sam-goal.lev
+lib/nethack/Sam-loca.lev
+lib/nethack/Sam-strt.lev
+lib/nethack/Tou-fila.lev
+lib/nethack/Tou-filb.lev
+lib/nethack/Tou-goal.lev
+lib/nethack/Tou-loca.lev
+lib/nethack/Tou-strt.lev
+lib/nethack/Val-fila.lev
+lib/nethack/Val-filb.lev
+lib/nethack/Val-goal.lev
+lib/nethack/Val-loca.lev
+lib/nethack/Val-strt.lev
+lib/nethack/Wiz-fila.lev
+lib/nethack/Wiz-filb.lev
+lib/nethack/Wiz-goal.lev
+lib/nethack/Wiz-loca.lev
+lib/nethack/Wiz-strt.lev
+lib/nethack/air.lev
+lib/nethack/asmodeus.lev
+lib/nethack/astral.lev
+lib/nethack/baalz.lev
+lib/nethack/bigrm-1.lev
+lib/nethack/bigrm-2.lev
+lib/nethack/bigrm-3.lev
+lib/nethack/bigrm-4.lev
+lib/nethack/bigrm-5.lev
+lib/nethack/castle.lev
+lib/nethack/cmdhelp
+lib/nethack/data
+lib/nethack/dungeon
+lib/nethack/earth.lev
+lib/nethack/fakewiz1.lev
+lib/nethack/fakewiz2.lev
+lib/nethack/fire.lev
+lib/nethack/help
+lib/nethack/hh
+lib/nethack/history
+lib/nethack/juiblex.lev
+lib/nethack/knox.lev
+lib/nethack/license
+lib/nethack/medusa-1.lev
+lib/nethack/medusa-2.lev
+lib/nethack/minefill.lev
+lib/nethack/minend-1.lev
+lib/nethack/minend-2.lev
+lib/nethack/minetn-1.lev
+lib/nethack/minetn-2.lev
+lib/nethack/opthelp
+lib/nethack/options
+lib/nethack/oracle.lev
+lib/nethack/oracles
+lib/nethack/orcus.lev
+lib/nethack/pet_mark.xbm
+lib/nethack/quest.dat
+lib/nethack/rip.xpm
+lib/nethack/rumors
+lib/nethack/sanctum.lev
+lib/nethack/soko1-1.lev
+lib/nethack/soko1-2.lev
+lib/nethack/soko2-1.lev
+lib/nethack/soko2-2.lev
+lib/nethack/soko3-1.lev
+lib/nethack/soko3-2.lev
+lib/nethack/soko4-1.lev
+lib/nethack/soko4-2.lev
+lib/nethack/tower1.lev
+lib/nethack/tower2.lev
+lib/nethack/tower3.lev
+lib/nethack/valley.lev
+lib/nethack/water.lev
+lib/nethack/wizard1.lev
+lib/nethack/wizard2.lev
+lib/nethack/wizard3.lev
+lib/nethack/wizhelp
+lib/nethack/x11tiles
+@mode 664
+lib/nethack/logfile
+lib/nethack/record
+lib/nethack/perm
+@dirrm lib/nethack
+%%PORTDOCS%%@dirrm share/doc/nethack