4 files changed, 18 insertions, 39 deletions

diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 04b843245554..96592efe5390 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -3,15 +3,17 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.11 1998/02/07 19:33:15 andreas Exp $
+# $Id: Makefile,v 1.12 1998/03/14 14:58:02 andreas Exp $
 #
 
 DISTNAME=	nethack-3.2.2
-PKGNAME=	nethack-qt-3.2.2
+PKGNAME=	qt-nethack-1.0.1
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.troll.no/warwick/nethack/ \
+		http://trolls.troll.no/warwick/nethack/ \
+		ftp://ftp.troll.no/contrib/ \
 		${MASTER_SITE_GNU}
-QT_PATCH=	nhqt0.93.tar.gz
+QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
 QT_SOUND=	nhs.tar.gz
 DISTFILES=	nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
 
@@ -19,7 +21,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
 		xpmtoppm:${PORTSDIR}/graphics/netpbm
-LIB_DEPENDS=	qt\\.1\\.:${PORTSDIR}/x11/qt \
+LIB_DEPENDS=	qt\\.1\\.40:${PORTSDIR}/x11/qt140 \
 		Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
 
@@ -41,6 +43,9 @@ pre-configure:
 	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-sounds.c.diff
 	@ cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/include-unixconf.h.diff
 
+pre-build:
+	(cd ${WRKSRC}/util; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} tile2x11 )
+
 post-install:
 	@ cd ${WRKSRC}/doc; chmod 644 *.6
 	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
@@ -58,8 +63,8 @@ post-install:
 	@ ${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}  "c) Copy the example nethackrc file from ${FILESDIR} to your"
 	@ ${ECHO}  "   login directory:"
-	@ ${ECHO}  "   \${CP} \$FILESDIR/sample.nethackrc \$HOME/.nethackrc"
+	@ ${ECHO}  "   ${CP} ${FILESDIR}/sample.nethackrc ${HOME}/.nethackrc"
 
 .include <bsd.port.mk>
diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index 59eb1556a8e9..3cc2a427dfc8 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,3 +1,3 @@
 MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (nhqt0.93.tar.gz) = a0709521ec26be0df6fbb04bff3354ee
+MD5 (qnethack-3.2.2.1.0.1.src.tar.gz) = 19054e00e5f99c9b05d967ebd977e81a
 MD5 (nhs.tar.gz) = 605f8bac130a9ad9857efd859d7a0dcf
diff --git a/games/nethack-qt/pkg-comment b/games/nethack-qt/pkg-comment
index d4eae3170b88..2a563dc5bfe5 100644
--- a/games/nethack-qt/pkg-comment
+++ b/games/nethack-qt/pkg-comment
@@ -1 +1 @@
-A dungeon explorin', slashin', hackin' game with graphic and sound support
+A dungeon explorin', slashin', hackin' game with graphic and sound
diff --git a/games/nethack-qt/pkg-plist b/games/nethack-qt/pkg-plist
index 269b1fad7324..bf8ecdeb7446 100644
--- a/games/nethack-qt/pkg-plist
+++ b/games/nethack-qt/pkg-plist
@@ -1,9 +1,7 @@
 bin/nethack
-lib/nethackdir/nethack
 @exec mkdir %D/lib/nethackdir/save
 @exec chmod 775 %D/lib/nethackdir/save
 @exec chown games.games %D/lib/nethackdir/save
-@dirrm %D/lib/nethackdir/save
 man/man6/dgn_comp.6.gz
 man/man6/dlb.6.gz
 man/man6/lev_comp.6.gz
@@ -81,26 +79,19 @@ lib/nethackdir/bigrm-2.lev
 lib/nethackdir/bigrm-3.lev
 lib/nethackdir/bigrm-4.lev
 lib/nethackdir/bigrm-5.lev
-lib/nethackdir/blind.ppm
 lib/nethackdir/breath.au
 lib/nethackdir/castle.lev
-lib/nethackdir/cha.ppm
-lib/nethackdir/chaotic.ppm
 lib/nethackdir/clunk.au
 lib/nethackdir/cmdhelp
 lib/nethackdir/coin.au
-lib/nethackdir/con.ppm
-lib/nethackdir/confused.ppm
 lib/nethackdir/data
 lib/nethackdir/death.au
 lib/nethackdir/destroy2.au
-lib/nethackdir/dex.ppm
 lib/nethackdir/doorclos.au
 lib/nethackdir/dooropen2.au
 lib/nethackdir/drop.au
 lib/nethackdir/dungeon
 lib/nethackdir/earth.lev
-lib/nethackdir/ext_encumber.ppm
 lib/nethackdir/fakewiz1.lev
 lib/nethackdir/fakewiz2.lev
 lib/nethackdir/fire.lev
@@ -108,21 +99,16 @@ lib/nethackdir/forcefld.au
 lib/nethackdir/frogs.au
 lib/nethackdir/gong.au
 lib/nethackdir/hallu.au
-lib/nethackdir/hallu.ppm
 lib/nethackdir/help
 lib/nethackdir/hh
 lib/nethackdir/history
 lib/nethackdir/hit2.au
-lib/nethackdir/hungry.ppm
-lib/nethackdir/hvy_encumber.ppm
-lib/nethackdir/int.ppm
 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/lawful.ppm
 lib/nethackdir/level_up.au
 lib/nethackdir/license
 lib/nethackdir/logfile
@@ -138,8 +124,7 @@ lib/nethackdir/minetn-1.lev
 lib/nethackdir/minetn-2.lev
 lib/nethackdir/miss2.au
 lib/nethackdir/mock.au
-lib/nethackdir/mod_encumber.ppm
-lib/nethackdir/neutral.ppm
+lib/nethackdir/nethack
 lib/nethackdir/ohdear.au
 lib/nethackdir/opthelp
 lib/nethackdir/options
@@ -147,28 +132,16 @@ lib/nethackdir/oracle.lev
 lib/nethackdir/oracles
 lib/nethackdir/orcus.lev
 lib/nethackdir/ouch2.au
-lib/nethackdir/ovr_encumber.ppm
 lib/nethackdir/perm
-lib/nethackdir/pet_mark.pbm
-lib/nethackdir/pet_mark.ppm
-lib/nethackdir/qt_tiles_0.ppm
-lib/nethackdir/qt_tiles_1.ppm
-lib/nethackdir/qt_tiles_2.ppm
-lib/nethackdir/qt_tiles_3.ppm
 lib/nethackdir/quest.dat
 lib/nethackdir/record
-lib/nethackdir/rip.ppm
+lib/nethackdir/rip.xpm
 lib/nethackdir/rumors
 lib/nethackdir/sanctum.lev
-lib/nethackdir/satiated.ppm
-lib/nethackdir/sick_fp.ppm
-lib/nethackdir/sick_il.ppm
-lib/nethackdir/slt_encumber.ppm
 lib/nethackdir/squeek.au
-lib/nethackdir/str.ppm
-lib/nethackdir/stunned.ppm
 lib/nethackdir/tada.au
 lib/nethackdir/thump.au
+lib/nethackdir/tiles.xpm
 lib/nethackdir/tower1.lev
 lib/nethackdir/tower2.lev
 lib/nethackdir/tower3.lev
@@ -178,9 +151,10 @@ lib/nethackdir/vomit.au
 lib/nethackdir/water.lev
 lib/nethackdir/weak.au
 lib/nethackdir/whistle2.au
-lib/nethackdir/wis.ppm
 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