cosmetic changes using portlint, a really nice tool ;-)

2 files changed, 28 insertions, 60 deletions

diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index 5d60bb2dc385..2f272641eb87 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1997/04/15 01:49:44 asami Exp $
+# $Id: Makefile,v 1.7 1997/07/12 16:53:38 max Exp $
 #
 
 DISTNAME=	nethack-3.2.2
@@ -30,38 +30,38 @@ USE_GMAKE=	yes
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
 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 xvzf ${DISTDIR}/${QT_PATCH}
-	@cd ${WRKSRC}; patch < 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
+	@ ${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 xvzf ${DISTDIR}/${QT_PATCH}
+	@ cd ${WRKSRC}; ${PATCH} < 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
 
 post-install:
-	@cd ${WRKSRC}/doc; chmod 644 *.6
-	@cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@ cd ${WRKSRC}/doc; chmod 644 *.6
+	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/nethack
 	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
 .endif
-	@cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@cd ${PREFIX}/lib/nethackdir; chown games.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"
+	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
+	@ cd ${PREFIX}/lib/nethackdir; chown games.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/pkg-descr b/games/nethack33-qt/pkg-descr
index a96d2d7b08fa..143ab871f433 100644
--- a/games/nethack33-qt/pkg-descr
+++ b/games/nethack33-qt/pkg-descr
@@ -1,14 +1,11 @@
 From: http://www.uq.edu.au/~cswallis/nhqt/
 
-NetHack QT - What is it?
-
 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.
 So, "NetHack with Qt interface" is a version of NetHack which has
 a user interface module written using the Qt toolkit.
 
-How is it better than the plain X11 interface?
 The Qt interface has these extra features: 
 
 o   Tiles (graphics) in the inventory and other item-menu windows. 
@@ -23,32 +20,3 @@ 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.
-
-The standard NetHack X11 interface is written in C using the Athena
-Widgets toolkit. The strongest reason for doing it that way was
-that NetHack is one of the most incredibly portable programs of
-any kind, and the Athena Widget Set is also available for free on
-a large number of X11 implementations. The problem is that Athena
-Widgets (also known as Xaw) is very ugly, difficult to program in,
-and buggy. The Qt interface toolkit on the other hand is written
-in C++ and is freely portable to any X11 implementation, but is
-less widespread, making it inappropriate for the standard NetHack
-X11 interface.
-
-Sound support
-
-The QtNetHack patch includes experimental support for sounds to be
-played based on messages. For example, you can arrange for a gong
-to sound when the message "... cursing shoplifter..." appears. The
-system maps any regular expression (can be just some text) to a
-sound. The QtNetHack windowport is the only one providing this
-method, and it does so using the NAS (Network Audio System) . As
-distributed, the patch enables this feature - see include/config.h
-once you have applied the patch, and look for USER_SOUNDS for an
-explanation of how to disable it if you want to.
-
-You will also want to collect some sound samples to try it out,
-and a .nethackrc attaching them to messages. This package contains
-the .au files that I use, and my ~/.nethackrc. Many of the sounds
-are from the nhsound package, which you can find referenced on the
-NetHack Home Page.