Upgrade from QT version 0.9 to 0.93

Upgraded URL's (thanks to Bill Fenners port survey)
list of changes: see the README file in the QT patch.
Homepage now located at: http://www.troll.no/~warwick/nethack/

3 files changed, 11 insertions, 25 deletions

diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index bd75b149e5ff..00f82f7d0ecd 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -3,17 +3,16 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.9 1997/11/09 08:14:44 jkh Exp $
+# $Id: Makefile,v 1.10 1997/11/10 09:29:54 asami Exp $
 #
 
 DISTNAME=	nethack-3.2.2
 PKGNAME=	nethack-qt-3.2.2
 CATEGORIES=	games x11
 MASTER_SITES=	ftp://ftp.uu.net/pub/games/nethack/sources/ \
-		http://www.uq.edu.au/~cswallis/nhqt/ \
-		http://student.uq.edu.au/~s002434/ \
+		http://www.troll.no/~warwick/nethack/ \
 		${MASTER_SITE_GNU}
-QT_PATCH=	nhqt0.9.tar.gz
+QT_PATCH=	nhqt0.93.tar.gz
 QT_SOUND=	nhs.tar.gz
 DISTFILES=	nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
 
@@ -36,12 +35,12 @@ pre-configure:
 	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
 	@ ${ECHO} "!! important for you                                     !!"
 	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ cd ${WRKSRC}/win; tar xvzf ${DISTDIR}/${QT_PATCH}
-	@ cd ${WRKSRC}; ${PATCH} < win/Qt/nhqt.patch
+	@ 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} < ${FILESDIR}/src-Makefile.diff
-	@ cd ${WRKSRC}/src; ${PATCH} < ${FILESDIR}/src-sounds.c.diff
-	@ cd ${WRKSRC}; ${PATCH} < ${FILESDIR}/include-unixconf.h.diff
+	@ 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-install:
 	@ cd ${WRKSRC}/doc; chmod 644 *.6
@@ -60,8 +59,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/nethack33-qt/distinfo b/games/nethack33-qt/distinfo
index abd07b3b68a8..59eb1556a8e9 100644
--- a/games/nethack33-qt/distinfo
+++ b/games/nethack33-qt/distinfo
@@ -1,3 +1,3 @@
 MD5 (nethack-3.2.2.tar.gz) = c85de4d14453b3a2d182d1dfc2ca04df
-MD5 (nhqt0.9.tar.gz) = 9e59311148cc944978d8d04cb87adf9d
+MD5 (nhqt0.93.tar.gz) = a0709521ec26be0df6fbb04bff3354ee
 MD5 (nhs.tar.gz) = 605f8bac130a9ad9857efd859d7a0dcf
diff --git a/games/nethack33-qt/files/src-Makefile.diff b/games/nethack33-qt/files/src-Makefile.diff
index f43c85bacc75..92f754dcd9b2 100644
--- a/games/nethack33-qt/files/src-Makefile.diff
+++ b/games/nethack33-qt/files/src-Makefile.diff
@@ -24,16 +24,3 @@
  
  # make NetHack
  GAME     = nethack
-@@ -536,6 +536,12 @@
- 
- # DO NOT DELETE THIS LINE
- 
-+qaudio-p.moc: ../win/Qt/qaudio-p.h
-+	moc ../win/Qt/qaudio-p.h > qaudio-p.moc
-+qaudio-p.o: ../win/Qt/qaudio-p.cc qaudio-p.moc
-+	$(CXX) $(CXXFLAGS) -c ../win/Qt/qaudio-p.cc
-+qaudio.o: ../win/Qt/qaudio.cc
-+	$(CXX) $(CXXFLAGS) -c ../win/Qt/qaudio.cc
- qt_win.o: ../win/Qt/qt_win.cc  ../include/hack.h ../include/qt_win.h ../include/cluster.h qt_win.moc
- 	$(CXX) $(CXXFLAGS) -c ../win/Qt/qt_win.cc
- qviewp.o: ../win/Qt/qviewp.cc  ../include/qviewp.h qviewp.moc